产品备案信息修改添加字段

kmall-admin/src/main/java/com/kmall/admin/controller/GoodsProductController.java

@@ -159,6 +159,7 @@ public class GoodsProductController {
                 Map<String, Object> valideDate = MapBeanUtil.fromObject(goodsProductDto);
                 ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
                 builder.put("merchSn", "商户编号");
+                builder.put("batchNo", "批次号");
                 builder.put("sku", "sku（商品料件号）");
                 builder.put("prodBarcode", "商品条形码");
                 builder.put("prodName", "商品中文名");

kmall-admin/src/main/java/com/kmall/admin/controller/oms2kmall/Oms2KmallController.java

@@ -3,6 +3,7 @@ package com.kmall.admin.controller.oms2kmall;
 import com.kmall.admin.controller.kmall2oms.KtoOmsController;
 import com.kmall.admin.service.oms2kmall.Oms2KmallService;
 import com.kmall.admin.utils.jackson.JacksonUtil;
+import com.kmall.admin.utils.oms.response.GoodsProductAuditResponse;
 import com.kmall.admin.utils.oms.response.TransferResponse;
 import com.kmall.admin.utils.oms.result.Result;
 import com.kmall.common.utils.R;
@@ -26,16 +27,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
 public class Oms2KmallController {
     private static Logger LOGGER = LoggerFactory.getLogger(Oms2KmallController.class);
 
-
     @Autowired
     private Oms2KmallService oms2KmallService;
 
-
-
     @RequestMapping("/transGoods/notice")
     public R transGoodsNotice(@RequestBody Result result){
 
-
         Object dataResult = result.getData();
         if(dataResult == null){
             LOGGER.info("解析响应数据OrderResponse集合失败");
@@ -57,4 +54,27 @@ public class Oms2KmallController {
         return oms2KmallService.transGoodsNotice(wayBillResponse);
     }
 
+    @RequestMapping("/goodsProductAudit/notice")
+    public R goodsProductAuditNotice(@RequestBody Result result){
+        Object dataResult = result.getData();
+        if (dataResult == null) {
+            LOGGER.info("解析响应数据OrderResponse集合失败");
+            return null;
+        }
+        JSONArray json = JSONArray.fromObject(dataResult);
+        if (json == null && json.size() <= 0) {
+            return null;
+        }
+        LOGGER.info("请求参数：" + json.toString());
+
+        GoodsProductAuditResponse goodsProductAuditResponse = null;
+        try {
+            goodsProductAuditResponse = JacksonUtil.fromStringJson(json.getString(0), GoodsProductAuditResponse.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error(e.getMessage());
+        }
+        return oms2KmallService.goodsProductAuditNotice(goodsProductAuditResponse);
+    }
+
 }

kmall-admin/src/main/java/com/kmall/admin/dto/GoodsProductDto.java

@@ -17,6 +17,8 @@ public class GoodsProductDto implements Serializable {
 
     private String prodBarcode;
 
+    private String batchNo;
+
     private String sku;
 
     private String cusCode;
@@ -147,6 +149,14 @@ public class GoodsProductDto implements Serializable {
 
     private String operateFlag; // 1、新增 2、修改
 
+    public String getBatchNo() {
+        return batchNo;
+    }
+
+    public void setBatchNo(String batchNo) {
+        this.batchNo = batchNo;
+    }
+
     public String getOperateFlag() {
         return operateFlag;
     }

kmall-admin/src/main/java/com/kmall/admin/entity/GoodsProductEntity.java

@@ -204,6 +204,66 @@ public class GoodsProductEntity implements Serializable {
 
     private String afterImg;
 
+    private String batchNo;
+
+    private String omsAuditStatus;
+
+    private String omsAuditRemark;
+
+    private Date omsCallbackTime;
+
+    private Date sendTime;
+
+    private Date omsAuditTime;
+
+    public Date getOmsAuditTime() {
+        return omsAuditTime;
+    }
+
+    public void setOmsAuditTime(Date omsAuditTime) {
+        this.omsAuditTime = omsAuditTime;
+    }
+
+    public Date getSendTime() {
+        return sendTime;
+    }
+
+    public void setSendTime(Date sendTime) {
+        this.sendTime = sendTime;
+    }
+
+    public String getBatchNo() {
+        return batchNo;
+    }
+
+    public void setBatchNo(String batchNo) {
+        this.batchNo = batchNo;
+    }
+
+    public String getOmsAuditStatus() {
+        return omsAuditStatus;
+    }
+
+    public void setOmsAuditStatus(String omsAuditStatus) {
+        this.omsAuditStatus = omsAuditStatus;
+    }
+
+    public String getOmsAuditRemark() {
+        return omsAuditRemark;
+    }
+
+    public void setOmsAuditRemark(String omsAuditRemark) {
+        this.omsAuditRemark = omsAuditRemark;
+    }
+
+    public Date getOmsCallbackTime() {
+        return omsCallbackTime;
+    }
+
+    public void setOmsCallbackTime(Date omsCallbackTime) {
+        this.omsCallbackTime = omsCallbackTime;
+    }
+
     public String getUpImg() {
         return upImg;
     }

kmall-admin/src/main/java/com/kmall/admin/service/GoodsProductService.java

@@ -4,6 +4,7 @@ package com.kmall.admin.service;
 import com.kmall.admin.dto.GoodsProductDto;
 import com.kmall.admin.entity.GoodsProductEntity;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -86,4 +87,6 @@ public interface GoodsProductService {
 
     int updateSendOmsFailStatus(List<String> skuList);
 
+    int updateAuditInfo(String sku, String isAudit, Date auditTime, String auditRemark);
+
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsProductServiceImpl.java

@@ -10,6 +10,7 @@ import com.kmall.admin.service.GoodsProductService;
 import com.kmall.admin.utils.ShiroUtils;
 import com.kmall.admin.utils.data.response.ResponseMessage;
 import com.kmall.admin.utils.oms.OmsSign;
+import com.kmall.common.constant.Dict;
 import com.kmall.common.utils.RRException;
 import com.kmall.manager.manager.merch.OmsMerchProperties;
 import okhttp3.Request;
@@ -86,6 +87,9 @@ public class GoodsProductServiceImpl implements GoodsProductService {
                 if (StringUtils.isEmpty(goodsProductDto.getMerchSn())) {
                     throw new RRException("第" + count + "行的商户编号为空！");
                 }
+                if (StringUtils.isEmpty(goodsProductDto.getBatchNo())) {
+                    throw new RRException("第" + count + "行的批次号为空！");
+                }
                 if (StringUtils.isEmpty(goodsProductDto.getSku())) {
                     throw new RRException("第" + count + "行的SKU为空！");
                 }
@@ -181,6 +185,7 @@ public class GoodsProductServiceImpl implements GoodsProductService {
             dto.setGrossWeight(goodsProductEntity.getGrossWeight().toString());
             dto.setDeclPrice(goodsProductEntity.getDeclPrice().toString());
             dto.setOperateFlag(operateFlag);
+            dto.setBatchNo(goodsProductEntity.getBatchNo());
             goodsProductDtoList.add(dto);
         }
         boolean isPass = true;
@@ -220,6 +225,7 @@ public class GoodsProductServiceImpl implements GoodsProductService {
             dto.setGrossWeight(goodsProductEntity.getGrossWeight().toString());
             dto.setDeclPrice(goodsProductEntity.getDeclPrice().toString());
             dto.setOperateFlag(operateFlag);
+            dto.setBatchNo(goodsProductEntity.getBatchNo());
             goodsProductDtoList.add(dto);
         }
         boolean isPass = true;
@@ -252,17 +258,31 @@ public class GoodsProductServiceImpl implements GoodsProductService {
     @Override
     public int updateSendOmsPassStatus(List<String> skuList) {
         Map<String, Object> param = new HashMap<>();
-        param.put("isSend", 1);
+        param.put("isSend", Dict.goodsProductIsSend.item_1.getItem());
+        param.put("sendTime", new Date());
+        param.put("omsAuditStatus", Dict.omsAuditStatus.item_0.getItem());
         return goodsProductDao.updateStatusBySkuBatch(skuList, param);
     }
 
     @Override
     public int updateSendOmsFailStatus(List<String> skuList) {
         Map<String, Object> param = new HashMap<>();
-        param.put("isSend", 2);
+        param.put("isSend", Dict.goodsProductIsSend.item_2.getItem());
+        param.put("sendTime", new Date());
+        param.put("omsAuditStatus", Dict.omsAuditStatus.item_0.getItem());
         return goodsProductDao.updateStatusBySkuBatch(skuList, param);
     }
 
+    @Override
+    public int updateAuditInfo(String sku, String isAudit, Date auditTime, String auditRemark) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("omsAuditStatus", isAudit);
+        param.put("omsAuditRemark", auditRemark);
+        param.put("omsCallbackTime", new Date());
+        param.put("omsAuditTime", auditTime);
+        return goodsProductDao.updateStatusBySkuBatch(Arrays.asList(sku), param);
+    }
+
 
     private ResponseMessage requestOmsProduct(List<GoodsProductDto> goodsProductDtoList){
         Map<String, String> sParaTemp = new TreeMap<String, String>();

kmall-admin/src/main/java/com/kmall/admin/service/impl/oms2kmall/Oms2KmallServiceImpl.java

@@ -3,11 +3,13 @@ package com.kmall.admin.service.impl.oms2kmall;
 import com.kmall.admin.controller.oms2kmall.Oms2KmallController;
 import com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity;
 import com.kmall.admin.entity.StoreTransferInventoryOrderEntity;
+import com.kmall.admin.service.GoodsProductService;
 import com.kmall.admin.service.ProductStoreRelaService;
 import com.kmall.admin.service.StoreTransferInventoryOrderDetailService;
 import com.kmall.admin.service.StoreTransferInventoryOrderService;
 import com.kmall.admin.service.oms2kmall.Oms2KmallService;
 import com.kmall.admin.utils.jackson.JacksonUtil;
+import com.kmall.admin.utils.oms.response.GoodsProductAuditResponse;
 import com.kmall.admin.utils.oms.response.TransferResponse;
 import com.kmall.common.constant.Dict;
 import com.kmall.common.utils.R;
@@ -43,6 +45,9 @@ public class Oms2KmallServiceImpl implements Oms2KmallService {
     @Autowired
     private StoreTransferInventoryOrderDetailService storeTransferInventoryOrderDetailService;
 
+    @Autowired
+    private GoodsProductService goodsProductService;
+
     @Transactional
     public R transGoodsNotice(TransferResponse wayBillResponse){
         LOGGER.info("转移单审核结果："+wayBillResponse);
@@ -91,5 +96,14 @@ public class Oms2KmallServiceImpl implements Oms2KmallService {
 
     }
 
+    @Override
+    public R goodsProductAuditNotice(GoodsProductAuditResponse resp) {
+        int count = goodsProductService.updateAuditInfo(resp.getSku(), resp.getIsAudit(), resp.getAuditTime(), resp.getAuditRemark());
+        if (count > 1) {
+            return R.ok();
+        }
+        return R.error("更新0条信息");
+    }
+
 
 }

kmall-admin/src/main/java/com/kmall/admin/service/oms2kmall/Oms2KmallService.java

@@ -1,5 +1,6 @@
 package com.kmall.admin.service.oms2kmall;
 
+import com.kmall.admin.utils.oms.response.GoodsProductAuditResponse;
 import com.kmall.admin.utils.oms.response.TransferResponse;
 import com.kmall.common.utils.R;
 
@@ -12,4 +13,6 @@ public interface Oms2KmallService {
 
     R transGoodsNotice(TransferResponse wayBillResponse);
 
+    R goodsProductAuditNotice(GoodsProductAuditResponse goodsProductAuditResponse);
+
 }

kmall-admin/src/main/java/com/kmall/admin/utils/oms/response/GoodsProductAuditResponse.java

@@ -0,0 +1,47 @@
+package com.kmall.admin.utils.oms.response;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class GoodsProductAuditResponse implements Serializable {
+
+    private String sku;
+
+    private String isAudit;
+
+    private Date auditTime;
+
+    private String auditRemark;
+
+    public String getSku() {
+        return sku;
+    }
+
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
+
+    public String getIsAudit() {
+        return isAudit;
+    }
+
+    public void setIsAudit(String isAudit) {
+        this.isAudit = isAudit;
+    }
+
+    public Date getAuditTime() {
+        return auditTime;
+    }
+
+    public void setAuditTime(Date auditTime) {
+        this.auditTime = auditTime;
+    }
+
+    public String getAuditRemark() {
+        return auditRemark;
+    }
+
+    public void setAuditRemark(String auditRemark) {
+        this.auditRemark = auditRemark;
+    }
+}

kmall-admin/src/main/resources/XmlTemplate/GoodsProductDtoList.xml

@@ -6,37 +6,38 @@
               varType="com.kmall.admin.dto.GoodsProductDto">
             <section startRow="1" endRow="1">
                 <mapping row="1" col="0">GoodsProductDto.merchSn</mapping>
-                <mapping row="1" col="1">GoodsProductDto.sku</mapping>
-                <mapping row="1" col="2">GoodsProductDto.prodBarcode</mapping>
-                <mapping row="1" col="3">GoodsProductDto.prodName</mapping>
-                <mapping row="1" col="4">GoodsProductDto.prodEname</mapping>
-                <mapping row="1" col="5">GoodsProductDto.prodBrandCn</mapping>
-                <mapping row="1" col="6">GoodsProductDto.prodBrandEn</mapping>
-                <mapping row="1" col="7">GoodsProductDto.unitCode</mapping>
-                <mapping row="1" col="8">GoodsProductDto.cusGoodsCode</mapping>
-                <mapping row="1" col="9">GoodsProductDto.cusDeclEle</mapping>
-                <mapping row="1" col="10">GoodsProductDto.oriCntCode</mapping>
-                <mapping row="1" col="11">GoodsProductDto.ciqProdModel</mapping>
-                <mapping row="1" col="12">GoodsProductDto.ciqMainEle</mapping>
-                <mapping row="1" col="13">GoodsProductDto.declCurrencyCode</mapping>
-                <mapping row="1" col="14">GoodsProductDto.netWeight</mapping>
-                <mapping row="1" col="15">GoodsProductDto.declPrice</mapping>
-                <mapping row="1" col="16">GoodsProductDto.legalUnit1Qty</mapping>
-                <mapping row="1" col="17">GoodsProductDto.legalUnit2Qty</mapping>
-                <mapping row="1" col="18">GoodsProductDto.ciqMonitorType</mapping>
-                <mapping row="1" col="19">GoodsProductDto.prodCompName</mapping>
-                <mapping row="1" col="20">GoodsProductDto.prodCompCntCode</mapping>
-                <mapping row="1" col="21">GoodsProductDto.itemRecordNo</mapping>
-                <mapping row="1" col="22">GoodsProductDto.isLaw</mapping>
-                <mapping row="1" col="23">GoodsProductDto.isGift</mapping>
-                <mapping row="1" col="24">GoodsProductDto.supplierName</mapping>
-                <mapping row="1" col="25">GoodsProductDto.supplierCntCode</mapping>
-                <mapping row="1" col="26">GoodsProductDto.grossWeight</mapping>
-                <mapping row="1" col="27">GoodsProductDto.localEmsNo</mapping>
-                <mapping row="1" col="28">GoodsProductDto.emsClassCode</mapping>
-                <mapping row="1" col="29">GoodsProductDto.thirdMerchSn</mapping>
-                <mapping row="1" col="30">GoodsProductDto.prodRecordName</mapping>
-                <mapping row="1" col="31">GoodsProductDto.prodRecordEname</mapping>
+                <mapping row="1" col="1">GoodsProductDto.batchNo</mapping>
+                <mapping row="1" col="2">GoodsProductDto.sku</mapping>
+                <mapping row="1" col="3">GoodsProductDto.prodBarcode</mapping>
+                <mapping row="1" col="4">GoodsProductDto.prodName</mapping>
+                <mapping row="1" col="5">GoodsProductDto.prodEname</mapping>
+                <mapping row="1" col="6">GoodsProductDto.prodBrandCn</mapping>
+                <mapping row="1" col="7">GoodsProductDto.prodBrandEn</mapping>
+                <mapping row="1" col="8">GoodsProductDto.unitCode</mapping>
+                <mapping row="1" col="9">GoodsProductDto.cusGoodsCode</mapping>
+                <mapping row="1" col="10">GoodsProductDto.cusDeclEle</mapping>
+                <mapping row="1" col="11">GoodsProductDto.oriCntCode</mapping>
+                <mapping row="1" col="12">GoodsProductDto.ciqProdModel</mapping>
+                <mapping row="1" col="13">GoodsProductDto.ciqMainEle</mapping>
+                <mapping row="1" col="14">GoodsProductDto.declCurrencyCode</mapping>
+                <mapping row="1" col="15">GoodsProductDto.netWeight</mapping>
+                <mapping row="1" col="16">GoodsProductDto.declPrice</mapping>
+                <mapping row="1" col="17">GoodsProductDto.legalUnit1Qty</mapping>
+                <mapping row="1" col="18">GoodsProductDto.legalUnit2Qty</mapping>
+                <mapping row="1" col="19">GoodsProductDto.ciqMonitorType</mapping>
+                <mapping row="1" col="20">GoodsProductDto.prodCompName</mapping>
+                <mapping row="1" col="21">GoodsProductDto.prodCompCntCode</mapping>
+                <mapping row="1" col="22">GoodsProductDto.itemRecordNo</mapping>
+                <mapping row="1" col="23">GoodsProductDto.isLaw</mapping>
+                <mapping row="1" col="24">GoodsProductDto.isGift</mapping>
+                <mapping row="1" col="25">GoodsProductDto.supplierName</mapping>
+                <mapping row="1" col="26">GoodsProductDto.supplierCntCode</mapping>
+                <mapping row="1" col="27">GoodsProductDto.grossWeight</mapping>
+                <mapping row="1" col="28">GoodsProductDto.localEmsNo</mapping>
+                <mapping row="1" col="29">GoodsProductDto.emsClassCode</mapping>
+                <mapping row="1" col="30">GoodsProductDto.thirdMerchSn</mapping>
+                <mapping row="1" col="31">GoodsProductDto.prodRecordName</mapping>
+                <mapping row="1" col="32">GoodsProductDto.prodRecordEname</mapping>
             </section>
             <loopbreakcondition>
                 <rowcheck offset="0">

kmall-admin/src/main/resources/mybatis/mapper/GoodsProductDao.xml

@@ -53,6 +53,12 @@
 		<result property="rightImg" column="right_img"/>
 		<result property="beforeImg" column="before_img"/>
 		<result property="afterImg" column="after_img"/>
+		<result property="sendTime" column="send_time"/>
+		<result property="omsAuditStatus" column="oms_audit_status"/>
+		<result property="omsAuditRemark" column="oms_audit_remark"/>
+		<result property="omsCallbackTime" column="oms_callback_time"/>
+		<result property="batchNo" column="batch_no"/>
+		<result property="omsAuditTime" column="oms_audit_time"/>
     </resultMap>
 
 	<select id="queryObject" resultType="com.kmall.admin.entity.GoodsProductEntity">
@@ -105,9 +111,15 @@
 			`left_img`,
 			`right_img`,
 			`before_img`,
-			`after_img`
-		from mall_goods_product
-		where mall_goods_product_sn = #{id}
+			`after_img`,
+			`send_time`,
+			`oms_audit_status`,
+			`oms_audit_remark`,
+			`oms_callback_time`,
+			`batch_no`,
+            `oms_audit_time`
+     from mall_goods_product
+     where mall_goods_product_sn = #{id}
 	</select>
 
 	<select id="queryList" resultType="com.kmall.admin.entity.GoodsProductEntity">
@@ -160,7 +172,13 @@
 			`left_img`,
 			`right_img`,
 			`before_img`,
-			`after_img`
+			`after_img`,
+			`send_time`,
+			`oms_audit_status`,
+			`oms_audit_remark`,
+			`oms_callback_time`,
+			`batch_no`,
+			`oms_audit_time`
 		from mall_goods_product
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
@@ -239,7 +257,13 @@
 		`left_img`,
 		`right_img`,
 		`before_img`,
-		`after_img`
+		`after_img`,
+		`send_time`,
+		`oms_audit_status`,
+		`oms_audit_remark`,
+		`oms_callback_time`,
+		`batch_no`,
+		`oms_audit_time`
 		from mall_goods_product
 		WHERE 1=1
 		<if test="sku != null and sku.trim() != ''">
@@ -302,7 +326,13 @@
 		`left_img`,
 		`right_img`,
 		`before_img`,
-		`after_img`
+		`after_img`,
+		`send_time`,
+		`oms_audit_status`,
+		`oms_audit_remark`,
+		`oms_callback_time`,
+		`batch_no`,
+		`oms_audit_time`
 		from mall_goods_product
 		WHERE 1=1
 		<if test="mallGoodsProductSns != null">
@@ -363,7 +393,13 @@
 			`left_img`,
 			`right_img`,
 			`before_img`,
-			`after_img`
+			`after_img`,
+			`send_time`,
+			`oms_audit_status`,
+			`oms_audit_remark`,
+			`oms_callback_time`,
+			`batch_no`,
+			`oms_audit_time`
 		from mall_goods_product
 		where sku = #{sku}
 	</select>
@@ -417,7 +453,13 @@
 			`left_img`,
 			`right_img`,
 			`before_img`,
-			`after_img`
+			`after_img`,
+			`send_time`,
+			`oms_audit_status`,
+			`oms_audit_remark`,
+			`oms_callback_time`,
+			`batch_no`,
+			`oms_audit_time`
 		from mall_goods_product
 		where prod_barcode = #{barCode}
 	</select>
@@ -472,7 +514,8 @@
 			`left_img`,
 			`right_img`,
 			`before_img`,
-			`after_img`)
+			`after_img`,
+			`batch_no`)
 		values(
 			#{mallGoodsProductSn},
 			#{merchSn},
@@ -522,7 +565,8 @@
 			#{leftImg},
 			#{rightImg},
 			#{beforeImg},
-			#{afterImg})
+			#{afterImg},
+		    #{batchNo})
 	</insert>
 
 	<update id="update" parameterType="com.kmall.admin.entity.GoodsProductEntity">
@@ -575,7 +619,12 @@
 			<if test="leftImg != null">`left_img` = #{leftImg},</if>
 			<if test="rightImg != null">`right_img` = #{rightImg},</if>
 			<if test="beforeImg != null">`before_img` = #{beforeImg},</if>
-			<if test="afterImg != null">`after_img` = #{afterImg}</if>
+			<if test="afterImg != null">`after_img` = #{afterImg},</if>
+			<if test="sendTime != null">`send_time` = #{sendTime}, </if>
+			<if test="omsAuditStatus != null">`oms_audit_status` = #{omsAuditStatus}, </if>
+			<if test="omsAuditRemark != null">`oms_audit_remark` = #{omsAuditRemark}, </if>
+			<if test="omsAuditTime != null">`oms_audit_time` = #{omsAuditTime}, </if>
+			<if test="omsCallbackTime != null">`oms_callback_time` = #{omsCallbackTime}, </if>
 		</set>
 		where mall_goods_product_sn = #{mallGoodsProductSn}
 	</update>
@@ -595,6 +644,11 @@
 			<if test="map.exField4 != null">`ex_field4` = #{map.exField4}, </if>
 			<if test="map.exField5 != null">`ex_field5` = #{map.exField5}, </if>
 			<if test="map.isSend != null">`is_send` = #{map.isSend}, </if>
+			<if test="map.sendTime != null">`send_time` = #{map.sendTime}, </if>
+			<if test="map.omsAuditStatus != null">`oms_audit_status` = #{map.omsAuditStatus}, </if>
+			<if test="map.omsAuditRemark != null">`oms_audit_remark` = #{map.omsAuditRemark}, </if>
+			<if test="map.omsAuditTime != null">`oms_audit_time` = #{map.omsAuditTime}, </if>
+			<if test="map.omsCallbackTime != null">`oms_callback_time` = #{map.omsCallbackTime}, </if>
 		</set>
 		where sku in
 		<foreach collection="list" item="sku" open="(" separator="," close=")">

kmall-admin/src/main/webapp/WEB-INF/page/shop/goodsproduct.html

@@ -85,6 +85,9 @@
             <Form-item label="产品条码" prop="prodBarcode">
                 <i-input v-model="goodsProduct.prodBarcode" placeholder="产品条码"/>
             </Form-item>
+            <Form-item label="批次号" prop="batchNo">
+                <i-input v-model="goodsProduct.batchNo" placeholder="批次号"/>
+            </Form-item>
             <Form-item label="sku" prop="sku">
                 <i-input v-model="goodsProduct.sku" placeholder="sku"/>
             </Form-item>
@@ -327,6 +330,24 @@
                     </Form-item>
                 </i-col>
             </Row>
+            <Form-item label="是否发送" prop="isSend">
+                <i-input v-model="goodsProduct.isSend" placeholder="是否发送"/>
+            </Form-item>
+            <Form-item label="发送时间" prop="sendTime">
+                <i-input v-model="goodsProduct.sendTime" placeholder="发送时间"/>
+            </Form-item>
+            <Form-item label="oms审核状态" prop="omsAuditStatus">
+                <i-input v-model="goodsProduct.omsAuditStatus" placeholder="oms审核状态"/>
+            </Form-item>
+            <Form-item label="oms审核备注" prop="omsAuditRemark">
+                <i-input v-model="goodsProduct.omsAuditRemark" placeholder="oms审核备注"/>
+            </Form-item>
+            <Form-item label="oms审核时间" prop="omsAuditTime">
+                <i-input v-model="goodsProduct.omsAuditTime" placeholder="oms审核时间"/>
+            </Form-item>
+            <Form-item label="oms回调时间" prop="omsCallbackTime">
+                <i-input v-model="goodsProduct.omsCallbackTime" placeholder="oms回调时间"/>
+            </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>

kmall-admin/src/main/webapp/js/shop/goodsproduct.js

@@ -14,6 +14,7 @@ $(function () {
             {label: '第三方商户编号', name: 'thirdMerchSn', index: 'third_merch_sn', width: 160},
             {label: '产品条码', name: 'prodBarcode', index: 'prod_barcode', width: 140},
             {label: 'sku', name: 'sku', index: 'sku', width: 140},
+            {label: '批次号', name: 'batchNo', index: 'batch_no', width: 140},
             {label: '海关商品编码', name: 'cusGoodsCode', index: 'cus_goods_code', width: 140},
             {label: '中文名称', name: 'prodName', index: 'prod_name', width: 140},
             {label: '英文名称', name: 'prodEname', index: 'prod_ename', width: 140},
@@ -71,6 +72,36 @@ $(function () {
                     }
                     return '';
                 }
+            },            {
+                label: '发送时间', name: 'sendTime', index: 'send_time', width: 140, formatter: function (value) {
+                    return transDate(value, 'yyyy-MM-dd hh:mm:ss');
+                }
+            },
+            {
+                label: 'oms审核状态', name: 'omsAuditStatus', index: 'oms_audit_status', width: 140, formatter: function (value) {
+                    if (value == '0') {
+                        return '未审核';
+                    } else if (value == '1') {
+                        return '待审核';
+                    } else if (value == '2') {
+                        return '审核成功';
+                    } else if (value == '3') {
+                        return '审核失败';
+                    }
+                    return '';
+                }
+            },
+            {
+                label: 'oms审核备注', name: 'omsAuditRemark', index: 'oms_audit_remark', width: 140 },
+            {
+                label: 'oms回调时间', name: 'omsCallbackTime', index: 'oms_callback_time', width: 140, formatter: function (value) {
+                    return transDate(value, 'yyyy-MM-dd hh:mm:ss');
+                }
+            },
+            {
+                label: 'oms审核时间', name: 'omsAuditTime', index: 'oms_audit_time', width: 140, formatter: function (value) {
+                    return transDate(value, 'yyyy-MM-dd hh:mm:ss');
+                }
             },
             {label: '海关申报要素', name: 'cusDeclEle', index: 'cus_decl_ele', width: 140},
             {label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 140},

kmall-common/src/main/java/com/kmall/common/constant/Dict.java

@@ -1810,5 +1810,75 @@ public class Dict {
 
     }
 
+    /**
+     * 产品备案信息发送oms状态
+     */
+    public enum goodsProductIsSend {
+        item_0("0", "未发送"),
+        item_1("1", "发送成功"),
+        item_2("2", "发送失败");
+
+        private String item;
+        private String itemName;
+
+        goodsProductIsSend(String item, String itemName) {
+            this.item = item;
+            this.itemName = itemName;
+        }
+
+        public String getItem() {
+            return item;
+        }
+
+        public void setItem(String item) {
+            this.item = item;
+        }
+
+        public String getItemName() {
+            return itemName;
+        }
+
+        public void setItemName(String itemName) {
+            this.itemName = itemName;
+        }
+
+    }
+
+
+    /**
+     * 产品备案信息oms审核状态
+     */
+    public enum omsAuditStatus {
+        item_0("0", "未审核"),
+        item_1("1", "审核中"),
+        item_2("2", "审核成功"),
+        item_3("3", "审核失败");
+
+        private String item;
+        private String itemName;
+
+        omsAuditStatus(String item, String itemName) {
+            this.item = item;
+            this.itemName = itemName;
+        }
+
+        public String getItem() {
+            return item;
+        }
+
+        public void setItem(String item) {
+            this.item = item;
+        }
+
+        public String getItemName() {
+            return itemName;
+        }
+
+        public void setItemName(String itemName) {
+            this.itemName = itemName;
+        }
+
+    }
+
 
 }