From b6d6d00376eb264b436ba6cd79c2f11eef4d97fa Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期三, 11 十二月 2024 15:39:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 209b3a0..e13029d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3101,7 +3101,7 @@
if (Cools.isEmpty(rgvOneSign)){
continue;
}
- RgvOneSign trunBig = rgvOneSignMapper.selectOneSign("TrunBig");
+ RgvOneSign trunBig = rgvOneSignMapper.selectOneSign("TrunBig"+wrkMast.getStaNo());
if (Cools.isEmpty(trunBig)){
continue;
}
@@ -3111,10 +3111,10 @@
if (trunBig.getRgvOneSign()+wrkCount+rgvOneSign.getRgvOneSign()>2){
continue;
}
-// int wrkCount = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).gt("sta_no", 309).lt("sta_no", 314).gt("wrk_sts",11L));
-// if (wrkCount>=12){
-// continue;
-// }
+ int wrkCountGt = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
+ if (wrkCountGt > 2){
+ continue;
+ }
// RgvOneSign bigTurn = rgvOneSignMapper.selectOneSign("bigTurn");
// if (Cools.isEmpty(bigTurn)){
// continue;
@@ -3271,8 +3271,8 @@
crnCommand.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
- if (!Cools.isEmpty(wrkMast.getStaNo()) && (wrkMast.getStaNo().equals(312) || wrkMast.getStaNo().equals(310))){
- updateRgvOneSign("TrunBig",turnBigInt+1);
+ if (wrkMast.booleanStaNoSign()){
+ updateRgvOneSign("TrunBig"+wrkMast.getStaNo(),turnBigInt+1);
}
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(crnStation==1? 2:5, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSONString(crnCommand));
@@ -5158,7 +5158,7 @@
if (jarMaxLoc == 0 || basJarOther.getJarCount() == 0) {
break;
}
- int count = basJarMastService.selectCount(new EntityWrapper<BasJarMast>().eq("jar_regin", basJar.getRegion()).lt("status", 17).gt("status", 6));
+ int count = basJarMastService.selectCount(new EntityWrapper<BasJarMast>().eq("jar_regin", basJar.getRegion()).lt("status", 17).gt("status", 5));
if (count>0){
break;
}
@@ -8447,7 +8447,10 @@
* ste鍏呯數浠诲姟鍒涘缓 //瀹屾垚
*/
public synchronized void signTrunBig() {
- updateRgvOneSign("TrunBig",0);
+ updateRgvOneSign("TrunSma126",0);
+ updateRgvOneSign("TrunSma131",0);
+ updateRgvOneSign("TrunBig310",0);
+ updateRgvOneSign("TrunBig312",0);
}
public synchronized boolean jarChargeGenerate() {
--
Gitblit v1.9.1