From e7a59235b41425b981b6d3ba99fde47e5b7584b6 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 30 七月 2025 09:59:27 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/WrkMastRgvTwoScheduler.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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..4c36f7a 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;
@@ -174,9 +178,9 @@
return;
}
if (basRgv1.getNowStaNo()!=102){
- WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no",102+19999L));
+ WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no",101+19999L));
if (Cools.isEmpty(wrkMastSta)){
- WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),102);
+ WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),101);
wrkMastSta1.setType(1);
wrkMastSta1.setWrkType(4);
wrkMastStaService.insert(wrkMastSta1);
--
Gitblit v1.9.1