From dc3b447b4dba4fa3be6167236237ae02a67b0984 Mon Sep 17 00:00:00 2001 From: whycq <123456> Date: 星期五, 12 八月 2022 14:12:39 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 63 +++++++++++++++---------------- 1 files changed, 31 insertions(+), 32 deletions(-) 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 83306ca..574eb94 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java @@ -39,23 +39,22 @@ @Autowired private OrderService orderService; - // update asr_wrk_mast set inv_wh = 'Y', ove_mk = 'Y' where wrk_no = @Transactional public ReturnT<String> start(WrkMast wrkMast) { try { List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); - // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴� - if (!Cools.isEmpty(wrkDetls)) { - Iterator<WrkDetl> iterator = wrkDetls.iterator(); - while (iterator.hasNext()) { - WrkDetl wrkDetl = iterator.next(); - if (!Cools.isEmpty(wrkDetl.getOrderNo())) { - orderService.checkComplete(wrkDetl.getOrderNo()); - iterator.remove(); - } - } - } - +// // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴� +// if (!Cools.isEmpty(wrkDetls)) { +// Iterator<WrkDetl> iterator = wrkDetls.iterator(); +// while (iterator.hasNext()) { +// WrkDetl wrkDetl = iterator.next(); +// if (!Cools.isEmpty(wrkDetl.getOrderNo())) { +// orderService.checkComplete(wrkDetl.getOrderNo()); +// iterator.remove(); +// } +// } +// } +// // 鍏ュ簱 -------------------------------------------------------------------------------- if (wrkMast.getWrkSts() == 5) { // 鍏ㄦ澘鍏ュ簱 @@ -71,28 +70,28 @@ exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo()); } } - // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆� - if (!Cools.isEmpty(wrkDetls)) { - if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) { - exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); - } - } +// // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆� +// if (!Cools.isEmpty(wrkDetls)) { +// if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) { +// exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); +// } +// } // 鎷f枡鍐嶅叆搴� } else if (wrkMast.getIoType() == 53) { - if (!Cools.isEmpty(wrkDetls)) { - if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) { - exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); - } - } +// if (!Cools.isEmpty(wrkDetls)) { +// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) { +// exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); +// } +// } } - - // 鍑哄簱 -------------------------------------------------------------------------------- - } else if (wrkMast.getWrkSts() == 15) { - if (!Cools.isEmpty(wrkDetls)) { - if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) { - exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); - } - } +// +// // 鍑哄簱 -------------------------------------------------------------------------------- +// } else if (wrkMast.getWrkSts() == 15) { +// if (!Cools.isEmpty(wrkDetls)) { +// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) { +// exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); +// } +// } } // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗� -- Gitblit v1.9.1