From b635d0eea6d5820a972c4eac945041d53d469cb1 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 12 五月 2025 10:01:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/TaskWrk.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
index d2149bd..34c077c 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrk.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -50,7 +50,7 @@
/**
* 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
*/
- @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 5: 瀹岀粨 4: 鍙栨秷 ")
+ @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 5: 瀹岀粨 4: 鍙栨秷 9锛氱瓑寰呭皬杞︽惉杩�")
@TableField("STATUS")
private Integer status;
@@ -101,7 +101,7 @@
@TableField("ORIGIN_START_POINT")
private String originStartPoint;
- @ApiModelProperty(value = "鍘熷璧风偣")
+ @ApiModelProperty(value = "鍘熷缁堢偣")
@TableField("ORIGIN_TARGET_POINT")
private String originTargetPoint;
@@ -186,6 +186,13 @@
@ApiModelProperty(value= "鍫嗗灈鏈哄彿")
@TableField("CRN_NO")
private Integer crnNo;
+
+ /**
+ * 鎸囦护鎵ц姝ュ簭
+ */
+ @ApiModelProperty(value= "鎸囦护鎵ц姝ュ簭")
+ @TableField("COMMAND_STEP")
+ private Integer commandStep;
@ApiModelProperty(value = "绉诲簱鏍囪")
@TableField("TRANSFER_MARK")
@@ -345,4 +352,41 @@
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 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