From b43b90ed4ff5e61df7c87553c8cab5daea66cb8e Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期六, 17 二月 2024 21:34:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 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..2ec0f95 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;
@@ -42,14 +43,18 @@
@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){
+ 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()));
@@ -72,9 +77,7 @@
}
if (!Cools.isEmpty(wrkMast)){
ReturnT<String> result = wrkMastCrnHandler.start(wrkMast,wrkMastOther);
- if (result.getCode()==200){
- continue;
- }else {
+ if (result.getCode()!=200){
System.out.println(staNo+"澶辫触锛�");
}
}
@@ -84,6 +87,24 @@
}
}
+ @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){
+ 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);
+ }
+ }
+ }
+ }
+ }
+
public Integer staNoOther(Integer staNo){
return staNo-1;
}
--
Gitblit v1.9.1