From aede5c5c19740a9903dfe2873caaacc10eebda66 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 28 四月 2025 12:37:07 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/TaskWrkLog.java | 89 ++++++++++++++++++++++++++++++--------------
1 files changed, 61 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
index e01d5a5..bcd7c06 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
@@ -32,7 +32,7 @@
import java.io.Serializable;
@Data
-@TableName("wcs_task_wrk_log")
+@TableName("\"SOURCE\".\"wcs_task_wrk_log\"")
public class TaskWrkLog implements Serializable {
private static final long serialVersionUID = 1L;
@@ -41,27 +41,28 @@
* wms浠诲姟鍙�
*/
@ApiModelProperty(value= "wms浠诲姟鍙�")
- @TableField("task_no")
+ @TableField("TASK_NO")
private String taskNo;
/**
* 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
*/
@ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷 ")
+ @TableField("STATUS")
private Integer status;
/**
* 浠诲姟鍙�
*/
@ApiModelProperty(value= "浠诲姟鍙�")
- @TableField("wrk_no")
+ @TableField("WRK_NO")
private Integer wrkNo;
/**
* 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
*/
@ApiModelProperty(value= "浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)")
- @TableField("create_time")
+ @TableField("CREATE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
@@ -69,42 +70,42 @@
* 浠诲姟绫诲瀷
*/
@ApiModelProperty(value= "浠诲姟绫诲瀷")
- @TableField("io_type")
+ @TableField("IO_TYPE")
private Integer ioType;
/**
* 浼樺厛绾�
*/
@ApiModelProperty(value= "浼樺厛绾�")
- @TableField("io_pri")
+ @TableField("IO_PRI")
private Double 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;
@@ -112,19 +113,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;
@@ -132,7 +135,7 @@
* 鎵ц鏃堕棿
*/
@ApiModelProperty(value= "鎵ц鏃堕棿")
- @TableField("execute_time")
+ @TableField("EXECUTE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date executeTime;
@@ -140,7 +143,7 @@
* 瀹岀粨鏃堕棿
*/
@ApiModelProperty(value= "瀹岀粨鏃堕棿")
- @TableField("complete_time")
+ @TableField("COMPLETE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date completeTime;
@@ -148,7 +151,7 @@
* 鍙栨秷鏃堕棿
*/
@ApiModelProperty(value= "鍙栨秷鏃堕棿")
- @TableField("cancel_time")
+ @TableField("CANCEL_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date cancelTime;
@@ -156,30 +159,35 @@
* 宸ヤ綔鐘舵��
*/
@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("COMMAND_STEP")
+// private Integer commandStep;
- @ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
+// @ApiModelProperty(value= "")
+// @TableId(value = "id", type = IdType.AUTO)
+// private Long id;
+
+
+ @ApiModelProperty(value = "绉诲簱鏍囪")
+ @TableField("TRANSFER_MARK")
+ private Integer transferMark;
public TaskWrkLog() {}
- public TaskWrkLog(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,Integer crnNo,Integer commandStep) {
+ public TaskWrkLog(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, Integer crnNo, Integer transferMark) {
this.taskNo = taskNo;
this.status = status;
this.wrkNo = wrkNo;
@@ -198,9 +206,32 @@
this.cancelTime = cancelTime;
this.wrkSts = wrkSts;
this.crnNo = crnNo;
- this.commandStep = commandStep;
+ this.transferMark = transferMark;
}
+ public TaskWrkLog(TaskWrk taskWrk) {
+ this.taskNo = taskWrk.getTaskNo();
+ this.status = taskWrk.getStatus();
+ this.wrkNo = taskWrk.getWrkNo();
+ this.createTime = taskWrk.getCreateTime();
+ this.ioType = taskWrk.getIoType();
+ if (Cools.isEmpty(taskWrk.getIoPri())){
+ taskWrk.setIoPri(1);
+ }
+ this.ioPri = (double)taskWrk.getIoPri();
+ this.startPoint = taskWrk.getStartPoint();
+ this.targetPoint = taskWrk.getTargetPoint();
+ this.modiUser = taskWrk.getModiUser();
+ this.modiTime = taskWrk.getModiTime();
+ this.memo = taskWrk.getMemo();
+ this.barcode = taskWrk.getBarcode();
+ this.assignTime = taskWrk.getAssignTime();
+ this.executeTime = taskWrk.getExecuteTime();
+ this.completeTime = taskWrk.getCompleteTime();
+ this.cancelTime = taskWrk.getCancelTime();
+ this.wrkSts = taskWrk.getWrkSts();
+ this.crnNo = taskWrk.getCrnNo();
+ }
// TaskWrkLog taskWrkLog = new TaskWrkLog(
// null, // wms浠诲姟鍙�
// null, // 浠诲姟鐘舵��
@@ -232,9 +263,11 @@
case 2:
return "娲惧彂";
case 3:
- return "瀹岀粨";
+ return "姝ュ簭瀹屾垚";
case 4:
return "鍙栨秷";
+ case 5:
+ return "瀹岀粨";
default:
return String.valueOf(this.status);
}
--
Gitblit v1.9.1