From d60e84cbedb554555578f071de95c4a8049183db Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 13 六月 2025 15:16:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 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 40d8991..646045a 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -33,34 +33,53 @@
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 11://婊″嚭
+ case 13://鍑� 3锛氬彇鏀�
if (Cools.isEmpty(wrkMastSta)){
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fillKM(wrkMast)? 0:1);
- wrkMastSta1.setWrkType(3);
+ wrkMastSta1.setType(1); //绫诲瀷 1:闈炵┖ 2:绌烘澘
+ wrkMastSta1.setWrkType(3); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
wrkMastStaService.insert(wrkMastSta1);
}
break;
- case 2://鍏�
+ case 21://1:鍙栵紙鍙犵洏锛�
if (Cools.isEmpty(wrkMastSta)){
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fillKM(wrkMast)? 0:1);
- wrkMastSta1.setWrkType(3);
+ wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
+ wrkMastSta1.setWrkType(1);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
+ wrkMastStaService.insert(wrkMastSta1);
+ };
+ 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);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
+ 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);
}
default:
- return FAIL;
+ return SUCCESS;
}
}catch (Exception e){
log.error("寮傚父锛侊紒锛�"+e);
return FAIL;
}
- return FAIL;
+ return SUCCESS;
}
- public boolean fillKM(WrkMast wrkMast){
+ public boolean fullKM(WrkMast wrkMast){
if (wrkMast.getIoType()!=10 && wrkMast.getIoType()!=110){
return true;
}
--
Gitblit v1.9.1