From fb13d79f33ee8dced242fabf2d66950ae8689400 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期一, 30 三月 2026 14:12:03 +0800
Subject: [PATCH] 修改数字孪生接口，将不同库位状态的数量上报
---
src/main/java/com/zy/asrs/entity/Task.java | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Task.java b/src/main/java/com/zy/asrs/entity/Task.java
index 79496f2..0e218d5 100644
--- a/src/main/java/com/zy/asrs/entity/Task.java
+++ b/src/main/java/com/zy/asrs/entity/Task.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.core.common.SpringUtils;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.zy.asrs.service.*;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -66,6 +67,9 @@
/**
* 鍏ュ嚭搴撶被鍨�
+ * 3.绔欏埌绔�
+ * 4.绔欏埌鍖哄煙
+ * 5.鍖哄煙鍒扮珯
*/
@ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
@TableField("io_type")
@@ -125,6 +129,17 @@
@TableField("loc_sts")
private String locSts;
+ @ApiModelProperty(value= "1.娴峰悍AGV 2.鍗庢檽AGV 榛樿鏄�1.娴峰悍")
+ @TableField("plt_type")
+ private Integer pltType=1;
+
+ @ApiModelProperty(value= "鏂欐灦鍙�")
+ private String packed;
+
+ @ApiModelProperty(value= "涓嬪彂AGV浠诲姟璁℃暟")
+ @TableField("ctn_type")
+ private Integer ctnType=0;
+
/**
* 鎷ｆ枡
*/
@@ -139,7 +154,7 @@
@TableField("online_yn")
private String onlineYn;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鏄惁浠诲姟鎶ラ敊")
@TableField("upd_mk")
private String updMk;
@@ -149,10 +164,6 @@
@ApiModelProperty(value= "閫�鍑�")
@TableField("exit_mk")
private String exitMk;
-
- @ApiModelProperty(value= "")
- @TableField("plt_type")
- private Integer pltType;
/**
* 绌烘澘
@@ -167,13 +178,6 @@
@ApiModelProperty(value= "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
-
- @ApiModelProperty(value= "")
- @TableField("ctn_type")
- private Integer ctnType;
-
- @ApiModelProperty(value= "")
- private String packed;
@ApiModelProperty(value= "")
@TableField("ove_mk")
@@ -334,6 +338,20 @@
@TableField("take_none")
private String takeNone;
+ /**
+ * 澶栭儴浠诲姟缂栧彿
+ */
+ @ApiModelProperty(value= "澶栭儴浠诲姟缂栧彿")
+ @TableField("task_no")
+ private String taskNo;
+
+ /**
+ * 鏄惁鏄痯da鍙戠殑
+ */
+ @ApiModelProperty(value= "鏄惁鏄疨DA鍙戠殑浠诲姟")
+ @TableField("is_PDA")
+ private String isPda;
+
public Task() {}
public String getYmd$(){
@@ -388,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