From 23e81c5d24c37a87fbbbf67c68b17e8f78832148 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 03 十一月 2025 18:56:42 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/TaskWrk.java | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
index 38d98da..4ee5736 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrk.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -72,7 +72,7 @@
/**
* 浠诲姟绫诲瀷
*/
- @ApiModelProperty(value= "浠诲姟绫诲瀷")
+ @ApiModelProperty(value= "浠诲姟绫诲瀷") // 1: 鍏ュ簱 2: 鍑哄簱 3: 绉诲簱 4:婕旂ず
@TableField("IO_TYPE")
private Integer ioType;
@@ -101,7 +101,7 @@
@TableField("ORIGIN_START_POINT")
private String originStartPoint;
- @ApiModelProperty(value = "鍘熷璧风偣")
+ @ApiModelProperty(value = "鍘熷缁堢偣")
@TableField("ORIGIN_TARGET_POINT")
private String originTargetPoint;
@@ -110,7 +110,7 @@
*/
@ApiModelProperty(value= "閲嶉噺")
@TableField("SC_WEIGHT")
- private Integer scWeight;
+ private Integer scWeight = 0;
/**
* 淇敼浜哄憳
@@ -248,11 +248,17 @@
case 2:
return "娲惧彂";
case 3:
- return "姝ュ簭瀹屾垚";
+ return "鍛戒护瀹屾垚";
case 4:
return "鍙栨秷";
case 5:
return "瀹岀粨";
+ case 7:
+ return "鎵嬪姩瀹岀粨";
+ case 9:
+ return "鍑哄簱鍒拌緭閫佺嚎";
+ case 99:
+ return "婕旂ず";
default:
return String.valueOf(this.status);
}
@@ -352,17 +358,6 @@
return Math.abs(day) + "澶�" + Math.abs(hour) + "灏忔椂" + Math.abs(min) + "鍒�" + Math.abs(s) + "绉�";
}
-
-
- public Integer getTargetPointConvert(){
- switch (targetPoint){
- case "11":
- return 11;
- default:
- return null;
- }
- }
-
public Integer getIoTypeWms(){
switch (ioType){
case 2:
@@ -371,9 +366,28 @@
return 2;
case 1:
return 3;
+ case 4:
+ return 4;
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