From 521e4ca5bd21a86db47b7a3b3774d33cbc38452f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Thu, 16 Jul 2026 09:50:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=BB=E5=8A=A1;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StockInOrderApplicationService.java       | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
index d6c3f698b..117efb435 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
@@ -618,29 +618,27 @@ public class StockInOrderApplicationService {
 
         //上架任务下发
         StockShelfOrderDO stockShelfOrderDO = new StockShelfOrderDO();
+
+
+        //完成上架
+        Boolean b1 = stockShelfOrderDomainService.completeUpShelf(stockShelfOrder.getShelfOrderId());
+
         String inOrderId = stockInOrderDO.getInOrderNumber();
         StockInOrder stockInOrder = stockInOrderService.getOne(new LambdaQueryWrapper<StockInOrder>()
                 .eq(StockInOrder::getInOrderNumber, inOrderId)
                 .eq(StockInOrder::getDelFlag,1) ,false);
         if (stockInOrder != null) {
-            stockShelfOrderDO.setOperatorsBy(stockInOrder.getWorkUserId());
-            List<Long> ids = new ArrayList<>();
-            ids.add(stockShelfOrder.getShelfOrderId());
-            stockShelfOrderDO.setShelfOrderIds(ids);
-            stockShelfOrderApplicationService.taskDistribution(stockShelfOrderDO);
+            DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper<DeliveTask>()
+                    .eq(DeliveTask::getTrackingNumber, stockShelfOrder.getShelfOrderNumber())
+                    .eq(DeliveTask::getDelFlag, 1));
+            if (deliveTask != null) {
+                deliveTask.setOperatorsBy(stockInOrder.getWorkUserId());
+                deliveTask.setOperatorsName(stockInOrder.getWorkUserName());
+                deliveTask.setTaskStatus(2);
+                deliveTaskService.updateById(deliveTask);
+            }
         }
 
-        //完成上架
-        Boolean b1 = stockShelfOrderDomainService.completeUpShelf(stockShelfOrder.getShelfOrderId());
-//        DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper<DeliveTask>()
-//                .eq(DeliveTask::getTrackingNumber, stockReceiptOrder.getReceiptOrderNumber())
-//                .eq(DeliveTask::getDelFlag, 1));
-//        if (deliveTask != null) {
-//            deliveTask.setOperatorsBy(workUserId);
-//            deliveTask.setOperatorsName(workUserName);
-//            deliveTask.setTaskStatus(2);
-//            deliveTaskService.updateById(deliveTask);
-//        }
         return b && b1;
     }