From 986b82b0941b98c2d9896214823679e12abffcae Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 31 一月 2023 14:57:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs' into bfwcs
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 a8d56f2..50c1f68 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -311,6 +311,10 @@
if (basDevps1.size()!=0){
continue;
}
+ List<WrkMast> wrkMasts1 = wrkMastMapper.selectWrkStsAndIoType(103);
+ if (wrkMasts1.size()!=0){
+ continue;
+ }
break;
case 204:
case 208:
@@ -319,6 +323,10 @@
if (basDevps2.size()!=0){
continue;
}
+ List<WrkMast> wrkMasts2 = wrkMastMapper.selectWrkStsAndIoType(203);
+ if (wrkMasts2.size()!=0){
+ continue;
+ }
break;
default:
News.error("{}浠诲姟鍐嶅叆搴撳け璐ワ紝绯荤粺鏁版嵁寮傚父锛�", wrkMast.getWrkNo());
--
Gitblit v1.9.1