From 0613172a33ffc4eb4f21c36bd05a39b176999bbd Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 08 六月 2024 08:35:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index a140f77..504427f 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -66,30 +66,41 @@
mainService.crnIoExecute();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 鍙屽伐浣嶅爢鍨涙満
mainService.crnIoExecuteTwo();
- // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
- mainService.storeFinished();
- // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣� 宸ヤ綅2
- mainService.storeFinishedTwo();
+ // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 鍙屽伐浣嶅爢鍨涙満 鎷嗗垎鎵ц浠诲姟涓嬪彂
+ mainService.crnIoExecuteTwoExecute();//Execute
+ if (i%2==0){
+ // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+ mainService.storeFinished();
+ }else {
+ // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣� 宸ヤ綅2
+ mainService.storeFinishedTwo();
+ }
/************************************RGV璋冨害************************************/
-// i++;
-// k++;
-// if (i<7) {
+ i++;
+ k++;
+ if (i<8) {
// // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
-// try{
- boolean rgvIoExecuteSign = mainService.rgvIoExecute(7); //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
-// if (rgvIoExecuteSign){
-// k = 0;
-// } else if (k>7){
-// k = 0;
-// mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+// 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);
// }
-// }catch (Exception e){
-// log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+// }else {
+// //绌挎鏉�
+//// boolean rgvIoExecuteSign = mainService.rgvIoExecute(i); //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
+//
// }
-// }else {
-// i = 0;
-// }
+ }else {
+ i = 0;
+ }
// //瀹屾垚灏忚溅浠诲姟
mainService.rgvCompleteWrkMastSta();
/************************************RGV璋冨害************************************/
--
Gitblit v1.9.1