From 52c94f01b291968f331fc0d2def2f7dd885609cb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 03 四月 2024 09:01:20 +0800
Subject: [PATCH] #平转立
---
src/main/java/com/zy/asrs/entity/LocNormal.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocNormal.java b/src/main/java/com/zy/asrs/entity/LocNormal.java
index 453c3a6..6c92cae 100644
--- a/src/main/java/com/zy/asrs/entity/LocNormal.java
+++ b/src/main/java/com/zy/asrs/entity/LocNormal.java
@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.service.LocMastService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
+import com.zy.asrs.service.LocAreaService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
@@ -24,6 +26,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value= "鑷ID")
+ @TableId(value = "id",type = IdType.AUTO)
private Integer id;
@ApiModelProperty(value= "鐗╂枡")
@@ -47,6 +50,12 @@
@ApiModelProperty(value= "浠撳簱")
private String warehouse;
+
+ @TableField(exist = false)
+ private String warehouseName;
+
+ @TableField(exist = false)
+ private String warehouse$;
@ApiModelProperty(value= "鍝佺墝")
private String brand;
@@ -84,7 +93,14 @@
private String state;
@TableField(exist = false)
+ private String getState$;
+
+ @TableField(exist = false)
private BigDecimal anfmeOut;
+
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
+ @TableField("mat_status")
+ private String matStatus;
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
@@ -119,4 +135,26 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public String getWarehouse$() {
+ LocAreaService warehouse = SpringUtils.getBean(LocAreaService.class);
+ LocArea warehouseName = warehouse.selectOne(new EntityWrapper<LocArea>().eq("uuid", this.warehouse));
+ if (!Cools.isEmpty(warehouseName)){
+ return String.valueOf(warehouseName.getName());
+ }
+ return null;
+ }
+
+ public String getState$() {
+ String txt = "";
+ switch (this.state) {
+ case "1":
+ txt = "宸插叆搴�";
+ break;
+ case "2":
+ txt = "宸插嚭搴�";
+ break;
+ }
+ return txt;
+ }
+
}
--
Gitblit v1.9.1