1.生产领料BUG修复

src/main/java/com/baosight/hggp/hg/constant/HGSqlConstant.java

@@ -388,6 +388,8 @@ public class HGSqlConstant {
 		public static final String LOCKS = MODULE_NAME + "locks";
 		// 修改库存
 		public static final String UPDATE_INV = MODULE_NAME + "updateInv";
+		// 领用查询
+		public static final String QUERY_LY = MODULE_NAME + "queryLy";
 	}
 
 	/**

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

@@ -6,6 +6,7 @@ import com.baosight.hggp.common.InventTypeDetailEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
+import com.baosight.hggp.hg.constant.HGSqlConstant;
 import com.baosight.hggp.hg.kc.domain.HGKC008;
 import com.baosight.hggp.hg.kc.domain.HGKC008A;
 import com.baosight.hggp.hg.kc.domain.HGKC010;
@@ -70,7 +71,7 @@ public class ServiceHGKC008B extends ServiceBase {
 		try {
 			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
 //			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "inventTypeDetails", InventTypeDetailEnum.getInentTypeTwo());
-			inInfo = super.query(inInfo, HGKC010.QUERY, new HGKC010());
+			inInfo = super.query(inInfo, HGSqlConstant.HgKc010.QUERY_LY, new HGKC010());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
 		}
@@ -130,10 +131,10 @@ public class ServiceHGKC008B extends ServiceBase {
 	}
 	
 	private void checkConfirmData(List<HGKC008A> hgkc008AList, Map<Long, HGKC010> dbHgkc010Map, HGKC008 hgkc008) {
-		AssertUtils.isTrue(hgkc008.getStatus().compareTo(HGConstant.ProductStatus.YTJ) == 0,"领料单已提交，不可修改");
+		AssertUtils.isTrue(hgkc008.getStatus().compareTo(HGConstant.ProductStatus.YTJ) == 0, "领料单已提交，不可修改");
 		hgkc008AList.forEach(o -> {
-			dbHgkc010Map.forEach((k,v) ->{
-				AssertUtils.isTrue(o.getInventCode().equals(v.getInventCode()), "此领料单已选择存货："+v.getInventCode());
+			dbHgkc010Map.forEach((k, v) -> {
+				AssertUtils.isTrue(o.getInventCode().equals(v.getInventCode()), "此领料单已选择存货：" + v.getInventCode());
 			});
 		});
 	}

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

@@ -120,6 +120,30 @@
         <include refid="BaseCondition.createdTimeCondition"/>
     </sql>
 
+    <sql id="lyCondition">
+        <isNotEmpty prepend=" AND " property="accountCode">
+            ACCOUNT_CODE = #accountCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="depCode">
+            DEP_CODE = #depCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="companyCode">
+            COMPANY_CODE = #companyCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="whCode">
+            WH_CODE = #whCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="inventType">
+            INVENT_TYPE = #inventType#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="inventCode">
+            INVENT_CODE LIKE CONCAT('%', #inventCode#, '%')
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="inventName">
+            INVENT_NAME LIKE CONCAT('%', #inventName#, '%')
+        </isNotEmpty>
+    </sql>
+
     <sql id="orderBy">
         <dynamic prepend="ORDER BY">
             <isNotEmpty property="orderBy">
@@ -145,6 +169,20 @@
         <include refid="condition"/>
     </select>
 
+    <select id="queryLy" resultClass="com.baosight.hggp.hg.kc.domain.HGKC010">
+        SELECT
+        <include refid="column"/>
+        FROM ${hggpSchema}.HGKC010
+        WHERE 1=1
+        <include refid="lyCondition"/>
+        <include refid="orderBy"/>
+    </select>
+
+    <select id="countLy" resultClass="int">
+        SELECT COUNT(*) FROM ${hggpSchema}.HGKC010 WHERE 1=1
+        <include refid="lyCondition"/>
+    </select>
+
     <select id="querySum" resultClass="com.baosight.hggp.hg.kc.domain.HGKC010">
         SELECT
         ACCOUNT_CODE as "accountCode",  <!-- 企业编码 -->

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

@@ -222,12 +222,17 @@ 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()
+	}
 	JSColorbox.open({
-        href: "HGKC008B?methodName=initLoad&inqu_status-0-receiveId="+$("#inqu_status-0-receiveId").val()+"&inqu_status-0-companyCode="+$("#inqu_status-0-companyCode").val(),
+		href: "HGKC008B",
 		title: "<div style='text-align: center;'>综合实时库存</div>",
 		width: "90%",
 		height: "90%",
+		params: params,
 		callbackName: selectInventCallback
 	});
 }

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

@@ -14,7 +14,7 @@
     <EF:EFRegion id="inqu" title="查询条件">
         <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"/>
+        <EF:EFInput ename="inqu_status-0-companyCode" cname="公司编码" colWidth="3" type="hidden"/>
         <EF:EFInput ename="inqu_status-0-status" cname="状态" colWidth="3" type="hidden"/>
         <div class="row">
             <EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">

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

@@ -20,7 +20,7 @@ $(window).load(function () {
 	// 查询
 	query();
 	//存货编号查询条件
-	initInventCode();
+	// initInventCode();
 });
 
 /**
@@ -46,10 +46,10 @@ let confirm = function () {
 			message("勾选的第" + (i + 1) + "行库存数量必须大于0");
 			return;
 		}
-		if (!isPositiveNumber(invWeight)) {
-			message("勾选的第" + (i + 1) + "行库存总重必须大于0");
-			return;
-		}
+		// if (!isPositiveNumber(invWeight)) {
+		// 	message("勾选的第" + (i + 1) + "行库存总重必须大于0");
+		// 	return;
+		// }
 	}
 	JSUtils.confirm("确定对勾选的[" + rows.length + "]条数据进行\"生产领料\"操作吗? ", {
 		ok: function () {

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

@@ -8,12 +8,9 @@
 <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="仓库名称" blockId="inqu_status" ename="whCode" row="0" colWidth="3"
-			             optionLabel="全部" defultValue="" filter="contains">
-				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
-			</EF:EFSelect>
 			<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"/>
@@ -22,6 +19,7 @@
 				<%--						 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>
 	</EF:EFRegion>