From 809f49807ce5f587fe881cfe4cc3d38d9c1a46a3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 20 十二月 2025 10:20:47 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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..f93d9dd 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -61,7 +61,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 +98,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 +108,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 +141,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 +163,7 @@
}
}
}catch (Exception e){
- log.error("鑷姩琛ョ┖鏉縎TA_WORK_RU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
+ log.error("STA_WORK_RU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
}
}
}
--
Gitblit v1.9.1