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 | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
index 220c720..d4eba75 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;
@@ -110,7 +110,7 @@
*/
@ApiModelProperty(value= "閲嶉噺")
@TableField("SC_WEIGHT")
- private Integer scWeight;
+ private Integer scWeight = 0;
/**
* 淇敼浜哄憳
@@ -248,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);
}
@@ -355,7 +359,7 @@
public Integer getTargetPointConvert(){
- switch (targetPoint){
+ switch (originTargetPoint){
case "11":
return 11;
default:
@@ -363,4 +367,34 @@
}
}
+ 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