From d835d1b51f832889929cdf69010034a30ef44d02 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 13:57:29 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java
index 4268ff1..d63ab64 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java
@@ -49,7 +49,7 @@
      * 浠诲姟鍙�
      */
     @ApiModelProperty(value= "浠诲姟鍙�")
-    private Integer wrkNo;
+    private Integer taskNo;
 
     /**
      * 搴忓垪鍙�
@@ -74,6 +74,18 @@
      */
     @ApiModelProperty(value= "鍚屾 1: 鏄�  0: 鍚�  ")
     private Integer sync;
+
+    /**
+     * 鎵ц瀹屾垚鍚庢槸鍚﹂噴鏀炬彁鍗囨満锛岄粯璁や笉閲婃斁  1: 閲婃斁  0: 涓嶉噴鏀�
+     */
+    @ApiModelProperty(value= "鎵ц瀹屾垚鍚庢槸鍚﹂噴鏀炬彁鍗囨満锛岄粯璁や笉閲婃斁  1: 閲婃斁  0: 涓嶉噴鏀�")
+    private Integer releaseLift;
+
+    /**
+     * 鎵ц瀹屾垚鍚庢槸鍚﹂噴鏀剧┛姊溅锛岄粯璁や笉閲婃斁  1: 閲婃斁  0: 涓嶉噴鏀�
+     */
+    @ApiModelProperty(value= "鎵ц瀹屾垚鍚庢槸鍚﹂噴鏀剧┛姊溅锛岄粯璁や笉閲婃斁  1: 閲婃斁  0: 涓嶉噴鏀�")
+    private Integer releaseShuttle;
 
     /**
      * 浠诲姟绫诲瀷
@@ -217,7 +229,6 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
-    @TableLogic
     private Integer deleted;
 
     /**
@@ -228,9 +239,9 @@
 
     public Motion() {}
 
-    public Motion(String uuid,Integer wrkNo,String serialNo,String title,Integer priority,Integer sync,Long motionCtg,Long motionSts,Long deviceCtg,String device,String origin,Integer oriDrt,String target,Integer tarDrt,String dockNo,Date ioTime,Date startTime,Date endTime,Date errTime,Long errCode,String errDesc,String temp,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer deleted,Long hostId) {
+    public Motion(String uuid,Integer taskNo,String serialNo,String title,Integer priority,Integer sync,Long motionCtg,Long motionSts,Long deviceCtg,String device,String origin,Integer oriDrt,String target,Integer tarDrt,String dockNo,Date ioTime,Date startTime,Date endTime,Date errTime,Long errCode,String errDesc,String temp,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer deleted,Long hostId) {
         this.uuid = uuid;
-        this.wrkNo = wrkNo;
+        this.taskNo = taskNo;
         this.serialNo = serialNo;
         this.title = title;
         this.priority = priority;

--
Gitblit v1.9.1