From 4a22d91f5855d6f2f9e58aa972d1c9314fdde34b Mon Sep 17 00:00:00 2001 From: 18516761980 <tqsxp@163.com> Date: 星期二, 27 十二月 2022 08:06:52 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 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 574eb94..6a86f6f 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java @@ -43,18 +43,18 @@ 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) { // 鍏ㄦ澘鍏ュ簱 @@ -78,20 +78,20 @@ // } // 鎷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