From c3e47e5e70a9055b7d25c118eb1f7ec3c869e953 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 05 六月 2025 13:53:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wz-JiAo-wms' into wz-JiAo-wms

---
 src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java b/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java
index 81bb8f3..e5f382a 100644
--- a/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java
+++ b/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java
@@ -54,7 +54,10 @@
         if(config.getStatus()==0){
             return;
         }
-
+        WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sta_no",200));
+        if(!Cools.isEmpty(wrkMast1)){
+            return;
+        }
         BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 200));
         if (Cools.isEmpty(basDevp.getLoading())||basDevp.getLoading().equals("N")) {
             //鎵惧埌鍏ュ簱鏈�鏃╃殑

--
Gitblit v1.9.1