From 6eecac9d82c970acf021669e3bb4cd782f36bbfe Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 24 一月 2024 11:34:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 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 fa510cc..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,45 +33,50 @@
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)? 0:1); //绫诲瀷 0:闈炵┖ 1:绌烘澘
- wrkMastSta1.setWrkType(3); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩�
+ wrkMastSta1.setType(1); //绫诲瀷 1:闈炵┖ 2:绌烘澘
+ wrkMastSta1.setWrkType(3); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
wrkMastStaService.insert(wrkMastSta1);
}
break;
case 21://1:鍙栵紙鍙犵洏锛�
if (Cools.isEmpty(wrkMastSta)){
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fullKM(wrkMast)? 0:1);
- wrkMastSta1.setWrkType(1);
+ wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
+ 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)? 0:1);
- wrkMastSta1.setWrkType(2);
+ wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
+ wrkMastSta1.setWrkType(5);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
wrkMastStaService.insert(wrkMastSta1);
- }
- case 23://3锛氬彇鏀�
- if (Cools.isEmpty(wrkMastSta)){
- WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fullKM(wrkMast)? 0:1);
- wrkMastSta1.setWrkType(3);
- 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(3);
+// 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