From d9eeceed86c1ce43c73dda00a108595a078a8f3d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 29 五月 2025 18:44:53 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 16 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..8f532b7 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
@@ -2,15 +2,10 @@
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.asrs.utils.TimeCalculatorUtils;
import com.zy.common.model.enums.CrnStnType;
import com.zy.common.model.enums.WrkMastExecuteType;
import org.slf4j.Logger;
@@ -20,6 +15,7 @@
import org.springframework.stereotype.Component;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -30,6 +26,7 @@
public class WrkMastSplitTwinInItScheduler {
private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
+// private static Integer signBigTurn = 0;
@Autowired
private WrkMastSplitTwinInItHandler wrkMastSplitTwinInItHandler;
@@ -41,6 +38,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);
@@ -102,6 +101,7 @@
case 2:
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 12L).eq("crn_no", crnNo));
if (wrkMasts.size()==1){
+ WrkMast wrkMast1 = wrkMasts.get(0);
wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 11L).eq("crn_no", crnNo));
if (wrkMasts.isEmpty()){
if (basCrnp.getCrnStatusOne() != 20) {//鍫嗗灈鏈哄伐浣�1鏈夌墿寰呬綔涓�
@@ -114,17 +114,66 @@
break;
}else {
for (WrkMast wrkMast:wrkMasts){
- if (wrkMast.getStaNo()>300){
- BasDevp basDevp = basDevpService.selectById(212);
- if (basDevp.getLoading().equals("Y")
- || !basDevp.getAutoing().equals("Y")
- || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){
- continue;
- }
- }
+// if (wrkMast.getStaNoSign().equals(signBigTurn)){
+// continue;
+// }
+// if (wrkMast.booleanStaNoSign() && wrkMast.booleanStaNoSign()){
+// RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMast.getStaNo()));
+// if (Cools.isEmpty(rgvOneSign)){
+// continue;
+// }
+// int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
+// if (wrkCount+rgvOneSign.getRgvOneSign()>2){
+// continue;
+// }
+// int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
+// if (wrkCountGt > 2){
+// continue;
+// }
+//// 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(wrkMast.getStaNoBying());
+//// if (basDevp.getLoading().equals("Y")
+//// || !basDevp.getAutoing().equals("Y")
+//// || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){
+//// continue;
+//// }
+// }
wrkMastSplitTwinInItHandler.start(wrkMastSplitTwin,wrkMast,2);
+// signBigTurn++;
+// if (signBigTurn > 2){
+// signBigTurn = 0;
+// }
break;
}
+ WrkMastSplitTwin wrkMastSplitTwin1 = wrkMastSplitTwinService.selectOne(new EntityWrapper<WrkMastSplitTwin>().eq("wrk_no", wrkMast1.getWrkNo()));
+ if (!Cools.isEmpty(wrkMastSplitTwin1)){
+ long differenceInSeconds = TimeCalculatorUtils.differenceInSeconds(wrkMastSplitTwin1.getUpdateTime(), new Date());
+ if (differenceInSeconds>180 || (!Cools.isEmpty(wrkMast1.getStaNo()) && (wrkMast1.getStaNo().equals(312) || wrkMast1.getStaNo().equals(310)) )){
+ if (basCrnp.getCrnStatusOne() != 20) {//鍫嗗灈鏈哄伐浣�1鏈夌墿寰呬綔涓�
+ break;
+ }
+ if (wrkMastSplitTwin.getWrkSts()!=2){
+ break;
+ }
+ wrkMastSplitTwinInItHandler.start(wrkMastSplitTwin);
+ break;
+ }
+ }
+
+// signBigTurn++;
+// if (signBigTurn > 2){
+// signBigTurn = 0;
+// }
break;
}
}
--
Gitblit v1.9.1