From af1a0f53aae9433cb27974120fa1e0ea84688d30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 13 May 2026 16:55:28 +0800 Subject: [PATCH] =?UTF-8?q?fix(controller):=20=E4=BF=AE=E6=AD=A3=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E7=AD=9B=E9=80=89=E5=8F=8A=E8=AE=BE=E7=BD=AE=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修正库存筛选条件中物料编号匹配的错误，改用二维码主表的物料编码进行匹配 - 添加设置库存DTO中的库位字段，确保库位信息正确传递 - 优化库存数据处理逻辑，提升准确性和规范性 --- .../com/nflg/wms/admin/controller/NormalPGIController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 ae0259be..4f0f3488 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 @@ -474,7 +474,7 @@ public class NormalPGIController extends BaseController { .forEach(qrCodeMaster -> { // 库存 InventoryInDTO inventoryDTO = inventories.stream() - .filter(inventoriesDTO -> inventoriesDTO.getMaterialNo().equals(item.getItemCode()) + .filter(inventoriesDTO -> inventoriesDTO.getMaterialNo().equals(qrCodeMaster.getMaterialCode()) && inventoriesDTO.getBatchNo().equals(qrCodeMaster.getBatchNo()) && inventoriesDTO.getSerialNo().equals(qrCodeMaster.getSerialNo()) && inventoriesDTO.getFactoryNo().equals(qrCodeMaster.getFactoryCode()) @@ -489,6 +489,7 @@ public class NormalPGIController extends BaseController { .setWarehouseNo(qrCodeMaster.getStorageLocation()) .setBatchNo(qrCodeMaster.getBatchNo()) .setSerialNo(qrCodeMaster.getSerialNo()) + .setBinLocation(qrCodeMaster.getBinLocation()) .setNum(qrCodeMaster.getQuantity()); inventories.add(inventoryDTO); } else {