From 98bcd061526cad604a83241cc94994e1e225982a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 10 二月 2025 09:21:03 +0800
Subject: [PATCH] 库存明细统计增加车间，树脂类型搜索框，默认统计库存状态为(已入库+部分出库+待出库),库存重量为0不显示记录

---
 src/main/java/com/zy/asrs/entity/Node.java |   75 ++++++++++++++++++++-----------------
 1 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/Node.java b/src/main/java/com/zy/asrs/entity/Node.java
index db7fe9d..d04091f 100644
--- a/src/main/java/com/zy/asrs/entity/Node.java
+++ b/src/main/java/com/zy/asrs/entity/Node.java
@@ -11,11 +11,12 @@
 import com.zy.system.service.HostService;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-
+@Data
 @TableName("man_node")
 public class Node implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -24,7 +25,7 @@
      * ID
      */
     @ApiModelProperty(value= "ID")
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**
@@ -98,6 +99,22 @@
     private Integer sort;
 
     /**
+     * 鎺�
+     */
+    @ApiModelProperty(value= "鎺�")
+    private Integer row1;
+    /**
+     * 鍒�
+     */
+    @ApiModelProperty(value= "鍒�")
+    private Integer bay1;
+    /**
+     * 灞�
+     */
+    @ApiModelProperty(value= "灞�")
+    private Integer lev1;
+
+    /**
      * 鏉＄爜
      */
     @ApiModelProperty(value= "鏉＄爜")
@@ -149,29 +166,8 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
-    public Node() {}
 
-    public Node(Long hostId, String uuid,String name,Long parentId,String parentName,Integer type,String path,String namePath,Integer level,String leading,Integer sort,String barcode,Integer major,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
-        this.hostId = hostId;
-        this.uuid = uuid;
-        this.name = name;
-        this.parentId = parentId;
-        this.parentName = parentName;
-        this.type = type;
-        this.path = path;
-        this.namePath = namePath;
-        this.level = level;
-        this.leading = leading;
-        this.sort = sort;
-        this.barcode = barcode;
-        this.major = major;
-        this.status = status;
-        this.createTime = createTime;
-        this.createBy = createBy;
-        this.updateTime = updateTime;
-        this.updateBy = updateBy;
-        this.memo = memo;
-    }
+
 
 //    Node node = new Node(
 //            null,    // 缂栧彿
@@ -333,16 +329,20 @@
         return status;
     }
 
-    public String getStatus$(){
-        if (null == this.status){ return null; }
-        switch (this.status){
-            case 1:
-                return "姝ｅ父";
-            case 0:
-                return "绂佺敤";
-            default:
-                return String.valueOf(this.status);
-        }
+
+    public String getRow1$(){
+        if (null == this.row1){ return null; }
+        return String.valueOf(this.row1);
+    }
+
+    public String getBay1$(){
+        if (null == this.lev1){ return null; }
+        return String.valueOf(this.lev1);
+    }
+
+    public String getLev1$(){
+        if (null == this.bay1){ return null; }
+        return String.valueOf(this.bay1);
     }
 
     public void setStatus(Integer status) {
@@ -421,5 +421,10 @@
         this.memo = memo;
     }
 
-
+    public String getStatus$() {
+        if (Cools.isEmpty(this.status)){
+            return "";
+        }
+        return this.status == 1 ? "姝ｅ父" : "鍐荤粨";
+    }
 }

--
Gitblit v1.9.1