From 7073a4ff0761c05664a0fa5ebc1c51b3bb58c268 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 03 十二月 2022 13:42:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index d12d9a3..9634d57 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -9,6 +9,7 @@
import org.springframework.stereotype.Component;
import javax.annotation.PreDestroy;
+import java.util.ArrayList;
/**
* WCS涓绘祦绋�
@@ -23,9 +24,8 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
- @Value("${crnBackHp.enable}")
- private boolean crnBackHp;
- private boolean look = true;
+ // 棰戠巼
+ private int i = 0;
/**
* =====>> 寮�濮嬪伐浣�
@@ -60,22 +60,40 @@
// mainService.crnIoWrkMast();
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
mainService.storeFinished();
+
+ ///////////////////////RGV璋冨害/////////////////////////////////////
+ // 鍏ュ嚭搴� ===>> RGV鍏ュ嚭搴撲綔涓氫笅鍙�
+ mainService.rgvIoExecute();
+ // RGV鍏ュ簱 ===>> 鏍规嵁RGV瀹屾垚淇″彿,鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+ mainService.rgvFinished();
+ // 鍏ュ嚭搴� ===>> RGV鍑哄簱绔欏埌绯荤粺鍏ュ嚭搴撶珯
+ mainService.rgvDestStnToCrnStn();
+// // 鍑哄簱 ===>> RGV鍑哄簱绔欏埌绯荤粺鍑哄簱绔�
+// mainService.rgvOutDStnToOutStn();
+ //////////////////////////////////////////////////////////////////
+
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
mainService.recCrnErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-// mainService.storeEmptyPlt();
+ mainService.storeEmptyPlt();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute();
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
-// if (crnBackHp) {
-// if (look) {
-// //鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃澶囧瓨鍦ㄥ叆搴撲换鍔℃椂鍙洖鍘熺偣
-// mainService.crnRebackHp();
-// }
-// }
-// look = !look;
+ mainService.outOfDevp();
+
+ //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
+ mainService.autoEmptyOut();
+// //绌烘墭鐩樿嚜鍔ㄥ叆搴�
+// mainService.autoEmptyIn();
+
+ // 鍏朵粬 ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
+ i++;
+ if (i > 1) {
+ mainService.ioConvert();
+ i = 0;
+ }
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1