From c4e8e814d2c9e0d03f6449860b70e58657fd7dc2 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 31 十二月 2024 11:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs
---
src/main/java/com/zy/asrs/entity/ManLocDetl.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ManLocDetl.java b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
index e630caf..e0b60b0 100644
--- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
@@ -9,6 +9,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocOwnerService;
import com.zy.asrs.service.NodeService;
+import com.zy.common.utils.Synchro;
import com.zy.system.entity.Host;
import com.zy.system.entity.User;
import com.zy.system.service.HostService;
@@ -30,6 +31,7 @@
* 鎵�灞為」鐩�
*/
@ApiModelProperty(value= "鎵�灞為」鐩�")
+ @TableId(value = "host_id", type = IdType.AUTO)
@TableField("host_id")
private Long hostId;
@@ -147,7 +149,7 @@
* 鏁伴噺
*/
@ApiModelProperty(value= "鏁伴噺")
- private Integer count;
+ private Double count;
/**
@@ -197,6 +199,13 @@
private Date modiTime;
/**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @TableField("produce_time")
+ private Date produceTime;
+
+ /**
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
@@ -216,11 +225,15 @@
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@TableField("real_anfme")
- private Date realAnfme;
+ private Double realAnfme;
@ApiModelProperty(value= "璁㈠崟鍙�")
@TableField("order_no")
private String orderNo;
+
+ @TableField("stock_freeze")
+ @ApiModelProperty(value= "搴撳瓨鍐荤粨{1:姝ｅ父,0:鍐荤粨}")
+ private Integer stockFreeze;
@@ -323,6 +336,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
+ public String getProduceTimeTime$(){
+ if (Cools.isEmpty(this.produceTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.produceTime);
+ }
+
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
@@ -338,6 +358,15 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
+ public String getStockFreeze$() {
+ if (Cools.isEmpty(this.stockFreeze)){
+ return "";
+ }
+ return this.stockFreeze == 1 ? "姝ｅ父" : "鍐荤粨";
+ }
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
--
Gitblit v1.9.1