From 320ed3f4782f9662f79ecfe14d2cf3f34dd288c5 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 01 八月 2023 19:52:36 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/Item.java | 143 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 141 insertions(+), 2 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 f766abb..304ce74 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 {
@@ -149,6 +147,8 @@
@TableField("type")
private String type;
+
+
@TableField(value = "real_start_time", strategy = FieldStrategy.IGNORED)
@@ -360,6 +360,28 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date realLADate;
+
+ /**
+ * 棰勮杞﹁締鏁伴噺
+ */
+ @ApiModelProperty(value= "棰勮杞﹁締鏁伴噺")
+ @TableField("planCarnumber")
+ private String planCarnumber;
+
+ /**
+ * 瓒呭嚭閲戦
+ */
+ @ApiModelProperty(value= "瓒呭嚭閲戦")
+ @TableField("Excess_amount")
+ private Double excessAmount;
+
+ /**
+ * 瓒呭嚭澶╂暟
+ */
+ @ApiModelProperty(value= "瓒呭嚭澶╂暟")
+ @TableField("Excess_time")
+ private Integer excessTime;
+
public Item() {}
// Item item = new Item(
@@ -379,6 +401,17 @@
// null, // 淇敼鏃堕棿
// 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);
@@ -531,6 +564,32 @@
}
}
+ public String getInstallMk$(){
+ if (null == this.installMk){ return null; }
+ switch (this.installMk){
+ case 0:
+ return "鍚�";
+ case 1:
+ return "鏄�";
+
+ default:
+ return String.valueOf(this.installMk);
+ }
+ }
+
+ public String getDeliveryMk$(){
+ if (null == this.deliveryMk){ return null; }
+ switch (this.deliveryMk){
+ case 0:
+ return "鍚�";
+ case 1:
+ return "鏄�";
+
+ default:
+ return String.valueOf(this.deliveryMk);
+ }
+ }
+
public void setStatus(Integer status) {
this.status = status;
}
@@ -632,6 +691,15 @@
return null;
}
+ public String getType$$(){
+ if (this.type.equals("10")) {
+ return "闆嗘垚椤圭洰";
+ }else {
+ return "甯歌椤圭洰";
+ }
+
+ }
+
public void setUpdateBy(Long updateBy) {
this.updateBy = updateBy;
}
@@ -666,11 +734,25 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.predeDate);
}
+ public String getPredeDate0$(){
+ if (Cools.isEmpty(this.predeDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.predeDate);
+ }
+
public String getPreinDate$(){
if (Cools.isEmpty(this.preinDate)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.preinDate);
+ }
+
+ public String getPreinDate0$(){
+ if (Cools.isEmpty(this.preinDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.preinDate);
}
public String getPlandeDate$(){
@@ -680,11 +762,25 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.plandeDate);
}
+ public String getPlandeDate0$(){
+ if (Cools.isEmpty(this.plandeDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.plandeDate);
+ }
+
public String getRealdeDate$(){
if (Cools.isEmpty(this.realdeDate)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realdeDate);
+ }
+
+ public String getRealdeDate0$(){
+ if (Cools.isEmpty(this.realdeDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realdeDate);
}
public String getPlaninDate$(){
@@ -694,11 +790,25 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.planinDate);
}
+ public String getPlaninDate0$(){
+ if (Cools.isEmpty(this.planinDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.planinDate);
+ }
+
public String getRealinDate$(){
if (Cools.isEmpty(this.realinDate)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realinDate);
+ }
+
+ public String getRealinDate0$(){
+ if (Cools.isEmpty(this.realinDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realinDate);
}
public String getPlanFADate$(){
@@ -708,11 +818,25 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.planFADate);
}
+ public String getPlanFADate0$(){
+ if (Cools.isEmpty(this.planFADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.planFADate);
+ }
+
public String getRealFADate$(){
if (Cools.isEmpty(this.realFADate)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realFADate);
+ }
+
+ public String getRealFADate0$(){
+ if (Cools.isEmpty(this.realFADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realFADate);
}
public String getPlanLADate$(){
@@ -722,6 +846,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.planLADate);
}
+ public String getPlanLADate0$(){
+ if (Cools.isEmpty(this.planLADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.planLADate);
+ }
+
public String getRealLADate$(){
if (Cools.isEmpty(this.realLADate)){
return "";
@@ -729,4 +860,12 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realLADate);
}
+ public String getRealLADate0$(){
+ if (Cools.isEmpty(this.realLADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realLADate);
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.1