1.销售出库逻辑关联生产任务以及实时库存，

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC011.java

@@ -150,13 +150,21 @@ public class HPKC011 extends DaoEPBase {
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_INVENT_CODE);
-		eiColumn.setDescName("物料编码");
+		eiColumn.setDescName("部件编码");
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_INVENT_NAME);
-		eiColumn.setDescName("物料名称");
+		eiColumn.setDescName("部件名称");
 		eiMetadata.addMeta(eiColumn);
-
+		
+		eiColumn = new EiColumn(FIELD_SUB_INVENT_CODE);
+		eiColumn.setDescName("零部件编码");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_SUB_INVENT_NAME);
+		eiColumn.setDescName("零部件名称");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_LENGTH);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(2);

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

@@ -101,13 +101,14 @@ public class ServiceHPKC004 extends ServiceBase {
 				HPKC004 newKc004 = BeanUtils.copy(dbKc004, HPKC004.class);
 				newKc004.setSaleNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC004_SALE_NO));
 				newKc004.setAmount(dbKc004.getAmount().negate());
-				newKc004.setUnitWeight(dbKc004.getUnitWeight().negate());
+				newKc004.setWeight(dbKc004.getWeight().negate());
 				newKc004.setOldSaleNo(dbKc004.getSaleNo());
+				newKc004.setIsPrint(CommonConstant.YesNo.NO_0);
 				newKc004.setDeleteFlag(CommonConstant.YesNo.YES_1);
 				DaoUtils.insert(HPKC004.INSERT, newKc004);
 				// 修改库存
-//				HPKCTools.updateStock(dbKc004.getWhCode(), dbKc004.getInventRecordId(),
-//						dbKc004.getAmount(), dbKc004.getWeight());
+				HPKCTools.updateProdStock(dbKc004.getWhCode(), dbKc004.getProdNo(),
+						dbKc004.getAmount(), dbKc004.getWeight());
 			}
 			inInfo = this.query(inInfo);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);

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

@@ -7,6 +7,7 @@ import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC004;
 import com.baosight.hpjx.hp.kc.domain.HPKC010;
+import com.baosight.hpjx.hp.kc.domain.HPKC011;
 import com.baosight.hpjx.hp.kc.tools.HPKCTools;
 import com.baosight.hpjx.util.AssertUtils;
 import com.baosight.hpjx.util.BeanUtils;
