From 3ad10a6c23f8a0d8bcf7401cff20c563b21aa461 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 17 九月 2023 18:13:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 63 +++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 1ef107e..ab1cb60 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -24,9 +24,8 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
- @Value("${crnBackHp.enable}")
- private boolean crnBackHp;
- private boolean look = true;
+ // 棰戠巼
+ private int i = 0;
/**
* =====>> 寮�濮嬪伐浣�
@@ -44,6 +43,8 @@
continue;
}
+ //鍒濆鍖朢GV鍦板浘
+// mainService.initRgvMap();
// 婕旂ず
mainService.crnDemoOfLocMove1();
// 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
@@ -61,25 +62,61 @@
// mainService.crnIoWrkMast();
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
mainService.storeFinished();
- // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
- mainService.recCrnErr();
+
+ /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+
+// //缁戝畾灏忚溅鏂规硶
+// mainService.rgvBindSte();
+// // 鍏ュ嚭搴� ===>> RGV鍏ュ嚭搴撲綔涓氫笅鍙�
+// mainService.rgvIoExecute();
+// // RGV鍏ュ簱 ===>> 鏍规嵁RGV瀹屾垚淇″彿,鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+// mainService.rgvFinished();
+// // 鍏ュ嚭搴� ===>> RGV鍑哄簱绔欏埌绯荤粺鍏ュ嚭搴撶珯
+// mainService.rgvDestStnToCrnStn();
+// // 鍑哄簱 ===>> RGV鍑哄簱绔欏埌绯荤粺鍑哄簱绔�
+// mainService.rgvOutDStnToOutStn();
+
+
+
+
+ /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+
+ // 寮傚父淇℃伅璁板綍
+ mainService.recErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-// mainService.storeEmptyPlt();
+ mainService.storeEmptyPlt();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute();
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
-// if (crnBackHp) {
-// if (look) {
-// //鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃澶囧瓨鍦ㄥ叆搴撲换鍔℃椂鍙洖鍘熺偣
-// mainService.crnRebackHp();
-// }
+// mainService.outOfDevp();
+
+// //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
+// mainService.autoEmptyOut();
+// //绌烘墭鐩樿嚜鍔ㄥ叆搴�
+// mainService.autoEmptyIn();
+
+// // 鍏朵粬 ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
+// i++;
+// if (i > 1) {
+// mainService.ioConvert();
+// i = 0;
// }
-// look = !look;
+ //鐮佸灈浣嶈嚜鍔ㄨˉ鍏呯┖鏉匡細椹卞姩鎷嗙洏鏈鸿緭鍑烘墭鐩�
+// mainService.dischargingMachineOutputTray();
- mainService.outOfDevp();
+// //鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
+// mainService.scanBarcodeEmptyBoard();
+
+ //鐮佸灈瀹屾垚椹卞姩鎵樼洏涓嬩竴姝ユ壂鐮佸叆搴�
+ mainService.stackingCompletionDriveTray();
+ //鎷嗗灈瀹屾垚缁х画涓嬩竴姝�
+ mainService.stackingCompletionDriveTray2();
+ //璐存爣瀹屾垚缁х画涓嬩竴姝�
+ mainService.stackingCompletionDriveTray3();
+
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1