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/WrkMastStaInItScheduler.java | 81 +++++++++++++++++++++++++---------------
1 files changed, 50 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 8675f48..0a20e0b 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -53,10 +53,10 @@
add(1901);
}};
public static final List<Integer> STA_WORK_CU_CAR_THREE = new ArrayList<Integer>() {{
- add(118);add(120);
+ add(118);add(120);add(1901);
}};
public static final List<Integer> STA_WORK_CU_CAR_FOUR = new ArrayList<Integer>() {{
- add(121);add(118);
+ add(121);add(118);add(1901);
}};
public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
@@ -97,14 +97,14 @@
continue;
}
if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){
- if (!wrkMast.getStaNo().equals(122) && !wrkMast.getStaNo().equals(1901)){
+ if (!wrkMast.getStaNoCar$().equals(122) && !wrkMast.getStaNoCar$().equals(1901)){
continue;
}
}
if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
continue;
}
- if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119 || wrkMast.getStaNo()==120 || wrkMast.getStaNo()==121){
+ if (wrkMast.getStaNoCar$()==118 || wrkMast.getStaNoCar$()==119 || wrkMast.getStaNoCar$()==120 || wrkMast.getStaNoCar$()==121){
continue;
}
// boolean wrkTypeSign = fullKM(wrkMast);
@@ -205,18 +205,21 @@
if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
continue;
}
- if (wrkMast.getStaNo()<118 || wrkMast.getStaNo()>121){
+ if (wrkMast.getStaNoCar$()<118 || wrkMast.getStaNoCar$()>121){
continue;
}
- int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMast.getStaNo()).or().eq("sta_end", wrkMast.getStaNo()));
- 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.getStaNo());
+ BasDevp basDevpEnd = basDevpService.selectById(wrkMast.getStaNoCar$());
if (!basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){
continue;
}
@@ -225,7 +228,7 @@
continue;
}
}
- if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){
+ if (wrkMast.getStaNoCar$()==118 || wrkMast.getStaNoCar$()==119){
RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
if (rgvOneSign.getRgvOneSign()==1){
continue;
@@ -236,11 +239,11 @@
if (!Cools.isEmpty(wrkDetls) && !wrkDetls.isEmpty()){
String origin = wrkDetls.get(0).getOrigin();
if (origin.equals("1")){
- if (!STA_WORK_CU_CAR_FOUR.contains(wrkMast.getStaNo())){
+ if (!STA_WORK_CU_CAR_FOUR.contains(wrkMast.getStaNoCar$())){
continue;
}
}else {
- if (!STA_WORK_CU_CAR_THREE.contains(wrkMast.getStaNo())){
+ if (!STA_WORK_CU_CAR_THREE.contains(wrkMast.getStaNoCar$())){
continue;
}
}
@@ -281,30 +284,33 @@
if(Cools.isEmpty(wrkMast)){
continue;
}
- if (wrkMast.getStaNo()==1901){
- boolean sign1901 = false;
- List<WrkDetl> wrkDetlList1901 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- for (WrkDetl wrkDetl : wrkDetlList1901){
- if (wrkDetl.getBrandArmType$()==999){
- sign1901 = true;
- break;
- }
- }
- if (sign1901){
- continue;
- }
- }
+// if (wrkMast.getStaNo()==1901){
+// boolean sign1901 = false;
+// List<WrkDetl> wrkDetlList1901 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+// for (WrkDetl wrkDetl : wrkDetlList1901){
+// if (wrkDetl.getBrandArmType$()==999){
+// sign1901 = true;
+// break;
+// }
+// }
+// if (sign1901){
+// continue;
+// }
+// }
if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=103){
continue;
}
if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
continue;
}
- Integer wrkMastStaNo = wrkMast.getStaNo();
- if (wrkMastStaNo==1901){
- wrkMastStaNo = 122;
- }
- if ((wrkMastStaNo<118 || wrkMastStaNo>121) && wrkMastStaNo!=122){
+ Integer wrkMastStaNo = wrkMast.getStaNoCar$();
+// if (wrkMastStaNo==1901){
+// wrkMastStaNo = 122;
+// }
+// if ((wrkMastStaNo<118 || wrkMastStaNo>121) && wrkMastStaNo!=122){
+// continue;
+// }
+ if (wrkMastStaNo<118 || wrkMastStaNo>121){
continue;
}
String origin = null;
@@ -371,6 +377,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;
}
int countOther = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNoOther).or().eq("sta_end", staNoOther));
@@ -387,6 +405,7 @@
}
}
if (staNoOther==122){
+ wrkMast.setSheetNo("3");
staNoOther = 1901;
}
wrkMast.setStaNo(staNoOther);
--
Gitblit v1.9.1