From a799e83553204086d279dcc7f910aba443c81904 Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Fri, 20 Mar 2026 11:22:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=EF=BC=88PDA=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=EF=BC=89=E4=BF=AE=E6=94=B9=E4=BC=A0=E5=8F=82=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TransferFactoryController.java | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java
index 3b63643f..3dcf8626 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java
@@ -252,14 +252,30 @@ public class TransferFactoryController extends BaseController {
                 .setCreateBy(UserUtil.getUserName())
                 .setCreateTime(LocalDateTime.now());
         List<WmsTransferFactoryTicketItem> ticketItems = new ArrayList<>();
-        List<WmsQrCodeMaster> qrCodeMasters = qrCodeMasterService.lambdaQuery()
-                .eq(WmsQrCodeMaster::getProcessStage, BarCodeProcessStage.InBound.getState())
-                .in(WmsQrCodeMaster::getBarcodeCode, request.getItems().stream()
-                        .map(OutProduceSubmitItemQO::getQrCodes)
-                        .flatMap(Collection::stream)
-                        .toList()
-                )
-                .list();
+//        List<WmsQrCodeMaster> qrCodeMasters = qrCodeMasterService.lambdaQuery()
+//                .eq(WmsQrCodeMaster::getProcessStage, BarCodeProcessStage.InBound.getState())
+//                .in(WmsQrCodeMaster::getBarcodeCode, request.getItems().stream()
+//                        .map(OutProduceSubmitItemQO::getQrCodes)
+//                        .flatMap(Collection::stream)
+//                        .toList()
+//                )
+//                .list();
+        List<String> barcodeCodes = request.getItems().stream()
+                .map(OutProduceSubmitItemQO::getQrCodes)
+                .filter(Objects::nonNull)
+                .flatMap(Collection::stream)
+                .map(qrCodeQO -> qrCodeQO.getContent())
+                .filter(StrUtil::isNotBlank)
+                .toList();
+        final List<WmsQrCodeMaster> qrCodeMasters = new ArrayList<>();
+        if (CollectionUtil.isNotEmpty(barcodeCodes)) {
+            List<WmsQrCodeMaster> tempList = qrCodeMasterService.lambdaQuery()
+                    .eq(WmsQrCodeMaster::getProcessStage, BarCodeProcessStage.InBound.getState())
+                    .in(WmsQrCodeMaster::getBarcodeCode, barcodeCodes)
+                    .list();
+            qrCodeMasters.addAll(tempList);
+        }
+
         request.getItems().forEach(qitem -> {
             WmsTransferFactoryItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qitem.getItemId())).findFirst().orElse(null);
             VUtil.trueThrowBusinessError(Objects.isNull(item)).throwMessage("物料" + qitem.getMaterialNo() + "不需要出库");