From 115e0776a3465ae4775b5a3bf715a7325a2474b6 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期三, 10 五月 2023 08:16:04 +0800 Subject: [PATCH] 工作档完成状态变更 --- src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 12 ++++++------ src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 10 +++++----- src/main/resources/mapper/WrkMastMapper.xml | 10 +++++----- src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index 87f58c1..1ea0054 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -290,7 +290,7 @@ WrkMast wrkMast = new WrkMast(); wrkMast.setWrkNo(workNo); wrkMast.setIoTime(now); - wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID + wrkMast.setWrkSts(21L); // 宸ヤ綔鐘舵�侊細21.鐢熸垚鍑哄簱浠诲姟 wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬� Double ioPri = wrkMastService.getIoPri(ioType, dto.getLocNo()); wrkMast.setIoPri(ioPri); // 浼樺厛绾э細13 @@ -369,7 +369,7 @@ WrkMast wrkMast = new WrkMast(); wrkMast.setWrkNo(workNo); wrkMast.setIoTime(now); - wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID + wrkMast.setWrkSts(21L); // 宸ヤ綔鐘舵�侊細21.鐢熸垚鍑哄簱浠诲姟 wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬� Double ioPri = wrkMastService.getIoPri(ioType, taskDto.getLocNo()); wrkMast.setIoPri(ioPri); // 浼樺厛绾э細13 @@ -581,7 +581,7 @@ WrkMast wrkMast = new WrkMast(); wrkMast.setWrkNo(workNo); wrkMast.setIoTime(new Date()); - wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID + wrkMast.setWrkSts(21L); // 宸ヤ綔鐘舵�侊細21.鐢熸垚鍑哄簱浠诲姟 wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱 Double ioPri = wrkMastService.getIoPri(110, locNo); wrkMast.setIoPri(ioPri); @@ -658,7 +658,7 @@ WrkMast wrkMast = new WrkMast(); wrkMast.setWrkNo(workNo); wrkMast.setIoTime(now); - wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID + wrkMast.setWrkSts(21L); // 宸ヤ綔鐘舵�侊細21.鐢熸垚鍑哄簱浠诲姟 wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇 wrkMast.setIoPri(10D); wrkMast.setOutMost(locMastService.isOutMost(locNo, false)?1:0);; @@ -1104,7 +1104,7 @@ WrkMast wrkMast = new WrkMast(); wrkMast.setWrkNo(workNo); wrkMast.setIoTime(now); - wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID + wrkMast.setWrkSts(21L); // 宸ヤ綔鐘舵�侊細21.鐢熸垚鍑哄簱浠诲姟 wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇 wrkMast.setIoPri(15D); wrkMast.setOutMost(locMastService.isOutMost(loc.getLocNo(), false)?1:0);; diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java index 0fbb782..724f99d 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java @@ -62,7 +62,7 @@ } // 鍏ュ簱 -------------------------------------------------------------------------------- - if (wrkMast.getWrkSts() == 10) { + if (wrkMast.getWrkSts() == 15) { // 鍏ㄦ澘鍏ュ簱 if (wrkMast.getIoType() == 1) { // 鍏ュ簱閫氱煡鍗� @@ -92,7 +92,7 @@ } // 鍑哄簱 -------------------------------------------------------------------------------- - } else if (wrkMast.getWrkSts() == 18) { + } else if (wrkMast.getWrkSts() == 35) { if (!Cools.isEmpty(wrkDetls)) { if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) { exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java index 8309fe1..fefe730 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java @@ -38,11 +38,11 @@ private WaitPakinService waitPakinService; public ReturnT<String> start(WrkMast wrkMast) { - // 9.鍏ュ簱瀹屾垚 - if (wrkMast.getWrkSts() == 9) { + // 14.鍏ュ簱瀹屾垚 + if (wrkMast.getWrkSts() == 14) { return doIn(wrkMast); - // 17.鍑哄簱瀹屾垚 - } else if (wrkMast.getWrkSts() == 17) { + // 34.鍑哄簱瀹屾垚 + } else if (wrkMast.getWrkSts() == 34) { return doOut(wrkMast); } return SUCCESS; @@ -254,7 +254,7 @@ break; } // 淇敼宸ヤ綔涓绘。鐘舵�� - wrkMast.setWrkSts(10L); + wrkMast.setWrkSts(15L);//15.搴撳瓨鏇存柊瀹屾垚 wrkMast.setModiTime(now); if (!wrkMastService.updateById(wrkMast)) { exceptionHandle("鏇存柊鍏ュ簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo()); @@ -323,7 +323,7 @@ break; } // 淇敼宸ヤ綔涓绘。鐘舵�� - wrkMast.setWrkSts(18L); + wrkMast.setWrkSts(35L);//35.搴撳瓨鏇存柊瀹屾垚 wrkMast.setModiTime(now); if (!wrkMastService.updateById(wrkMast)) { exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo()); diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml index ad96104..db134bf 100644 --- a/src/main/resources/mapper/WrkMastMapper.xml +++ b/src/main/resources/mapper/WrkMastMapper.xml @@ -66,15 +66,15 @@ </resultMap> <select id="selectToBeCompleteData" resultMap="BaseResultMap"> - select * from asr_wrk_mast where ((wrk_sts = 9 Or wrk_sts = 17) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no + select * from asr_wrk_mast where ((wrk_sts = 14 Or wrk_sts = 34) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no </select> <select id="selectToBeHistoryData" resultMap="BaseResultMap"> select * from asr_wrk_mast - where wrk_sts=10 - or (wrk_sts=18 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp)) - or (wrk_sts=18 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp)) - or (wrk_sts=18 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp)) + where wrk_sts=15 + or (wrk_sts=35 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp)) + or (wrk_sts=35 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp)) + or (wrk_sts=35 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp)) order by io_time,wrk_no asc </select> -- Gitblit v1.9.1