From da3bbf602cf91249b31c8b01eba0f5c2bf9edea7 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 11 九月 2025 13:01:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
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 8a43981..e2c293f 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -52,6 +52,7 @@
case 1015:wrkMastSta1.setStaEnd(1018);break;
case 1025:wrkMastSta1.setStaEnd(1028);break;
case 1032:wrkMastSta1.setStaEnd(1035);break;
+ case 4001:wrkMastSta1.setStaEnd(4001);break;
}
wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
wrkMastSta1.setWrkType(5);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
@@ -62,8 +63,9 @@
if (Cools.isEmpty(wrkMastSta)){
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
- if(wrkMast.getWrkNo() == 1108){
- wrkMastSta1.setStaEnd(1106);
+ switch ((wrkMast.getStaNo())){
+ case 1108:wrkMastSta1.setStaEnd(1106);break;
+ case 4006:wrkMastSta1.setStaEnd(1018);break;
}
wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
wrkMastSta1.setWrkType(6);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
--
Gitblit v1.9.1