From 80d97d40c44165674ee0168be5f08c8ca52d3c06 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 六月 2025 09:36:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtwcs' into jxgtwcs
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 d63ab64..a252e80 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
@@ -76,9 +76,9 @@
private Integer sync;
/**
- * 鎵ц瀹屾垚鍚庢槸鍚﹂噴鏀炬彁鍗囨満锛岄粯璁や笉閲婃斁 1: 閲婃斁 0: 涓嶉噴鏀�
+ * 鎵ц瀹屾垚鍚庢槸鍚﹂噴鏀炬彁鍗囨満锛岄粯璁や笉閲婃斁 2:鎵ц涓噴鏀� 1: 閲婃斁 0: 涓嶉噴鏀�
*/
- @ApiModelProperty(value= "鎵ц瀹屾垚鍚庢槸鍚﹂噴鏀炬彁鍗囨満锛岄粯璁や笉閲婃斁 1: 閲婃斁 0: 涓嶉噴鏀�")
+ @ApiModelProperty(value= "鎵ц瀹屾垚鍚庢槸鍚﹂噴鏀炬彁鍗囨満锛岄粯璁や笉閲婃斁 2:鎵ц涓噴鏀� 1: 閲婃斁 0: 涓嶉噴鏀�")
private Integer releaseLift;
/**
@@ -237,6 +237,12 @@
@ApiModelProperty(value= "鎵�灞炴満鏋�")
private Long hostId;
+ /**
+ * 绉诲姩璺緞
+ */
+ @ApiModelProperty(value= "绉诲姩璺緞")
+ private String movePath;
+
public Motion() {}
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) {
--
Gitblit v1.9.1