From a266dc0a223c8c7ca6acecd5e6e5f23a59e488ba Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 22 十月 2024 16:48:47 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 16d8fa9..1f5b0d3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -146,6 +146,8 @@
         runRgv:
         for (List<WrkMast> wrkMastList : wrkMastLists){
             for (WrkMast wrkMast: wrkMastList){
+                log.error("瀛樺湪浠诲姟锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(wrkMast));
+
                 rgvId++;
                 BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_id", 1L));
                 RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, basCircularShuttle.getRgvNo());
@@ -157,7 +159,6 @@
                         && rgvProtocol.getAlarm() == 0){
                     RgvCommand rgvCommand = new RgvCommand();
                     rgvCommand.setRgvNo(rgvProtocol.getRgvNo());
-                    rgvCommand.setTaskNo1(wrkMast.getWrkNo().shortValue());
                     rgvCommand.setAckFinish1((short) 0);  // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
                     rgvCommand.setTaskNo1(wrkMast.getWrkNo().shortValue());
                     rgvCommand.setTaskMode1(RgvTaskModeType.FETCH_PUT); // 宸ヤ綅1浠诲姟妯″紡:  鍙栨斁璐�
@@ -169,6 +170,8 @@
                         log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(rgvCommand));
                         break runRgv;
                     }
+                    log.error("RGV鍛戒护涓嬪彂鎴愬姛锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(rgvCommand));
+
                     wrkMast.setWrkSts(2L);
                     wrkMast.setRgvNo(rgvProtocol.getRgvNo());
                     wrkMast.setAppeTime(new Date());
@@ -200,7 +203,9 @@
                     log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", rgvSlave.getId());
                     continue;
                 }
-
+                if (rgvProtocol.getStatusType() == RgvStatusType.WAITING){
+                    log.info("{}鍙峰皬杞︾瓑寰厀cs纭锛岀姸鎬亄}锛屽弬鏁皗}",rgvProtocol.getRgvNo(),rgvProtocol.getStatusType(),rgvProtocol);
+                }
                 // 鍙湁褰揜GV绛夊緟WCS纭銆佽嚜鍔�
                 if (rgvProtocol.getStatusType() == RgvStatusType.WAITING
                         && rgvProtocol.getModeType() == RgvModeType.AUTO

--
Gitblit v1.9.1