From 431f88fdade07a22b636714f1690cee3a55668d0 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期三, 30 十月 2024 13:35:56 +0800
Subject: [PATCH] 完善
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocInPrintMat.java | 157 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 128 insertions(+), 29 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocInPrintMat.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocInPrintMat.java
index 9362b60..7a39bec 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocInPrintMat.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocInPrintMat.java
@@ -29,53 +29,102 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value= "")
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
private String uuid;
- @ApiModelProperty(value= "")
+ /**
+ * 鎵撳嵃鎯呭喌 1: 鏈墦鍗� 2: 宸叉墦鍗�
+ */
+ @ApiModelProperty(value= "鎵撳嵃鎯呭喌 1: 鏈墦鍗� 2: 宸叉墦鍗� ")
private Integer status;
- @ApiModelProperty(value= "")
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @ApiModelProperty(value= "")
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
private Long createBy;
- @ApiModelProperty(value= "")
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
- @ApiModelProperty(value= "")
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
- @ApiModelProperty(value= "")
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
private String memo;
- @ApiModelProperty(value= "")
+ /**
+ * 鐗╂枡缂栫爜
+ */
+ @ApiModelProperty(value= "鐗╂枡缂栫爜")
private String matnr;
- @ApiModelProperty(value= "")
+ /**
+ * 鎵规
+ */
+ @ApiModelProperty(value= "鎵规")
private String batch;
- @ApiModelProperty(value= "")
+ /**
+ * 閲嶉噺
+ */
+ @ApiModelProperty(value= "閲嶉噺")
private Double anfme;
- @ApiModelProperty(value= "")
+ /**
+ * 搴撲綅鍙�
+ */
+ @ApiModelProperty(value= "搴撲綅鍙�")
private String locNo;
- @ApiModelProperty(value= "")
+ /**
+ * 鍟嗗搧鍚嶇О
+ */
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "")
+ /**
+ * 鍟嗗搧鍚嶇О
+ */
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private Long ownerId;
+
+ @ApiModelProperty(value="鍒朵护")
+ private String decrees;
+
+ @ApiModelProperty(value = "瑷傚柈铏�")
+ private String orderNo;
public LocInPrintMat() {}
- public LocInPrintMat(String uuid,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,String matnr,String batch,Double anfme,String locNo,String maktx,Long ownerId) {
+ public LocInPrintMat(String uuid,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,String matnr,String batch,Double anfme,String locNo,String maktx) {
this.uuid = uuid;
this.status = status;
this.createTime = createTime;
@@ -88,24 +137,47 @@
this.anfme = anfme;
this.locNo = locNo;
this.maktx = maktx;
- this.ownerId = ownerId;
+ }
+
+ public LocInPrintMat(Date now,Long userId,String matnr,String batch,Double anfme,String locNo,String maktx) {
+ this.uuid = String.valueOf(now.getTime());
+ this.createTime = now;
+ this.createBy = userId;
+// this.updateTime = now;
+// this.updateBy = userId;
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.locNo = locNo;
+ this.maktx = maktx;
}
// LocInPrintMat locInPrintMat = new LocInPrintMat(
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
+// null, // 缂栧彿
+// null, // 鎵撳嵃鎯呭喌
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 澶囨敞
+// null, // 鐗╂枡缂栫爜
+// null, // 鎵规
+// null, // 閲嶉噺
+// null, // 搴撲綅鍙�
+// null // 鍟嗗搧鍚嶇О
// );
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "鏈墦鍗�";
+ case 2:
+ return "宸叉墦鍗�";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
@@ -114,6 +186,24 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+// public String getOwner$(){
+// LocOwnerService locOwnerService = SpringUtils.getBean(LocOwnerService.class);
+// LocOwner locOwner = locOwnerService.selectById(this.ownerId);
+// if (!Cools.isEmpty(locOwner)){
+// return String.valueOf(locOwner.getOwner());
+// }
+// return null;
+// }
+
public String getUpdateTime$(){
if (Cools.isEmpty(this.updateTime)){
return "";
@@ -121,5 +211,14 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.1