From 76cf10a7c0e487c246c7fa3d653d105206400944 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 14 十月 2022 14:38:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 b76244b..2548b3d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -696,9 +696,17 @@
}
// 杩囨护
- if (null != wrkMastMapper.selectPakout(slave.getId(), null)) {
- log.error("{}鍏ュ簱浠诲姟鏃犳硶浣滀笟锛屽洜瀛樺湪鍑哄簱涓换鍔�!", wrkMast.getWrkNo());
- continue;
+ WrkMast pakoutWrkMast = wrkMastMapper.selectPakout(slave.getId(), null);
+ if (null != pakoutWrkMast) {
+ if ((pakoutWrkMast.getIoType() == 103 || pakoutWrkMast.getIoType() == 104 || pakoutWrkMast.getIoType() == 107)
+ && pakoutWrkMast.getWrkSts() == 17
+ && basDevpService.selectByWrkNo(pakoutWrkMast.getWrkNo()) != null
+ ) {
+
+ } else {
+ log.error("{}鍏ュ簱浠诲姟鏃犳硶浣滀笟锛屽洜瀛樺湪鍑哄簱涓换鍔�!", wrkMast.getWrkNo());
+ continue;
+ }
}
// 缃《浠诲姟
--
Gitblit v1.9.1