From a159d70468d238504a2d705b738ca59bff7e7392 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 22 十二月 2025 10:45:06 +0800
Subject: [PATCH] #1901
---
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 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 8ae4cea..8675f48 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);
@@ -61,7 +60,7 @@
}};
public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
- add(118);add(120);add(121);add(122);add(123);
+ add(118);add(120);add(121);add(122);add(123);add(1907);
}};
// add(171);
@@ -98,7 +97,7 @@
continue;
}
if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){
- if (!wrkMast.getStaNo().equals(122)){
+ if (!wrkMast.getStaNo().equals(122) && !wrkMast.getStaNo().equals(1901)){
continue;
}
}
@@ -108,13 +107,14 @@
if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119 || wrkMast.getStaNo()==120 || wrkMast.getStaNo()==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锛氬彇鏀�
if (result.getCode()==200){
continue;
- }else {
+ } else {
System.out.println(staNo+"澶辫触锛�");
}
} else {
@@ -140,9 +140,14 @@
if (Cools.isEmpty(wrkMast)){
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);
@@ -157,7 +162,7 @@
}
}
}catch (Exception e){
- log.error("鑷姩琛ョ┖鏉縎TA_WORK_RU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
+ log.error("STA_WORK_RU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
}
}
}
@@ -276,6 +281,19 @@
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;
}
@@ -283,7 +301,10 @@
continue;
}
Integer wrkMastStaNo = wrkMast.getStaNo();
- if (wrkMastStaNo<118 || wrkMastStaNo>121){
+ if (wrkMastStaNo==1901){
+ wrkMastStaNo = 122;
+ }
+ if ((wrkMastStaNo<118 || wrkMastStaNo>121) && wrkMastStaNo!=122){
continue;
}
String origin = null;
@@ -349,7 +370,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;
@@ -363,6 +386,9 @@
continue;
}
}
+ if (staNoOther==122){
+ staNoOther = 1901;
+ }
wrkMast.setStaNo(staNoOther);
wrkMastService.updateById(wrkMast);
log.info("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"淇敼鐩爣绔欎负:"+staNoOther+";鍘熺洰鏍囩珯涓�:"+wrkMastStaNo);
--
Gitblit v1.9.1