From 6193eddf242c4b879402367704b8b5b2e8df84a4 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 19 七月 2025 13:29:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/TaskWrk.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
index 1d95280..b2083da 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrk.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import io.swagger.models.auth.In;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkIotypeService;
@@ -46,9 +48,9 @@
private String taskNo;
/**
- * 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
+ * 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 4: 鍙栨秷浠诲姟涓婃姤wms 5.鍙栨秷浠诲姟 6: 瀹岀粨浠诲姟涓婃姤wms 7.瀹岀粨
*/
- @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷 ")
+ @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 4: 鍙栨秷浠诲姟涓婃姤wms 5.鍙栨秷浠诲姟 6: 瀹岀粨浠诲姟涓婃姤wms 7.瀹岀粨 ")
private Integer status;
/**
@@ -68,6 +70,8 @@
/**
* 浠诲姟绫诲瀷
+ *
+ *
*/
@ApiModelProperty(value= "浠诲姟绫诲瀷")
@TableField("io_type")
@@ -78,19 +82,19 @@
*/
@ApiModelProperty(value= "浼樺厛绾�")
@TableField("io_pri")
- private Double ioPri;
+ private Integer ioPri;
/**
* 璧风偣
*/
- @ApiModelProperty(value= "璧风偣")
+ @ApiModelProperty(value= "婧愮珯鐐�")
@TableField("start_point")
private String startPoint;
/**
- * 缁堢偣
+ * 鐩爣绔欑偣
*/
- @ApiModelProperty(value= "缁堢偣")
+ @ApiModelProperty(value= "鐩爣绔欑偣")
@TableField("target_point")
private String targetPoint;
@@ -172,15 +176,27 @@
*/
@ApiModelProperty(value= "鎸囦护鎵ц姝ュ簭")
@TableField("command_step")
- private Integer commandStep;
+ private Integer commandStep = 0;
@ApiModelProperty(value = "绉诲簱鏍囪")
@TableField("transfer_mark")
private Integer transferMark;
+ @ApiModelProperty(value = "婧愬簱浣�")
+ @TableField("origin_start_point")
+ private String originStartPoint;
+
+ @ApiModelProperty(value = "鐩爣搴撲綅")
+ @TableField("origin_target_point")
+ private String originTargetPoint;
+
+ @ApiModelProperty(value = "寮�濮嬩换鍔℃爣璁�")
+ @TableField("mark_start")
+ private Integer markStart;
+
public TaskWrk() {}
- public TaskWrk(String taskNo,Integer status,Integer wrkNo,Date createTime,Integer ioType,Double ioPri,String startPoint,String targetPoint,Long modiUser,Date modiTime,String memo,String barcode,Date assignTime,Date executeTime,Date completeTime,Date cancelTime,Integer wrkSts) {
+ public TaskWrk(String taskNo,Integer status,Integer wrkNo,Date createTime,Integer ioType,Integer ioPri,String startPoint,String targetPoint,Long modiUser,Date modiTime,String memo,String barcode,Date assignTime,Date executeTime,Date completeTime,Date cancelTime,Integer wrkSts) {
this.taskNo = taskNo;
this.status = status;
this.wrkNo = wrkNo;
@@ -228,9 +244,11 @@
case 2:
return "娲惧彂";
case 3:
- return "瀹岀粨";
+ return "姝ュ簭瀹屾垚";
case 4:
return "鍙栨秷";
+ case 5:
+ return "瀹岀粨";
default:
return String.valueOf(this.status);
}
--
Gitblit v1.9.1