From 0cdbbb60b9549be1c99ff7d5a37936dadac61649 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 27 三月 2024 10:50:30 +0800
Subject: [PATCH] AGV任务下发

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

diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index 3bfcbea..4f425b5 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -75,7 +75,7 @@
     putaway锛氫笂鏋�
     瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负201.鐢熸垚鍏ュ簱浠诲姟ID 涓�(鍑哄簱绫诲瀷涓� 53.鎷f枡鍐嶅叆搴� || 1.鍏ュ簱 || 10.绌烘澘鍏ュ簱鏍� || 57.鐩樼偣鍐嶅叆搴�)鐨勬暟鎹�
      */
-    @Scheduled(cron = "0/10 * * * * ? ")
+    //@Scheduled(cron = "0/10 * * * * ? ")
     public void startPutwayWrk(){
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
                 ,new EntityWrapper<AgvWrkMast>()
@@ -86,11 +86,13 @@
                 .or().eq("io_type", 57)).getRecords();
 
         if(!Cools.isEmpty(agvWrkMastList)){
-            try {
-                ReturnT<String> returnT = agvWrkMastHandler.startPutWayWrk(agvWrkMastList);
-            } catch (IOException e) {
-                log.error(e.getMessage());
-            }
+            agvWrkMastList.forEach(agvWrkMast -> {
+                try {
+                    agvWrkMastHandler.startPutWayWrk(agvWrkMast);
+                } catch (IOException e) {
+                    log.error(e.getMessage());
+                }
+            });
         }
     }
 
@@ -103,7 +105,7 @@
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
                 ,new EntityWrapper<AgvWrkMast>()
                         .eq("wrk_sts", 21)
-                        .like("loc_no","@")
+                        //.like("loc_no","@")
                         .andNew().eq("io_type", 101)
                         .or().eq("io_type", 103)
                         .or().eq("io_type", 11)
@@ -111,18 +113,20 @@
                         .or().eq("io_type", 107)).getRecords();
 
         if(!Cools.isEmpty(agvWrkMastList)){
-            try {
-                ReturnT<String> returnT = agvWrkMastHandler.startCarryWrk(agvWrkMastList);
-            } catch (IOException e) {
-                log.error(e.getMessage());
-            }
+            agvWrkMastList.forEach(agvWrkMast -> {
+                try {
+                    agvWrkMastHandler.startPutWayWrk(agvWrkMast);
+                } catch (IOException e) {
+                    log.error(e.getMessage());
+                }
+            });
         }
     }
 
     /*
     瀹氭椂澶勭悊绛夊緟鎵ц鐨勪换鍔� 宸ヤ綔鐘舵�佷负21.鐢熸垚鍑哄簱浠诲姟 涓旂洰鏍囧簱浣嶄腑涓嶅惈@瀛楃
      */
-    @Scheduled(cron = "0/10 * * * * ? ")
+    //@Scheduled(cron = "0/10 * * * * ? ")
     public void dealWatiWrk(){
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectReadyAgvWrkMast();
         if(!Cools.isEmpty(agvWrkMastList)){

--
Gitblit v1.9.1