@@ -35,11 +36,6 @@ import java.util.Map;
  */
 public class ServiceHPKC004A extends ServiceEPBase {
 	
-	// 指定存货类型
-	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
-			InventTypeEnum.CONSUMABLE.getCode(), InventTypeEnum.SEMI_FINISHED_PRODUCT.getCode(),
-			InventTypeEnum.FINISHED_PRODUCT.getCode()};
-	
 	/**
 	 * 初始化
 	 *
@@ -49,13 +45,7 @@ public class ServiceHPKC004A extends ServiceEPBase {
 	@Override
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			Map queryMap = new HashMap();
-			queryMap.put("inventTypes", DEFAULT_INVENT_CODE);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), queryMap);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), queryMap, false);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
-			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC010().eiMetadata);
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC011().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}
@@ -71,9 +61,7 @@ public class ServiceHPKC004A extends ServiceEPBase {
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
-			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
-			queryRow.put("inventTypes", DEFAULT_INVENT_CODE);
-			inInfo = super.query(inInfo, HPKC010.QUERY, new HPKC010());
+			inInfo = super.query(inInfo, HPKC011.QUERY, new HPKC011());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
 		}
@@ -92,41 +80,37 @@ public class ServiceHPKC004A extends ServiceEPBase {
 			// 库存ID
 			List<Long> ids = ObjectUtils.listKey(resultRows, "id");
 			// 行锁
-			HPKCTools.HpKc010.lock(ids);
+			HPKCTools.HpKc011.lock(ids);
 			// 获取库存信息
-			Map<Long, HPKC010> dbKc010Map = HPKCTools.HpKc010.map(ids);
+			Map<Long, HPKC011> dbKc011Map = HPKCTools.HpKc011.map(ids);
 			// 状态校验
 			for (Map row : resultRows) {
 				Long id = MapUtils.getLong(row, "id");
-				HPKC010 dbKc010 = dbKc010Map.get(id);
-				AssertUtils.isNull(dbKc010, "库存号[" + id + "]不存在!");
+				HPKC011 dbKc011 = dbKc011Map.get(id);
+				AssertUtils.isNull(dbKc011, "库存号[" + id + "]不存在!");
 				// 校验数量
 				BigDecimal applyAmount = MapUtils.getBigDecimal(row, "applyAmount");
-				AssertUtils.isGt(applyAmount, dbKc010.getAmount(),
-						"库存号[" + id + "]可用数量不足！");
-				BigDecimal applyWeight = MapUtils.getBigDecimal(row, "applyWeight");
-				AssertUtils.isGt(applyWeight, dbKc010.getWeight(),
-						"库存号[" + id + "]可用重量不足！");
+				AssertUtils.isGt(applyAmount, dbKc011.getAmount(), "库存号[" + id + "]可用数量不足！");
 			}
 			// 生成销售库单
 			for (Map row : resultRows) {
 				BigDecimal applyAmount = MapUtils.getBigDecimal(row, "applyAmount");
-				BigDecimal applyWeight = MapUtils.getBigDecimal(row, "applyWeight");
 				String applyRemark = MapUtils.getString(row, "applyRemark");
 				Long kcId = MapUtils.getLong(row, "id");
-				HPKC010 dbKc010 = dbKc010Map.get(kcId);
-				HPKC004 newKc004 = BeanUtils.copy(dbKc010, HPKC004.class);
+				HPKC011 dbKc011 = dbKc011Map.get(kcId);
+				HPKC004 newKc004 = BeanUtils.copy(dbKc011, HPKC004.class);
 				newKc004.setSaleNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC004_SALE_NO));
 				newKc004.setReceiptDate(DateUtils.shortDate());
 				newKc004.setAmount(applyAmount);
-				newKc004.setWeight(applyWeight);
+				newKc004.setWeight(applyAmount.multiply(dbKc011.getUnitWeight()));
 				newKc004.setRemark(applyRemark);
 				newKc004.setKcId(kcId);
+				newKc004.setIsPrint(CommonConstant.YesNo.NO_0);
 				newKc004.setDeleteFlag(CommonConstant.YesNo.NO_0);
 				DaoUtils.insert(HPKC004.INSERT, newKc004);
 				// 修改库存数量
-//				HPKCTools.updateStock(newKc004.getWhCode(), newKc004.getInventRecordId(),
-//						newKc004.getAmount().negate(), newKc004.getWeight().negate());
+				HPKCTools.updateProdStock(newKc004.getWhCode(), newKc004.getProdNo(),
+						newKc004.getAmount().negate(), newKc004.getWeight().negate());
 			}
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "生成出库单失败");

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC011.xml

@@ -57,13 +57,13 @@
             INVENT_CODE = #inventCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="inventName">
-            INVENT_NAME = #inventName#
+            INVENT_NAME LIKE CONCAT('%', #inventName#, '%')
 		</isNotEmpty>
         <isNotEmpty prepend=" AND " property="subInventCode">
             SUB_INVENT_CODE = #subInventCode#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="subInventName">
-            SUB_INVENT_NAME = #subInventName#
+            SUB_INVENT_NAME LIKE CONCAT('%', #subInventName#, '%')
         </isNotEmpty>
 		<isNotEmpty prepend=" AND " property="createdBy">
 			CREATED_BY = #createdBy#

src/main/java/com/baosight/hpjx/hp/kc/tools/HPKCTools.java

@@ -325,7 +325,7 @@ public class HPKCTools {
 	}
 	
 	/**
-	 * HPKC004公共DAO方法定义
+	 * HPKC010公共DAO方法定义
 	 *
 	 * @author:songx
 	 * @date:2024/1/31,16:42
@@ -378,6 +378,61 @@ public class HPKCTools {
 		
 	}
 	
+	
+	/**
+	 * HPKC011公共DAO方法定义
+	 *
+	 * @author:songx
+	 * @date:2024/1/31,16:42
+	 */
+	public static class HpKc011 {
+		
+		/**
+		 * 查询库存信息
+		 *
+		 * @param ids
+		 * @return
+		 */
+		public static List<HPKC011> list(List<Long> ids) {
+			if (CollectionUtils.isEmpty(ids)) {
+				return null;
+			}
+			Map queryMap = new HashMap();
+			queryMap.put("ids", ids);
+			return DaoBase.getInstance().query(HPKC011.QUERY, queryMap);
+		}
+		
+		/**
+		 * 查询库存信息
+		 *
+		 * @param ids
+		 * @return
+		 */
+		public static Map<Long, HPKC011> map(List<Long> ids) {
+			List<HPKC011> results = list(ids);
+			if (CollectionUtils.isEmpty(results)) {
+				return null;
+			}
+			return results.stream().collect(Collectors.toMap(HPKC011::getId, item -> item));
+		}
+		
+		/**
+		 * 锁
+		 *
+		 * @param ids
+		 * @return
+		 */
+		public static void lock(List<Long> ids) {
+			if (CollectionUtils.isEmpty(ids)) {
+				return;
+			}
+			Map queryMap = new HashMap();
+			queryMap.put("ids", ids);
+			DaoBase.getInstance().update(HPSqlConstant.HPKC011.LOCK, queryMap);
+		}
+		
+	}
+	
 	/**
 	 * 更新库存
 	 *

src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java

@@ -31,13 +31,14 @@ public class ServiceHPZL001 extends ServiceBase {
      * 画面初始化.
      */
     public EiInfo initLoad(EiInfo inInfo) {
-        HPZL001 HPZL001 = new HPZL001();
-        EiInfo outInfo = super.initLoad(inInfo, HPZL001);
-        outInfo.getBlock(EiConstant.resultBlock).getRows().clear();
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.PROJ_RECORD_BLOCK_ID),
-                new HashMap<String,String>(1) {{put("status", "1" );
-        }});
-        return outInfo;
+	    HPZL001 HPZL001 = new HPZL001();
+	    EiInfo outInfo = super.initLoad(inInfo, HPZL001);
+	    outInfo.getBlock(EiConstant.resultBlock).getRows().clear();
+	    CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.PROJ_RECORD_BLOCK_ID),
+			    new HashMap<String, Object>(1) {{
+				    put("status", "1");
+			    }});
+	    return outInfo;
     }
 
     /**

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

@@ -43,9 +43,7 @@ let select = function () {
 	}
 	for (let i = 0; i < rows.length; i++) {
 		let applyAmount = rows[i]['applyAmount'];
-		let applyWeight = rows[i]['applyWeight'];
 		let amount = rows[i]['amount'];
-		let weight = rows[i]['weight'];
 		if (isBlank(applyAmount) || !isNumber(applyAmount) || !(applyAmount > 0)) {
 			message("第" + (i + 1) + "行申请数量必须大于0");
 			return;
@@ -53,13 +51,6 @@ let select = function () {
 		if (parseFloat(applyAmount) > parseFloat(amount)) {
 			message("第" + (i + 1) + "行申请数量不能大于库存数量");
 			return;
-		}if (isBlank(applyWeight) || !isNumber(applyWeight) || !(applyWeight > 0)) {
-			message("第" + (i + 1) + "行申请重量必须大于0");
-			return;
-		}
-		if (parseFloat(applyWeight) > parseFloat(weight)) {
-			message("第" + (i + 1) + "行申请重量不能大于库存重量");
-			return;
 		}
 	}
 	JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据生成出库单吗? ", {

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

@@ -8,51 +8,38 @@
 <EF:EFPage title="库存查询">
 	<EF:EFRegion id="inqu" title="查询区域" type="query">
 		<div class="row">
-			<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
-				<EF:EFOption label="全部" value=""/>
-				<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('1', '2', '3', '4')"/>
-			</EF:EFSelect>
-			<EF:EFSelect cname="仓库名称" ename="inqu_status-0-whCode" colWidth="3" filter="contains">
-				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
-			</EF:EFSelect>
-			<EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains">
-				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
-			</EF:EFSelect>
-			<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains">
-				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
-			</EF:EFSelect>
+			<div class="row">
+				<EF:EFInput cname="项目号" ename="projCode" blockId="inqu_status" row="0" colWidth="3"/>
+				<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3"/>
+				<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>
+			<div class="row">
+				<EF:EFInput cname="零部件编码" ename="subInventCode" blockId="inqu_status" row="0" colWidth="3"/>
+				<EF:EFInput cname="零部件名称" ename="subInventName" blockId="inqu_status" row="0" colWidth="3"/>
+			</div>
 		</div>
 	</EF:EFRegion>
 
 	<EF:EFRegion id="result" title="记录集">
 		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="库存ID" enable="false" width="60" align="center"/>
-			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
-				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
-			</EF:EFComboColumn>
-			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
-			                  blockName="wh_record_block_id" textField="textField" valueField="valueField"
-			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
-			</EF:EFComboColumn>
-			<EF:EFComboColumn ename="inventCode" cname="存货名称" enable="false" width="120" align="center"
-			                  blockName="invent_name_block_id" textField="textField" valueField="valueField"
-			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
-			</EF:EFComboColumn>
-			<EF:EFComboColumn ename="inventRecordId" cname="规格" enable="false" width="120" align="center"
-			                  blockName="invent_spec_block_id" textField="textField" valueField="valueField"
-			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
-			</EF:EFComboColumn>
+			<EF:EFColumn ename="whName" cname="仓库名称" enable="false" width="140" align="center"/>
+			<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="140" align="center"/>
+			<EF:EFColumn ename="inventName" cname="部件名称" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="subInventName" cname="零部件名称" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="applyAmount" cname="申请数量" width="120" align="right" format="{0:N3}" required="true"/>
-			<EF:EFColumn ename="applyWeight" cname="申请重量" width="120" align="right" format="{0:N3}" required="true"/>
 			<EF:EFColumn ename="applyRemark" cname="说明" width="150" editType="textarea" copy="true"/>
 			<EF:EFColumn ename="amount" cname="库存数量" enable="false" width="120" align="right" format="{0:N3}"
 			             sumType="all"/>
 			<EF:EFColumn ename="weight" cname="库存重量" enable="false" width="120" align="right" format="{0:N3}"
 			             sumType="all"/>
 			<EF:EFColumn ename="remark" cname="备注" enable="false" width="150"/>
+			<EF:EFColumn ename="whCode" cname="仓库编码" enable="false" width="140" align="center"/>
+			<EF:EFColumn ename="projCode" cname="项目号" enable="false" width="140" align="center"/>
+			<EF:EFColumn ename="inventCode" cname="部件编码" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="subInventCode" cname="零部件编码" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="prodNo" cname="生产订单号" enable="false" width="140" align="center"/>
 		</EF:EFGrid>
 	</EF:EFRegion>
 </EF:EFPage>