From 7d42dc149401791c84c70abec853edf7e900e034 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 24 十二月 2025 08:39:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java | 60 ++++++++-------
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 56 +++++++------
src/main/java/com/zy/asrs/entity/WrkMast.java | 15 +++
src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java | 56 +++++++------
4 files changed, 107 insertions(+), 80 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index e00a33a..45a1719 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -395,6 +395,21 @@
return null;
}
+ public Integer getStaNoCar$(){
+ BasDevpService service = SpringUtils.getBean(BasDevpService.class);
+ BasDevp basDevp = service.selectById(this.sourceStaNo);
+ if (!Cools.isEmpty(basDevp)){
+ Integer devNoCar = basDevp.getDevNo();
+ switch (devNoCar){
+ case 1901:
+ return 122;
+ default:
+ return devNoCar;
+ }
+ }
+ return null;
+ }
+
public String getSourceLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.sourceLocNo);
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
index 6923a30..169c87f 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
@@ -95,14 +95,14 @@
continue;
}
if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){
- if (!wrkMast.getStaNo().equals(122)){
+ if (!wrkMast.getStaNoCar$().equals(122)){
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);
@@ -192,10 +192,10 @@
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()));
+ int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMast.getStaNoCar$()).or().eq("sta_end", wrkMast.getStaNoCar$()));
if (count!=0){
continue;
}
@@ -203,7 +203,7 @@
if (countStart!=0){
continue;
}
- BasDevp basDevpEnd = basDevpService.selectById(wrkMast.getStaNo());
+ BasDevp basDevpEnd = basDevpService.selectById(wrkMast.getStaNoCar$());
if (!basDevpEnd.getAutoing().equals("Y")){
continue;
}
@@ -213,7 +213,7 @@
if (Cools.isEmpty(wrkMastEnd) || wrkMastEnd.getIoType()!=101 || Cools.isEmpty(wrkMastEnd.getSheetNo()) || wrkMastEnd.getSheetNo().equals("0")){
continue;
}
- if (wrkMast.getStaNo()==121){
+ if (wrkMast.getStaNoCar$()==121){
BasDevp basDevpEnd120 = basDevpService.selectById(120);
if (Cools.isEmpty(basDevpEnd120)){
continue;
@@ -251,7 +251,7 @@
}
}
- if (wrkMast.getStaNo()==120){
+ if (wrkMast.getStaNoCar$()==120){
BasDevp basDevpEnd121 = basDevpService.selectById(121);
if (Cools.isEmpty(basDevpEnd121)){
continue;
@@ -292,7 +292,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;
@@ -303,11 +303,11 @@
if (wrkDetls.size()!=0){
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;
}
}
@@ -343,30 +343,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;
@@ -431,6 +434,7 @@
continue;
}
if (staNoOther==122){
+ wrkMast.setSheetNo("3");
staNoOther = 1901;
}
wrkMast.setStaNo(staNoOther);
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
index ed3765b..34af12c 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
@@ -91,14 +91,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);
@@ -198,10 +198,10 @@
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()));
+ int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMast.getStaNoCar$()).or().eq("sta_end", wrkMast.getStaNoCar$()));
if (count!=0){
continue;
}
@@ -209,7 +209,7 @@
if (countStart!=0){
continue;
}
- BasDevp basDevpEnd = basDevpService.selectById(wrkMast.getStaNo());
+ BasDevp basDevpEnd = basDevpService.selectById(wrkMast.getStaNoCar$());
if (!basDevpEnd.getAutoing().equals("Y")){
continue;
}
@@ -223,7 +223,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;
@@ -234,11 +234,11 @@
if (wrkDetls.size()!=0){
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;
}
}
@@ -274,30 +274,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;
@@ -362,6 +365,7 @@
continue;
}
if (staNoOther==122){
+ wrkMast.setSheetNo("3");
staNoOther = 1901;
}
wrkMast.setStaNo(staNoOther);
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 8675f48..6e68f5c 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -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,10 +205,10 @@
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()));
+ int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMast.getStaNoCar$()).or().eq("sta_end", wrkMast.getStaNoCar$()));
if (count!=0){
continue;
}
@@ -216,7 +216,7 @@
if (countStart!=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 +225,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 +236,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 +281,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;
@@ -387,6 +390,7 @@
}
}
if (staNoOther==122){
+ wrkMast.setSheetNo("3");
staNoOther = 1901;
}
wrkMast.setStaNo(staNoOther);
--
Gitblit v1.9.1