From 69d9b1fe14308d65e68e813b465d9b4a38fdbfc5 Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Fri, 28 Mar 2025 14:04:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E9=BD=90=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderBackupService.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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 0e1d2841c..aa06f72f9 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
@@ -164,13 +164,13 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
                     collectOrderBizResponse.setScanUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getScanUdiCode()) + "," + collectOrderCodeMan.getUdiCode());
                 }
             }
-            if (StrUtil.isNotEmpty(collectOrderBizResponse.getReplaceCode())) {
-                collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getReplaceCode());
-            } else if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())) {
-                collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode() == null ? "" : collectOrderBizResponse.getScanUdiCode().substring(1));
-            } else if (StrUtil.isNotEmpty(collectOrderBizResponse.getSplitUdiCode())) {
-                collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getSplitUdiCode() == null ? "" : collectOrderBizResponse.getSplitUdiCode().substring(1));
-            }
+//            if (StrUtil.isNotEmpty(collectOrderBizResponse.getReplaceCode())) {
+//                collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getReplaceCode());
+//            } else if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())) {
+//                collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode() == null ? "" : collectOrderBizResponse.getScanUdiCode().substring(1));
+//            } else if (StrUtil.isNotEmpty(collectOrderBizResponse.getSplitUdiCode())) {
+//                collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getSplitUdiCode() == null ? "" : collectOrderBizResponse.getSplitUdiCode().substring(1));
+//            }
             // 如果码没值就去备份表查询
             if(StringUtils.isEmpty(collectOrderBizResponse.getFinishUdiCode())){
                 List<IoCollectCodeBackup> ioCollectCodeBackupList = ioCollectCodeBackMapper.selectList(new QueryWrapper<IoCollectCodeBackup>()
@@ -178,7 +178,7 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
                 );
                 if(CollUtil.isNotEmpty(ioCollectCodeBackupList)){
                     for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackupList) {
-                        collectOrderBizResponse.setFinishUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getSplitUdiCode()) + "," + ioCollectCodeBackup.getCode());
+                        collectOrderBizResponse.setFinishUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getFinishUdiCode()) + "," + ioCollectCodeBackup.getCode());
                     }
 
                 }