From 6a6ceb0e57285d49c3f9c884e244710c9edf2b7a Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期三, 07 一月 2026 13:52:33 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java | 52 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
index 34af12c..b361a5c 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
@@ -53,10 +53,10 @@
add(1901);
}};
public static final List<Integer> STA_WORK_CU_CAR_THREE = new ArrayList<Integer>() {{
- add(118);
+ add(118);add(1901);
}};
public static final List<Integer> STA_WORK_CU_CAR_FOUR = new ArrayList<Integer>() {{
- add(118);
+ add(118);add(1901);
}};
public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
@@ -162,7 +162,7 @@
}
}
- @Scheduled(cron = "0/1 * * * * ? ")
+ @Scheduled(cron = "0/2 * * * * ? ")
private void execute2(){
RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo"));
if (Cools.isEmpty(rgvTwoSign) || rgvTwoSign.getRgvOneSign()!=0){
@@ -201,16 +201,22 @@
if (wrkMast.getStaNoCar$()<118 || wrkMast.getStaNoCar$()>121){
continue;
}
- int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMast.getStaNoCar$()).or().eq("sta_end", wrkMast.getStaNoCar$()));
- if (count!=0){
+ int count1 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMast.getStaNoCar$()));
+ int count2 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_end", wrkMast.getStaNoCar$()));
+ if (count1+count2!=0){
continue;
}
- int countStart = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo).or().eq("sta_end", staNo).or().eq("wrk_no", wrkMast.getWrkNo()));
- if (countStart!=0){
+ int countStart1 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo));
+ int countStart2 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_end", staNo));
+ int countStart3 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo()));
+ if (countStart1+countStart2+countStart3!=0){
continue;
}
BasDevp basDevpEnd = basDevpService.selectById(wrkMast.getStaNoCar$());
if (!basDevpEnd.getAutoing().equals("Y")){
+ continue;
+ }
+ if (!basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){
continue;
}
if (basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){
@@ -323,12 +329,24 @@
continue;
}
}
- int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMastStaNo).or().eq("sta_end", wrkMastStaNo));
- if (count!=0){
+ int count1 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMast.getStaNoCar$()));
+ if (count1!=0){
continue;
}
- int countStart = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo).or().eq("sta_end", staNo).or().eq("wrk_no", wrkMast.getWrkNo()));
- if (countStart!=0){
+ int count2 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_end", wrkMast.getStaNoCar$()));
+ if (count2!=0){
+ continue;
+ }
+ int countStart1 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo));
+ if (countStart1!=0){
+ continue;
+ }
+ int countStart2 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_end", staNo));
+ if (countStart2!=0){
+ continue;
+ }
+ int countStart3 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo()));
+ if (countStart3!=0){
continue;
}
RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
@@ -353,6 +371,18 @@
}
}
if (staNoOther==1901){
+ boolean sign1901 = false;
+ for (Integer staNo1901 : STA_WORK_CU){
+ BasDevp basDevp1901 = basDevpService.selectById(staNo1901);
+ WrkMast wrkMast1901 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp1901.getWrkNo()));
+ if (wrkMast1901.getStaNo()==1901){
+ sign1901 = true;
+ break;
+ }
+ }
+ if (sign1901){
+ continue;
+ }
staNoOther = 122;
}
--
Gitblit v1.9.1