Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

kmall-admin/src/main/java/com/kmall/admin/Test.java

@@ -55,6 +55,7 @@ public class Test {
         //构建Request
         String  url = "http://127.0.0.1:8680/al/product/addPdProductList";
         Request request = com.kmall.admin.utils.oms.OkHttpUtils.buildRequest(url, JSON.toJSONString(sParaTemp));
+        String s = JSON.toJSONString(sParaTemp);
         // 同步访问,返回结果字符串
         String responseString = null;
         try {

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

@@ -141,7 +141,8 @@ public class GoodsProductController {
                 builder.put("merchSn", "商户编号");
                 builder.put("sku", "sku（商品料件号）");
                 builder.put("prodBarcode", "商品条形码");
-                builder.put("prodName", "品名");
+                builder.put("prodName", "商品中文名");
+                builder.put("prodEname", "商品英文名");
                 builder.put("prodBrand", "品牌");
                 builder.put("unitCode", "计量单位");
                 builder.put("cusGoodsCode", "商品编码");
@@ -150,7 +151,7 @@ public class GoodsProductController {
                 builder.put("ciqProdModel", "规格型号");
                 builder.put("ciqMainEle", "主要成分");
                 builder.put("declCurrencyCode", "申报币种代码");
-                builder.put("netWeight", "单个净重（g）");
+                builder.put("netWeight", "净重（kg）");
                 builder.put("declPrice", "申报价格（RMB）");
                 builder.put("legalUnit1Qty", "第一法定单位数量");
                 builder.put("legalUnit2Qty", "第二法定单位数量");
@@ -158,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;
@@ -121,6 +141,25 @@ public class GoodsProductDto implements Serializable {
 
     private String thirdMerchSn;
 
+    private String prodRecordName;
+
+    private String prodRecordEname;
+
+    public String getProdRecordName() {
+        return prodRecordName;
+    }
+
+    public void setProdRecordName(String prodRecordName) {
+        this.prodRecordName = prodRecordName;
+    }
+
+    public String getProdRecordEname() {
+        return prodRecordEname;
+    }
+
+    public void setProdRecordEname(String prodRecordEname) {
+        this.prodRecordEname = prodRecordEname;
+    }
 
     public String getMerchSn() {
         return merchSn;

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

@@ -146,6 +146,29 @@ public class GoodsEntity implements Serializable {
 
     private Long createUserDeptId;
 
+
+
+    private String prodName;
+
+    public String getProdName() {
+        return prodName;
+    }
+
+    public void setProdName(String prodName) {
+        this.prodName = prodName;
+    }
+
+    private String prodRecordName; // 产品中文备案名称
+
+
+    public String getProdRecordName() {
+        return prodRecordName;
+    }
+
+    public void setProdRecordName(String prodRecordName) {
+        this.prodRecordName = prodRecordName;
+    }
+
     // 商品规格
 
     // 商品规格编号

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

@@ -186,6 +186,36 @@ public class GoodsProductEntity implements Serializable {
 
     private String isSend;
 
+    private String prodRecordName;
+
+    private String prodRecordEname;
+
+    private String prodEname;
+
+
+    public String getProdRecordName() {
+        return prodRecordName;
+    }
+
+    public void setProdRecordName(String prodRecordName) {
+        this.prodRecordName = prodRecordName;
+    }
+
+    public String getProdRecordEname() {
+        return prodRecordEname;
+    }
+
+    public void setProdRecordEname(String prodRecordEname) {
+        this.prodRecordEname = prodRecordEname;
+    }
+
+    public String getProdEname() {
+        return prodEname;
+    }
+
+    public void setProdEname(String prodEname) {
+        this.prodEname = prodEname;
+    }
 
     public String getIsSend() {
         return isSend;

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

@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -93,10 +94,23 @@ public class GoodsProductServiceImpl implements GoodsProductService {
                     throw new RRException("第" + count + "行的商品条形码为空！");
                 }
                 if (StringUtils.isEmpty(goodsProductDto.getProdName())) {
-                    throw new RRException("第" + count + "行的品名为空！");
+                    throw new RRException("第" + count + "行的商品中文名为空！");
                 }
-                if (StringUtils.isEmpty(goodsProductDto.getProdBrand())) {
-                    throw new RRException("第" + count + "行的品牌为空！");
+                if (StringUtils.isEmpty(goodsProductDto.getProdEname())) {
+                    throw new RRException("第" + count + "行的商品英文名为空！");
+                }
+//                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 + "行的计量单位为空！");
@@ -137,6 +151,15 @@ public class GoodsProductServiceImpl implements GoodsProductService {
                 }
                 GoodsProductEntity goodsProductEntity = new GoodsProductEntity();
                 BeanUtils.copyProperties(goodsProductDto,goodsProductEntity);
+                goodsProductEntity.setLegalUnit1Qty(new BigDecimal(goodsProductDto.getLegalUnit1Qty()));
+                goodsProductEntity.setLegalUnit2Qty(new BigDecimal(goodsProductDto.getLegalUnit2Qty()));
+                goodsProductEntity.setNetWeight(new BigDecimal(goodsProductDto.getNetWeight()));
+                if (!StringUtils.isEmpty(goodsProductDto.getGrossWeight())) {
+                    goodsProductEntity.setGrossWeight(new BigDecimal(goodsProductDto.getGrossWeight()));
+                }
+                goodsProductEntity.setGrossWeight(goodsProductEntity.getNetWeight().add(new BigDecimal("0.05")));
+
+                goodsProductEntity.setDeclPrice(new BigDecimal(goodsProductDto.getDeclPrice()));
                 goodsProductEntity.setCreateTime(new Date());
                 goodsProductEntity.setCreaterSn(ShiroUtils.getUserId().toString());
                 goodsProductDao.save(goodsProductEntity);

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

@@ -623,6 +623,7 @@ public class GoodsServiceImpl implements GoodsService {
 
 
     @Transactional
+    @Override
     public void updateForImgUrl(GoodsEntity goodsEntity){
         // 修改商品
         goodsDao.update(goodsEntity);
@@ -1970,6 +1971,8 @@ public class GoodsServiceImpl implements GoodsService {
                 if (Objects.nonNull(skuInfoMap)){
                     String hsCodeName = (String) skuInfoMap.get("cusGoodsName");
                     String hsCode = (String) skuInfoMap.get("cusGoodsCode");
+                    String prodName = (String) skuInfoMap.get("prodName");
+                    String prodRecordName = (String) skuInfoMap.get("prodRecordName");
                     BigDecimal impConsumTaxRate = (BigDecimal) skuInfoMap.get("impConsumTaxRate");
                     BigDecimal valueAddedTaxRate = (BigDecimal) skuInfoMap.get("valueAddedTaxRate");
                     BigDecimal legalUnit1Qty = (BigDecimal) skuInfoMap.get("legalUnit1Qty");
@@ -1985,6 +1988,8 @@ public class GoodsServiceImpl implements GoodsService {
                                 goodsEntity.setValueAddedTaxRate(valueAddedTaxRate);
                                 goodsEntity.setIsSyncHsCode("1");
                                 goodsEntity.setLegalUnit1Qty(legalUnit1Qty);
+                                goodsEntity.setProdName(prodName);
+                                goodsEntity.setProdRecordName(prodRecordName);
                                 goodsEntity.setLegalUnit2Qty(legalUnit2Qty);
                                 goodsEntity.setCosmThresholdValue(cosmThresholdValue);
                                 goodsDao.update(goodsEntity);

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

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

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

@@ -82,6 +82,8 @@
         <result column="legal_unit2_qty" property="legalUnit2Qty"/>
         <result column="cosm_threshold_value" property="cosmThresholdValue"/>
         <result column="to_be_restored" property="toBeRestored" />
+        <result column="prod_name" property="prodName" />
+        <result column="prod_record_name" property="prodRecordName" />
     </resultMap>
 
     <select id="queryObject" resultType="com.kmall.admin.entity.GoodsEntity">

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

@@ -11,6 +11,9 @@
         <result property="sku" column="sku"/>
         <result property="cusGoodsCode" column="cus_goods_code"/>
         <result property="prodName" column="prod_name"/>
+		<result property="prodEname" column="prod_ename"/>
+		<result property="prodRecordName" column="prod_record_name"/>
+		<result property="prodRecordEname" column="prod_record_ename"/>
         <result property="ciqProdModel" column="ciq_prod_model"/>
         <result property="prodBrand" column="prod_brand"/>
         <result property="oriCntCode" column="ori_cnt_code"/>
@@ -55,6 +58,9 @@
 			`sku`,
 			`cus_goods_code`,
 			`prod_name`,
+			`prod_ename`,
+			`prod_record_name`,
+			`prod_record_ename`,
 			`ciq_prod_model`,
 			`prod_brand`,
 			`ori_cnt_code`,
@@ -101,6 +107,9 @@
     		`sku`,
     		`cus_goods_code`,
     		`prod_name`,
+			`prod_ename`,
+			`prod_record_name`,
+			`prod_record_ename`,
     		`ciq_prod_model`,
     		`prod_brand`,
     		`ori_cnt_code`,
@@ -168,6 +177,9 @@
 		`sku`,
 		`cus_goods_code`,
 		`prod_name`,
+		`prod_ename`,
+		`prod_record_name`,
+		`prod_record_ename`,
 		`ciq_prod_model`,
 		`prod_brand`,
 		`ori_cnt_code`,
@@ -222,6 +234,9 @@
 		`sku`,
 		`cus_goods_code`,
 		`prod_name`,
+		`prod_ename`,
+		`prod_record_name`,
+		`prod_record_ename`,
 		`ciq_prod_model`,
 		`prod_brand`,
 		`ori_cnt_code`,
@@ -275,6 +290,9 @@
 			`sku`,
 			`cus_goods_code`,
 			`prod_name`,
+			`prod_ename`,
+			`prod_record_name`,
+			`prod_record_ename`,
 			`ciq_prod_model`,
 			`prod_brand`,
 			`ori_cnt_code`,
@@ -316,6 +334,9 @@
 			#{sku},
 			#{cusGoodsCode},
 			#{prodName},
+			#{prodEname},
+			#{prodRecordName},
+			#{prodRecordEname},
 			#{ciqProdModel},
 			#{prodBrand},
 			#{oriCntCode},
@@ -360,6 +381,9 @@
 			<if test="sku != null">`sku` = #{sku}, </if>
 			<if test="cusGoodsCode != null">`cus_goods_code` = #{cusGoodsCode}, </if>
 			<if test="prodName != null">`prod_name` = #{prodName}, </if>
+			<if test="prodEname != null">`prod_ename` = #{prodEname}, </if>
+			<if test="prodRecordName != null">`prod_record_name` = #{prodRecordName}, </if>
+			<if test="prodRecordEname != null">`prod_record_ename` = #{prodRecordEname}, </if>
 			<if test="ciqProdModel != null">`ciq_prod_model` = #{ciqProdModel}, </if>
 			<if test="prodBrand != null">`prod_brand` = #{prodBrand}, </if>
 			<if test="oriCntCode != null">`ori_cnt_code` = #{oriCntCode}, </if>

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>
@@ -32,14 +41,14 @@
                             :on-progress="uploadExcelProgress"
                             :format="['xls','xlsx']"
                             action="../goodsproduct/upload">
-                        <i-button type="ghost" icon="ios-cloud-upload-outline">商品导入</i-button>
+                        <i-button type="ghost" icon="ios-cloud-upload-outline">产品备案导入</i-button>
                     </Upload>
                 </i-col>
-                <a href="../statics/file/goods_product_export_yyyy_mm_dd_v1.0.0.xlsx">产品备案excel导入模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                <a href="../statics/file/goods_product_import_yyyy_mm_dd_v1.0.0.xlsx">产品备案excel导入模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
             </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/goods.js

@@ -375,7 +375,7 @@ var vm = new Vue({
             });
         },
         syncGoodsRate: function () {
-            confirm('同步商品税率会影响线上收银，请谨慎确认，同步税率预需要数分钟，确定要同步商品税率？', function () {
+            confirm('同步商品税率会影响线上收银，请谨慎确认，并会同步产品备案信息，同步税率和产品备案信息预需要数分钟，确定要同步？', function () {
                 $.ajax({
                     type: "POST",
                     url: "../goods/syncGoodsRate",

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

@@ -4,25 +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: '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 '否';
@@ -31,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 '否';
@@ -40,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') {
@@ -57,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');
 				}},
@@ -77,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",
@@ -91,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"});
         }
     });
 });

kmall-manager/src/main/resources/conf/oms-merch.properties

@@ -17,24 +17,24 @@ merch.queryInveResponseUrl=http://ws.ds-bay.com/al/queryInveResponse
 
 #ccnet\u751F\u4EA7\u73AF\u5883\u67E5\u8BE2\u652F\u4ED8\u5355\u3001\u7535\u5B50\u8BA2\u5355\u3001\u8FD0\u5355\u5931\u8D25\u8BA2\u5355\u63A5\u53E3
 merch.wxOrderResendUrl=http://8.135.102.238:8680/wx/wxOrderResendQueryAll
-#oms\u6D4B\u8BD5\u73AF\u5883\u5BC6\u94A5
-#merch.md5Salt=IxyIvP0sJqlUZinx
-##oms\u6D4B\u8BD5\u73AF\u5883\u6D3B\u4F53\u4EBA\u8138\u6838\u8EAB\u63A5\u53E3
-#merch.livenessRecognitionUrl=http://127.0.0.1:8680/al/faceid/livenessRecognition
-##oms\u6D4B\u8BD5\u73AF\u5883\u8DE8\u5883\u989D\u5EA6\u67E5\u8BE2\u63A5\u53E3
-#merch.quotaInquiryUrl=http://127.0.0.1:8680/al/cus/yearLimit
-#\u7533\u8BF7\u4EA7\u54C1\u5907\u6848\u63A5\u53E3(\u672C\u5730\u6D4B\u8BD5)
-#merch.addPdProductListUrl=http://127.0.0.1:8680/al/product/addPdProductList
+oms\u6D4B\u8BD5\u73AF\u5883\u5BC6\u94A5
+merch.md5Salt=IxyIvP0sJqlUZinx
+#oms\u6D4B\u8BD5\u73AF\u5883\u6D3B\u4F53\u4EBA\u8138\u6838\u8EAB\u63A5\u53E3
+merch.livenessRecognitionUrl=http://127.0.0.1:8680/al/faceid/livenessRecognition
+#oms\u6D4B\u8BD5\u73AF\u5883\u8DE8\u5883\u989D\u5EA6\u67E5\u8BE2\u63A5\u53E3
+merch.quotaInquiryUrl=http://127.0.0.1:8680/al/cus/yearLimit
+\u7533\u8BF7\u4EA7\u54C1\u5907\u6848\u63A5\u53E3(\u672C\u5730\u6D4B\u8BD5)
+merch.addPdProductListUrl=http://127.0.0.1:8680/al/product/addPdProductList
 
 
 ####oms\u751F\u4EA7\u73AF\u5883\u5BC6\u94A5
-merch.md5Salt=IxyIvP0sJqlUZinx
-##oms\u751F\u4EA7\u73AF\u5883\u6D3B\u4F53\u4EBA\u8138\u6838\u8EAB\u63A5\u53E3
-merch.livenessRecognitionUrl=http://ws.ds-bay.com/al/faceid/livenessRecognition
-##oms\u6D4B\u8BD5\u73AF\u5883\u8DE8\u5883\u989D\u5EA6\u67E5\u8BE2\u63A5\u53E3
-merch.quotaInquiryUrl=http://ws.ds-bay.com/al/cus/yearLimit
-#\u7533\u8BF7\u4EA7\u54C1\u5907\u6848\u63A5\u53E3
-merch.addPdProductListUrl=http://ws.ds-bay.com/al/product/addPdProductList
+#merch.md5Salt=IxyIvP0sJqlUZinx
+###oms\u751F\u4EA7\u73AF\u5883\u6D3B\u4F53\u4EBA\u8138\u6838\u8EAB\u63A5\u53E3
+#merch.livenessRecognitionUrl=http://ws.ds-bay.com/al/faceid/livenessRecognition
+###oms\u6D4B\u8BD5\u73AF\u5883\u8DE8\u5883\u989D\u5EA6\u67E5\u8BE2\u63A5\u53E3
+#merch.quotaInquiryUrl=http://ws.ds-bay.com/al/cus/yearLimit
+##\u7533\u8BF7\u4EA7\u54C1\u5907\u6848\u63A5\u53E3
+#merch.addPdProductListUrl=http://ws.ds-bay.com/al/product/addPdProductList
 
 
 

test.md

@@ -0,0 +1,2 @@
+test...
+