From 752c05fdff47a9147dd2a92e72631d3fd2c89dca Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 18 六月 2024 10:58:16 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 11 ++++++-----
src/main/java/com/zy/core/MainProcess.java | 27 +++++++++++++++++++++++++--
2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index dcc4d17..b5729ad 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2548,7 +2548,7 @@
/**
* 鎵ц灏忚溅鎼繍浠诲姟
*/
- public synchronized void rgvRunWrkMastFullSta() {
+ public synchronized boolean rgvRunWrkMastFullSta() {
boolean wrkEnable = false;
try{
List<BasRgvMap> basRgvMaps = basRgvMapService.selectList(new EntityWrapper<>());
@@ -2605,7 +2605,7 @@
rgvThread.setPakMk(false);
boolean signMap = rgvMapUpdate(basRgvMap, wrkMastSta.getStaStart(), wrkMastSta.getStaEnd(),"2526");
if (signMap){
- return;
+ return wrkEnable;
// break;
}else {
log.error("3864琛岋紝璐х墿鎼繍浠诲姟锛氬伐浣滃彿{}鎵�灞炰换鍔′笅鍙戝悗鍦板浘鍚屾澶辫触",wrkMastSta.getWrkNo());
@@ -2620,13 +2620,14 @@
}
}
- if (!wrkEnable){
- rgvRunWrkMastEmptyStaAvoidance();
- }
+// if (!wrkEnable){
+// rgvRunWrkMastEmptyStaAvoidance();
+// }
}catch (Exception e){
log.error("3875琛屾墽琛屽皬杞︽惉杩愪换鍔′笅鍙戝け璐�");
log.error("3875琛�"+e);
}
+ return wrkEnable;
}
/**
* 鎵ц灏忚溅鎼繍浠诲姟
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index de7ccb0..c5a4753 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;
/**
@@ -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,28 @@
/////////////////////////////////////RGV璋冨害/////////////////////////////////////
+ /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+ i++;
+ k++;
+ if (i<4) {
+ // 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);
+ }
+ }else {
+ i = 0;
+ }
+ //瀹屾垚灏忚溅浠诲姟
+ mainService.rgvCompleteWrkMastSta();
+ /////////////////////////////////////RGV璋冨害/////////////////////////////////////
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1