From ce3e1bbcbcbe57100bb8a1a48b79e836bb82bc32 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 24 十一月 2024 10:26:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java | 61 +++++++++++++++++-------------
1 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
index 91e8fb8..a239e71 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
@@ -25,7 +25,7 @@
public class WrkMastCrnScheduler {
private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
- private static Integer signSmallTurn = 0;
+// private static Integer signSmallTurn = 0;
@Autowired
private WrkMastCrnHandler wrkMastCrnHandler;
@@ -104,27 +104,34 @@
.eq("source_sta_no", staNo).eq("wrk_sts", 11L)
.orderBy("io_pri",false));
for (WrkMast wrkMast:wrkMasts){
- if (wrkMast.getStaNoSign().equals(signSmallTurn)){
- continue;
- }
+// if (wrkMast.getStaNoSign().equals(signSmallTurn)){
+// continue;
+// }
if (wrkMast.getIoType()==101){
- BasDevp basDevp = basDevpService.selectById(119);
- if (basDevp.getLoading().equals("Y")
- || !basDevp.getAutoing().equals("Y")
- || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){
+ RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMast.getStaNo()));
+ if (Cools.isEmpty(rgvOneSign)){
continue;
}
- int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 103).le("dev_no", 121).eq("loading", "Y"));
- if (loadIngCount>8){
+ if (rgvOneSign.getRgvOneSign()>=2){
continue;
}
- RgvOneSign smallTurn = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","smallTurn"));
- if (Cools.isEmpty(smallTurn)){
- continue;
- }
- if (smallTurn.getRgvOneSign()>15){
- continue;
- }
+// BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNoBying());
+// if (basDevp.getLoading().equals("Y")
+// || !basDevp.getAutoing().equals("Y")
+// || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){
+// continue;
+// }
+// int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 103).le("dev_no", 121).eq("loading", "Y"));
+// if (loadIngCount>8){
+// continue;
+// }
+// RgvOneSign smallTurn = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","smallTurn"));
+// if (Cools.isEmpty(smallTurn)){
+// continue;
+// }
+// if (smallTurn.getRgvOneSign()>15){
+// continue;
+// }
}
try{
int row = Utils.getRow(wrkMast.getSourceLocNo());
@@ -133,10 +140,10 @@
if (Cools.isEmpty(wrkMastCrn)){
ReturnT<String> result = wrkMastCrnHandler.start(wrkMast);
if (result.isSuccess()) {
- signSmallTurn++;
- if (signSmallTurn > 2){
- signSmallTurn = 0;
- }
+// signSmallTurn++;
+// if (signSmallTurn > 2){
+// signSmallTurn = 0;
+// }
break;
}
}
@@ -145,12 +152,12 @@
log.error("宸﹀彸鍙屽伐浣嶅爢鍨涙満鎵ц浠诲姟鐢熸垚====銆嬪嚭搴撲换鍔＄敓鎴愬紓甯革細"+e.getMessage());
}
}
- if (!wrkMasts.isEmpty()){
- signSmallTurn++;
- if (signSmallTurn > 2){
- signSmallTurn = 0;
- }
- }
+// if (!wrkMasts.isEmpty()){
+// signSmallTurn++;
+// if (signSmallTurn > 2){
+// signSmallTurn = 0;
+// }
+// }
}
}
}
--
Gitblit v1.9.1