From e597fc1db67c560adecbd8d1e37d13c8f5a50fe3 Mon Sep 17 00:00:00 2001 From: yxFwq <1> Date: 星期四, 24 十月 2024 12:48:47 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 94b5623..2e74e09 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -8395,7 +8395,14 @@ continue; } SteProtocol steProtocol = steThread.getSteProtocol(); - if (steProtocol == null || steProtocol.getChargeStatus()!=0) { + if (steProtocol == null) { + continue; + } + if (Cools.isEmpty(steProtocol.getChargeStatus())) { + log.error("{}鍙峰皬杞︼紝鍏呯數鐘舵�佷俊鎭紓甯革紝灏忚溅淇℃伅锛歿}",steProtocol.getSteNo(),steProtocol.toString()); + continue; + } + if (steProtocol.getChargeStatus()!=0) { continue; } WrkMastExecute wrkMastExecuteByCharge = wrkMastExecuteService.getWrkMastExecuteByCharge(steSlave.getId()); @@ -8509,7 +8516,14 @@ continue; } SteProtocol steProtocol = steThread.getSteProtocol(); - if (steProtocol == null || steProtocol.getChargeStatus()!=1) { + if (steProtocol == null) { + continue; + } + if (Cools.isEmpty(steProtocol.getChargeStatus())) { + log.error("{}鍙峰皬杞︼紝鍏呯數鐘舵�佷俊鎭紓甯革紝灏忚溅淇℃伅锛歿}",steProtocol.getSteNo(),steProtocol.toString()); + continue; + } + if (steProtocol.getChargeStatus()!=1) { continue; } -- Gitblit v1.9.1