From d07154d92334ba2ec312bf738a2a02a60350d5d9 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 29 九月 2025 13:34:21 +0800 Subject: [PATCH] 2. pda 组托加减号 应该是整数加减(完成) 3. 站点状态,显示清楚 (完成) 4. 站点保存报错, 修改人,创建人员显示 错误(完成) 5. agv入库不显示 历史库位记录 (完成) 6. 任务类型,应该为入库 (完成) --- src/main/java/com/zy/asrs/entity/BasStation.java | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/BasStation.java b/src/main/java/com/zy/asrs/entity/BasStation.java index d2c4670..f2f4b9d 100644 --- a/src/main/java/com/zy/asrs/entity/BasStation.java +++ b/src/main/java/com/zy/asrs/entity/BasStation.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotations.TableField; import java.text.SimpleDateFormat; import java.util.Date; + +import com.zy.asrs.enums.LocStsType; import org.springframework.format.annotation.DateTimeFormat; import com.core.common.SpringUtils; import com.zy.system.service.UserService; @@ -32,6 +34,7 @@ * 涓婚敭 */ @ApiModelProperty(value= "涓婚敭") + @TableId(value = "id", type = IdType.AUTO) private Long id; /** @@ -303,6 +306,26 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime); } + public String getLocSts$() { + if (Cools.isEmpty(this.locSts)){ + return null; + } + if (this.locSts.equals(LocStsType.LOC_STS_TYPE_O.type)) { + return LocStsType.LOC_STS_TYPE_O.type + "." + LocStsType.LOC_STS_TYPE_O.desc; + } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_R.type)) { + return LocStsType.LOC_STS_TYPE_R.type + "." + LocStsType.LOC_STS_TYPE_R.desc; + } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_S.type)) { + return LocStsType.LOC_STS_TYPE_S.type + "." + LocStsType.LOC_STS_TYPE_S.desc; + } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_F.type)) { + return LocStsType.LOC_STS_TYPE_F.type + "." + LocStsType.LOC_STS_TYPE_F.desc; + } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_X.type)) { + return LocStsType.LOC_STS_TYPE_X.type + "." + LocStsType.LOC_STS_TYPE_X.desc; + } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_D.type)) { + return LocStsType.LOC_STS_TYPE_D.type + "." + LocStsType.LOC_STS_TYPE_D.desc; + } + return null; + } + public String getLocType1$(){ if (null == this.locType1){ return null; } switch (this.locType1){ -- Gitblit v1.9.1