From c3617b473555b7b37755f92a04e258f0e55f333d Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期四, 08 一月 2026 09:13:18 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java | 138 +++++++++++++++++++++++++++++++++++----------
1 files changed, 107 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
index cbe94cb..5c8887a 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
@@ -46,28 +46,28 @@
}};
public static final List<Integer> STA_WORK_CU_CAR = new ArrayList<Integer>() {{
- add(118);
+ add(118);add(1901);
}};
public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{
-
+ 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>() {{
- add(118);add(122);
+ add(118);add(122);add(1907);
}};
@Scheduled(cron = "0/1 * * * * ? ")
private void execute(){
RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo"));
- if (rgvTwoSign.getRgvOneSign()!=0){
+ if (Cools.isEmpty(rgvTwoSign) || rgvTwoSign.getRgvOneSign()!=0){
return;
}
List<Integer> integersStaArr = new ArrayList<>();
@@ -91,17 +91,18 @@
continue;
}
if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){
- if (!wrkMast.getStaNo().equals(122)){
+ 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);
+// boolean wrkTypeSign = fullKM(wrkMast);
+ boolean wrkTypeSign = true;
if (!Cools.isEmpty(wrkMast)){
if (wrkTypeSign) {
ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀�
@@ -121,7 +122,7 @@
}
}
}catch (Exception e){
- log.error("鑷姩琛ョ┖鏉縎TA_WORK_CU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
+ log.error("鑷姩琛ョ┖鏉縎TA_WORK_CU澶勭悊澶辫触1锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
}
}
@@ -134,8 +135,14 @@
continue;
}
- if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
- continue;
+ if (staNo==1907){
+ if (wrkMast.getWrkSts()!=2){
+ continue;
+ }
+ } else {
+ if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
+ continue;
+ }
}
// boolean wrkTypeSign = fullKM(wrkMast);
@@ -150,15 +157,15 @@
}
}
}catch (Exception e){
- log.error("鑷姩琛ョ┖鏉縎TA_WORK_RU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
+ log.error("STA_WORK_RU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
}
}
}
- @Scheduled(cron = "0/1 * * * * ? ")
+ @Scheduled(cron = "0/2 * * * * ? ")
private void execute2(){
RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo"));
- if (rgvTwoSign.getRgvOneSign()!=0){
+ if (Cools.isEmpty(rgvTwoSign) || rgvTwoSign.getRgvOneSign()!=0){
return;
}
try{
@@ -191,19 +198,28 @@
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){
+ log.info(staNo+"绔欑偣鍑嗗鐢熸垚灏忚溅浠诲姟锛岃繘鍏ョ▼搴�");
+ 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){
+ log.info(staNo+"绔欑偣锛屾暟閲�1锛�"+count1+",鏁伴噺2:"+count2);
+ 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());
+ log.info(staNo+"绔欑偣锛屾暟閲�1锛�"+countStart1+",鏁伴噺2:"+countStart2+",鏁伴噺3:"+countStart3);
+ 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){
@@ -216,7 +232,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;
@@ -227,11 +243,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;
}
}
@@ -244,6 +260,7 @@
boolean wrkTypeSign = fullKM(wrkMast);
if (!Cools.isEmpty(wrkMast)){
if (wrkTypeSign) {
+ log.info(staNo+"绔欑偣鐢熸垚灏忚溅浠诲姟锛岃繘鍏ョ▼搴�;//3锛氬彇鏀�");
ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀�
if (result.getCode()==200){
continue;
@@ -254,7 +271,7 @@
}
}
}catch (Exception e){
- log.error("STA_WORK_CU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
+ log.error("STA_WORK_CU澶勭悊澶辫触2锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
}
}
@@ -267,13 +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;
+// }
+// }
+ log.info(staNo+"绔欑偣鍑嗗鍒囨崲绔欑偣锛岃繘鍏ョ▼搴�");
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;
}
@@ -297,14 +334,28 @@
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;
}
+ log.info(staNo+"绔欑偣锛宼wo鏁伴噺1锛�"+count1+",鏁伴噺2:"+count2);
+ 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;
+ }
+ log.info(staNo+"绔欑偣锛宼wo鏁伴噺1锛�"+countStart1+",鏁伴噺2:"+countStart2+",鏁伴噺3:"+countStart3);
RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
if (rgvOneSign.getRgvOneSign()==1){
STA_WORK_CU_CAR_NOW = STA_WORK_CU_CAR_TWO;
@@ -326,6 +377,27 @@
}
}
}
+ if (staNoOther==1901){
+ log.info("鍑嗗鍒囨崲"+staNoOther+"绔欑偣");
+ boolean sign1901 = false;
+ for (Integer staNo1901 : STA_WORK_CU){
+ BasDevp basDevp1901 = basDevpService.selectById(staNo1901);
+ if (Cools.isEmpty(basDevp1901)){
+ log.info("basDevp1901"+staNoOther+"涓虹┖");
+ continue;
+ }
+ WrkMast wrkMast1901 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp1901.getWrkNo()));
+ if (!Cools.isEmpty(wrkMast1901) && wrkMast1901.getStaNo()==1901){
+ sign1901 = true;
+ break;
+ }
+ }
+ if (sign1901){
+ log.info("瀛樺湪"+staNoOther+"绔欑偣浠诲姟锛岃烦杩�");
+ continue;
+ }
+ staNoOther = 122;
+ }
int countOther = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNoOther).or().eq("sta_end", staNoOther));
if (countOther!=0){
@@ -335,6 +407,10 @@
if (!basDevpOther.getAutoing().equals("Y") || basDevpOther.getWrkNo()!=0 || basDevpOther.getLoading().equals("Y") || basDevpOther.getReportSign()!=0) {
continue;
}
+ if (staNoOther==122){
+ wrkMast.setSheetNo("3");
+ staNoOther = 1901;
+ }
wrkMast.setStaNo(staNoOther);
wrkMastService.updateById(wrkMast);
log.info("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"淇敼鐩爣绔欎负:"+staNoOther+";鍘熺洰鏍囩珯涓�:"+wrkMastStaNo);
@@ -343,7 +419,7 @@
}
}
}catch (Exception e){
- log.error("STA_WORK_CU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
+ log.error("STA_WORK_CU澶勭悊澶辫触3锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
}
}
}catch (Exception e){
--
Gitblit v1.9.1