From 48920c1d9f886611fad85a829e42ca4a21b2be1f Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Fri, 28 Mar 2025 11:40:06 +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   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

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 6396be032..0e1d2841c 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
@@ -16,6 +16,8 @@ import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.dao.auth.InvWarehouseDao;
 import com.glxp.api.dao.basic.SysWorkplaceBusMapper;
+import com.glxp.api.dao.collect.IoCollectCodeBackMapper;
+import com.glxp.api.dao.collect.IoCollectCodeMapper;
 import com.glxp.api.dao.collect.IoCollectOrderBackupMapper;
 import com.glxp.api.dao.inout.IoCodeTempDao;
 import com.glxp.api.entity.auth.AuthAdmin;
@@ -49,6 +51,7 @@ import com.glxp.api.service.inout.IoOrderService;
 import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.util.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
@@ -136,7 +139,8 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
     public int updateByBillNo(IoCollectOrderBackup collectOrder) {
         return ioCollectOrderBackupMapper.update(collectOrder, new UpdateWrapper<IoCollectOrderBackup>().eq("billNo", collectOrder.getBillNo()));
     }
-
+    @Resource
+    private IoCollectCodeBackMapper ioCollectCodeBackMapper;
     public List<CollectOrderBizResponse> combieOrderDetail(CollectOrderBizRequest collectOrderBizRequest) {
         List<CollectOrderBizResponse> list = ioCollectOrderBizBackupService.filterList(collectOrderBizRequest);
 
@@ -167,6 +171,18 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             } 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>()
+                        .eq("billNo",collectOrderBizRequest.getOrderIdFk())
+                );
+                if(CollUtil.isNotEmpty(ioCollectCodeBackupList)){
+                    for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackupList) {
+                        collectOrderBizResponse.setFinishUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getSplitUdiCode()) + "," + ioCollectCodeBackup.getCode());
+                    }
+
+                }
+            }
 
             collectOrderBizResponses.add(collectOrderBizResponse);
         }