From a64aaeecc264176a60c6bb0e4e348c63f929d459 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 22 六月 2024 13:52:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 57 +++++++++++++++++++++++++--------------------------------
1 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 2cc40ed..69ad5fe 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -66,40 +66,20 @@
mainService.crnIoExecute();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 鍙屽伐浣嶅爢鍨涙満
mainService.crnIoExecuteTwo();
- // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
- mainService.storeFinished();
- // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣� 宸ヤ綅2
- mainService.storeFinishedTwo();
-
- /************************************RGV璋冨害************************************/
- i++;
- k++;
- if (i<8) {
- // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
- if (i == 7) {
- try{
- boolean rgvIoExecuteSign = mainService.rgvIoExecute(i); //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
-// if (rgvIoExecuteSign){
-// k = 0;
-// } else if (k>8){
-// k = 0;
-// mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
-// }
- }catch (Exception e){
- log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
- }
- }else {
- //绌挎鏉�
-// boolean rgvIoExecuteSign = mainService.rgvIoExecute(i); //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
-
- }
-
+ // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 鍙屽伐浣嶅爢鍨涙満 鎷嗗垎鎵ц浠诲姟涓嬪彂
+ mainService.crnIoExecuteTwoExecute(i);//Execute
+ if (i%2==0){
+ // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+ mainService.storeFinished();
}else {
- i = 0;
+ // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣� 宸ヤ綅2
+ mainService.storeFinishedTwo();
}
-// //瀹屾垚灏忚溅浠诲姟
- mainService.rgvCompleteWrkMastSta();
- /************************************RGV璋冨害************************************/
+
+ i++;
+ if (i>5){
+ i=0;
+ }
// // 寮傚父淇℃伅璁板綍
// mainService.recErr();
@@ -114,6 +94,19 @@
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
+ /************************************JAR璋冨害************************************/
+
+ //寮�闂ㄣ�佸叆纭寲缃�
+ mainService.jarWrkMastExecuteGenerate();
+ //Jar浠诲姟鍒涘缓 //瀹屾垚
+ mainService.jarMastGenerate();
+
+
+
+
+ /************************************JAR璋冨害************************************/
+
+
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1