From 0ece92133b17ec498b3fb12bec8fb1324ca19b38 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 21 Feb 2025 11:17:26 +0800
Subject: [PATCH] =?UTF-8?q?2/21=20=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=961.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/res/collect/CollectOrderBizResponse.java |  3 ++-
 .../collect/IoCollectOrderBackupService.java     | 16 ++++++++--------
 .../collect/IoCollectOrderBizBackupMapper.xml    |  1 +
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
index 1dfe13285..e4c61a1aa 100644
--- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
@@ -128,6 +128,8 @@ public class CollectOrderBizResponse {
     private String unSplitUdiCode;
     private String finishUdiCode;
     private String bzgg;
+    private String prepnSpec;
+
 
 
     private Integer autoResCount;
@@ -184,7 +186,6 @@ public class CollectOrderBizResponse {
     private String checkCode;
 
     private String queueCode;
-    private String prepnSpec;
     private Integer ledNum;
 
     /**
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
index fa9c24b4c..6a825e309 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
@@ -506,14 +506,14 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
 
             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceMap.get(collectOrderBizResponse.getNameCode());
             if (udiRelevanceResponse != null) {
-                for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackups) {
-                    if (ioCollectCodeBackup.getRelId().equals(udiRelevanceResponse.getId())) {
-                        collectOrderBizResponse.setScanUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getScanUdiCode()) + "," + ioCollectCodeBackup.getCode());
-                    }
-                }
-                if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())) {
-                    collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode() == null ? "" : collectOrderBizResponse.getScanUdiCode().substring(1));
-                }
+//                for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackups) {
+//                    if (ioCollectCodeBackup.getRelId().equals(udiRelevanceResponse.getId())) {
+//                        collectOrderBizResponse.setScanUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getScanUdiCode()) + "," + ioCollectCodeBackup.getCode());
+//                    }
+//                }
+//                if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())) {
+//                    collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode() == null ? "" : collectOrderBizResponse.getScanUdiCode().substring(1));
+//                }
             }
             collectOrderBizResponses.add(collectOrderBizResponse);
         }
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml
index c9664a3d5..65d0fee4d 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml
@@ -7,6 +7,7 @@
         bp.nameCode                   diCode,
         bp.zczbhhzbapzbh,
         bp.packUnit,
+        bp.prepnSpec,
         bp.manufactory,
         COALESCE(bp.bzgg,bp.ggxh) AS spec
         FROM io_collect_order_biz_backup icobb