From 32bb782c3ff2dee184e485f1ebd71c10313571a1 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期六, 10 七月 2021 16:13:53 +0800
Subject: [PATCH] 1.平仓库存管理新增导出功能

---
 src/main/java/com/zy/asrs/entity/LocNormal.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 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 bbd8357..76a6d42 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;
@@ -51,6 +53,9 @@
     @TableField(exist = false)
     private String warehouseName;
 
+    @TableField(exist = false)
+    private String warehouse$;
+
     @ApiModelProperty(value= "鍝佺墝")
     private String brand;
 
@@ -87,6 +92,9 @@
     private String state;
 
     @TableField(exist = false)
+    private String getState$;
+
+    @TableField(exist = false)
     private BigDecimal anfmeOut;
 
     public String getModiUser$(){
@@ -122,4 +130,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