From 655f0eaba18ec8c56058a87270bf7e15790b6aab Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 17 十二月 2025 11:05:56 +0800
Subject: [PATCH] 添加备货单接口对接
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 83298e9..beb9176 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -22,13 +22,17 @@
private static final long serialVersionUID = 1L;
+ private Long id;
+
/**
* 宸ヤ綔鍙�
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableId(value = "wrk_no", type = IdType.INPUT)
@TableField("wrk_no")
private Integer wrkNo;
+
+ @ApiModelProperty("浠诲姟绫诲瀷锛� agv, crn")
+ private String taskType;
@ApiModelProperty(value= "")
@TableField("inv_wh")
@@ -92,14 +96,14 @@
*/
@ApiModelProperty(value= "鐩爣绔�")
@TableField("sta_no")
- private Integer staNo;
+ private String staNo;
/**
* 婧愮珯
*/
@ApiModelProperty(value= "婧愮珯")
@TableField("source_sta_no")
- private Integer sourceStaNo;
+ private String sourceStaNo;
/**
* 婧愬簱浣�
@@ -247,6 +251,11 @@
@TableField("pause_mk")
private String pauseMk;
+
+ @ApiModelProperty("骞舵澘鍑哄簱锛堢紦瀛樺尯AGV绔欑偣锛�")
+ @TableField(exist = false)
+ private String avgSta;
+
@ApiModelProperty(value= "")
@TableField("error_time")
private Date errorTime;
@@ -373,6 +382,16 @@
return null;
}
+ public String getTaskType$(){
+ if (Cools.isEmpty(this.taskType)){return null;}
+ if (taskType.equals("agv")) {
+ return "AGV浠诲姟";
+ } else {
+ return "鍫嗗灈鏈轰换鍔�";
+ }
+ }
+
+
public String getStaNo$(){
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.staNo);
--
Gitblit v1.9.1