From 4e4aaf7b1b8dc57377e9cdc8c90e53c41f835e6f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 12 六月 2024 10:33:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java | 85 ++++++++++++++++++++++++++++--------------
1 files changed, 57 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
index 13b8b2c..eb6832b 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
@@ -7,6 +7,7 @@
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WrkMastCrnHandler;
import com.zy.asrs.task.handler.WrkMastStaInItHandler;
+import com.zy.asrs.utils.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +19,7 @@
/**
* Created by Monkey D. Luffy on 2023.07.25
- * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鑷姩琛ョ┖鏉�
+ * 浜冲窞鐓滄槦..............浠ヤ笅.............浜冲窞鐓滄槦.............宸﹀彸鍙屽伐浣嶅爢鍨涙満鎵ц浠诲姟鐢熸垚
*/
@Component
public class WrkMastCrnScheduler {
@@ -42,45 +43,73 @@
@Autowired
private WrkMastCrnService wrkMastCrnService;
- public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
+ public static final List<Integer> CRN_WORK_RU = new ArrayList<Integer>() {{
add(153);add(145);
+ }};
+
+ public static final List<Integer> CRN_WORK_CU = new ArrayList<Integer>() {{
+ add(100);add(148);
}};
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
- for(Integer staNo : STA_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){
+ 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;
- }else {
- System.out.println(staNo+"澶辫触锛�");
+ }
+ 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());
+ }
+ }
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute2(){
+ for(Integer staNo : CRN_WORK_CU) {
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("source_sta_no", staNo).eq("wrk_sts", 11L)
+ .orderBy("io_pri",false));
+ for (WrkMast wrkMast:wrkMasts){
+ 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