From 9126e6315288e1ea50e74c70b099974522d6b172 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 13 ++-----------
1 files changed, 2 insertions(+), 11 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 691e0b7..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) {
@@ -94,7 +85,7 @@
wrkMastSta1.setStaEnd(1028);
break;
} else {
- wrkMastSta1.setStaEnd(2021);
+ wrkMastSta1.setStaEnd(2024);
break;
}
case 5:
--
Gitblit v1.9.1