From 6cb1f93b9914cb374ee6598b0c55555feed412d2 Mon Sep 17 00:00:00 2001
From: lsh <s>
Date: 星期五, 17 五月 2024 15:59:52 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 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 43bf79e..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,8 +296,9 @@
                 if (rgvComplete){
                     rgvThread.setPakMk(true);
                 }
-                WrkMastSta wrkMastSta = wrkMastStaMapper.selectById(rgvProtocol.getTaskNo1());
-                if (!Cools.isEmpty(wrkMastSta)){
+                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);
                     wrkMastStaMapper.updateById(wrkMastSta);
                 }
@@ -486,15 +487,21 @@
                 return;
             }
             // 鍙湁褰揜GV绌洪棽銆佽嚜鍔�,宸ヤ綅涓�鏃犵墿//rgv鍙敤
-            if (rgvProtocol.getStatusType() == RgvStatusType.IDLE
+            if (rgvProtocol.getStatusType1() == RgvStatusType.IDLE
                     && rgvProtocol.getModeType() == RgvModeType.AUTO
                     && rgvProtocol.getLoaded1()==0
                     && 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()!=0 || wrkMastSta.getWrkType()!=3){//1:婊＄増   3锛氬彇鏀�
+                    if (wrkMastSta.getType()!=1 || wrkMastSta.getWrkType()!=3){//1:婊＄増   3锛氬彇鏀�
                         continue;
                     }
                     boolean sign = rgvTakeFullAll(1, wrkMastSta); //鍛戒护涓嬪彂
@@ -525,7 +532,7 @@
             rgvCommand.setTaskMode1(RgvTaskModeType.FETCH_PUT); // 宸ヤ綅1浠诲姟妯″紡:  鍙栨斁璐�
             rgvCommand.setSourceStaNo1(wrkMastSta.getStaStart().shortValue());   //宸ヤ綅1璧风偣
             rgvCommand.setDestinationStaNo1(wrkMastSta.getStaEnd().shortValue());   //宸ヤ綅1鐩爣绔欑偣
-            rgvCommand.setCommand((short) 1);   //宸ヤ綅1浠诲姟纭
+            rgvCommand.setCommand((short) 0);   //宸ヤ綅1浠诲姟纭
             if (!MessageQueue.offer(SlaveType.Rgv, rgvId, new Task(4, rgvCommand))) {
                 //step=2,宸ヤ綅1銆�2鍐欎换鍔★紱   step=4锛屽伐浣�1鍐欎换鍔★紱     step=5锛屽伐浣�2鍐欎换鍔�
                 log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(rgvCommand));

--
Gitblit v1.9.1