From 5dfbde6716d9074099fa90799a079e09a8f407be Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 10 三月 2026 11:15:51 +0800
Subject: [PATCH] lsh#

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index 65dedd5..a8dc8f0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -553,7 +553,7 @@
                     // 绔嬪嵆瑙﹀彂寮傛浠诲姟锛屼笉绛夊緟缁撴灉
                     if (!Cools.isEmpty(palletId.get()) && StringUtils.isNotBlank(syncOrder.getOrderNo()) && !Cools.isEmpty(syncOrder.getStationId())) {
                         Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, palletId.get()));
-                        if (!Cools.isEmpty(loc) && loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+                        if (!Cools.isEmpty(loc) && loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
 //                            outStockService.getOrderOutTaskItem(orderOutTaskParam,param.getOrderItemId());
                             //鍑哄簱
 //                        boolean itemsCheck = waitPakinService.mergeItemsCheck(pakinParam, loginUserId);
@@ -566,6 +566,9 @@
                                 }
                             });
 //                            }
+                        } else {
+                            log.warn("璁㈠崟 {} 鑷姩鍑哄簱澶辫触锛侊紒鏈煡璇㈠埌鎸囧畾搴撳瓨锛侊紒", syncOrder.getOrderNo());
+                            throw new CoolException("鑷姩鍑哄簱澶辫触锛侊紒鏈煡璇㈠埌鎸囧畾搴撳瓨锛侊紒");
                         }
                     }
                 }
@@ -611,6 +614,17 @@
     @Async
     public void asyncOutboundExecutionWcs(String stationId ,Long orderId, Long loginUserId,String locCode) {
         try {
+            int i = 0;
+            while (true) {
+                i++;
+                if (i > 5) return;
+                Thread.sleep(3000);
+                WkOrder byId = asnOrderService.getById(orderId);
+                if (Cools.isEmpty(byId)) {
+                    continue;
+                }
+                break;
+            }
 
             GenWaveParams genWaveParams = new GenWaveParams();
             List<Long> ids = new ArrayList<>();

--
Gitblit v1.9.1