From d983b88916d7489aa154984b67e1bcfb2f13f5d1 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期二, 06 五月 2025 11:10:43 +0800
Subject: [PATCH] 解决待机位和提升机互锁问题

---
 src/main/java/com/zy/asrs/entity/BasShuttle.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/BasShuttle.java b/src/main/java/com/zy/asrs/entity/BasShuttle.java
index ed0fd8f..1ee828b 100644
--- a/src/main/java/com/zy/asrs/entity/BasShuttle.java
+++ b/src/main/java/com/zy/asrs/entity/BasShuttle.java
@@ -106,13 +106,6 @@
     private String memo;
 
     /**
-     * 鎻愬崌鏈哄彿
-     */
-    @ApiModelProperty(value= "鎻愬崌鏈哄彿")
-    @TableField("lift_no")
-    private Integer liftNo;
-
-    /**
      * 浣滀笟鏍囪
      */
     @ApiModelProperty(value= "浣滀笟鏍囪")
@@ -133,9 +126,16 @@
     @TableField("device_status")
     private String deviceStatus;
 
+    /**
+     * 灏忚溅绂佺敤妤煎眰
+     */
+    @ApiModelProperty(value= "灏忚溅绂佺敤妤煎眰")
+    @TableField("disable_lev")
+    private String disableLev;
+
     public BasShuttle() {}
 
-    public BasShuttle(Integer shuttleNo, Integer status, Integer shuttleStatus, Integer wrkNo, String idleLoc, Integer autoCharge, Integer chargeLine, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer liftNo, Boolean pakMk, String deviceStatus) {
+    public BasShuttle(Integer shuttleNo, Integer status, Integer shuttleStatus, Integer wrkNo, String idleLoc, Integer autoCharge, Integer chargeLine, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Boolean pakMk, String deviceStatus) {
         this.shuttleNo = shuttleNo;
         this.status = status;
         this.shuttleStatus = shuttleStatus;
@@ -148,7 +148,6 @@
         this.updateBy = updateBy;
         this.updateTime = updateTime;
         this.memo = memo;
-        this.liftNo = liftNo;
         this.pakMk = pakMk;
         this.deviceStatus = deviceStatus;
     }

--
Gitblit v1.9.1