From 58b23d18daa51a9837306fb0a8c03285fbd80e99 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:16:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 11 +----------
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 7 ++++---
2 files changed, 5 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 8626282..f24ffc5 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -43,7 +43,7 @@
//鍏ュ簱鍙�
public static final List<Integer> STA_WORK_IN = new ArrayList<Integer>() {{
- add(1042);add(1043);add(1104);add(1105);add(1038);add(1036);add(2037);
+ add(1042);add(1043);add(1044);add(1104);add(1105);add(1103);add(1038);add(1036);add(2037);
}};
//鍑哄簱鍙�
@@ -61,12 +61,13 @@
put(1105,1105);put(1104,1105);put(1043,1042);put(1042,1042);
}};
public static final Map<Integer, Integer> siteInMap = new HashMap<Integer, Integer>() {{
- put(1043, 1042);put(1042, 1042);put(1105, 1105);put(1104, 1105);put(1036, 1036);put(1038, 1038);put(2037,2037);
+ put(1043, 1042);put(1042, 1042);put(1044, 1042);put(1105, 1105);put(1104, 1105);
+ put(1103, 1105);put(1036, 1036);put(1038, 1038);put(2037,2037);
}};
// 寮傚父鍑哄簱鍙�
public static final List<Integer> STA_WORK_Exception = new ArrayList<Integer>() {{
- add(1042);add(1105);add(1104);add(1043);
+ add(1042);add(1105);add(1104);add(1043);add(1044);add(1103);
}};
// public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
index 4f25588..ea3f25d 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -40,15 +40,6 @@
return SUCCESS;
}
switch (type){
-// case 13://鍑� 3锛氬彇鏀�
-// if (Cools.isEmpty(wrkMastSta)){
-// WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
-// wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
-// wrkMastSta1.setType(1); //绫诲瀷 1:闈炵┖ 2:绌烘澘
-// wrkMastSta1.setWrkType(3); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
-// wrkMastStaService.insert(wrkMastSta1);
-// }
-// break;
case 21://鍏ュ簱
if (Cools.isEmpty(wrkMastSta)){
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
@@ -71,7 +62,7 @@
if (Cools.isEmpty(wrkMastSta)){
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
- if(wrkMast.getIoType() == 57){
+ if(wrkMast.getIoType() == 57 || wrkMast.getIoType() == 53){
switch (wrkMast.getCrnNo()) {
case 1:
if (wrkMast.getSourceStaNo() < 2000) {
--
Gitblit v1.9.1