1.销售发货存货编码名称显示错误问题修复

src/main/resources/log4j2.xml

@@ -11,7 +11,7 @@
     <Appenders>
         <!--*********************控制台日志***********************-->
         <Console name="Console" target="SYSTEM_OUT" follow="true">
-            <PatternLayout charset="GBK" pattern="${LOG_PATTERN}"/>
+            <PatternLayout charset="UTF-8" pattern="${LOG_PATTERN}"/>
         </Console>
         <TextArea name="platLogAppender">
             <PatternLayout pattern="%m%n"/>

src/main/webapp/HG/YX/HGYX001.js

@@ -73,10 +73,9 @@ $(function () {
                 }
             }],
             loadComplete: function (grid) {
-                // 此 grid 对象
                 // 新增
-                $("#add").on("click",add);
-                //修改
+	            $("#add").on("click", add);
+	            //修改
                 $("#BNT_MODIFY").on("click", update);
                 //删除
                 $("#BNT_REMOVE").on("click", remove);
@@ -229,8 +228,8 @@ function add() {
     JSColorbox.open({
         href: "HGYX001A?methodName=initLoad",
         title: "<div style='text-align: center;'>新增销售发货</div>",
-        width: "80%",
-        height: "80%",
+        width: "95%",
+        height: "95%",
         callbackName: windowCallback
     });
 }

src/main/webapp/HG/YX/HGYX001A.js

@@ -31,28 +31,6 @@ $(function() {
                 this.filter(options);
             }
         }, {
-            field: "inventCode",
-            title: "存货名称",
-            filter: function (options) {
-                let inventType = options.model["inventType"];
-                if (inventType){
-                    return _.filter(INVENT_CODE_BOX, function (item) {
-                        return item["param1Field"] === inventType;
-                    })
-                }
-                return options.values;
-            },
-            template: function (dataItem) {
-                for (let i = 0; i < INVENT_CODE_BOX.length; i++) {
-                    if (INVENT_CODE_BOX[i]['valueField'] === dataItem['inventCode']){
-                        dataItem['inventName'] = INVENT_CODE_BOX[i]['textField']
-                        dataItem['inventRecordId'] = INVENT_CODE_BOX[i]['param2Field'];
-                        return INVENT_CODE_BOX[i]['textField'];
-                    }
-                }
-                return dataItem["inventCode"];
-            }
-        }, {
             field: "spec",
             filter: function (options) {
                 let specId = options.model["inventRecordId"];
@@ -397,8 +375,8 @@ function detail() {
     JSColorbox.open({
         href: "HGYX001C?methodName=initLoad&inqu_status-0-companyCode="+consCode+"&inqu_status-0-projCode="+projCode+"&inqu_status-0-whCode="+consWhCode+"&inqu_status-0-specIds="+ids.join(','),
         title: "<div style='text-align: center;'>选择发货明细</div>",
-        width: "90%",
-        height: "80%",
+        width: "95%",
+        height: "95%",
         callbackName: detailCallback
     });
 }

src/main/webapp/HG/YX/HGYX001A.jsp

@@ -75,11 +75,7 @@
                               filter="contains">
             </EF:EFComboColumn>
             <EF:EFColumn ename="inventTypeDetail" cname="存货类型大类" hidden="true"/>
-            <EF:EFComboColumn ename="inventCode" cname="存货编码" enable="false" width="120" align="center" required="true"
-                              blockName="invent_code_box_block_id" textField="textField" valueField="valueField"
-                              columnTemplate="#=valueField#" itemTemplate="#=valueField#-#=textField#" readonly="false"
-                              filter="contains">
-            </EF:EFComboColumn>
+	        <EF:EFColumn ename="inventCode" cname="存货编码" enable="false" width="100"/>
 	        <EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="120"/>
             <EF:EFComboColumn ename="spec" cname="规格" enable="false" width="120" align="center" required="true"
                               blockName="spec_box_block_id" textField="textField" valueField="valueField"

src/main/webapp/HG/YX/HGYX001C.jsp

@@ -33,11 +33,7 @@
                               filter="contains">
             </EF:EFComboColumn>
             <EF:EFColumn ename="inventTypeDetail" cname="存货类型大类" hidden="true"/>
-	        <EF:EFComboColumn ename="inventCode" cname="存货编码" enable="true" width="120" align="center" required="true"
-	                          blockName="invent_record_block_id" textField="textField" valueField="valueField"
-	                          columnTemplate="#=valueField#" itemTemplate="#=valueField#-#=textField#" readonly="true"
-	                          filter="contains">
-	        </EF:EFComboColumn>
+	        <EF:EFColumn ename="inventCode" cname="存货编码" enable="false" width="120"/>
 	        <EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="120"/>
             <EF:EFComboColumn ename="spec" cname="规格" enable="true" width="120" align="center" required="true"
                               blockName="spec_name_block_id" textField="textField" valueField="valueField"