From 4ad1f324ab1fd2b51504afc00b43b4ee40f029c2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 20 二月 2025 09:40:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 139 +++++++++++++++++++++++++++++++---------------
1 files changed, 93 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 51b1728..4dfbb4a 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -45,7 +45,7 @@
}};
public static final List<Integer> STA_WORK_CU_CAR = new ArrayList<Integer>() {{
- add(118);add(119);add(120);add(121);
+ add(118);add(120);add(121);
}};
public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{
@@ -55,69 +55,79 @@
add(118);add(120);
}};
public static final List<Integer> STA_WORK_CU_CAR_FOUR = new ArrayList<Integer>() {{
- add(119);add(121);
+ add(121);
}};
public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
- add(118);add(119);add(120);add(121);add(122);add(123);
+ add(118);add(120);add(121);add(122);add(123);add(171);
}};
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
for(Integer staNo : STA_WORK_CU){
- BasDevp basDevp = basDevpService.selectById(staNo);
- if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
- if(Cools.isEmpty(wrkMast)){
- continue;
- }
- if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){
- if (!wrkMast.getStaNo().equals(122)){
+ try{
+ BasDevp basDevp = basDevpService.selectById(staNo);
+ if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
+ if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
+ if (!basDevp.getLoadingSuper().equals("Y")){
+ continue;
+ }
+ }
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+ if(Cools.isEmpty(wrkMast)){
continue;
}
- }
- if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
- continue;
- }
- if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119 || wrkMast.getStaNo()==120 || wrkMast.getStaNo()==121){
- continue;
- }
- boolean wrkTypeSign = fullKM(wrkMast);
- if (!Cools.isEmpty(wrkMast)){
- if (wrkTypeSign) {
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀�
- if (result.getCode()==200){
+ if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){
+ if (!wrkMast.getStaNo().equals(122)){
continue;
- }else {
- System.out.println(staNo+"澶辫触锛�");
}
- } else {
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,23);//5锛氭弧鍙�
- if (result.getCode()==200){
- continue;
- }else {
- System.out.println(staNo+"澶辫触锛�");
+ }
+ if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
+ continue;
+ }
+ if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119 || wrkMast.getStaNo()==120 || wrkMast.getStaNo()==121){
+ continue;
+ }
+ boolean wrkTypeSign = fullKM(wrkMast);
+ if (!Cools.isEmpty(wrkMast)){
+ if (wrkTypeSign) {
+ ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀�
+ if (result.getCode()==200){
+ continue;
+ }else {
+ System.out.println(staNo+"澶辫触锛�");
+ }
+ } else {
+ ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,23);//5锛氭弧鍙�
+ if (result.getCode()==200){
+ continue;
+ }else {
+ System.out.println(staNo+"澶辫触锛�");
+ }
}
}
}
+ }catch (Exception e){
+ log.error("鑷姩琛ョ┖鏉縎TA_WORK_CU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
}
}
for(Integer staNo : STA_WORK_RU){
- BasDevp basDevp = basDevpService.selectById(staNo);
- if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
- if (Cools.isEmpty(wrkMast)){
- continue;
- }
+ try{
+ BasDevp basDevp = basDevpService.selectById(staNo);
+ if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getLoadingSuper().equals("Y") && basDevp.getAutoing().equals("Y")){
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+ if (Cools.isEmpty(wrkMast)){
+ continue;
+ }
- if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
- continue;
- }
+ if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
+ continue;
+ }
// boolean wrkTypeSign = fullKM(wrkMast);
- if (!Cools.isEmpty(wrkMast)){
+ if (!Cools.isEmpty(wrkMast)){
// if (wrkTypeSign){
ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);
if (result.getCode()==200) {
@@ -125,18 +135,26 @@
} else {
System.out.println(staNo+"澶辫触锛�");
}
+ }
}
+ }catch (Exception e){
+ log.error("鑷姩琛ョ┖鏉縎TA_WORK_RU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
}
}
}
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute2(){
try{
for(Integer staNo : STA_WORK_CU){
try{
BasDevp basDevp = basDevpService.selectById(staNo);
if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
+ if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
+ if (!basDevp.getLoadingSuper().equals("Y")){
+ continue;
+ }
+ }
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
if(Cools.isEmpty(wrkMast)){
continue;
@@ -162,6 +180,11 @@
if (!basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){
continue;
}
+ if (basDevpEnd.getDevNo()>117 && basDevpEnd.getDevNo()<124){
+ if (basDevpEnd.getLoadingSuper().equals("Y")){
+ continue;
+ }
+ }
if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){
RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
if (rgvOneSign.getRgvOneSign()==1){
@@ -170,7 +193,7 @@
}
if (wrkMast.getIoType()!=101){
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- if (wrkDetls.size()!=0){
+ 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())){
@@ -208,6 +231,11 @@
try{
BasDevp basDevp = basDevpService.selectById(staNo);
if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
+ if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
+ if (!basDevp.getLoadingSuper().equals("Y")){
+ continue;
+ }
+ }
List<Integer> STA_WORK_CU_CAR_NOW = STA_WORK_CU_CAR;
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
if(Cools.isEmpty(wrkMast)){
@@ -225,9 +253,10 @@
}
String origin = null;
boolean sign = false;
+ boolean sign101 = false;
if (wrkMast.getIoType()!=101){
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- if (wrkDetls.size()!=0){
+ if (!Cools.isEmpty(wrkDetls) && !wrkDetls.isEmpty()){
origin = wrkDetls.get(0).getOrigin();
if (origin.equals("1")){
if (!STA_WORK_CU_CAR_FOUR.contains(wrkMastStaNo)){
@@ -242,6 +271,8 @@
log.error("鏈煡璇㈠埌宸ヤ綔鏄庣粏");
continue;
}
+ }else {
+ sign101 = true;
}
int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMastStaNo).or().eq("sta_end", wrkMastStaNo));
if (count!=0){
@@ -257,11 +288,22 @@
}
BasDevp basDevpEnd = basDevpService.selectById(wrkMastStaNo);
+ if (Cools.isEmpty(basDevpEnd)){
+ sign = true;
+ }
+ if (!sign && basDevpEnd.getDevNo()>117 && basDevpEnd.getDevNo()<124){
+ if (basDevpEnd.getLoadingSuper().equals("Y")){
+ sign = true;
+ }
+ }
if (sign || !basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0) {
for (Integer staNoOther : STA_WORK_CU_CAR_NOW) {
if (staNoOther.equals(wrkMastStaNo)) continue;
- if (sign){
+ if (sign && !sign101){
+ if (Cools.isEmpty(origin)){
+ continue;
+ }
if (origin.equals("1")){
if (!STA_WORK_CU_CAR_FOUR.contains(staNoOther)){
continue;
@@ -281,6 +323,11 @@
if (!basDevpOther.getAutoing().equals("Y") || basDevpOther.getWrkNo()!=0 || basDevpOther.getLoading().equals("Y") || basDevpOther.getReportSign()!=0) {
continue;
}
+ if (basDevpOther.getDevNo()>117 && basDevpOther.getDevNo()<124){
+ if (basDevpOther.getLoadingSuper().equals("Y")){
+ continue;
+ }
+ }
wrkMast.setStaNo(staNoOther);
wrkMastService.updateById(wrkMast);
log.info("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"淇敼鐩爣绔欎负:"+staNoOther+";鍘熺洰鏍囩珯涓�:"+wrkMastStaNo);
--
Gitblit v1.9.1