From 6a6ceb0e57285d49c3f9c884e244710c9edf2b7a Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期三, 07 一月 2026 13:52:33 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 7d59022..0a20e0b 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -53,10 +53,10 @@
add(1901);
}};
public static final List<Integer> STA_WORK_CU_CAR_THREE = new ArrayList<Integer>() {{
- add(118);add(120);
+ add(118);add(120);add(1901);
}};
public static final List<Integer> STA_WORK_CU_CAR_FOUR = new ArrayList<Integer>() {{
- add(121);add(118);
+ add(121);add(118);add(1901);
}};
public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
@@ -377,6 +377,18 @@
}
}
if (staNoOther==1901){
+ boolean sign1901 = false;
+ for (Integer staNo1901 : STA_WORK_CU){
+ BasDevp basDevp1901 = basDevpService.selectById(staNo1901);
+ WrkMast wrkMast1901 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp1901.getWrkNo()));
+ if (wrkMast1901.getStaNo()==1901){
+ sign1901 = true;
+ break;
+ }
+ }
+ if (sign1901){
+ continue;
+ }
staNoOther = 122;
}
int countOther = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNoOther).or().eq("sta_end", staNoOther));
--
Gitblit v1.9.1