From 35ddd989b73d815777055bcdf05118d6cdd892e6 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 13 九月 2022 11:18:40 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/entity/Item.java |   39 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 36 insertions(+), 3 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 6874241..304ce74 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -22,8 +22,6 @@
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
-
 @Data
 @TableName("man_item")
 public class Item implements Serializable {
@@ -149,6 +147,8 @@
 
     @TableField("type")
     private String type;
+
+
 
 
     @TableField(value = "real_start_time", strategy = FieldStrategy.IGNORED)
@@ -366,8 +366,21 @@
      */
     @ApiModelProperty(value= "棰勮杞﹁締鏁伴噺")
     @TableField("planCarnumber")
-    private Integer planCarnumber;
+    private String planCarnumber;
 
+    /**
+     * 瓒呭嚭閲戦
+     */
+    @ApiModelProperty(value= "瓒呭嚭閲戦")
+    @TableField("Excess_amount")
+    private Double excessAmount;
+
+    /**
+     * 瓒呭嚭澶╂暟
+     */
+    @ApiModelProperty(value= "瓒呭嚭澶╂暟")
+    @TableField("Excess_time")
+    private Integer excessTime;
 
     public Item() {}
 
@@ -388,6 +401,17 @@
 //            null,    // 淇敼鏃堕棿
 //            null    // 澶囨敞
 //    );
+
+//    public String getProgressRate$(){
+//        ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
+//        ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>()
+//                .eq("id", this.progressRate));
+//        if (!Cools.isEmpty(id)) {
+//            return id.getStatusName();
+//        }
+//
+//        return "";
+//    }
 
     public String getProjectStatus$(){
         ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
@@ -667,6 +691,15 @@
         return null;
     }
 
+    public String getType$$(){
+        if (this.type.equals("10")) {
+            return "闆嗘垚椤圭洰";
+        }else {
+            return "甯歌椤圭洰";
+        }
+
+    }
+
     public void setUpdateBy(Long updateBy) {
         this.updateBy = updateBy;
     }

--
Gitblit v1.9.1