From dcd7fcf596005d0c7cf66558bee97edf6c3b03a0 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期四, 10 三月 2022 18:12:09 +0800
Subject: [PATCH] #物料状态维护
---
src/main/java/com/zy/asrs/entity/LocNormal.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocNormal.java b/src/main/java/com/zy/asrs/entity/LocNormal.java
index 92cbee5..a2d8673 100644
--- a/src/main/java/com/zy/asrs/entity/LocNormal.java
+++ b/src/main/java/com/zy/asrs/entity/LocNormal.java
@@ -4,15 +4,18 @@
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;
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -21,6 +24,9 @@
public class LocNormal implements Serializable {
private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value= "鑷ID")
+ private Integer id;
@ApiModelProperty(value= "鐗╂枡")
@TableId(value = "matnr", type = IdType.INPUT)
@@ -44,11 +50,17 @@
@ApiModelProperty(value= "浠撳簱")
private String warehouse;
+ @TableField(exist = false)
+ private String warehouseName;
+
+ @TableField(exist = false)
+ private String warehouse$;
+
@ApiModelProperty(value= "鍝佺墝")
private String brand;
@ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
+ private BigDecimal anfme;
@ApiModelProperty(value= "鍗曚綅")
private String altme;
@@ -78,6 +90,16 @@
@ApiModelProperty(value= "鐗╂枡鍑哄叆搴撶姸鎬�")
@TableField("state")
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);
@@ -112,4 +134,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