From c9d011ae46f73cc87c4d6addd7d9d24d6c53bec0 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期一, 30 三月 2026 09:55:38 +0800
Subject: [PATCH] 修复入库任务还未生成时下发出库任务会同步进行的问题
---
src/main/java/com/zy/asrs/entity/Task.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Task.java b/src/main/java/com/zy/asrs/entity/Task.java
index aff7888..6e92715 100644
--- a/src/main/java/com/zy/asrs/entity/Task.java
+++ b/src/main/java/com/zy/asrs/entity/Task.java
@@ -135,6 +135,10 @@
@ApiModelProperty(value= "鏂欐灦鍙�")
private String packed;
+ @ApiModelProperty(value= "涓嬪彂AGV浠诲姟璁℃暟")
+ @TableField("ctn_type")
+ private Integer ctnType=0;
+
/**
* 鎷ｆ枡
*/
@@ -173,10 +177,6 @@
@ApiModelProperty(value= "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
-
- @ApiModelProperty(value= "")
- @TableField("ctn_type")
- private Integer ctnType;
@ApiModelProperty(value= "")
@TableField("ove_mk")
@@ -344,6 +344,14 @@
@TableField("task_no")
private String taskNo;
+ /**
+ * 鏄惁鏄痯da鍙戠殑
+ */
+ @ApiModelProperty(value= "鏄惁鏄疨DA鍙戠殑浠诲姟")
+ @TableField("is_PDA")
+ private String isPda;
+
+
public Task() {}
public String getYmd$(){
@@ -398,10 +406,16 @@
public String getTaskType$(){
if (Cools.isEmpty(this.taskType)){return null;}
- if (taskType.equals("AGV")) {
+ if (taskType.equals("AGV") || taskType.equals("agv")) {
return "AGV浠诲姟";
+ }if(taskType.equals("AGV琛ョ┖鏂欐灦")){
+ return "AGV琛ョ┖鏂欐灦浠诲姟";
+ }if(taskType.equals("AGV绌烘枡鏋跺洖缂撳瓨鍖�")){
+ return "AGV绌烘枡鏋跺洖缂撳瓨鍖轰换鍔�";
+ }if(taskType.equals("ZX-AGV")){
+ return "杞簭鎼繍浠诲姟";
} else {
- return "鍫嗗灈鏈轰换鍔�";
+ return "鍏朵粬鎼繍浠诲姟";
}
}
--
Gitblit v1.9.1