From 49d1053421645d82e506febd514138ffc1d853fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Fri, 26 Jun 2026 10:44:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor(normal-pgi):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=E6=89=B9=E6=AC=A1=E5=8F=B7?=
 =?UTF-8?q?=E9=9B=86=E5=90=88=E5=92=8C=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 删除未使用的 batchNos 集合声明
- 移除批次号数据流处理逻辑
- 移除批次号添加到集合的操作
- 将批次号字段设置为空字符串以保持接口兼容性
---
 .../wms/admin/controller/NormalPGIController.java     | 11 +----------
 1 file changed, 1 insertion(+), 10 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 cb4c304e..c0db44fc 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
@@ -1183,7 +1183,6 @@ public class NormalPGIController extends BaseController {
 //            pushDto.getContent().getLineVOList().add(srmItem);
 //        }
         Set<String> qrCodes = new HashSet<>();
-        Set<String> batchNos = new HashSet<>();
         if (CollectionUtil.isNotEmpty(codes)) {
             List<WmsQrCodeMaster> qrCodeMasters = qrCodeMasterService.lambdaQuery()
                     .in(WmsQrCodeMaster::getMaterialCode, codes.stream()
@@ -1193,9 +1192,6 @@ public class NormalPGIController extends BaseController {
             List<WmsQrCodeMaster> qrCodeMasters0 = qrCodeMasters.stream()
                     .filter(q -> q.getPackagingType() == 0)
                     .toList();
-            batchNos = qrCodeMasters0.stream()
-                    .map(WmsQrCodeMaster::getBatchNo)
-                    .collect(Collectors.toSet());
             qrCodes.addAll(
                     qrCodeMasters0.stream()
                             .map(WmsQrCodeMaster::getMaterialCode)
@@ -1208,11 +1204,6 @@ public class NormalPGIController extends BaseController {
                             .toList()
                     )
                     .list();
-            batchNos.addAll(
-                    qrCodeMasters0.stream()
-                            .map(WmsQrCodeMaster::getBatchNo)
-                            .collect(Collectors.toSet())
-            );
             qrCodes.addAll(
                     qrCodeMasters0.stream()
                             .map(WmsQrCodeMaster::getMaterialCode)
@@ -1234,7 +1225,7 @@ public class NormalPGIController extends BaseController {
                         .setInspectionQty(item.getReceiptNum() != null ? item.getReceiptNum().intValue() : 0)
                         .setPurchaseGroup(order.getPurchaseGroup())
                         .setQrCodes(qrCodes)
-                        .setBatchNo(StrUtil.join(",", batchNos))
+                        .setBatchNo("")
         );
     }