1.采购入库增加长宽高

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC001.java

@@ -153,7 +153,7 @@ public class ServiceHPKC001 extends ServiceBase {
 			fKc001.fromMap(resultRow);
 			AssertUtils.isEmpty(fKc001.getWhCode(), "仓库名称不能为空");
 			AssertUtils.isEmpty(fKc001.getInventCode(), "存货名称不能为空");
-			AssertUtils.isNull(fKc001.getInventRecordId(), "规格不能为空");
+//			AssertUtils.isNull(fKc001.getInventRecordId(), "规格不能为空");
 			AssertUtils.isGt(BigDecimal.ZERO, fKc001.getAmount(), "数量必须大于0");
 			AssertUtils.isGt(BigDecimal.ZERO, fKc001.getWeight(), "重量必须大于0");
 		}

src/main/webapp/HP/KC/HPKC001.js

@@ -62,14 +62,17 @@ $(function() {
                     refreshSelect(container, inInfo);
                 }
             }, {
-                field: "inventRecordId",
+                field: "spec",
                 template: function (dataItem) {
                     for (let i = 0; i < inventAllGlobalData.length; i++) {
-                        if (inventAllGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
-                            return inventAllGlobalData[i]['textField'];
-                        }
+	                    if (inventAllGlobalData[i]['textField'] === dataItem['spec']) {
+		                    dataItem['inventRecordId'] = inventAllGlobalData[i]['valueField']
+		                    return inventAllGlobalData[i]['textField'];
+	                    } else {
+		                    dataItem['inventRecordId'] = '';
+	                    }
                     }
-                    return "";
+                    return dataItem['spec'];
                 },
                 editor: function (container, options) {
                     let inInfo = new EiInfo();
@@ -83,6 +86,36 @@ $(function() {
                     refreshSelect(container, inInfo);
                 }
             }, {
+	            field: "length",
+	            template: function (dataItem) {
+		            for (let i = 0; i < inventAllGlobalData.length; i++) {
+			            if (inventAllGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
+				            return inventAllGlobalData[i]['param3Field'];
+			            }
+		            }
+		            return "";
+	            }
+            }, {
+	            field: "width",
+	            template: function (dataItem) {
+		            for (let i = 0; i < inventAllGlobalData.length; i++) {
+			            if (inventAllGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
+				            return inventAllGlobalData[i]['param4Field'];
+			            }
+		            }
+		            return "";
+	            }
+            }, {
+	            field: "thick",
+	            template: function (dataItem) {
+		            for (let i = 0; i < inventAllGlobalData.length; i++) {
+			            if (inventAllGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
+				            return inventAllGlobalData[i]['param5Field'];
+			            }
+		            }
+		            return "";
+	            }
+            }, {
                 field: "material",
                 template: function (dataItem) {
                     for (let i = 0; i < inventAllGlobalData.length; i++) {
@@ -114,6 +147,9 @@ $(function() {
                             if (inventAllGlobalData[i]['valueField'] === item.inventRecordId) {
                                 resultGrid.setCellValue(item, 'material', inventAllGlobalData[i]['param1Field'])
                                 resultGrid.setCellValue(item, 'unit', inventAllGlobalData[i]['param2Field'])
+	                            resultGrid.setCellValue(item, 'length', inventAllGlobalData[i]['param3Field'])
+	                            resultGrid.setCellValue(item, 'width', inventAllGlobalData[i]['param4Field'])
+	                            resultGrid.setCellValue(item, 'thick', inventAllGlobalData[i]['param5Field'])
                             }
                         }
                     }

src/main/webapp/HP/KC/HPKC001.jsp

@@ -55,13 +55,17 @@
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="whCode" cname="仓库名称" width="120" align="center" required="true" readonly="true"/>
 			<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true" readonly="true"/>
-			<EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center" required="true" readonly="true"/>
+			<EF:EFColumn ename="inventRecordId" cname="规格ID" width="120" align="center" readonly="true" hidden="true"/>
+			<EF:EFColumn ename="spec" cname="规格" width="120" align="center"/>
+			<EF:EFColumn ename="length" cname="长(MM)" width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="width" cname="宽(MM)" width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="thick" cname="厚(MM)" width="120" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="material" cname="材质" width="120" align="center" enable="false"/>
 			<EF:EFColumn ename="unit" cname="单位" width="120" align="center" enable="false"/>
 			<EF:EFColumn ename="amount" cname="数量" format="{0:N0}" maxLength="20" width="100" align="right"
 			             required="true" readonly="true"/>
-			<EF:EFColumn ename="unitWeight" cname="单重" enable="false" width="100" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="weight" cname="重量" enable="false" width="100" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="unitWeight" cname="单重(KG)" enable="false" width="100" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="weight" cname="重量(KG)" enable="false" width="100" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="remark" cname="备注" width="150" readonly="true"/>
 			<EF:EFColumn ename="oldPurchaseNo" cname="原采购单号" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>