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 | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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..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);
@@ -282,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;
}
@@ -289,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;
@@ -355,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;
@@ -369,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