From f9b1879a3a9a27d90b144c1cc40f80e1c1339acf Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sun, 30 Mar 2025 21:20:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E5=8F=96=E5=8D=95=E6=8D=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/inout/IoCodeTempController.java     | 10 +++++++++-
 .../api/service/collect/IoCollectOrderService.java     |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 49a2c558d..a8b528523 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -35,6 +35,7 @@ import com.glxp.api.res.inout.AddCodeResult;
 import com.glxp.api.res.inout.AddEnterCodeResponse;
 import com.glxp.api.res.inout.IoCodeTempResponse;
 import com.glxp.api.res.inout.VailCodeResultResponse;
+import com.glxp.api.res.sync.SpsSyncOrderResponse;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.auth.SysWorkplaceService;
 import com.glxp.api.service.basic.*;
@@ -258,10 +259,17 @@ public class IoCodeTempController extends BaseController {
                     response.setData(collectOrder);
                     return response;
                 } else if (addEnterCodeRequest.getBusType().startsWith("SC")) {
-                    BaseResponse baseResponse2 = collectOrderService.importSpmsUdi(collectOrderRequest);
+                    BaseResponse<SpsSyncOrderResponse> baseResponse2 = collectOrderService.importSpmsUdi(collectOrderRequest);
                     if (baseResponse2.getCode() == 20000) {
                         collectOrder = collectOrderService.unionSearch(null, null, code);
                         //=============================================//
+                        SpsSyncOrderResponse data = baseResponse2.getData();
+                        List<IoOrderEntity> orderEntities = data.getOrderEntities();
+
+                        if (collectOrder == null && CollUtil.isNotEmpty(orderEntities)) {
+                                collectOrder = collectOrderService.unionSearch(null, null, orderEntities.get(0).getBillNo());
+                        }
+
                         if (collectOrder != null) {
                             collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode());
                             collectOrder.setBusType(addEnterCodeRequest.getBusType());
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
index 424e804c2..6e8b9a7fa 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -397,10 +397,12 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 //                    }
                 }
                 orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
+                collectOrderRequest.setBillNo(orderEntity.getBillNo());
                 if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) {
                     return ResultVOUtils.error(500, "非待审核单据！");
                 }
             }
+
             this.importUdi(collectOrderRequest);
         }
         return baseResponse;