From c65db22f67af8018ae7105ea00d8743e42835e13 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 29 三月 2025 15:52:09 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/entity/AgvLocMast.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/AgvLocMast.java b/src/main/java/com/zy/asrs/entity/AgvLocMast.java
index 11bc094..e8a739a 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;
@@ -184,6 +185,21 @@
@ApiModelProperty(value= "")
private String status;
+ /**
+ * 鎺�
+ */
+ @ApiModelProperty(value= "鍦板浘鎺�")
+ private Integer mapRow1;
+
+ /**
+ * 鍒�
+ */
+ @ApiModelProperty(value= "鍦板浘鍒�")
+ private Integer mapBay1;
+
+ @ApiModelProperty(value= "鍦板浘鍒�")
+ private Integer rightSide;
+
public String getWhsType$(){
BasWhsService service = SpringUtils.getBean(BasWhsService.class);
@@ -218,19 +234,12 @@
}
public String getLocType1$() {
- if (null == this.locType1){ return null; }
- switch (this.locType1){
- case 0:
- return "鏈煡";
- case 1:
- return "寰呭寘瑁�";
- case 2:
- return "鍘熸潗鏂�";
- case 3:
- 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