From c904f735e0b8a488ef56744c08f8e10258639bce Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 05 六月 2025 15:54:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/TaskWrk.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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..0a7f68d 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;
@@ -78,7 +80,7 @@
*/
@ApiModelProperty(value= "浼樺厛绾�")
@TableField("io_pri")
- private Double ioPri;
+ private Integer ioPri;
/**
* 璧风偣
@@ -172,15 +174,23 @@
*/
@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;
+
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,13 +238,30 @@
case 2:
return "娲惧彂";
case 3:
- return "瀹岀粨";
+ return "璁惧瀹屾垚";
case 4:
return "鍙栨秷";
+ case 5:
+ return "瀹岀粨";
default:
return String.valueOf(this.status);
}
}
+ public String getIoPri$(){
+ if (null == this.ioPri){ return null; }
+ switch (this.ioPri){
+ case 100:
+ return "浣�";
+ case 200:
+ return "涓�";
+ case 300:
+ return "楂�";
+ case 400:
+ return "绱ф��";
+ default:
+ return String.valueOf(this.ioPri);
+ }
+ }
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
--
Gitblit v1.9.1