From 2028b51aeda2b6b23fda4183875b145d5e83822f Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 19 六月 2024 11:06:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs
---
src/main/java/com/zy/core/MainProcess.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 1192aa1..858c5ba 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -26,6 +26,7 @@
private Thread thread;
// 棰戠巼
private int i = 0;
+ private int k = 0;
private boolean rgcWrk = true;
/**
@@ -37,7 +38,7 @@
try {
// 闂撮殧
- Thread.sleep(500);
+ Thread.sleep(1000);
// 绯荤粺杩愯鐘舵�佸垽鏂�
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
@@ -45,7 +46,7 @@
}
// 婕旂ず
- mainService.crnDemoOfLocMove1();
+// mainService.crnDemoOfLocMove1();
//鍒锋柊RGV鍦板浘
mainService.refreshRgvMap();
@@ -99,14 +100,14 @@
/////////////////////////////////////RGV璋冨害/////////////////////////////////////
//
//瀹屾垚灏忚溅浠诲姟
- mainService.rgvCompleteWrkMastSta();
+// mainService.rgvCompleteWrkMastSta();
// //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
// mainService.rgvRunWrkMastEmptyStaPut();//鏀�
// mainService.rgvRunWrkMastEmptyStaTake();//鍙�
// if (rgcWrk){
// //鎵ц灏忚溅璐х墿鎼繍浠诲姟
- mainService.rgvRunWrkMastFullSta();
+// mainService.rgvRunWrkMastFullSta();
// rgcWrk = false;
// }else {
// mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
@@ -115,6 +116,24 @@
/////////////////////////////////////RGV璋冨害/////////////////////////////////////
+ /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+ k++;
+
+ // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
+ try{
+ boolean rgvIoExecuteSign = mainService.rgvRunWrkMastFullSta();
+ if (rgvIoExecuteSign){
+ k = 0;
+ } else if (k>4){
+ k = 0;
+ mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+ }
+ }catch (Exception e){
+ log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+ }
+ //瀹屾垚灏忚溅浠诲姟
+ mainService.rgvCompleteWrkMastSta();
+ /////////////////////////////////////RGV璋冨害/////////////////////////////////////
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1