xwh修改产品备案模板

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

@@ -159,6 +159,9 @@ public class GoodsProductController {
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
                 }
+                if (org.apache.commons.lang3.StringUtils.isEmpty(goodsProductDto.getProdBrandCn()) && org.apache.commons.lang3.StringUtils.isEmpty(goodsProductDto.getProdBrandEn())) {
+                    throw new RRException("品牌中文或品牌英文必填其中之一!");
+                }
             }
         }
         try {

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

@@ -35,6 +35,26 @@ public class GoodsProductDto implements Serializable {
 
     private String prodBrand;
 
+    private String prodBrandCn;
+
+    private String prodBrandEn;
+
+    public String getProdBrandCn() {
+        return prodBrandCn;
+    }
+
+    public void setProdBrandCn(String prodBrandCn) {
+        this.prodBrandCn = prodBrandCn;
+    }
+
+    public String getProdBrandEn() {
+        return prodBrandEn;
+    }
+
+    public void setProdBrandEn(String prodBrandEn) {
+        this.prodBrandEn = prodBrandEn;
+    }
+
     private String oriCntCode;
 
     private String unitCode;

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

@@ -102,6 +102,16 @@ public class GoodsProductServiceImpl implements GoodsProductService {
                 if (StringUtils.isEmpty(goodsProductDto.getProdBrand())) {
                     throw new RRException("第" + count + "行的品牌为空！");
                 }
+                if (StringUtils.isEmpty(goodsProductDto.getProdBrandCn()) && StringUtils.isEmpty(goodsProductDto.getProdBrandEn())) {
+                    throw new RRException("第" + count + "行的品牌中文或品牌英文必填其中之一！");
+                }
+                if (!StringUtils.isEmpty(goodsProductDto.getProdBrandCn()) && !StringUtils.isEmpty(goodsProductDto.getProdBrandEn())) {
+                    goodsProductDto.setProdBrand(goodsProductDto.getProdBrandCn()+"#&#"+goodsProductDto.getProdBrandEn());
+                }else if (!StringUtils.isEmpty(goodsProductDto.getProdBrandCn()) && StringUtils.isEmpty(goodsProductDto.getProdBrandEn())){
+                    goodsProductDto.setProdBrand(goodsProductDto.getProdBrandCn());
+                }else{
+                    goodsProductDto.setProdBrand(goodsProductDto.getProdBrandEn());
+                }
                 if (StringUtils.isEmpty(goodsProductDto.getUnitCode())) {
                     throw new RRException("第" + count + "行的计量单位为空！");
                 }

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

@@ -10,32 +10,33 @@
                 <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.prodBrand</mapping>
-                <mapping row="1" col="6">GoodsProductDto.unitCode</mapping>
-                <mapping row="1" col="7">GoodsProductDto.cusGoodsCode</mapping>
-                <mapping row="1" col="8">GoodsProductDto.cusDeclEle</mapping>
-                <mapping row="1" col="9">GoodsProductDto.oriCntCode</mapping>
-                <mapping row="1" col="10">GoodsProductDto.ciqProdModel</mapping>
-                <mapping row="1" col="11">GoodsProductDto.ciqMainEle</mapping>
-                <mapping row="1" col="12">GoodsProductDto.declCurrencyCode</mapping>
-                <mapping row="1" col="13">GoodsProductDto.netWeight</mapping>
-                <mapping row="1" col="14">GoodsProductDto.declPrice</mapping>
-                <mapping row="1" col="15">GoodsProductDto.legalUnit1Qty</mapping>
-                <mapping row="1" col="16">GoodsProductDto.legalUnit2Qty</mapping>
-                <mapping row="1" col="17">GoodsProductDto.ciqMonitorType</mapping>
-                <mapping row="1" col="18">GoodsProductDto.prodCompName</mapping>
-                <mapping row="1" col="19">GoodsProductDto.prodCompCntCode</mapping>
-                <mapping row="1" col="20">GoodsProductDto.itemRecordNo</mapping>
-                <mapping row="1" col="21">GoodsProductDto.isLaw</mapping>
-                <mapping row="1" col="22">GoodsProductDto.isGift</mapping>
-                <mapping row="1" col="23">GoodsProductDto.supplierName</mapping>
-                <mapping row="1" col="24">GoodsProductDto.supplierCntCode</mapping>
-                <mapping row="1" col="25">GoodsProductDto.grossWeight</mapping>
-                <mapping row="1" col="26">GoodsProductDto.localEmsNo</mapping>
-                <mapping row="1" col="27">GoodsProductDto.emsClassCode</mapping>
-                <mapping row="1" col="28">GoodsProductDto.thirdMerchSn</mapping>
-                <mapping row="1" col="29">GoodsProductDto.prodRecordName</mapping>
-                <mapping row="1" col="30">GoodsProductDto.prodRecordEname</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>
             </section>
             <loopbreakcondition>
                 <rowcheck offset="0">