From e3a413d3410621a7abbec52e48b3ff51b89d9cca Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 07 六月 2024 15:08:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 2cc40ed..504427f 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -66,34 +66,38 @@
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<8) {
- // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
- if (i == 7) {
- try{
- boolean rgvIoExecuteSign = mainService.rgvIoExecute(i); //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
+// // 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鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
-
- }
-
+// }catch (Exception e){
+// log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+// }
+// }else {
+// //绌挎鏉�
+//// boolean rgvIoExecuteSign = mainService.rgvIoExecute(i); //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
+//
+// }
}else {
i = 0;
}
--
Gitblit v1.9.1