From bcf1e1d9bb4d269e0d2a6ad0765d218adfe1fb6c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 06 九月 2022 12:45:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/java/zy/cloud/wms/manager/entity/Item.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 ed8fbe8..38a2ed1 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 {
@@ -366,21 +364,21 @@
*/
@ApiModelProperty(value= "棰勮杞﹁締鏁伴噺")
@TableField("planCarnumber")
- private Integer planCarnumber;
+ private String planCarnumber;
/**
- * 棰勮杞﹁締鏁伴噺
+ * 瓒呭嚭閲戦
*/
@ApiModelProperty(value= "瓒呭嚭閲戦")
@TableField("Excess_amount")
- private Double ExcessAmount;
+ private Double excessAmount;
/**
- * 棰勮杞﹁締鏁伴噺
+ * 瓒呭嚭澶╂暟
*/
@ApiModelProperty(value= "瓒呭嚭澶╂暟")
@TableField("Excess_time")
- private Integer ExcessTime;
+ private Integer excessTime;
public Item() {}
@@ -402,6 +400,17 @@
// 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);
ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>().eq("id", this.projectStatus));
--
Gitblit v1.9.1