From cf9fac40a8e39b25ee935a743224ae6c405bbddc Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 24 三月 2025 19:33:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs
---
src/main/java/com/zy/core/MainProcess.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 93c01fd..d713dd4 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -46,7 +46,7 @@
// 婕旂ず
// mainService.crnDemoOfLocMove1();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
- mainService.generateStoreWrkFile(); // 缁勬墭
+ mainService.generateStoreWrkFile1(); // 缁勬墭
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
mainService.crnStnToOutStn();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -62,6 +62,10 @@
// mainService.outOfDevp();
// 鍏朵粬 ===>> // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
+
+ //鐜舰寰幆鍑芥暟
+ mainService.shiftTargetToCyclePoint();
+ mainService.shiftCyclePointToTarget();
i++;
if (i > 1) {
// mainService.ioConvert();
@@ -73,7 +77,7 @@
//鑷姩瀹屾垚浠诲姟
// mainService.autoCompleteTask();
//agv鍙栨斁璐у畬鎴�
- mainService.autoCompleteAGV();
+// mainService.autoCompleteAGV();
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1