From 8cac228f877e7183646aee6f474848ae5a38ca50 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 17 七月 2025 14:20:40 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    6 +++---
 src/main/java/com/zy/core/MainProcess.java                  |    4 ++--
 2 files changed, 5 insertions(+), 5 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 6f9f172..e9205b7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -782,10 +782,10 @@
                         crnCommand.setLaneNo(crnProtocol.getLaneNo()); // 鍫嗗灈鏈哄贩閬撶紪鍙�
                         crnCommand.setTaskNo((short)999); // 宸ヤ綔鍙�
                         crnCommand.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
-                        crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡:  搴撲綅绉昏浆
+                        crnCommand.setTaskMode(CrnTaskModeType.SITE_MOVE); // 浠诲姟妯″紡:  绔欎綅绉昏浆4
                         crnCommand.setSourcePosX((short) 0);     // 婧愬簱浣嶆帓
-                        crnCommand.setSourcePosY((short) 0);     // 婧愬簱浣嶅垪
-                        crnCommand.setSourcePosZ((short) 0);   // 婧愬簱浣嶅眰
+                        crnCommand.setSourcePosY(crnProtocol.getBay());     // 婧愬簱浣嶅垪
+                        crnCommand.setSourcePosZ(crnProtocol.getLevel());   // 婧愬簱浣嶅眰
                         int row = crnProtocol.getLaneNo() * 2;
                         crnCommand.setDestinationPosX((short) row);     // 鐩爣搴撲綅鎺�
                         crnCommand.setDestinationPosY((short) 1);     // 鐩爣搴撲綅灞�
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 948d3c9..dfa182a 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -47,8 +47,6 @@
                     mainService.storeFinished();
                     // 浠诲姟涓嬪彂
                     mainService.taskStart();
-                    // 鍑哄簱  ===>>  鍫嗗灈鏈�10鍒嗛挓鏃犱换鍔″垯鍥炲埌婧愮偣
-//                    mainService.crnStnToOutStnSou();
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -69,6 +67,8 @@
                     mainService.crnStnToOutStn();
                     // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
                     mainService.recCrnErr();
+                    // 鍑哄簱  ===>>  鍫嗗灈鏈�10鍒嗛挓鏃犱换鍔″垯鍥炲埌婧愮偣
+                    mainService.crnStnToOutStnSou();
                     // 杈撻�佺嚎寮傚父淇℃伅璁板綍
 //                    mainService.recDevErr();
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�

--
Gitblit v1.9.1