From 03bc25bac2967decb8c20b01803b210349716e58 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期日, 11 八月 2024 21:09:20 +0800
Subject: [PATCH] # 192.168.103.12:8182

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

diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index f3c8e4e..539a5b5 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -56,10 +56,19 @@
                 .or().eq("io_type",12)
                 .or().eq("io_type",108)
                 .or().eq("io_type",109)
-                .or().eq("io_type",112));
+                .or().eq("io_type",111)
+                .or().eq("io_type",112)
+                .or().eq("io_type",113)
+                .or().eq("io_type",114)
+                .or().eq("io_type",121)
+        );
         if(!Cools.isEmpty(agvWrkMastList)){
             agvWrkMastList.stream().forEach(agvWrkMast -> {
-                agvWrkMastHandler.completedPutWayWrk(agvWrkMast);
+                try{
+                    agvWrkMastHandler.completedPutWayWrk(agvWrkMast);
+                } catch (Exception e){
+                    log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负205,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+                }
             });
         }
     }
@@ -75,7 +84,11 @@
                 .or().eq("io_type",101));
         if(!Cools.isEmpty(agvWrkMastList)){
             agvWrkMastList.stream().forEach(agvWrkMast -> {
-                ReturnT<String> returnT = agvWrkMastHandler.completedCarryWrk(agvWrkMast);
+                try{
+                    agvWrkMastHandler.completedCarryWrk(agvWrkMast);
+                } catch (Exception e){
+                    log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负206,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+                }
             });
         }
     }
@@ -92,7 +105,11 @@
                 .or().eq("io_type",101));
         if(!Cools.isEmpty(agvWrkMastList)){
             agvWrkMastList.stream().forEach(agvWrkMast -> {
-                ReturnT<String> returnT = agvWrkMastHandler.completedCarryWrk2(agvWrkMast);
+                try{
+                    agvWrkMastHandler.completedCarryWrk2(agvWrkMast);
+                } catch (Exception e){
+                    log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负206,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+                }
             });
         }
     }
@@ -116,14 +133,16 @@
                 .or().eq("io_type", 12)
                 .or().eq("io_type", 109)
                 .or().eq("io_type", 108)
-                .or().eq("io_type", 112)).getRecords();
+                .or().eq("io_type", 111)
+                .or().eq("io_type", 112)
+                .or().eq("io_type", 113)).getRecords();
 
         if(!Cools.isEmpty(agvWrkMastList)){
             agvWrkMastList.forEach(agvWrkMast -> {
-                try {
+                try{
                     agvWrkMastHandler.startPutWayWrk(agvWrkMast);
-                } catch (IOException e) {
-                    log.error(e.getMessage());
+                } catch (Exception e){
+                    log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负201,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
                 }
             });
         }
@@ -166,6 +185,7 @@
                         .or().eq("io_type", 11)
                         .or().eq("io_type", 110)
                         .or().eq("io_type", 107)
+                        .or().eq("io_type", 109)
                         .or().eq("io_type", 108)).getRecords();
 
         if(!Cools.isEmpty(agvWrkMastList)){
@@ -195,10 +215,9 @@
                     if(!Cools.isEmpty(agvWrkMastWorking)){
                         return;
                     }
-
                     agvWrkMastHandler.startPutWayWrk(agvWrkMast);
-                } catch (IOException e) {
-                    log.error(e.getMessage());
+                } catch (Exception e) {
+                    log.error("鎼繍锛岀粺鎸囧嚭搴撱�佺Щ搴撱�佺偣鍒扮偣鎼繍绛�"+e.getMessage());
                 }
             });
         }

--
Gitblit v1.9.1