From ba8987f0abe16ef9bb11a25a73495d5709a8a785 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 06 六月 2024 13:28:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java |   70 +++++++++++++++++++---------------
 1 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
index 2ec0f95..eb6832b 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
@@ -19,7 +19,7 @@
 
 /**
  * Created by Monkey D. Luffy on 2023.07.25
- * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鑷姩琛ョ┖鏉�
+ * 浜冲窞鐓滄槦..............浠ヤ笅.............浜冲窞鐓滄槦.............宸﹀彸鍙屽伐浣嶅爢鍨涙満鎵ц浠诲姟鐢熸垚
  */
 @Component
 public class WrkMastCrnScheduler {
@@ -54,36 +54,40 @@
 
     @Scheduled(cron = "0/3 * * * * ? ")
     private void execute(){
-        for(Integer staNo : CRN_WORK_RU){
-            BasDevp basDevp = basDevpService.selectById(staNo);
-            if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y") && basDevp.getInEnable().equals("Y")){
-                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
-                if(Cools.isEmpty(wrkMast)){
-                    continue;
-                }
-                if (wrkMast.getWrkSts()!=2){
-                    continue;
-                }
-                WrkMastCrn wrkMastCrn = wrkMastCrnService.selectOne(new EntityWrapper<WrkMastCrn>().eq("wrk_no", wrkMast.getWrkNo()));
-                if (Cools.isEmpty(wrkMastCrn)){
-                    BasDevp basDevpOther = basDevpService.selectById(staNoOther(staNo));
-                    if (basDevpOther.getWrkNo()!=0 && basDevpOther.getLoading().equals("Y") && basDevpOther.getAutoing().equals("Y") && basDevpOther.getInEnable().equals("Y")){
-                        WrkMast wrkMastOther = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevpOther.getWrkNo()));
-                        if(Cools.isEmpty(wrkMastOther)){
-                            continue;
-                        }
-                        if (wrkMastOther.getWrkSts()!=2){
-                            continue;
-                        }
-                        if (!Cools.isEmpty(wrkMast)){
-                            ReturnT<String> result = wrkMastCrnHandler.start(wrkMast,wrkMastOther);
-                            if (result.getCode()!=200){
-                                System.out.println(staNo+"澶辫触锛�");
+        try{
+            for(Integer staNo : CRN_WORK_RU){
+                BasDevp basDevp = basDevpService.selectById(staNo);
+                if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y") && basDevp.getInEnable().equals("Y")){
+                    WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+                    if(Cools.isEmpty(wrkMast)){
+                        continue;
+                    }
+                    if (wrkMast.getWrkSts()!=2){
+                        continue;
+                    }
+                    WrkMastCrn wrkMastCrn = wrkMastCrnService.selectOne(new EntityWrapper<WrkMastCrn>().eq("wrk_no", wrkMast.getWrkNo()));
+                    if (Cools.isEmpty(wrkMastCrn)){
+                        BasDevp basDevpOther = basDevpService.selectById(staNoOther(staNo));
+                        if (basDevpOther.getWrkNo()!=0 && basDevpOther.getLoading().equals("Y") && basDevpOther.getAutoing().equals("Y") && basDevpOther.getInEnable().equals("Y")){
+                            WrkMast wrkMastOther = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevpOther.getWrkNo()));
+                            if(Cools.isEmpty(wrkMastOther)){
+                                continue;
+                            }
+                            if (wrkMastOther.getWrkSts()!=2){
+                                continue;
+                            }
+                            if (!Cools.isEmpty(wrkMast)){
+                                ReturnT<String> result = wrkMastCrnHandler.start(wrkMast,wrkMastOther);
+                                if (result.getCode()!=200){
+                                    System.out.println(staNo+"澶辫触锛�");
+                                }
                             }
                         }
                     }
                 }
             }
+        }catch (Exception e){
+            log.error("宸﹀彸鍙屽伐浣嶅爢鍨涙満鎵ц浠诲姟鐢熸垚====銆嬪叆搴撲换鍔＄敓鎴愬紓甯革細"+e.getMessage());
         }
     }
 
@@ -94,12 +98,16 @@
                     .eq("source_sta_no", staNo).eq("wrk_sts", 11L)
                     .orderBy("io_pri",false));
             for (WrkMast wrkMast:wrkMasts){
-                int row = Utils.getRow(wrkMast.getSourceLocNo());
-                if (row == wrkMast.getCrnNo()*4 || row == wrkMast.getCrnNo()*4-3){
-                    WrkMastCrn wrkMastCrn = wrkMastCrnService.selectOne(new EntityWrapper<WrkMastCrn>().eq("wrk_no", wrkMast.getWrkNo()));
-                    if (Cools.isEmpty(wrkMastCrn)){
-                        ReturnT<String> result = wrkMastCrnHandler.start(wrkMast);
+                try{
+                    int row = Utils.getRow(wrkMast.getSourceLocNo());
+                    if (row == wrkMast.getCrnNo()*4 || row == wrkMast.getCrnNo()*4-3){
+                        WrkMastCrn wrkMastCrn = wrkMastCrnService.selectOne(new EntityWrapper<WrkMastCrn>().eq("wrk_no", wrkMast.getWrkNo()));
+                        if (Cools.isEmpty(wrkMastCrn)){
+                            ReturnT<String> result = wrkMastCrnHandler.start(wrkMast);
+                        }
                     }
+                }catch (Exception e){
+                    log.error("宸﹀彸鍙屽伐浣嶅爢鍨涙満鎵ц浠诲姟鐢熸垚====銆嬪嚭搴撲换鍔＄敓鎴愬紓甯革細"+e.getMessage());
                 }
             }
         }

--
Gitblit v1.9.1