From 083659a2e1a8eb245b086d7046ee7d8e61f07a8f Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期四, 17 七月 2025 18:22:06 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/WrkMastRgvTwoScheduler.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastRgvTwoScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastRgvTwoScheduler.java
index 6bf631a..281dfbd 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastRgvTwoScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastRgvTwoScheduler.java
@@ -56,7 +56,9 @@
}
BasRgv basRgv2 = basRgvService.selectById(2);
- if (Cools.isEmpty(basRgv2) || basRgv2.getRgvSts()!=3 || basRgv2.getWrkNo1()!=0 || basRgv2.getWrkNo2()!=0){
+ if (Cools.isEmpty(basRgv2) || basRgv2.getRgvSts()!=3
+ || basRgv2.getRgvSts1()!=0 || basRgv2.getRgvSts2()!=0
+ || basRgv2.getWrkNo1()!=0 || basRgv2.getWrkNo2()!=0 || basRgv2.getLoaded2()>1){
return;
}
if (Cools.isEmpty(basRgv2.getNowStaNo())){
@@ -103,7 +105,9 @@
return;
}
BasRgv basRgv2 = basRgvService.selectById(2);
- if (basRgv2==null || basRgv2.getRgvSts()!=3 || basRgv2.getWrkNo1()!=0 || basRgv2.getWrkNo2()!=0){
+ if (basRgv2==null || basRgv2.getRgvSts()!=3
+ || basRgv2.getRgvSts1()!=0 || basRgv2.getRgvSts2()!=0
+ || basRgv2.getWrkNo1()!=0 || basRgv2.getWrkNo2()!=0){
rgvTwoSign.setRgvOneSign(0);
rgvOneSignService.updateById(rgvTwoSign);
return;
--
Gitblit v1.9.1