From 083659a2e1a8eb245b086d7046ee7d8e61f07a8f Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期四, 17 七月 2025 18:22:06 +0800
Subject: [PATCH] *

---
 src/main/resources/mapper/BasRgvMapper.xml                 |    2 ++
 src/main/java/com/zy/asrs/entity/BasRgv.java               |   14 ++++++++++++++
 src/main/java/com/zy/asrs/task/WrkMastRgvTwoScheduler.java |    8 ++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/BasRgv.java b/src/main/java/com/zy/asrs/entity/BasRgv.java
index 1e59d48..01192e4 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgv.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgv.java
@@ -56,6 +56,20 @@
     private Integer rgvSts;
 
     /**
+     * 浣滀笟鎬�
+     */
+    @ApiModelProperty(value= "浣滀笟鎬�")
+    @TableField("rgv_sts1")
+    private Integer rgvSts1;
+
+    /**
+     * 浣滀笟鎬�
+     */
+    @ApiModelProperty(value= "浣滀笟鎬�")
+    @TableField("rgv_sts2")
+    private Integer rgvSts2;
+
+    /**
      * 浠诲姟鍙�
      */
     @ApiModelProperty(value= "浠诲姟鍙�")
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;
diff --git a/src/main/resources/mapper/BasRgvMapper.xml b/src/main/resources/mapper/BasRgvMapper.xml
index 56844e1..54b6c8e 100644
--- a/src/main/resources/mapper/BasRgvMapper.xml
+++ b/src/main/resources/mapper/BasRgvMapper.xml
@@ -8,6 +8,8 @@
         <result column="in_enable" property="inEnable" />
         <result column="out_enable" property="outEnable" />
         <result column="rgv_sts" property="rgvSts" />
+        <result column="rgv_sts1" property="rgvSts1" />
+        <result column="rgv_sts2" property="rgvSts2" />
         <result column="wrk_no1" property="wrkNo1" />
         <result column="wrk_no2" property="wrkNo2" />
         <result column="rgv_err" property="rgvErr" />

--
Gitblit v1.9.1