From d426a65ba84bd4ef3298cb7cda0e9664cc6038e7 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 13 一月 2022 14:23:30 +0800
Subject: [PATCH] #单据类型区分入库单和出库单

---
 src/main/java/zy/cloud/wms/manager/entity/Item.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/entity/Item.java b/src/main/java/zy/cloud/wms/manager/entity/Item.java
index 84ade5b..2cab0b2 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -4,11 +4,15 @@
 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.core.common.Cools;
 import com.core.common.SpringUtils;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+import zy.cloud.wms.manager.service.CstmrService;
+import zy.cloud.wms.manager.service.ProjectStatusService;
+import zy.cloud.wms.manager.service.ProjectTypeService;
 import zy.cloud.wms.system.entity.Host;
 import zy.cloud.wms.system.entity.User;
 import zy.cloud.wms.system.service.HostService;
@@ -17,6 +21,7 @@
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName("man_item")
@@ -102,7 +107,7 @@
     /**
      * 鐘舵�� 1: 姝ｅ父  0: 绂佺敤
      */
-    @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父  0: 绂佺敤  ")
+    @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父  0: 瀹岀粨  ")
     private Integer status;
 
     /**
@@ -144,12 +149,14 @@
     @TableField("type")
     private String type;
 
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+
     @TableField("real_start_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date realStartTime;
 
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+
     @TableField("real_end_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date realEndTime;
 
     @TableField("real_month")
@@ -160,6 +167,12 @@
 
     @TableField("duty_man")
     private String dutyMan;
+
+    @TableField("origin_area")
+    private String originArea;
+
+    @TableField("project_status")
+    private Integer projectStatus;
 
     public Item() {}
 
@@ -183,6 +196,14 @@
 //            null    // 澶囨敞
 //    );
 
+    public String getProjectStatus$(){
+        ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
+        ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>().eq("id", this.projectStatus));
+        if (!Cools.isEmpty(this.id)) {
+            return id.getStatusName();
+        }
+        return null;
+    }
     public Long getId() {
         return id;
     }
@@ -211,6 +232,7 @@
     public String getUuid() {
         return uuid;
     }
+
 
     public void setUuid(String uuid) {
         this.uuid = uuid;
@@ -303,7 +325,9 @@
         switch (this.status){
             case 1:
                 return "姝ｅ父";
-            case 0:
+            case 3:
+                return "瀹岀粨";
+            case 2:
                 return "绂佺敤";
             default:
                 return String.valueOf(this.status);
@@ -358,6 +382,25 @@
         }
         return null;
     }
+    public String getCstmrUuid$(){
+        CstmrService bean = SpringUtils.getBean(CstmrService.class);
+        Cstmr id = bean.selectOne(new EntityWrapper<Cstmr>()
+                .eq("id", this.cstmrUuid));
+        if (!Cools.isEmpty(id)) {
+            return id.getName();
+        }
+        return null;
+    }
+
+    public String getType$(){
+        ProjectTypeService bean = SpringUtils.getBean(ProjectTypeService.class);
+        ProjectType id = bean.selectOne(new EntityWrapper<ProjectType>()
+                .eq("id", this.type));
+        if (!Cools.isEmpty(id)) {
+            return id.getTypeName();
+        }
+        return null;
+    }
 
     public void setUpdateBy(Long updateBy) {
         this.updateBy = updateBy;
@@ -387,4 +430,5 @@
     }
 
 
+
 }

--
Gitblit v1.9.1