From f0adc332d570cde0084bce7372ae7b9653b8c93b Mon Sep 17 00:00:00 2001 From: 1 <1> Date: 星期四, 02 十月 2025 11:49:59 +0800 Subject: [PATCH] #和得服务器 --- src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 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 8a43981..c1d80ba 100644 --- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java @@ -29,7 +29,7 @@ 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)){ + if (!Cools.isEmpty(wrkMastSta) ){ return SUCCESS; } switch (type){ @@ -52,6 +52,7 @@ case 1015:wrkMastSta1.setStaEnd(1018);break; case 1025:wrkMastSta1.setStaEnd(1028);break; case 1032:wrkMastSta1.setStaEnd(1035);break; + case 4001:wrkMastSta1.setStaEnd(4001);break; } wrkMastSta1.setType(fullKM(wrkMast)? 1:2); wrkMastSta1.setWrkType(5);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀� @@ -62,21 +63,24 @@ if (Cools.isEmpty(wrkMastSta)){ WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp); wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo())); - if(wrkMast.getWrkNo() == 1108){ - wrkMastSta1.setStaEnd(1106); + switch ((wrkMast.getStaNo())){ + case 1108:wrkMastSta1.setStaEnd(1106);break; + case 4006:wrkMastSta1.setStaEnd(1018);break; } wrkMastSta1.setType(fullKM(wrkMast)? 1:2); wrkMastSta1.setWrkType(6);//宸ヤ綔绫诲瀷 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); -// } + case 23://寮傚父閫�鍑� + WrkMast wrkMast23 = new WrkMast(); + 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); + wrkMastSta1.setWrkType(6); + wrkMastStaService.insert(wrkMastSta1); default: return SUCCESS; } -- Gitblit v1.9.1