From 0213556a2ec8d77bb012dca635e4581e0791cb2b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 20 五月 2024 16:52:30 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index edbe3a4..df8b0c4 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -79,6 +79,7 @@
         }
     }
 
+
     /*
     瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负206.鍑哄簱瀹屾垚 涓� (101.鍑哄簱 || 110.绌烘澘鍑哄簱)
      */
@@ -162,7 +163,8 @@
                         .or().eq("io_type", 103)
                         .or().eq("io_type", 11)
                         .or().eq("io_type", 110)
-                        .or().eq("io_type", 107)).getRecords();
+                        .or().eq("io_type", 107)
+                        .or().eq("io_type", 108)).getRecords();
 
         if(!Cools.isEmpty(agvWrkMastList)){
             List<String> devNos = new ArrayList<>();
@@ -183,6 +185,14 @@
                     if(!Cools.isEmpty(agvWrkMastWorking)){
                         return;
                     }
+                    
+                    agvWrkMastWorking = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
+                            .eq("source_loc_no",agvWrkMast.getLocNo())
+                            .lt("loc_sts",204L));
+
+                    if(!Cools.isEmpty(agvWrkMastWorking)){
+                        return;
+                    }
 
                     agvWrkMastHandler.startPutWayWrk(agvWrkMast);
                 } catch (IOException e) {

--
Gitblit v1.9.1