Merge branch 'master' of xwh/kmall-pt-general into master

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">

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

@@ -3,6 +3,15 @@
 <head>
     <title>产品信息备案表</title>
     #parse("sys/header.html")
+    <style>
+        .ui-jqgrid .ui-jqgrid-bdiv {
+            border-top: 1px solid #E1E1E1;
+            overflow-x: auto;
+        }
+        .frozen-div, .frozen-bdiv {
+            background-color: #E4E6E9;/*与网页背景色一致*/
+        }
+    </style>
 </head>
 <body>
 <div id="rrapp" v-cloak>
@@ -39,7 +48,7 @@
             </div>
         </Row>
 	    <table id="jqGrid"></table>
-	    <div id="jqGridPager"></div>
+	    <div id="jqGridPager"><div class="ui-jqgrid-bdiv frozen-div"></div></div>
     </div>
 
     <Card v-show="!showList">

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

@@ -4,28 +4,28 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'mallGoodsProductSn', name: 'mallGoodsProductSn', index: 'mall_goods_product_sn', key: true, hidden: true},
-			{label: '商户编号', name: 'merchSn', index: 'merch_sn', width: 80},
-			{label: '第三方商户编号', name: 'thirdMerchSn', index: 'third_merch_sn', width: 80},
-			{label: '产品条码', name: 'prodBarcode', index: 'prod_barcode', width: 80},
-			{label: 'sku', name: 'sku', index: 'sku', width: 80},
-			{label: '海关商品编码', name: 'cusGoodsCode', index: 'cus_goods_code', width: 80},
-			{label: '中文名称', name: 'prodName', index: 'prod_name', width: 80},
-			{label: '英文名称', name: 'prodEname', index: 'prod_ename', width: 80},
-			{label: '中文备案名称', name: 'prodRecordName', index: 'prod_record_name', width: 80},
-			{label: '英文备案名称', name: 'prodRecordEname', index: 'prod_record_ename', width: 80},
-			{label: '国检规格型号', name: 'ciqProdModel', index: 'ciq_prod_model', width: 80},
-			{label: '品牌', name: 'prodBrand', index: 'prod_brand', width: 80},
-			{label: '原产国代码', name: 'oriCntCode', index: 'ori_cnt_code', width: 80},
-			{label: '计量单位代码', name: 'unitCode', index: 'unit_code', width: 80},
-			{label: '申报价格', name: 'declPrice', index: 'decl_price', width: 80},
-			{label: '申报币种代码', name: 'declCurrencyCode', index: 'decl_currency_code', width: 80},
-			{label: '供应商企业名称', name: 'supplierName', index: 'supplier_name', width: 80},
-			{label: '供货商企业国别代码', name: 'supplierCntCode', index: 'supplier_cnt_code', width: 80},
-			{label: '生产企业名称', name: 'prodCompName', index: 'prod_comp_name', width: 80},
-			{label: '生产企业国别名称', name: 'prodCompCntCode', index: 'prod_comp_cnt_code', width: 80},
-			{label: '主要成分', name: 'ciqMainEle', index: 'ciq_main_ele', width: 80},
-			{label: '国检监管类别', name: 'ciqMonitorType', index: 'ciq_monitor_type', width: 80},
-			{label: '是否法检', name: 'isLaw', index: 'is_law', width: 80,
+			{label: '商户编号', name: 'merchSn', index: 'merch_sn', width: 160},
+			{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: 'cusGoodsCode', index: 'cus_goods_code', width: 140},
+			{label: '中文名称', name: 'prodName', index: 'prod_name', width: 140},
+			{label: '英文名称', name: 'prodEname', index: 'prod_ename', width: 140},
+			{label: '中文备案名称', name: 'prodRecordName', index: 'prod_record_name', width: 140},
+			{label: '英文备案名称', name: 'prodRecordEname', index: 'prod_record_ename', width: 140},
+			{label: '国检规格型号', name: 'ciqProdModel', index: 'ciq_prod_model', width: 140},
+			{label: '品牌', name: 'prodBrand', index: 'prod_brand', width: 140},
+			{label: '原产国代码', name: 'oriCntCode', index: 'ori_cnt_code', width: 140},
+			{label: '计量单位代码', name: 'unitCode', index: 'unit_code', width: 140},
+			{label: '申报价格', name: 'declPrice', index: 'decl_price', width: 140},
+			{label: '申报币种代码', name: 'declCurrencyCode', index: 'decl_currency_code', width: 140},
+			{label: '供应商企业名称', name: 'supplierName', index: 'supplier_name', width: 140},
+			{label: '供货商企业国别代码', name: 'supplierCntCode', index: 'supplier_cnt_code', width: 140},
+			{label: '生产企业名称', name: 'prodCompName', index: 'prod_comp_name', width: 140},
+			{label: '生产企业国别名称', name: 'prodCompCntCode', index: 'prod_comp_cnt_code', width: 140},
+			{label: '主要成分', name: 'ciqMainEle', index: 'ciq_main_ele', width: 140},
+			{label: '国检监管类别', name: 'ciqMonitorType', index: 'ciq_monitor_type', width: 140},
+			{label: '是否法检', name: 'isLaw', index: 'is_law', width: 140,
 				formatter: function (value) {
 					if (value == '0') {
 						return '否';
@@ -34,7 +34,7 @@ $(function () {
 					}
 					return '';
 				}},
-			{label: '是否赠品', name: 'isGift', index: 'is_gift', width: 80,
+			{label: '是否赠品', name: 'isGift', index: 'is_gift', width: 140,
 				formatter: function (value) {
 					if (value == '0') {
 						return '否';
@@ -43,14 +43,14 @@ $(function () {
 					}
 					return '';
 				}},
-			{label: '第一法定单位数量', name: 'legalUnit1Qty', index: 'legal_unit1_qty', width: 80},
-			{label: '净重,kg', name: 'netWeight', index: 'net_weight', width: 80},
-			{label: '第二法定单位数量', name: 'legalUnit2Qty', index: 'legal_unit2_qty', width: 80},
-			{label: '毛重,kg', name: 'grossWeight', index: 'gross_weight', width: 80},
-			{label: '园区账册编号', name: 'localEmsNo', index: 'local_ems_no', width: 80},
-			{label: '园区商品序号', name: 'itemRecordNo', index: 'item_record_no', width: 80},
-			{label: '账册分类代码', name: 'emsClassCode', index: 'ems_class_code', width: 80},
-			{label: '是否发送', name: 'isSend', index: 'is_send', width: 80,formatter: function (value) {
+			{label: '第一法定单位数量', name: 'legalUnit1Qty', index: 'legal_unit1_qty', width: 140},
+			{label: '净重,kg', name: 'netWeight', index: 'net_weight', width: 140},
+			{label: '第二法定单位数量', name: 'legalUnit2Qty', index: 'legal_unit2_qty', width: 140},
+			{label: '毛重,kg', name: 'grossWeight', index: 'gross_weight', width: 140},
+			{label: '园区账册编号', name: 'localEmsNo', index: 'local_ems_no', width: 140},
+			{label: '园区商品序号', name: 'itemRecordNo', index: 'item_record_no', width: 140},
+			{label: '账册分类代码', name: 'emsClassCode', index: 'ems_class_code', width: 140},
+			{label: '是否发送', name: 'isSend', index: 'is_send', width: 140,formatter: function (value) {
 					if (value == '0') {
 						return '未发送';
 					} else if (value == '1') {
@@ -60,14 +60,14 @@ $(function () {
 					}
 					return '';
 				}},
-			{label: '海关申报要素', name: 'cusDeclEle', index: 'cus_decl_ele', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80,
+			{label: '海关申报要素', name: 'cusDeclEle', index: 'cus_decl_ele', width: 140},
+			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 140},
+			{label: '创建时间', name: 'createTime', index: 'create_time', width: 140,
 				formatter: function (value) {
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
 				}},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'modTime', index: 'mod_time', width: 80,
+			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 140},
+			{label: '修改时间', name: 'modTime', index: 'mod_time', width: 140,
 				formatter: function (value) {
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
 				}},
@@ -80,7 +80,10 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
-        multiselect: true,
+		shrinkToFit: false,
+		autoScroll: true,   //开启水平滚动条
+		multiselect: true,
+		width: 1600,
         pager: "#jqGridPager",
         jsonReader: {
             root: "page.list",
@@ -94,7 +97,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });