From dd9438d16375800e5b5d53c2d654b7fb4b2f2dd4 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 02 四月 2025 10:51:50 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/TaskWrk.java | 73 ++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 29 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..df76b24 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;
@@ -41,28 +43,36 @@
* wms浠诲姟鍙�
*/
@ApiModelProperty(value= "wms浠诲姟鍙�")
- @TableId(value = "task_no", type = IdType.INPUT)
- @TableField("task_no")
+ @TableId(value = "\"task_no\"", type = IdType.INPUT)
+ @TableField("\"task_no\"")
private String taskNo;
/**
* 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
*/
- @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷 ")
+ @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 5: 瀹岀粨 4: 鍙栨秷 ")
+ @TableField("\"status\"")
private Integer status;
/**
* 浠诲姟鍙�
*/
@ApiModelProperty(value= "浠诲姟鍙�")
- @TableField("wrk_no")
+ @TableField("\"wrk_no\"")
private Integer wrkNo;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "閲嶉噺")
+ @TableField("\"sc_weight\"")
+ private Integer scWeight;
/**
* 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
*/
@ApiModelProperty(value= "浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)")
- @TableField("create_time")
+ @TableField("\"create_time\"")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
@@ -70,42 +80,42 @@
* 浠诲姟绫诲瀷
*/
@ApiModelProperty(value= "浠诲姟绫诲瀷")
- @TableField("io_type")
+ @TableField("\"io_type\"")
private Integer ioType;
/**
* 浼樺厛绾�
*/
@ApiModelProperty(value= "浼樺厛绾�")
- @TableField("io_pri")
- private Double ioPri;
+ @TableField("\"io_pri\"")
+ private Integer ioPri;
/**
* 璧风偣
*/
@ApiModelProperty(value= "璧风偣")
- @TableField("start_point")
+ @TableField("\"start_point\"")
private String startPoint;
/**
* 缁堢偣
*/
@ApiModelProperty(value= "缁堢偣")
- @TableField("target_point")
+ @TableField("\"target_point\"")
private String targetPoint;
/**
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
+ @TableField("\"modi_user\"")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
+ @TableField("\"modi_time\"")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date modiTime;
@@ -113,19 +123,21 @@
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
+ @TableField("\"memo\"")
private String memo;
/**
* 鏉＄爜
*/
@ApiModelProperty(value= "鏉＄爜")
+ @TableField("\"barcode\"")
private String barcode;
/**
* 娲惧彂鏃堕棿
*/
@ApiModelProperty(value= "娲惧彂鏃堕棿")
- @TableField("assign_time")
+ @TableField("\"assign_time\"")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date assignTime;
@@ -133,7 +145,7 @@
* 鎵ц鏃堕棿
*/
@ApiModelProperty(value= "鎵ц鏃堕棿")
- @TableField("execute_time")
+ @TableField("\"execute_time\"")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date executeTime;
@@ -141,7 +153,7 @@
* 瀹岀粨鏃堕棿
*/
@ApiModelProperty(value= "瀹岀粨鏃堕棿")
- @TableField("complete_time")
+ @TableField("\"complete_time\"")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date completeTime;
@@ -149,7 +161,7 @@
* 鍙栨秷鏃堕棿
*/
@ApiModelProperty(value= "鍙栨秷鏃堕棿")
- @TableField("cancel_time")
+ @TableField("\"cancel_time\"")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date cancelTime;
@@ -157,30 +169,31 @@
* 宸ヤ綔鐘舵��
*/
@ApiModelProperty(value= "宸ヤ綔鐘舵��")
- @TableField("wrk_sts")
+ @TableField("\"wrk_sts\"")
private Integer wrkSts;
/**
* 鍫嗗灈鏈哄彿
*/
@ApiModelProperty(value= "鍫嗗灈鏈哄彿")
- @TableField("crn_no")
+ @TableField("\"crn_no\"")
private Integer crnNo;
- /**
- * 鎸囦护鎵ц姝ュ簭
- */
- @ApiModelProperty(value= "鎸囦护鎵ц姝ュ簭")
- @TableField("command_step")
- private Integer commandStep;
-
@ApiModelProperty(value = "绉诲簱鏍囪")
- @TableField("transfer_mark")
+ @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,9 +241,11 @@
case 2:
return "娲惧彂";
case 3:
- return "瀹岀粨";
+ return "姝ュ簭瀹屾垚";
case 4:
return "鍙栨秷";
+ case 5:
+ return "瀹岀粨";
default:
return String.valueOf(this.status);
}
--
Gitblit v1.9.1