From 7135f8d64d80386fc028eed3f9e29015f3a4a6a0 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 29 十一月 2024 00:56:23 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java     |    2 +-
 src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java |    8 ++++----
 src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java           |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
index b07a3c9..fb91527 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
@@ -116,7 +116,7 @@
                             continue;
                         }
                         int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
-                        if (wrkCount+rgvOneSign.getRgvOneSign()>=3){
+                        if (wrkCount+rgvOneSign.getRgvOneSign()>2){
                             continue;
                         }
 //                        BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNoBying());
diff --git a/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
index 1775708..914e512 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
@@ -101,7 +101,7 @@
                             case 2:
                                 List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 12L).eq("crn_no", crnNo));
                                 if (wrkMasts.size()==1){
-                                    Integer wrkNo = wrkMasts.get(0).getWrkNo();
+                                    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鏈夌墿寰呬綔涓�
@@ -123,7 +123,7 @@
                                                     continue;
                                                 }
                                                 int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
-                                                if (wrkCount+rgvOneSign.getRgvOneSign()>=3){
+                                                if (wrkCount+rgvOneSign.getRgvOneSign()>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));
@@ -151,10 +151,10 @@
 //                                            }
                                             break;
                                         }
-                                        WrkMastSplitTwin wrkMastSplitTwin1 = wrkMastSplitTwinService.selectOne(new EntityWrapper<WrkMastSplitTwin>().eq("wrk_no", wrkNo));
+                                        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){
+                                            if (differenceInSeconds>180 || (!Cools.isEmpty(wrkMast1.getStaNo()) && (wrkMast1.getStaNo().equals(312) || wrkMast1.getStaNo().equals(310)) )){
                                                 if (basCrnp.getCrnStatusOne() != 20) {//鍫嗗灈鏈哄伐浣�1鏈夌墿寰呬綔涓�
                                                     break;
                                                 }
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java
index b02d099..bc4c512 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java
@@ -128,7 +128,7 @@
                         return FAIL;
                     }
                     int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMastOther.getStaNo()).eq("wrk_sts",12L));
-                    if (wrkCount+rgvOneSign.getRgvOneSign()>=3){
+                    if (wrkCount+rgvOneSign.getRgvOneSign()>2){
                         return FAIL;
                     }
                 }

--
Gitblit v1.9.1