From c21062d3b8565812051d7a498d3e537fae49eece Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 29 五月 2025 18:37:57 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java | 54 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
index 1dae031..9be2e05 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
@@ -15,6 +15,7 @@
import org.springframework.stereotype.Component;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -101,15 +102,15 @@
@Scheduled(cron = "0/3 * * * * ? ")
private void execute2(){
for(Integer staNo : CRN_WORK_CU) {
- try{
- for(Integer staNo1 : CRN_WORK_CU_SMA) {
- RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+staNo1));
- trunSma.setRgvOneSign(0);
- rgvOneSignService.updateById(trunSma);
- }
- } catch (Exception e){
-
- }
+// try{
+// for(Integer staNo1 : CRN_WORK_CU_SMA) {
+// RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+staNo1));
+// trunSma.setRgvOneSign(0);
+// rgvOneSignService.updateById(trunSma);
+// }
+// } catch (Exception e){
+//
+// }
List<WrkMastCrn> wrkMastCrnList = wrkMastCrnService.selectList(new EntityWrapper<WrkMastCrn>().eq("source_sta_no",staNo));
if (Cools.isEmpty(wrkMastCrnList)){
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
@@ -123,21 +124,30 @@
// continue;
// }
boolean sign = true;
- if ((wrkMast.getIoType()==101 || wrkMast.getIoType() == 110) && wrkMast.booleanStaNoSign()){
- RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMast.getStaNo()));
- if (Cools.isEmpty(rgvOneSign)){
+ if ((wrkMast.getIoType()==101 || wrkMast.getIoType() == 110) && wrkMast.booleanStaNoSign() && wrkMast.getIoPri()<99D){
+ Date now = new Date();
+ long differenceInSeconds = now.getTime() - wrkMast.getModiTime().getTime();
+ if (differenceInSeconds<=2000){
continue;
}
- RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMast.getStaNo()));
- if (Cools.isEmpty(trunSma)){
- continue;
- }
- int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
- int wrkCountCrn = wrkMastCrnService.selectCount(new EntityWrapper<WrkMastCrn>().eq("sta_no", wrkMast.getStaNo()));
- if (wrkCountCrn+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){
- continue;
- }
- sign = false;
+// RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMast.getStaNo()));
+// if (Cools.isEmpty(rgvOneSign)){
+// continue;
+// }
+// RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMast.getStaNo()));
+// if (Cools.isEmpty(trunSma)){
+// continue;
+// }
+// int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
+// int wrkCountCrn = wrkMastCrnService.selectCount(new EntityWrapper<WrkMastCrn>().eq("sta_no", wrkMast.getStaNo()));
+// if (wrkCountCrn*2+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){
+// continue;
+// }
+// int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
+// if (wrkCountGt > 1){
+// continue;
+// }
+// sign = false;
// BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNoBying());
// if (basDevp.getLoading().equals("Y")
// || !basDevp.getAutoing().equals("Y")
--
Gitblit v1.9.1