From 5a8d3f9952ec4ff545ef0f5878d861692b0a39a3 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期二, 30 九月 2025 15:35:31 +0800 Subject: [PATCH] 13 --- src/main/java/com/zy/asrs/entity/WrkMast.java | 21 ++++++++++++++++++--- 1 files changed, 18 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..8617128 100644 --- a/src/main/java/com/zy/asrs/entity/WrkMast.java +++ b/src/main/java/com/zy/asrs/entity/WrkMast.java @@ -22,13 +22,18 @@ private static final long serialVersionUID = 1L; + @TableId(value = "id", type = IdType.AUTO) + 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 +97,14 @@ */ @ApiModelProperty(value= "鐩爣绔�") @TableField("sta_no") - private Integer staNo; + private String staNo; /** * 婧愮珯 */ @ApiModelProperty(value= "婧愮珯") @TableField("source_sta_no") - private Integer sourceStaNo; + private String sourceStaNo; /** * 婧愬簱浣� @@ -373,6 +378,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