From 0ebe62181d5eeb1e59a6943af13cc79bcdfe732a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 02 六月 2025 18:54:16 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 37d62dc..bb21ce1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -334,6 +334,7 @@
                         rgvCommand.setSourceStaNo1(wrkMast.getSourceStaNo().shortValue());   //宸ヤ綅1璧风偣
                         rgvCommand.setDestinationStaNo1(wrkMast.getStaNo().shortValue());   //宸ヤ綅1鐩爣绔欑偣
                         rgvCommand.setCommand((short) 1);   //宸ヤ綅1浠诲姟纭
+                        rgvCommand.setRgvSome(basCircularShuttle.getRgvSome()==1 ? (short) 1 : (short) 0);
                         if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(2, rgvCommand))) {
                             //
                             log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(rgvCommand));
@@ -343,7 +344,9 @@
 
                         wrkMast.setWrkSts(2L);
                         wrkMast.setRgvNo(rgvProtocol.getRgvNo());
-                        wrkMast.setAppeTime(new Date());
+                        Date now = new Date();
+                        wrkMast.setAppeTime(now);
+                        wrkMast.setCrnStrTime(now);
                         try {
                             wrkMastService.updateById(wrkMast);
                             break;
@@ -395,6 +398,7 @@
                     wrkMast.setWrkSts(3L);
                     Date now = new Date();
                     wrkMast.setAppeTime(now);
+                    wrkMast.setCrnEndTime(now);
                     try{
                         try{
                             if (reportSwitch){

--
Gitblit v1.9.1