From 8b75fe61a3eefe36761aa0f82a79b59342aa6709 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 20 十月 2025 16:10:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 e2c293f..d874084 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -28,8 +28,15 @@
public ReturnT<String> start(WrkMast wrkMast,BasDevp basDevp,Integer type) {
try {
- WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo().longValue()));
- if (!Cools.isEmpty(wrkMastSta)){
+ WrkMastSta wrkMastSta = null;
+ if(wrkMast != null){
+ wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo().longValue()));
+ }
+ if(basDevp.getWrkNo() != null){
+ wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", basDevp.getWrkNo().longValue()));
+ }
+
+ if (!Cools.isEmpty(wrkMastSta) ){
return SUCCESS;
}
switch (type){
@@ -52,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);
@@ -64,7 +72,7 @@
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
switch ((wrkMast.getStaNo())){
- case 1108:wrkMastSta1.setStaEnd(1106);break;
+ case 1108:wrkMastSta1.setStaEnd(1109);break;
case 4006:wrkMastSta1.setStaEnd(1018);break;
}
wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
@@ -72,13 +80,16 @@
wrkMastStaService.insert(wrkMastSta1);
};
break;
-// case 23://3锛氭弧鍙�
-// if (Cools.isEmpty(wrkMastSta)){
-// WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
-// wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
-// wrkMastSta1.setWrkType(5);
-// wrkMastStaService.insert(wrkMastSta1);
-// }
+ case 23://寮傚父閫�鍑�
+ WrkMast wrkMast23 = new WrkMast();
+ wrkMast23.setWrkNo(basDevp.getWrkNo());
+ wrkMast23.setSourceStaNo(basDevp.getDevNo());
+ wrkMast23.setStaNo(1041);
+
+ WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast23,new Date(),basDevp);
+ wrkMastSta1.setType(2);
+ wrkMastSta1.setWrkType(6);
+ wrkMastStaService.insert(wrkMastSta1);
default:
return SUCCESS;
}
--
Gitblit v1.9.1