From 48302c5c7f85bfdd52dfd071d7a9ef8628d87667 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 三月 2024 16:45:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index c75dfe3..104120c 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -68,42 +68,50 @@
// mainService.stnToCrnStnPick3Auto(i);
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
mainService.crnStnToOutStn();
+ // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯 宸ヤ綅2
+ mainService.crnStnToOutStnTwo();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
mainService.crnIoExecute();
+ // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 鍙屽伐浣嶅爢鍨涙満
+ mainService.crnIoExecuteTwo();
// 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
// mainService.crnIoWrkMast();
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
mainService.storeFinished();
+ // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣� 宸ヤ綅2
+ mainService.storeFinishedTwo();
// /////////////////////////////////////RGV璋冨害/////////////////////////////////////
-// i++;
-// k++;
-// if (i<7) {
-// // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
-// try{
-// boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
+ i++;
+ k++;
+ if (i<7) {
+ // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
+ try{
+ boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
// if (rgvIoExecuteSign){
// k = 0;
// } else if (k>7){
// k = 0;
// mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
// }
-// }catch (Exception e){
-// log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
-// }
-// }else {
-// i = 0;
-// }
+ }catch (Exception e){
+ log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+ }
+ }else {
+ i = 0;
+ }
// //瀹屾垚灏忚溅浠诲姟
-// mainService.rgvCompleteWrkMastSta();
+ mainService.rgvCompleteWrkMastSta();
// /////////////////////////////////////RGV璋冨害/////////////////////////////////////
// // 寮傚父淇℃伅璁板綍
// mainService.recErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱
-// mainService.storeEmptyPlt();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱
+ mainService.storeEmptyPlt();
+ // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱 鍙屽伐浣嶅崟浼� 灏忔枡绠�
mainService.storeEmptyPltSingle();
+ // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱 鍙屽伐浣嶅崟浼� 澶ф枡绠�
+ mainService.storeEmptyPltLarge();
// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満绌烘澘鍏ュ簱
// mainService.storeEmptyPlt3();
// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満鍙犵洏
--
Gitblit v1.9.1