From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 14:56:58 +0800
Subject: [PATCH] 仓库： 显示在库信息，入库完成后显示成功入库的包数 订单出库页面显示剩余待检包数 (PDA) 未查询到的提示改为显示物料实际状态 拣货单已完成，单据未完成 ✔ 单据数量字段显示变更 ✔ 拣货单按实际操作时间降序排序 ✔ 拣货单明细导出 ✔ 拣货单显示创建时间与操作时间 ✔
---
src/main/java/com/zy/asrs/entity/Node.java | 59 ++++++++++++++++++++++++-----------------------------------
1 files changed, 24 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 3f01a58..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;
/**
@@ -165,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, // 缂栧彿
@@ -349,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) {
@@ -437,5 +421,10 @@
this.memo = memo;
}
-
+ public String getStatus$() {
+ if (Cools.isEmpty(this.status)){
+ return "";
+ }
+ return this.status == 1 ? "姝ｅ父" : "鍐荤粨";
+ }
}
--
Gitblit v1.9.1