From b1e690dfb531c0ae1fbf694ca8a0249c2a039519 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期五, 17 五月 2024 13:43:57 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   12 +++++++++---
 1 files changed, 9 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 6726fec..7194c24 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -296,7 +296,7 @@
                 if (rgvComplete){
                     rgvThread.setPakMk(true);
                 }
-                List<WrkMastSta> wrkMastStas = wrkMastStaMapper.selectList(new EntityWrapper<WrkMastSta>().eq("wrk_no", rgvProtocol.getTaskNo1()));
+                List<WrkMastSta> wrkMastStas = wrkMastStaMapper.selectList(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", rgvProtocol.getTaskNo1()));
                 if (!Cools.isEmpty(wrkMastStas) || wrkMastStas.size()<=0){
                     WrkMastSta wrkMastSta = wrkMastStas.get(0);
                     wrkMastSta.setWrkSts(3);
@@ -493,9 +493,15 @@
                     && rgvProtocol.getTaskNo1() == 0
                     && rgvThread.isPakMk()
             ) {
-                List<WrkMastSta> wrkMastStaList = wrkMastStaMapper.selectList(new EntityWrapper<WrkMastSta>());
+                Integer selectCount = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts", 3).ne("wrk_sts", 0));
+                if (selectCount>0){
+                    log.error("瀛樺湪鎵цRGV涓换鍔★紝浣嗘槸灏忚溅鐘舵�佺┖闂诧紒锛侊紒");
+                    return;
+                }
+
+                List<WrkMastSta> wrkMastStaList = wrkMastStaMapper.selectList(new EntityWrapper<WrkMastSta>().eq("wrk_sts",0));
                 for (WrkMastSta wrkMastSta : wrkMastStaList){
-                    if (wrkMastSta.getType()!=1 || wrkMastSta.getWrkType()!=3 || wrkMastSta.getWrkSts()!=0){//1:婊＄増   3锛氬彇鏀�
+                    if (wrkMastSta.getType()!=1 || wrkMastSta.getWrkType()!=3){//1:婊＄増   3锛氬彇鏀�
                         continue;
                     }
                     boolean sign = rgvTakeFullAll(1, wrkMastSta); //鍛戒护涓嬪彂

--
Gitblit v1.9.1