1.fixBug:生产领料根据仓库过滤库存

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

@@ -226,8 +226,8 @@ let save = function (btnNode) {
 let selectInvent = function () {
 	let params = {
 		"inqu_status-0-receiveId": $("#inqu_status-0-receiveId").val(),
-		"inqu_status-0-companyCode": $("#inqu_status-0-companyCode").val(),
-		"inqu_status-0-whCode": $("#inqu_status-0-whCode").val()
+		"inqu_status-0-companyCode": $("#main-0-companyCode").val(),
+		"inqu_status-0-whCode": $("#main-0-whCode").val()
 	}
 	JSColorbox.open({
 		href: "HGKC008B",

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

@@ -11,11 +11,11 @@
 <EF:EFPage title="生产领料详情">
 	<EF:EFInput ename="main-0-applyCode" cname="领料单号" colWidth="3" type="hidden"/>
 	<EF:EFInput ename="main-0-status" cname="状态" colWidth="3" type="hidden"/>
+	<EF:EFInput ename="main-0-whCode" cname="仓库编码" colWidth="3" type="hidden"/>
+	<EF:EFInput ename="main-0-companyCode" cname="公司编码" colWidth="3" type="hidden"/>
 	<EF:EFRegion id="inqu" title="查询条件">
 		<EF:EFInput ename="inqu_status-0-applyCode" cname="申请编码" colWidth="3" type="hidden"/>
 		<EF:EFInput ename="inqu_status-0-receiveId" cname="领料单id" colWidth="3" type="hidden"/>
-		<EF:EFInput ename="inqu_status-0-whCode" cname="仓库编码" colWidth="3" type="hidden"/>
-		<EF:EFInput ename="inqu_status-0-companyCode" cname="公司编码" colWidth="3" type="hidden"/>
 		<div class="row">
 			<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>

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

@@ -8,17 +8,16 @@
 <EF:EFPage title="综合库存管理">
 	<EF:EFRegion id="inqu" title="查询条件">
 		<EF:EFInput ename="inqu_status-0-companyCode" cname="公司编号" colWidth="3" type="hidden"/>
-		<EF:EFInput ename="inqu_status-0-whCode" cname="仓库编码" colWidth="3" type="hidden"/>
 		<EF:EFInput ename="inqu_status-0-receiveId" cname="领料单id" colWidth="3" type="hidden"/>
 		<div class="row">
+			<EF:EFSelect cname="仓库" ename="whCode" blockId="inqu_status" row="0" colWidth="3"
+			             optionLabel="全部" defultValue="" readonly="true">
+				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 			<EF:EFSelect cname="存货类型" ename="inventType" blockId="inqu_status" 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="inventCode" row="0" colWidth="3"--%>
-				<%--						 filter="contains" optionLabel="全部" defultValue="" template="[#=valueField#]#=textField#">--%>
-				<%--				<EF:EFOptions blockId="invent_record_block_id" textField="textField"  valueField="valueField"/>--%>
-				<%--			</EF:EFSelect>--%>
 			<EF:EFInput cname="存货编码" ename="inventCode" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFInput cname="存货名称" ename="inventName" blockId="inqu_status" row="0" colWidth="3"/>
 		</div>