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/WrkMastStaInItScheduler.java | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index f93d9dd..6e68f5c 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -47,11 +47,10 @@
// add(116);add(117);
public static final List<Integer> STA_WORK_CU_CAR = new ArrayList<Integer>() {{
- add(118);add(120);add(121);
+ add(118);add(120);add(121);add(1901);
}};
-
public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{
- add(120);add(121);
+ add(1901);
}};
public static final List<Integer> STA_WORK_CU_CAR_THREE = new ArrayList<Integer>() {{
add(118);add(120);
@@ -98,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);
@@ -206,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;
}
@@ -217,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;
}
@@ -226,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;
@@ -237,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;
}
}
@@ -282,13 +281,32 @@
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.getIoType()!=101 && wrkMast.getIoType()!=103){
continue;
}
if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
continue;
}
- Integer wrkMastStaNo = wrkMast.getStaNo();
+ Integer wrkMastStaNo = wrkMast.getStaNoCar$();
+// if (wrkMastStaNo==1901){
+// wrkMastStaNo = 122;
+// }
+// if ((wrkMastStaNo<118 || wrkMastStaNo>121) && wrkMastStaNo!=122){
+// continue;
+// }
if (wrkMastStaNo<118 || wrkMastStaNo>121){
continue;
}
@@ -355,7 +373,9 @@
}
}
}
-
+ if (staNoOther==1901){
+ staNoOther = 122;
+ }
int countOther = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNoOther).or().eq("sta_end", staNoOther));
if (countOther!=0){
continue;
@@ -369,6 +389,10 @@
continue;
}
}
+ if (staNoOther==122){
+ wrkMast.setSheetNo("3");
+ staNoOther = 1901;
+ }
wrkMast.setStaNo(staNoOther);
wrkMastService.updateById(wrkMast);
log.info("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"淇敼鐩爣绔欎负:"+staNoOther+";鍘熺洰鏍囩珯涓�:"+wrkMastStaNo);
--
Gitblit v1.9.1