From b424d6493efb60cb8d93a2e16526086da1fc2ea9 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 01 四月 2025 16:08:11 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/TaskWrk.java | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
index d7cabf4..15cb346 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;
@@ -32,7 +34,7 @@
import java.io.Serializable;
@Data
-@TableName("wcs_task_wrk")
+@TableName("\"SOURCE\".\"wcs_task_wrk\"")
public class TaskWrk implements Serializable {
private static final long serialVersionUID = 1L;
@@ -48,7 +50,7 @@
/**
* 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
*/
- @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷 ")
+ @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 5: 瀹岀粨 4: 鍙栨秷 ")
private Integer status;
/**
@@ -57,6 +59,13 @@
@ApiModelProperty(value= "浠诲姟鍙�")
@TableField("wrk_no")
private Integer wrkNo;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "閲嶉噺")
+ @TableField("sc_weight")
+ private Integer scWeight;
/**
* 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
@@ -78,7 +87,7 @@
*/
@ApiModelProperty(value= "浼樺厛绾�")
@TableField("io_pri")
- private Double ioPri;
+ private Integer ioPri;
/**
* 璧风偣
@@ -167,16 +176,21 @@
@TableField("crn_no")
private Integer crnNo;
- /**
- * 鎸囦护鎵ц姝ュ簭
- */
- @ApiModelProperty(value= "鎸囦护鎵ц姝ュ簭")
- @TableField("command_step")
- private Integer commandStep;
+ @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;
@@ -224,9 +238,11 @@
case 2:
return "娲惧彂";
case 3:
- return "瀹岀粨";
+ return "姝ュ簭瀹屾垚";
case 4:
return "鍙栨秷";
+ case 5:
+ return "瀹岀粨";
default:
return String.valueOf(this.status);
}
--
Gitblit v1.9.1