From b5e0def6c1356c2fb82c73310389856ffb54c166 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 09 十月 2025 09:08:31 +0800
Subject: [PATCH] #和得服务器
---
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 c1d80ba..23110ee 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -28,7 +28,14 @@
public ReturnT<String> start(WrkMast wrkMast,BasDevp basDevp,Integer type) {
try {
- WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo().longValue()));
+ 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;
}
@@ -64,7 +71,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);
@@ -77,8 +84,9 @@
wrkMast23.setWrkNo(basDevp.getWrkNo());
wrkMast23.setSourceStaNo(basDevp.getDevNo());
wrkMast23.setStaNo(1041);
- WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
+
+ WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast23,new Date(),basDevp);
+ wrkMastSta1.setType(2);
wrkMastSta1.setWrkType(6);
wrkMastStaService.insert(wrkMastSta1);
default:
--
Gitblit v1.9.1