From 92c572e50893a93a810bbe6adb6d3cdbfc225073 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 20 五月 2025 14:17:33 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/TaskWrk.java | 113 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 84 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 54b3913..d4eba75 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrk.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -34,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;
@@ -43,28 +43,29 @@
* 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: 鍙栨秷 9锛氱瓑寰呭皬杞︽惉杩�")
+ @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;
@@ -72,42 +73,57 @@
* 浠诲姟绫诲瀷
*/
@ApiModelProperty(value= "浠诲姟绫诲瀷")
- @TableField("io_type")
+ @TableField("IO_TYPE")
private Integer ioType;
/**
* 浼樺厛绾�
*/
@ApiModelProperty(value= "浼樺厛绾�")
- @TableField("io_pri")
+ @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("ORIGIN_START_POINT")
+ private String originStartPoint;
+
+ @ApiModelProperty(value = "鍘熷缁堢偣")
+ @TableField("ORIGIN_TARGET_POINT")
+ private String originTargetPoint;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "閲嶉噺")
+ @TableField("SC_WEIGHT")
+ private Integer scWeight = 0;
/**
* 淇敼浜哄憳
*/
@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;
@@ -115,19 +131,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;
@@ -135,7 +153,7 @@
* 鎵ц鏃堕棿
*/
@ApiModelProperty(value= "鎵ц鏃堕棿")
- @TableField("execute_time")
+ @TableField("EXECUTE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date executeTime;
@@ -143,7 +161,7 @@
* 瀹岀粨鏃堕棿
*/
@ApiModelProperty(value= "瀹岀粨鏃堕棿")
- @TableField("complete_time")
+ @TableField("COMPLETE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date completeTime;
@@ -151,7 +169,7 @@
* 鍙栨秷鏃堕棿
*/
@ApiModelProperty(value= "鍙栨秷鏃堕棿")
- @TableField("cancel_time")
+ @TableField("CANCEL_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date cancelTime;
@@ -159,34 +177,26 @@
* 宸ヤ綔鐘舵��
*/
@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")
+ @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() {}
@@ -238,11 +248,15 @@
case 2:
return "娲惧彂";
case 3:
- return "姝ュ簭瀹屾垚";
+ return "鍛戒护瀹屾垚";
case 4:
return "鍙栨秷";
case 5:
return "瀹岀粨";
+ case 7:
+ return "鎵嬪姩瀹岀粨";
+ case 9:
+ return "鍑哄簱鍒拌緭閫佺嚎";
default:
return String.valueOf(this.status);
}
@@ -342,4 +356,45 @@
return Math.abs(day) + "澶�" + Math.abs(hour) + "灏忔椂" + Math.abs(min) + "鍒�" + Math.abs(s) + "绉�";
}
+
+
+ public Integer getTargetPointConvert(){
+ switch (originTargetPoint){
+ case "11":
+ return 11;
+ default:
+ return null;
+ }
+ }
+
+ public Integer getIoTypeWms(){
+ switch (ioType){
+ case 2:
+ return 1;
+ case 3:
+ return 2;
+ case 1:
+ return 3;
+ default:
+ return 0;
+ }
+ }
+
+ public Integer getStatusWms(){
+ return status;
+ }
+
+ public String getPut(String point){
+ String[] split = point.split("-");
+ if (split.length == 5){
+// String locNo = String.format("%02d", ) +
+// String.format("%03d", split[3]) +
+// String.format("%02d", split[4]);
+
+ return split[2]+"0"+split[3]+split[4];
+ } else {
+ return point;
+ }
+ }
+
}
--
Gitblit v1.9.1