生产领料单bug修改

src/main/webapp/HG/KC/HGKC008.js

@@ -121,6 +121,14 @@ $(function (){
                             filter: "contains"
                         });
                     }
+                }, {
+                    field: "receiptDate",
+                    attributes: {
+                        class: "i-input-readonly"
+                    },
+                    defaultValue: function () {
+                        return currShortDate();
+                    }
                 }
             ],
             loadComplete: function(grid) {

src/main/webapp/HG/KC/HGKC008A.js

@@ -129,18 +129,6 @@ $(function (){
                             let totalWeight = item.invQty * item.invUnitWeight;
                             resultGrid.setCellValue(item, 'invWeight', totalWeight)
                         }
-                        if(item.price && item.invQty){
-                            let totalAmount = item.price * item.invQty;
-                            resultGrid.setCellValue(item, 'amount', totalAmount)
-                        }
-                        loadChange(grid,e,"price");
-                    }
-                    //单价计算
-                    if (e.field == "price") {
-                        if(item.price && item.invQty){
-                            let totalAmount = item.price * item.invQty;
-                            resultGrid.setCellValue(item, 'amount', totalAmount)
-                        }
                     }
                     if (e.field == "inventType") {
                         //选择后，先加载此方法，再加载属性中的方法，所以存货类型加载时，先修改存货编号下拉框的查询
@@ -264,6 +252,38 @@ let save = function (btnNode) {
         return;
     }
     let flag = true;
+    $.each(rows, function(index, item) {
+        let inventType= item.get("inventType");
+        let inventCode= item.get("inventCode");
+        let inventName= item.get("inventName");
+        let invSpec= item.get("invSpec");
+        let invQty= item.get("invQty");
+        if(isBlank(inventType)){
+            message("选中的第"+(index+1)+"行\"存货类型\"，不能为空!");
+            flag = false;
+            return false;
+        }
+        if(isBlank(inventCode)){
+            message("选中的第"+(index+1)+"行\"存货编码\"，不能为空!");
+            flag = false;
+            return false;
+        }
+        if(isBlank(inventName)){
+            message("选中的第"+(index+1)+"行\"存货名称\"，不能为空!");
+            flag = false;
+            return false;
+        }
+        if(isBlank(invSpec)){
+            message("选中的第"+(index+1)+"行\"规格\"，不能为空!");
+            flag = false;
+            return false;
+        }
+        if(isBlank(invQty)){
+            message("选中的第"+(index+1)+"行\"数量\"，不能为空!");
+            flag = false;
+            return false;
+        }
+    });
     if(flag) {
         JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
             ok: function () {

src/main/webapp/HG/KC/HGKC008A.jsp

@@ -45,15 +45,15 @@
             <EF:EFColumn ename="invThick" cname="厚度(MM)" width="120" align="center" enable="false"/>
             <EF:EFColumn ename="invQty" cname="数量" width="120" align="right" format="{0:N0}" enable="true" required="true" />
             <EF:EFColumn ename="invUnitWeight" cname="单重" width="100" enable="false" readonly="true" format="{0:N3}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="17" required="true" defaultValue="0"
+                         displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
                          data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/"
                          data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
             <EF:EFColumn ename="invWeight" cname="重量" width="100" enable="false" readonly="true" format="{0:N3}" editType="text"
                          displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
                          data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/"
                          data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
-            <EF:EFColumn ename="price" cname="单价" width="100" enable="true" format="{0:N3}" editType="text"
-                         displayType="0.000" sort="true" align="right" maxLength="17" required="true" defaultValue="0"
+            <EF:EFColumn ename="price" cname="单价" width="100" enable="false" format="{0:N3}" editType="text"
+                         displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
                          data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/"
                          data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
             <EF:EFColumn ename="amount" cname="金额" width="100" enable="false" format="{0:N3}" editType="text"

src/main/webapp/HG/KC/HGKC010.jsp

@@ -16,11 +16,11 @@
 			             optionLabel="全部" defultValue="" filter="contains">
 				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
-			<EF:EFSelect cname="存货类型" blockId="inqu_status" ename="incentType" row="0" colWidth="3"
+			<EF:EFSelect cname="存货类型" blockId="inqu_status" ename="inventType" row="0" colWidth="3"
 			             optionLabel="全部" defultValue="" filter="contains">
 				<EF:EFOptions blockId="invent_type_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
-			<EF:EFSelect cname="存货名称" blockId="inqu_status" ename="incentCode" row="0" colWidth="3"
+			<EF:EFSelect cname="存货名称" blockId="inqu_status" ename="inventCode" row="0" colWidth="3"
 			             optionLabel="全部" defultValue="" filter="contains">
 				<EF:EFOptions blockId="invent_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>