其他入库单，其他出库单

src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC006A.java

@@ -84,7 +84,6 @@ public class ServiceHGKC006A extends ServiceBase {
 			for (int i = 0; i < resultRows.size(); i++) {
 				HGKC006A hgkc006A = new HGKC006A();
 				hgkc006A.fromMap(resultRows.get(i));
-				hgkc006A.setInvWeight(hgkc006A.getInvUnitWeight().multiply(hgkc006A.getInvQty()));
 				if (hgkc006A.getId() == null || hgkc006A.getId() == 0) {
 					Map queryMap = new HashMap();
 					queryMap.put("id",inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGKC006A.FIELD_PRIMARY_ID));

src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC007A.java

@@ -86,7 +86,6 @@ public class ServiceHGKC007A extends ServiceBase {
 			for (int i = 0; i < resultRows.size(); i++) {
 				HGKC007A hgkc007A = new HGKC007A();
 				hgkc007A.fromMap(resultRows.get(i));
-				hgkc007A.setInvWeight(hgkc007A.getInvUnitWeight().multiply(hgkc007A.getInvQty()));
 				if (hgkc007A.getId() == null || hgkc007A.getId() == 0) {
 					Map queryMap = new HashMap();
 					queryMap.put("id",inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGKC006A.FIELD_PRIMARY_ID));

src/main/java/com/baosight/hggp/hg/kc/sql/HGKC006.xml

@@ -93,7 +93,7 @@
 			WH_CODE = #whCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="whName">
-			WH_NAME = #whName#
+			WH_NAME LIKE CONCAT('%', #whName#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="otherEnterNoOld">
 			OTHER_ENTER_NO_OLD = #otherEnterNoOld#

src/main/java/com/baosight/hggp/hg/kc/sql/HGKC006A.xml

@@ -114,7 +114,7 @@
 			INVENT_CODE = #inventCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="inventName">
-			INVENT_NAME = #inventName#
+			INVENT_NAME LIKE CONCAT('%', #inventName#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="invQty">
 			INV_QTY = #invQty#

src/main/java/com/baosight/hggp/hg/kc/sql/HGKC007.xml

@@ -93,7 +93,7 @@
 			WH_CODE = #whCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="whName">
-			WH_NAME = #whName#
+			WH_NAME LIKE CONCAT('%', #whName#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="otherOutNoOld">
 			OTHER_OUT_NO_OLD = #otherOutNoOld#

src/main/java/com/baosight/hggp/hg/kc/sql/HGKC007A.xml

@@ -114,7 +114,7 @@
 			INVENT_CODE = #inventCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="inventName">
-			INVENT_NAME = #inventName#
+			INVENT_NAME  LIKE CONCAT('%', #inventName#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="invQty">
 			INV_QTY = #invQty#

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

@@ -42,6 +42,7 @@ $(function () {
 			template: function (dataItem) {
 				for (let i = 0; i < WhNameGlobalData.length; i++) {
 					if (WhNameGlobalData[i]['valueField'] === dataItem['whCode']) {
+						dataItem['whName'] = WhNameGlobalData[i]['textField'];
 						return WhNameGlobalData[i]['textField'];
 					}
 				}

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

@@ -13,11 +13,12 @@
 			<EF:EFDatePicker cname="单据日期" ename="otherEnterDate" blockId="inqu_status" row="0" colWidth="3"
 			                 format="yyyy-MM-dd" readonly="true"/>
 			<EF:EFInput cname="其他入库单号" ename="otherEnterNo" blockId="inqu_status" row="0" colWidth="3"/>
-			<EF:EFSelect cname="仓库名称" ename="whCode" blockId="inqu_status" row="0" colWidth="3"
+<%--			<EF:EFSelect cname="仓库名称" ename="whCode" blockId="inqu_status" row="0" colWidth="3"
 			             filter="contains" defultValue="">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
-			</EF:EFSelect>
+			</EF:EFSelect>--%>
+			<EF:EFInput cname="仓库名称" ename="whName" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFSelect cname="单据状态" ename="submitStatus" blockId="inqu_status" row="0" colWidth="3">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFCodeOption codeName="hggp.hpkc.submitStatus"/>
@@ -42,6 +43,7 @@
 			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
 			<EF:EFColumn ename="otherEnterNo" cname="其他入库单号" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="whCode" cname="仓库名称" width="120" align="center" required="true"/>
+			<EF:EFColumn ename="whName" cname="仓库名称" hidden="true"/>
 			<EF:EFComboColumn cname="状态" ename="submitStatus" width="90" align="center" required="true" defaultValue="0">
 				<EF:EFCodeOption codeName="hggp.hpkc.submitStatus"/>
 			</EF:EFComboColumn>

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

@@ -17,6 +17,7 @@ $(function () {
 			template: function (dataItem) {
 				for (let i = 0; i < InventNameGlobalData.length; i++) {
 					if (InventNameGlobalData[i]['valueField'] === dataItem['inventCode']) {
+						dataItem['inventName'] = InventNameGlobalData[i]['textField'];
 						return InventNameGlobalData[i]['textField'];
 					}
 				}
@@ -56,6 +57,43 @@ $(function () {
 				inInfo.set("field", options.field);
 				refreshSelect(container, inInfo);
 			}
+		},{
+			field: "invQty",
+			template: function (item) {
+				if(item.invQty && item.invUnitWeight){
+					debugger;
+					let invWeight = item.invQty * item.invUnitWeight;
+					//item['invWeight'] = invWeight.toString();
+					resultGrid.setCellValue(item, 'invWeight', invWeight);
+				}
+				if(item.invQty && item.price){
+					let amount = item.invQty * item.price;
+					//item['amount'] = amount.toString();
+					resultGrid.setCellValue(item, 'amount', amount);
+				}
+				return item.invQty;
+			}
+		}, {
+			field: "invUnitWeight",
+			template: function (item) {
+				debugger;
+				if(item.invQty && item.invUnitWeight){
+					let invWeight = item.invQty * item.invUnitWeight;
+					//item['invWeight'] = invWeight.toString();
+					resultGrid.setCellValue(item, 'invWeight', invWeight);
+				}
+				return item.invUnitWeight;
+			}
+		},{
+			field: "price",
+			template: function (item) {
+				if(item.invQty && item.price){
+					let amount = item.invQty * item.price;
+					//item['amount'] = amount.toString();
+					resultGrid.setCellValue(item, 'amount', amount);
+				}
+				return item.price;
+			}
 		}, ],
 		loadComplete: function (grid) {
 			// 此grid对象
@@ -75,6 +113,16 @@ $(function () {
 						}
 					}
 				}
+/*				if (e.field == "invQty") {
+					loadChange(grid,e,"invWeight");
+					loadChange(grid,e,"amount");
+				}
+				if (e.field == "invUnitWeight") {
+					loadChange(grid,e,"invWeight");
+				}
+				if (e.field == "price") {
+					loadChange(grid,e,"amount");
+				}*/
 			});
 		},
 		onSave: function (e) {

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

@@ -8,11 +8,12 @@
 <EF:EFPage title="其他入库单明细">
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
-			<EF:EFSelect cname="存货名称" blockId="inqu_status" ename="inventCode" row="0" colWidth="3" filter="contains"
+<%--			<EF:EFSelect cname="存货名称" blockId="inqu_status" ename="inventCode" row="0" colWidth="3" filter="contains"
 						 defultValue="">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="invent_record_box_block_id" textField="textField" valueField="valueField"/>
-			</EF:EFSelect>
+			</EF:EFSelect>--%>
+			<EF:EFInput cname="存货名称" ename="inventName" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFInput cname="主表id" ename="primaryId" blockId="inqu_status" row="0" colWidth="3" type="hidden"/>
 		</div>
 <%--		<div class="row">
@@ -34,16 +35,26 @@
 							  filter="contains">
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true" readonly="true"/>
+			<EF:EFColumn ename="inventName" cname="存货名称" hidden="true"/>
 			<EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center" required="true" readonly="true"/>
 			<EF:EFColumn ename="partLength" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="partWidth" cname="宽(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="partThick" cname="厚(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="invQty" cname="数量"  width="120" align="right" format="{0:N0}"/>
-			<EF:EFColumn ename="invUnitWeight" cname="单重"  width="120" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="invWeight" cname="总重" enable="false" width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="invQty" cname="数量"  width="120" align="right" format="{0:N0}"
+						 defaultValue="0"
+						 data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/"
+						 data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
+			<EF:EFColumn ename="invUnitWeight" cname="单重"  width="120" align="right" format="{0:N3}"
+						 defaultValue="0"
+						 data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/"
+						 data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
+			<EF:EFColumn ename="invWeight" cname="总重" width="120" align="right" enable="false" format="{0:N3}"/>
 			<EF:EFColumn ename="prdtCode" cname="部件编码" enable="false" width="120" align="center" hidden="true"/>
 			<EF:EFColumn ename="partCode" cname="零件编码" enable="false" width="120" align="center" hidden="true"/>
-			<EF:EFColumn ename="price" cname="单价"  width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="price" cname="单价"  width="120" align="right" format="{0:N3}"
+						 defaultValue="0"
+						 data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/"
+						 data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
 			<EF:EFColumn ename="amount" cname="金额"  width="120" align="right" enable="false" format="{0:N3}"/>
 		</EF:EFGrid>
 	</EF:EFRegion>

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

@@ -42,6 +42,7 @@ $(function () {
 			template: function (dataItem) {
 				for (let i = 0; i < WhNameGlobalData.length; i++) {
 					if (WhNameGlobalData[i]['valueField'] === dataItem['whCode']) {
+						dataItem['whName'] = WhNameGlobalData[i]['textField'];
 						return WhNameGlobalData[i]['textField'];
 					}
 				}

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

@@ -13,11 +13,13 @@
 			<EF:EFDatePicker cname="单据日期" ename="otherOutDate" blockId="inqu_status" row="0" colWidth="3"
 			                 format="yyyy-MM-dd" readonly="true"/>
 			<EF:EFInput cname="其他出库单号" ename="otherOutNo" blockId="inqu_status" row="0" colWidth="3"/>
-			<EF:EFSelect cname="仓库名称" ename="whCode" blockId="inqu_status" row="0" colWidth="3"
+<%--			<EF:EFSelect cname="仓库名称" ename="whCode" blockId="inqu_status" row="0" colWidth="3"
 			             filter="contains" defultValue="">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
-			</EF:EFSelect>
+			</EF:EFSelect>--%>
+
+			<EF:EFInput cname="仓库名称" ename="whName" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFSelect cname="单据状态" ename="submitStatus" blockId="inqu_status" row="0" colWidth="3">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFCodeOption codeName="hggp.hpkc.submitStatus"/>
@@ -42,9 +44,11 @@
 						 dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
 			<EF:EFColumn ename="otherOutNo" cname="其他入库单号" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="whCode" cname="仓库名称" width="120" align="center" required="true" />
+			<EF:EFColumn ename="whName" cname="仓库名称" hidden="true"/>
 			<EF:EFComboColumn cname="状态" ename="submitStatus" width="90" align="center" required="true" defaultValue="0">
 				<EF:EFCodeOption codeName="hggp.hpkc.submitStatus"/>
 			</EF:EFComboColumn>
+
 		</EF:EFGrid>
 	</EF:EFRegion>
 

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

@@ -17,6 +17,7 @@ $(function () {
 			template: function (dataItem) {
 				for (let i = 0; i < InventNameGlobalData.length; i++) {
 					if (InventNameGlobalData[i]['valueField'] === dataItem['inventCode']) {
+						dataItem['inventName'] = InventNameGlobalData[i]['textField'];
 						return InventNameGlobalData[i]['textField'];
 					}
 				}
@@ -56,7 +57,44 @@ $(function () {
 				inInfo.set("field", options.field);
 				refreshSelect(container, inInfo);
 			}
-		}, ],
+		},{
+			field: "invQty",
+			template: function (item) {
+				if(item.invQty && item.invUnitWeight){
+					debugger;
+					let invWeight = item.invQty * item.invUnitWeight;
+					//item['invWeight'] = invWeight.toString();
+					resultGrid.setCellValue(item, 'invWeight', invWeight);
+				}
+				if(item.invQty && item.price){
+					let amount = item.invQty * item.price;
+					//item['amount'] = amount.toString();
+					resultGrid.setCellValue(item, 'amount', amount);
+				}
+				return item.invQty;
+			}
+		}, {
+			field: "invUnitWeight",
+			template: function (item) {
+				debugger;
+				if(item.invQty && item.invUnitWeight){
+					let invWeight = item.invQty * item.invUnitWeight;
+					//item['invWeight'] = invWeight.toString();
+					resultGrid.setCellValue(item, 'invWeight', invWeight);
+				}
+				return item.invUnitWeight;
+			}
+		},{
+			field: "price",
+			template: function (item) {
+				if(item.invQty && item.price){
+					let amount = item.invQty * item.price;
+					//item['amount'] = amount.toString();
+					resultGrid.setCellValue(item, 'amount', amount);
+				}
+				return item.price;
+			}
+		},],
 		loadComplete: function (grid) {
 			// 此grid对象
 			grid.dataSource.bind("change", function(e) {
@@ -75,6 +113,16 @@ $(function () {
 						}
 					}
 				}
+/*				if (e.field == "invQty") {
+					loadChange(grid,e,"invWeight");
+					loadChange(grid,e,"amount");
+				}
+				if (e.field == "invUnitWeight") {
+					loadChange(grid,e,"invWeight");
+				}
+				if (e.field == "price") {
+					loadChange(grid,e,"amount");
+				}*/
 			});
 		},
 		onSave: function (e) {

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

@@ -8,11 +8,12 @@
 <EF:EFPage title="其他出库单明细">
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
-			<EF:EFSelect cname="存货名称" blockId="inqu_status" ename="inventCode" row="0" colWidth="3" filter="contains"
+<%--			<EF:EFSelect cname="存货名称" blockId="inqu_status" ename="inventCode" row="0" colWidth="3" filter="contains"
 						 defultValue="">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="invent_record_box_block_id" textField="textField" valueField="valueField"/>
-			</EF:EFSelect>
+			</EF:EFSelect>--%>
+			<EF:EFInput cname="存货名称" ename="inventName" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFInput cname="主表id" ename="primaryId" blockId="inqu_status" row="0" colWidth="3" type="hidden"/>
 		</div>
 	</EF:EFRegion>
@@ -26,16 +27,26 @@
 							  filter="contains">
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true" readonly="true"/>
+			<EF:EFColumn ename="inventName" cname="存货名称" hidden="true"/>
 			<EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center" required="true" readonly="true"/>
 			<EF:EFColumn ename="partLength" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="partWidth" cname="宽(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="partThick" cname="厚(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="invQty" cname="数量"  width="120" align="right" format="{0:N0}"/>
-			<EF:EFColumn ename="invUnitWeight" cname="单重"  width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="invQty" cname="数量"  width="120" align="right" format="{0:N0}"
+						 defaultValue="0"
+						 data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/"
+						 data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
+			<EF:EFColumn ename="invUnitWeight" cname="单重"  width="120" align="right" format="{0:N3}"
+						 defaultValue="0"
+						 data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/"
+						 data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
 			<EF:EFColumn ename="invWeight" cname="总重" enable="false" width="120" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="prdtCode" cname="部件编码" enable="false" width="120" align="center" hidden="true"/>
 			<EF:EFColumn ename="partCode" cname="零件编码" enable="false" width="120" align="center" hidden="true"/>
-			<EF:EFColumn ename="price" cname="单价"  width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="price" cname="单价"  width="120" align="right" format="{0:N3}"
+						 defaultValue="0"
+						 data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/"
+						 data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
 			<EF:EFColumn ename="amount" cname="金额"  width="120" align="right" enable="false" format="{0:N3}"/>
 		</EF:EFGrid>
 	</EF:EFRegion>