From f04b8ddd9192fb1d3adec275edf072da7b72273e Mon Sep 17 00:00:00 2001 From: mzr Date: Thu, 30 Oct 2025 16:21:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(ic):=20=E6=97=A0=E5=A4=87=E6=96=99?= =?UTF-8?q?=E9=A2=86=E6=96=99-=E6=9D=90=E6=96=99=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E4=BF=9D=E5=AD=98-=E5=A2=9E=E5=8A=A0=E5=AE=9E=E5=8F=91?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic/m4d/insert/rule/MaterialOutBatchCodeRule.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ic/src/private/nc/bs/ic/m4d/insert/rule/MaterialOutBatchCodeRule.java b/ic/src/private/nc/bs/ic/m4d/insert/rule/MaterialOutBatchCodeRule.java index 02c1990f..0c0a429c 100644 --- a/ic/src/private/nc/bs/ic/m4d/insert/rule/MaterialOutBatchCodeRule.java +++ b/ic/src/private/nc/bs/ic/m4d/insert/rule/MaterialOutBatchCodeRule.java @@ -21,6 +21,7 @@ import nc.vo.mmpac.pickm.entity.AggPickmVO; import nc.vo.mmpac.pickm.entity.PickmHeadVO; import nc.vo.org.StockOrgVO; import nc.vo.pub.BusinessException; +import nc.vo.pub.lang.UFDouble; import nc.vo.pubapp.pattern.exception.ExceptionUtils; import nc.vo.pubapp.pattern.pub.SqlBuilder; import nc.vo.scmf.ic.mbatchcode.BatchcodeVO; @@ -88,7 +89,6 @@ public class MaterialOutBatchCodeRule extends ICRule { // 判断仓库是否为WF001 if (warehouseId.equals(cwarehouseid)) { IPickmQueryService service = NCLocator.getInstance().lookup(IPickmQueryService.class); - // 批次号赋值 for (MaterialOutBodyVO body : bodys) { // 备料计划表头主键 String cpickmhid = body.getCpickmhid(); @@ -98,6 +98,13 @@ public class MaterialOutBatchCodeRule extends ICRule { if (!configMaterialCode.equals(materialCode)) { continue; } + // 实发数量赋值 + UFDouble nshouldnum = body.getNshouldnum();// 应发主数量 + UFDouble nshouldassistnum = body.getNshouldassistnum();// 应发数量 + // nnum 实发主数量 + body.setNnum(nshouldnum); + // nassistnum 实发数量 + body.setNassistnum(nshouldassistnum); if (MMValueCheck.isNotEmpty(cpickmhid)) { AggPickmVO aggVO = service.querySingleBillByPk(cpickmhid); if (aggVO == null) { @@ -106,8 +113,9 @@ public class MaterialOutBatchCodeRule extends ICRule { PickmHeadVO pickmHeadVO = aggVO.getParentVO(); // 来源生产订单明细 String vsourcemorowid = pickmHeadVO.getVsourcemorowid(); - NCCForUAPLogger.debug("来源生产订单明细:" + vsourcemorowid); + // NCCForUAPLogger.debug("来源生产订单明细:" + vsourcemorowid); if (vsourcemorowid != null && !vsourcemorowid.isEmpty()) { + // 批次号赋值 body.setVbatchcode(vsourcemorowid);// 批次号 Map batchMap = getBatchCodeVO(cmaterialvid, vsourcemorowid); String pkBatchcode = batchMap.get(vsourcemorowid);