From f103888ea0db86fa0d84ac7c59c93a082ff2a29f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 25 Jun 2026 18:46:37 +0800 Subject: [PATCH] =?UTF-8?q?fix(qm):=20=E4=BF=AE=E6=AD=A3=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84=E5=92=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复了不合格数量字段映射，将rejectQty改为unqualifiedQty - 修正了合格数量和不合格数量的数据源映射关系 - 调整了入库数量计算逻辑，正确累加接收数量和不合格数量 - 更新了任务项目数量统计的计算方式，确保数据准确性 --- .../wms/admin/controller/NormalQMController.java | 2 +- .../wms/admin/service/NormalQMControllerService.java | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java index 1aafdc05..c225c4ad 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java @@ -340,7 +340,7 @@ public class NormalQMController extends BaseController { .setMatnr(code.getItemCode()) .setEbeln(code.getPoNum()) .setEbelp(Integer.valueOf(code.getPoLineNumber())) - .setMenge(code.getRejectQty()) + .setMenge(code.getUnqualifiedQty()) .setMatDoc(code.getReceiveNum()) .setDocYear(DateTimeUtil.format(LocalDate.now(), "yyyy")) ); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java index 4366e0f8..85ae9bb0 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java @@ -73,17 +73,19 @@ public class NormalQMControllerService { .setMaterialBatch(code.getMaterialBatch()) .setSerialNum(code.getSerialNum()) .setInspectionResult(code.getInspectionResult()) - .setQualifiedQty(code.getReceiveQty()) - .setUnqualifiedQty(code.getRejectQty()) + .setQualifiedQty(code.getQualifiedQty()) + .setUnqualifiedQty(code.getUnqualifiedQty()) ); taskItemVO.setUnqualifiedQty( ObjectUtil.defaultIfNull(taskItemVO.getUnqualifiedQty(), BigDecimal.ZERO) .add(ObjectUtil.defaultIfNull(code.getUnqualifiedQty(), BigDecimal.ZERO))); taskItemVO.setQualifiedQty( ObjectUtil.defaultIfNull(taskItemVO.getQualifiedQty(), BigDecimal.ZERO) - .add(ObjectUtil.defaultIfNull(code.getReceiveQty(), BigDecimal.ZERO))); - taskItemVO.setInQty(ObjectUtil.defaultIfNull(code.getQualifiedQty(), BigDecimal.ZERO) - .add(ObjectUtil.defaultIfNull(code.getUnqualifiedQty(), BigDecimal.ZERO))); + .add(ObjectUtil.defaultIfNull(code.getQualifiedQty(), BigDecimal.ZERO))); + taskItemVO.setInQty(ObjectUtil.defaultIfNull(taskItemVO.getInQty(), BigDecimal.ZERO) + .add(ObjectUtil.defaultIfNull(code.getReceiveQty(), BigDecimal.ZERO)) + .add(ObjectUtil.defaultIfNull(code.getUnqualifiedQty(), BigDecimal.ZERO)) + ); }); } }