From fe0b22ed3a56a53f0d9ccd95e09d009634d34b65 Mon Sep 17 00:00:00 2001 From: L <L@123> Date: 星期日, 13 七月 2025 16:05:01 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 52 +++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 43 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 8cd2ed4..646045a 100644 --- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; +import com.core.common.R; import com.zy.asrs.entity.BasDevp; import com.zy.asrs.entity.WrkMast; import com.zy.asrs.entity.WrkMastSta; @@ -29,26 +30,59 @@ @Autowired private WrkMastStaService wrkMastStaService; - public ReturnT<String> start(WrkMast wrkMast,BasDevp basDevp) { + 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 wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp); - wrkMastSta1.setType(fillKM(wrkMast)? 0:1); - wrkMastStaService.insert(wrkMastSta1); + 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(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)? 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 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 false; + return true; } - return true; + return false; } } -- Gitblit v1.9.1