From e4a672a1ff1d8d881fe3071edb69080c2edaa96c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 02 八月 2023 08:57:49 +0800
Subject: [PATCH] 充电任务

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   11 ++++++++++-
 1 files changed, 10 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 75868e7..5021b23 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2159,12 +2159,21 @@
                 assignCommand.setSourceLocNo(shuttleProtocol.getCurrentLocNo());//婧愬簱浣�(灏忚溅褰撳墠浣嶇疆)
                 assignCommand.setCommands(commands);//杩愯鍛戒护
 
-                wrkCharge.setWrkSts(60L);//52.灏忚溅鍘诲厖鐢典腑 => 60.鍏呯數浠诲姟瀹屾垚
+                wrkCharge.setWrkSts(53L);//52.灏忚溅鍘诲厖鐢典腑 => 53.灏忚溅鍏呯數瀹屾垚
                 wrkCharge.setModiTime(new Date());
                 if (wrkChargeMapper.updateById(wrkCharge) > 0) {
                     //涓嬪彂浠诲姟
                     MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
                 }
+            } else if (wrkCharge.getWrkSts() == 53) {
+                boolean result = Utils.searchEmptyGroupToMoveShuttle(Utils.getLev(wrkCharge.getLocNo()), shuttleThread.getSlave().getId(), shuttleThread);
+                if (!result) {
+                    continue;
+                }
+
+                wrkCharge.setWrkSts(60L);//53.灏忚溅鍏呯數瀹屾垚 => 60.鍏呯數浠诲姟瀹屾垚
+                wrkCharge.setModiTime(new Date());
+                wrkChargeMapper.updateById(wrkCharge);
             }
 
         }

--
Gitblit v1.9.1