From 45d602719964509214d06ec5173f23e5307d5dfe Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 16 四月 2024 12:24:10 +0800
Subject: [PATCH] 无空库位时,不做空板入库操作

---
 src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java |   19 ++++++++++++++++++-
 1 files changed, 18 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 1acf9ef..ba079d1 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -117,8 +117,25 @@
                         .or().eq("io_type", 107)).getRecords();
 
         if(!Cools.isEmpty(agvWrkMastList)){
+            List<String> devNos = new ArrayList<>();
             agvWrkMastList.forEach(agvWrkMast -> {
                 try {
+
+                    //杩囨护璇ユ壒宸ヤ綔妗d腑閲嶅鐨勫嚭绔欑偣
+                    if (devNos.contains(agvWrkMast.getLocNo())){
+                        return;
+                    }
+                    devNos.add(agvWrkMast.getLocNo());
+
+                    //妫�娴嬪綋鍓嶅伐浣滀换鍔′腑鐨勭珯鐐规槸鍚﹀凡鏈夋湁浣滀笟涓殑浠诲姟
+                    AgvWrkMast agvWrkMastWorking = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
+                            .eq("loc_no", agvWrkMast.getLocNo())
+                            .ge("wrk_sts", 202L));
+
+                    if(!Cools.isEmpty(agvWrkMastWorking)){
+                        return;
+                    }
+
                     agvWrkMastHandler.startPutWayWrk(agvWrkMast);
                 } catch (IOException e) {
                     log.error(e.getMessage());
@@ -145,7 +162,7 @@
     /*
     鑷姩鐢熸垚绌烘澘鍑哄簱浠诲姟
      */
-    //@Scheduled(cron = "0/10 * * * * ? ")
+    @Scheduled(cron = "0/10 * * * * ? ")
     public void autoEmptyOut(){
         boolean packageEmptyAutoOUt = Cools.eq("Y",Parameter.get().getPackageEmptyAutoOUt());
         boolean mateEmptyAutoOut = Cools.eq("Y",Parameter.get().getMateEmptyAutoOut());

--
Gitblit v1.9.1