From 00620a6917d2c4b0df1f62366a489cfe6aed8be1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 02 一月 2025 15:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs-auto
---
src/main/java/com/zy/core/MainProcess.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index c7ca12f..6cd6912 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -37,18 +37,14 @@
// 闂撮殧
Thread.sleep(1000);
-
// 绯荤粺杩愯鐘舵�佸垽鏂�
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
-
- // 婕旂ず
- //mainService.crnDemoOfLocMove1();
-// // 婕旂ず 鎵�鏈夊簱浣嶈疆璇�
-// mainService.crnDemoOfLocMove2();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(); // 缁勬墭
+ mainService.generateStoreWrkFile7(); // 缁勬墭
+ Thread.sleep(200);
// mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
mainService.stnToCrnStnPick();
@@ -58,12 +54,6 @@
mainService.crnIoExecute();
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
mainService.storeFinished();
-
- //RGV鎼繍
- mainService.rgvIoExecute();
- //RGV宸ヤ綔瀹屾垚
- mainService.rgvFinished();
-
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
mainService.recCrnErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
@@ -78,6 +68,27 @@
//鎵弿鎷嗙洏鏈鸿嚜鍔ㄥ嚭搴撶┖鎵樼洏
mainService.autoEmptyOut();
+ //浜屾湡
+// //绌烘《搴撲换鍔＄敓鎴�
+// mainService.crn5TaskCreate();
+// //绌烘《搴撳叆搴�
+// mainService.crn5InTask();
+// //绌烘《鍑哄簱瀹屾垚
+// mainService.crn5StnToOutStn();
+ //rgv浠诲姟
+ mainService.RGVTaskCreate();
+ //rgv1,3浠诲姟瀹屾垚
+ mainService.RGVTaskput();
+ mainService.RGVTaskOver();
+
+ //rgv2浠诲姟瀹屾垚
+ mainService.RGV2Taskput();
+ mainService.RGV2TaskOver();
+ //浜屾湡缁勬墭
+ mainService.generateStoreWrkFile2();
+ mainService.getNeed();
+
+
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1