From 04b1ba2cf7f144079f1ae65d5d24fdcda330d1f9 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 21 一月 2024 16:09:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 d13466b..f6d3f08 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -33,12 +33,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)){
+ return SUCCESS;
+ }
switch (type){
case 13://鍑� 3锛氬彇鏀�
if (Cools.isEmpty(wrkMastSta)){
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fullKM(wrkMast)? 1:2); //绫诲瀷 1:闈炵┖ 2:绌烘澘
- wrkMastSta1.setWrkType(3); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
+ wrkMastSta1.setType(1); //绫诲瀷 1:闈炵┖ 2:绌烘澘
+ wrkMastSta1.setWrkType(3); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
wrkMastStaService.insert(wrkMastSta1);
}
break;
@@ -46,16 +49,18 @@
if (Cools.isEmpty(wrkMastSta)){
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
- wrkMastSta1.setWrkType(1);
+ wrkMastSta1.setWrkType(1);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
wrkMastStaService.insert(wrkMastSta1);
- }
- case 22://2锛氭斁
+ };
+ break;
+ case 22://2锛氭斁(鎷嗙洏)
if (Cools.isEmpty(wrkMastSta)){
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
- wrkMastSta1.setWrkType(5);
+ wrkMastSta1.setWrkType(5);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
wrkMastStaService.insert(wrkMastSta1);
- }
+ };
+ break;
// case 23://3锛氬彇鏀�
// if (Cools.isEmpty(wrkMastSta)){
// WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
@@ -64,14 +69,14 @@
// wrkMastStaService.insert(wrkMastSta1);
// }
default:
- return FAIL;
+ return SUCCESS;
}
}catch (Exception e){
log.error("寮傚父锛侊紒锛�"+e);
return FAIL;
}
- return FAIL;
+ return SUCCESS;
}
public boolean fullKM(WrkMast wrkMast){
--
Gitblit v1.9.1