From 0afba31001bcc9cc05af2b9061aa32bf7bd83b0b Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 03 一月 2025 14:28:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java | 92 +++++++++++++++++++++++-----------------------
1 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
index 3b38656..ddc92e5 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
@@ -101,15 +101,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,43 +123,43 @@
// 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)){
- 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")
-// || (!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;
-// }
- }
+// 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)){
+//// 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")
+//// || (!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());
if (row == wrkMast.getCrnNo()*4 || row == wrkMast.getCrnNo()*4-3){
--
Gitblit v1.9.1