From 044e946787ba4bf936451111c73ac239e4e0ae36 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 18 四月 2025 15:29:58 +0800
Subject: [PATCH] #erp开发

---
 src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
index 76ec280..2cb6df9 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
@@ -26,10 +26,18 @@
     public ReturnT<String> start(){
         List<Order> settleEqual6 = orderService.selectList(new EntityWrapper<Order>()
                 .eq("settle", 6));
+        boolean result = true;
         for (Order order : settleEqual6) {
             List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
                     .eq("order_no", order.getOrderNo()));
-            moveBoth(order,orderDetls);
+            for (OrderDetl orderDetl : orderDetls) {
+                if(orderDetl.getMemo().isEmpty()){//鑻ヨ鍗曢噷浠嶆湁鏈笂鎶ョ殑鍋滄杞巻鍙叉。
+                    result = false;
+                }
+            }
+            if(result){
+                moveBoth(order,orderDetls);
+            }
             log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" +order);
         }
         return SUCCESS;

--
Gitblit v1.9.1