From 9e01b73fcaee2a6387a06a540006146704d71fc8 Mon Sep 17 00:00:00 2001 From: zhangke Date: Fri, 5 Sep 2025 15:53:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E7=89=A9=E6=96=99=E5=85=A5?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/NormalPGIController.java | 35 +++++++++++++------ .../service/NormalQMControllerService.java | 7 ++-- .../resources/mapper/WmsQcReceiveMapper.xml | 2 +- .../srm/receive/controller/SRMController.java | 3 +- 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index ae3fb8ac..ac945382 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -449,16 +449,31 @@ public class NormalPGIController extends BaseController { List item2 = zwm3A17DTO.getItem2(); if (CollectionUtil.isNotEmpty(codes)) { codes.forEach(code -> { - item1.add(new ZWM3A17Item1DTO() - .setEBELP(item.getPoLineNumber()) - .setMATNR(item.getItemCode()) - .setERFMG(code.getCodeNum()) - .setMEINS(materialInfoInOrder.getMeins()) - .setCHARG(code.getBatchNumber()) - .setWERKS(materialInfoInOrder.getWerks()) - .setLGORT(materialInfoInOrder.getWarehouseNo()) - .setKZKRI(materialInfoInOrder.getKzkri()) - ); + ZWM3A17Item1DTO ietm1Dto = item1.stream() + .filter(dto1 -> + dto1.getEBELP().equals(item.getPoLineNumber()) + && dto1.getMATNR().equals(item.getItemCode()) + && dto1.getWERKS().equals(materialInfoInOrder.getWerks()) + && dto1.getKZKRI().equals(materialInfoInOrder.getKzkri()) + && dto1.getLGORT().equals(materialInfoInOrder.getWarehouseNo()) + && dto1.getCHARG().equals(code.getBatchNumber()) + && dto1.getMeins().equals(materialInfoInOrder.getMeins()) + ).findFirst().orElse(null); + + if (Objects.isNull(ietm1Dto)) { + item1.add(new ZWM3A17Item1DTO() + .setEBELP(item.getPoLineNumber()) + .setMATNR(item.getItemCode()) + .setERFMG(code.getCodeNum()) + .setMEINS(materialInfoInOrder.getMeins()) + .setCHARG(code.getBatchNumber()) + .setWERKS(materialInfoInOrder.getWerks()) + .setLGORT(materialInfoInOrder.getWarehouseNo()) + .setKZKRI(materialInfoInOrder.getKzkri()) + ); + } else { + ietm1Dto.setERFMG(ietm1Dto.getERFMG().add(code.getCodeNum())); + } item2.add(new ZWM3A17Item2DTO() .setEBELP(item.getPoLineNumber()) .setFLAG("") 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 c051d935..5acc16ca 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 @@ -70,9 +70,10 @@ public class NormalQMControllerService { } } } - return tasks.stream() - .filter(task -> task.getInQty().compareTo(BigDecimal.ZERO) > 0) - .toList(); + return tasks; +// return tasks.stream() +// .filter(task -> task.getInQty().compareTo(BigDecimal.ZERO) > 0) +// .toList(); } @Transactional diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml index c2e0885b..cec15159 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml @@ -9,7 +9,7 @@ create_time, factory_code from wms_qc_receive - where is_completed = 0 + where is_completed = 0 and is_check = true and ( in_no like concat( '%',#{orderNo},'%') or order_no like concat( '%',#{orderNo},'%') ) diff --git a/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/SRMController.java b/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/SRMController.java index 3b5af5f6..f386a984 100644 --- a/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/SRMController.java +++ b/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/SRMController.java @@ -2,6 +2,7 @@ package com.nflg.wms.srm.receive.controller; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.nflg.wms.common.pojo.dto.SRMOrderReceiveDTO; @@ -151,7 +152,7 @@ public class SRMController extends BaseController { .setSupplerNum(data.getSupplierNum()) .setInspectionType(data.getInspectionType()) .setPoLineNumber(String.valueOf(data.getPoLineNumber())) - .setInspectionQty(data.getInspectionQty()) + .setInspectionQty(ObjectUtil.defaultIfNull(data.getInspectionQty(), BigDecimal.ZERO)) .setItemName(data.getItemName()) .setUnit(data.getUnit()) .setReceivedWarehouse(data.getReceivedWarehouse())