From 401da88caef79968c8c0b1cb15487c4a554761ec Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期三, 23 十月 2024 14:37:04 +0800 Subject: [PATCH] 测试环境暂时注释 --- src/main/java/com/zy/asrs/entity/AgvLocMast.java | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/AgvLocMast.java b/src/main/java/com/zy/asrs/entity/AgvLocMast.java index f8f9807..46699fb 100644 --- a/src/main/java/com/zy/asrs/entity/AgvLocMast.java +++ b/src/main/java/com/zy/asrs/entity/AgvLocMast.java @@ -9,6 +9,7 @@ import com.zy.asrs.entity.BasLocSts; import com.zy.asrs.entity.BasWhs; import com.zy.asrs.service.BasLocStsService; +import com.zy.asrs.service.BasLocType1Service; import com.zy.asrs.service.BasWhsService; import com.zy.system.entity.User; import com.zy.system.service.UserService; @@ -40,7 +41,7 @@ @TableField("whs_type") private Long whsType; - @ApiModelProperty(value= "") + @ApiModelProperty(value= "erp浠撳簱缂栫爜") @TableField("plt_type") private Integer pltType; @@ -218,17 +219,12 @@ } public String getLocType1$() { - if (null == this.locType1){ return null; } - switch (this.locType1){ - case 0: - return "鏈煡"; - case 1: - return "浣庡簱浣�"; - case 2: - return "楂樺簱浣�"; - default: - return String.valueOf(this.locType1); + BasLocType1Service service = SpringUtils.getBean(BasLocType1Service.class); + BasLocType1 basLocType1 = service.selectById(this.locType1); + if (!Cools.isEmpty(basLocType1)){ + return String.valueOf(basLocType1.getLocDesc()); } + return null; } public String getLocType2$() { -- Gitblit v1.9.1