From f107eaf4d1857d2230a5bc6983e4beb7fb811aa1 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期六, 08 七月 2023 22:06:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs6' into bfwcs6

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    4 ----
 1 files changed, 0 insertions(+), 4 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 3cda130..62cd994 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -336,8 +336,6 @@
                             staNo = 103;
                             if (basDevps1.size()!=0 && basDevps2.size()!=0){
                                 continue;
-                            } else if (basDevps1.size()!=0){
-                                staNo = 203;
                             }
 
                             List<WrkMast> wrkMasts1 = wrkMastMapper.selectWrkStsAndIoType((int)staNo);
@@ -360,8 +358,6 @@
                             staNo = 203;
                             if (basDevps1.size()!=0 && basDevps2.size()!=0){
                                 continue;
-                            } else if (basDevps2.size()!=0){
-                                staNo = 103;
                             }
 
 //                            if (basDevps2.size()!=0){

--
Gitblit v1.9.1