From 642428dd870c2f288bb0f3a5fc94373a69a425cf Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期五, 25 四月 2025 13:08:53 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 36 +++++++++++++++++++++++------------- 1 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java index ef62596..f61788a 100644 --- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java +++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java @@ -39,19 +39,24 @@ return; } for (WrkMast wrkMast : wrkMasts) { - if (wrkMast.getIoType().equals(101)){ - if (Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("3")){ - continue; + try{ + if (wrkMast.getIoType().equals(101)){ + if (Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("3")){ + continue; + } } - } - ReturnT<String> returnT = workMastHandler.start(wrkMast); - if (!returnT.isSuccess()) { - wrkMast.setUpdMk("X"); - wrkMast.setErrorMemo(returnT.getMsg()); - wrkMast.setErrorTime(new Date()); - if (!wrkMastService.updateById(wrkMast)) { - log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo()); + ReturnT<String> returnT = workMastHandler.start(wrkMast); + if (!returnT.isSuccess()) { + wrkMast.setUpdMk("X"); + wrkMast.setErrorMemo(returnT.getMsg()); + wrkMast.setErrorTime(new Date()); + if (!wrkMastService.updateById(wrkMast)) { + log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo()); + } } + }catch (Exception e){ + log.error("宸ヤ綔妗workNo={}]鏇存柊搴撳瓨澶勭悊澶辫触", wrkMast.getWrkNo()); + log.error("澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e); } } } @@ -72,9 +77,14 @@ return; } for (WrkMast wrkMast : wrkMasts) { - wrkMast.setWrkSts(57L); - if (!wrkMastService.updateById(wrkMast)) { + try{ + wrkMast.setWrkSts(57L); + if (!wrkMastService.updateById(wrkMast)) { + log.error("宸ヤ綔妗workNo={}]杞畬鎴愬鐞嗗け璐�", wrkMast.getWrkNo()); + } + }catch (Exception e){ log.error("宸ヤ綔妗workNo={}]杞畬鎴愬鐞嗗け璐�", wrkMast.getWrkNo()); + log.error("澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e); } } } -- Gitblit v1.9.1