From 754bc2945aa5c91a510780d8e2c451c3bae576fb Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 25 六月 2021 17:05:44 +0800
Subject: [PATCH] 1.发货通知-平仓出库支持生产单号的搜索过滤

---
 src/main/java/com/zy/asrs/entity/LocArea.java |   68 ++++++++++++++++++++++-----------
 1 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocArea.java b/src/main/java/com/zy/asrs/entity/LocArea.java
index 1de663d..6c74f61 100644
--- a/src/main/java/com/zy/asrs/entity/LocArea.java
+++ b/src/main/java/com/zy/asrs/entity/LocArea.java
@@ -12,18 +12,22 @@
 import io.swagger.annotations.ApiModelProperty;
 import com.core.common.SpringUtils;
 import com.baomidou.mybatisplus.annotations.TableField;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import com.core.common.SpringUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 
 import com.baomidou.mybatisplus.annotations.TableName;
+
 import java.io.Serializable;
 
 @TableName("asr_loc_area")
@@ -34,65 +38,73 @@
     /**
      * ID
      */
-    @ApiModelProperty(value= "ID")
+    @ApiModelProperty(value = "ID")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
      * 搴撳尯缂栧彿
      */
-    @ApiModelProperty(value= "搴撳尯缂栧彿")
+    @ApiModelProperty(value = "搴撳尯缂栧彿")
     private String uuid;
 
     /**
      * 搴撳尯鍚嶇О
      */
-    @ApiModelProperty(value= "搴撳尯鍚嶇О")
+    @ApiModelProperty(value = "搴撳尯鍚嶇О")
     private String name;
 
     /**
-     * 鐘舵�� 1: 姝ｅ父  0: 绂佺敤  
+     * 鐘舵�� 1: 姝ｅ父  0: 绂佺敤
      */
-    @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父  0: 绂佺敤  ")
+    @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父  0: 绂佺敤  ")
     private Integer status;
 
     /**
      * 娣诲姞浜哄憳
      */
-    @ApiModelProperty(value= "娣诲姞浜哄憳")
+    @ApiModelProperty(value = "娣诲姞浜哄憳")
     @TableField("create_by")
     private Long createBy;
 
     /**
      * 娣诲姞鏃堕棿
      */
-    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @ApiModelProperty(value = "娣诲姞鏃堕棿")
     @TableField("create_time")
     private Date createTime;
 
     /**
      * 淇敼浜哄憳
      */
-    @ApiModelProperty(value= "淇敼浜哄憳")
+    @ApiModelProperty(value = "淇敼浜哄憳")
     @TableField("update_by")
     private Long updateBy;
 
     /**
      * 淇敼鏃堕棿
      */
-    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @ApiModelProperty(value = "淇敼鏃堕棿")
     @TableField("update_time")
     private Date updateTime;
 
     /**
      * 澶囨敞
      */
-    @ApiModelProperty(value= "澶囨敞")
+    @ApiModelProperty(value = "澶囨敞")
     private String memo;
 
-    public LocArea() {}
+    /**
+     * 搴撳尯绫诲瀷
+     */
+    @ApiModelProperty(value = "搴撳尯绫诲瀷")
+    @TableField("area_type")
+    private String areaType;
 
-    public LocArea(String uuid,String name,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+    public LocArea() {
+    }
+
+    public LocArea(String uuid, String name, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, String areaType) {
         this.uuid = uuid;
         this.name = name;
         this.status = status;
@@ -101,6 +113,7 @@
         this.updateBy = updateBy;
         this.updateTime = updateTime;
         this.memo = memo;
+        this.areaType = areaType;
     }
 
 //    LocArea locArea = new LocArea(
@@ -142,9 +155,11 @@
         return status;
     }
 
-    public String getStatus$(){
-        if (null == this.status){ return null; }
-        switch (this.status){
+    public String getStatus$() {
+        if (null == this.status) {
+            return null;
+        }
+        switch (this.status) {
             case 1:
                 return "姝ｅ父";
             case 0:
@@ -162,10 +177,10 @@
         return createBy;
     }
 
-    public String getCreateBy$(){
+    public String getCreateBy$() {
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.createBy);
-        if (!Cools.isEmpty(user)){
+        if (!Cools.isEmpty(user)) {
             return String.valueOf(user.getUsername());
         }
         return null;
@@ -179,8 +194,8 @@
         return createTime;
     }
 
-    public String getCreateTime$(){
-        if (Cools.isEmpty(this.createTime)){
+    public String getCreateTime$() {
+        if (Cools.isEmpty(this.createTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
@@ -194,10 +209,10 @@
         return updateBy;
     }
 
-    public String getUpdateBy$(){
+    public String getUpdateBy$() {
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.updateBy);
-        if (!Cools.isEmpty(user)){
+        if (!Cools.isEmpty(user)) {
             return String.valueOf(user.getUsername());
         }
         return null;
@@ -211,8 +226,8 @@
         return updateTime;
     }
 
-    public String getUpdateTime$(){
-        if (Cools.isEmpty(this.updateTime)){
+    public String getUpdateTime$() {
+        if (Cools.isEmpty(this.updateTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
@@ -231,4 +246,11 @@
     }
 
 
+    public String getAreaType() {
+        return areaType;
+    }
+
+    public void setAreaType(String areaType) {
+        this.areaType = areaType;
+    }
 }

--
Gitblit v1.9.1