From 4fc00c0045dcd4cafdb5c9ea998cb2c71ea80fbe Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 三月 2023 16:55:27 +0800
Subject: [PATCH] 四向穿梭车排列顺利问题修改、获取redis数据错误问题
---
src/main/java/com/zy/core/MainProcess.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index cd101e5..a2f1a1d 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -22,6 +22,8 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
+ // 棰戠巼
+ private int i = 0;
/**
* =====>> 寮�濮嬪伐浣�
@@ -32,7 +34,7 @@
try {
// 闂撮殧
- Thread.sleep(500);
+ Thread.sleep(300);
// 绯荤粺杩愯鐘舵�佸垽鏂�
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
@@ -40,22 +42,25 @@
}
// 婕旂ず
-// mainService.demo();
+ mainService.demo();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(); // 缁勬墭
- mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+// mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
// 闂撮殧
Thread.sleep(500);
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
- mainService.stnToCrnStnPick0();
- mainService.stnToCrnStnPick1();
+ mainService.stnToCrnStnPick();
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
mainService.crnStnToOutStn();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
mainService.crnIoExecute();
+ // 鍏ュ嚭搴� ===>> 鍥涘悜绌挎杞﹀叆鍑哄簱浣滀笟涓嬪彂
+ mainService.shuttleIoExecute();
+ //鍥涘悜绌挎杞︿换鍔″畬鎴�
+ mainService.shuttleFinished();
// 鍏ュ簱 ===>> 鎵ц鍫嗗灈鏈哄宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔
mainService.storeFinished();
// 鍏ュ簱 ===>> 鎵ц绌挎杞﹀宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔
@@ -70,8 +75,19 @@
mainService.ledReset();
// 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
mainService.loopSteCharge();
+ mainService.executeSteCharge();
+ //鍑哄叆搴撴ā寮�
+ i++;
+ if (i > 1) {
+ mainService.outAndIn();
+ i = 0;
+ }
+
+ // 闂撮殧
+ Thread.sleep(200);
// 绌挎杞� ===>> 灏忚溅澶嶄綅鑷冲緟鏈哄簱浣�
- mainService.steFromChargeToIdleLoc();
+// mainService.queryChargeLocOfComplete();
+// mainService.steFromChargeToIdleLoc();
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1