From 7b6329313ca3a5e6ff96246eeaf96f839df7760b Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 22 十月 2025 11:51:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 23110ee..9a9c3bc 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -59,6 +59,7 @@
case 1015:wrkMastSta1.setStaEnd(1018);break;
case 1025:wrkMastSta1.setStaEnd(1028);break;
case 1032:wrkMastSta1.setStaEnd(1035);break;
+ case 2037:wrkMastSta1.setStaEnd(2037);break;
case 4001:wrkMastSta1.setStaEnd(4001);break;
}
wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
@@ -72,7 +73,12 @@
wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
switch ((wrkMast.getStaNo())){
case 1108:wrkMastSta1.setStaEnd(1109);break;
- case 4006:wrkMastSta1.setStaEnd(1018);break;
+ case 4006:
+ if(wrkMastSta1.getStaStart()>2000){
+ wrkMastSta1.setStaEnd(2018);break;
+ }else{
+ wrkMastSta1.setStaEnd(1018);break;
+ }
}
wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
wrkMastSta1.setWrkType(6);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
--
Gitblit v1.9.1