From 291769f73e1b60bde6953aa72be4e0f632eba0a6 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 23 十一月 2024 14:45:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
index e6c378c..57ca4c2 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
@@ -2,14 +2,8 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.entity.WrkMastSplitTwin;
-import com.zy.asrs.service.BasCrnpService;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.WrkMastService;
-import com.zy.asrs.service.WrkMastSplitTwinService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.handler.WrkMastSplitTwinInItHandler;
import com.zy.common.model.enums.CrnStnType;
import com.zy.common.model.enums.WrkMastExecuteType;
@@ -30,6 +24,7 @@
public class WrkMastSplitTwinInItScheduler {
private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
+ private static Integer signBigTurn = 0;
@Autowired
private WrkMastSplitTwinInItHandler wrkMastSplitTwinInItHandler;
@@ -41,6 +36,8 @@
private BasDevpService basDevpService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
public static final List<Integer> SplitTwin_CRN_NO = new ArrayList<Integer>() {{
add(3);
@@ -114,7 +111,21 @@
break;
}else {
for (WrkMast wrkMast:wrkMasts){
- if (wrkMast.getStaNo()>300){
+ if (wrkMast.getStaNoSign().equals(signBigTurn)){
+ continue;
+ }
+ if (wrkMast.getStaNo()>309){
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).gt("sta_no", 309).lt("sta_no", 314).gt("wrk_sts",11L));
+ if (wrkCount>=12){
+ continue;
+ }
+ RgvOneSign bigTurn = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","bigTurn"));
+ if (Cools.isEmpty(bigTurn)){
+ continue;
+ }
+ if (bigTurn.getRgvOneSign()>13){
+ continue;
+ }
BasDevp basDevp = basDevpService.selectById(212);
if (basDevp.getLoading().equals("Y")
|| !basDevp.getAutoing().equals("Y")
@@ -123,8 +134,16 @@
}
}
wrkMastSplitTwinInItHandler.start(wrkMastSplitTwin,wrkMast,2);
+ signBigTurn++;
+ if (signBigTurn > 2){
+ signBigTurn = 0;
+ }
break;
}
+ signBigTurn++;
+ if (signBigTurn > 2){
+ signBigTurn = 0;
+ }
break;
}
}
--
Gitblit v1.9.1