From 155cb0e523b9b9fd4c37734989c63b012d770051 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 17 十月 2025 15:12:00 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java b/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java
index fa42ace..ca91d38 100644
--- a/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java
+++ b/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java
@@ -30,7 +30,7 @@
  */
 @Component
 public class AutoAssignAGVTasks {
-    private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
+    private static final Logger log = LoggerFactory.getLogger(AutoAssignAGVTasks.class);
 
     @Autowired
     private WaitPakinService waitPakinService;
@@ -51,7 +51,7 @@
      * 鑷姩娲惧彂鍏ュ簱浠诲姟缁橝GV
      */
     @Scheduled(cron = "0/3 * * * * ? ")
-    private synchronized void execute(){
+    public synchronized void execute(){
         /**
          * agv鐘舵��
          * be_batch
@@ -127,11 +127,19 @@
                             }else {
                                 staNo = "101";
                             }
+
                             break;
                         }
                     }
                 }
             }
+
+            //褰撶珯鐐规湁鍑哄簱浠诲姟鏃惰烦杩囨淳鍙戜换鍔�
+            List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", staNo).lt("wrk_sts",33));
+            if(!Cools.isEmpty(wrkMasts1)){
+                continue;
+            }
+
             if (Cools.isEmpty(staNo)) {
                 return;
             }
@@ -166,7 +174,7 @@
      * 鑷姩娲惧彂琛ョ┖鏉夸换鍔$粰AGV
      */
     @Scheduled(cron = "0/3 * * * * ? ")
-    private synchronized void autoFillEmptyPallets(){
+    public synchronized void autoFillEmptyPallets(){
         /**
          * 璇ュ瓧娈垫槸缁勬墭鍏ュ簱鑷姩鍑哄彂琛ョ┖鎵樼洏鏍囪
          * item_num
@@ -212,7 +220,7 @@
      * 鑷姩娲惧彂鍑哄簱浠诲姟缁檃gv鎼繍
      */
     @Scheduled(cron = "0/3 * * * * ? ")
-    private synchronized void autoOut(){
+    public synchronized void autoOut(){
         List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 30));
         if (wrkMasts.isEmpty()) {
             return;
@@ -257,7 +265,7 @@
      * 鍏ュ簱浠诲姟鑷姩瑙g粦agv绔欑偣
      */
     @Scheduled(cron = "0/3 * * * * ? ")
-    private synchronized void UnbindTheSite(){
+    public synchronized void UnbindTheSite(){
         List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                 .in("io_type",1,53)
                 .ge("wrk_sts", 2)

--
Gitblit v1.9.1