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/ProjectPlan.java |   96 ++++++++++++++++++++++++++++-------------------
 1 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java b/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
index 402305c..6ce0309 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
@@ -1,6 +1,9 @@
 package zy.cloud.wms.manager.entity;
 
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
@@ -10,6 +13,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -36,8 +40,12 @@
 import io.swagger.annotations.ApiModelProperty;
 
 import com.baomidou.mybatisplus.annotations.TableName;
+import zy.cloud.wms.manager.service.FlowStatusService;
+import zy.cloud.wms.manager.service.ItemService;
+
 import java.io.Serializable;
 
+@Data
 @TableName("sys_project_plan")
 public class ProjectPlan implements Serializable {
 
@@ -46,6 +54,7 @@
     /**
      * 鍞竴ID
      */
+    @TableId(value = "id",type = IdType.AUTO)
     @ApiModelProperty(value= "鍞竴ID")
     private Long id;
 
@@ -150,7 +159,7 @@
      */
     @ApiModelProperty(value= "鍒涘缓浜篿d")
     @TableField("create_id")
-    private Integer createId;
+    private Long createId;
 
     /**
      * 淇敼鏃堕棿
@@ -165,7 +174,7 @@
      */
     @ApiModelProperty(value= "淇敼浜篿d")
     @TableField("modify_id")
-    private Integer modifyId;
+    private Long modifyId;
 
     /**
      * 鑺傜偣鍚嶇О
@@ -175,26 +184,6 @@
     private String flowName;
 
     public ProjectPlan() {}
-
-    public ProjectPlan(Long itemId,Integer weightNum,Integer flowId,Date startTime,Date realStartTime,Date endTime,Date realEndTime,Integer delay,String delayReason,String memo,String dutyDepartment,String dutyMan,Date createTime,Integer createId,Date modifyTime,Integer modifyId,String flowName) {
-        this.itemId = itemId;
-        this.weightNum = weightNum;
-        this.flowId = flowId;
-        this.startTime = startTime;
-        this.realStartTime = realStartTime;
-        this.endTime = endTime;
-        this.realEndTime = realEndTime;
-        this.delay = delay;
-        this.delayReason = delayReason;
-        this.memo = memo;
-        this.dutyDepartment = dutyDepartment;
-        this.dutyMan = dutyMan;
-        this.createTime = createTime;
-        this.createId = createId;
-        this.modifyTime = modifyTime;
-        this.modifyId = modifyId;
-        this.flowName = flowName;
-    }
 
 //    ProjectPlan projectPlan = new ProjectPlan(
 //            null,    // 椤圭洰ID[闈炵┖]
@@ -216,6 +205,16 @@
 //            null    // 鑺傜偣鍚嶇О
 //    );
 
+
+    public String getItemId$(){
+        ItemService bean = SpringUtils.getBean(ItemService.class);
+        Item id = bean.selectOne(new EntityWrapper<Item>()
+                .eq("id", this.itemId));
+        if (!Cools.isEmpty(id)) {
+            return id.getName();
+        }
+        return null;
+    }
     public Long getId() {
         return id;
     }
@@ -363,13 +362,13 @@
         this.createTime = createTime;
     }
 
-    public Integer getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Integer createId) {
-        this.createId = createId;
-    }
+//    public Integer getCreateId() {
+//        return createId;
+//    }
+//
+//    public void setCreateId(Integer createId) {
+//        this.createId = createId;
+//    }
 
     public Date getModifyTime() {
         return modifyTime;
@@ -385,14 +384,14 @@
     public void setModifyTime(Date modifyTime) {
         this.modifyTime = modifyTime;
     }
-
-    public Integer getModifyId() {
-        return modifyId;
-    }
-
-    public void setModifyId(Integer modifyId) {
-        this.modifyId = modifyId;
-    }
+//
+//    public Integer getModifyId() {
+//        return modifyId;
+//    }
+//
+//    public void setModifyId(Integer modifyId) {
+//        this.modifyId = modifyId;
+//    }
 
     public String getFlowName() {
         return flowName;
@@ -402,5 +401,24 @@
         this.flowName = flowName;
     }
 
-
+//    public String getItemId$(){
+//        ItemService itemService = SpringUtils.getBean(ItemService.class);
+//        Item id = itemService.selectOne(new EntityWrapper<Item>()
+//                .eq("id", this.getItemId()));
+//        if (!Cools.isEmpty(id)) {
+//
+//            return id.getName();
+//        }else {
+//            return null;
+//        }
+//    }
+    public String getFlowId$(){
+        FlowStatusService bean = SpringUtils.getBean(FlowStatusService.class);
+        FlowStatus id = bean.selectOne(new EntityWrapper<FlowStatus>()
+                .eq("id", this.flowId));
+        if (!Cools.isEmpty(id)) {
+            return id.getName();
+        }
+        return null;
+    }
 }

--
Gitblit v1.9.1