From 13b690312e3397305fb20c2d3dc60be9e9452049 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 18 五月 2024 10:43:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
index a426fce..fc14bc2 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
@@ -385,9 +385,9 @@
             }
         } else if (shuttleProtocol.getMoveType() == 4) {//鍙栨斁璐�
             Integer xCurrent = shuttleProtocol.getXCurrent();
-            if (xCurrent > shuttleProtocol.getXTarget()) {//褰揦鍊煎ぇ浜嶺鐩爣鍊硷紝杩涜褰掗浂涓擸鏂瑰悜+1
+            if (xCurrent > shuttleProtocol.getXTarget()) {//褰揦鍊煎ぇ浜嶺鐩爣鍊�
                 shuttleProtocol.setXCurrent(shuttleProtocol.getXStart());
-                shuttleProtocol.setYCurrent(shuttleProtocol.getYCurrent() + 1);
+                shuttleProtocol.setYCurrent(shuttleProtocol.getYStart());
                 return;
             }
 

--
Gitblit v1.9.1