From 75e83ba772ef70396b2595ccab646edf8ec4df51 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 26 五月 2023 12:20:13 +0800
Subject: [PATCH] 调整计划管理模块3
---
igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java | 75 +++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 29 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java b/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java
index e541f5e..84a122c 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java
@@ -10,7 +10,7 @@
import java.util.Date;
/**
- * 鍑哄叆搴�-鍏ュ簱閫氱煡鍗�
+ * 鍑哄叆搴�-鍏ュ簱閫氱煡鍗曪紝2023骞�5鏈�26鏃� 浼樺寲璋冩暣
*
* @author chen
*/
@@ -30,32 +30,36 @@
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
- @Column(name = "DEPT_ID_", length = 40)
- @PropertyDef(label = "搴撳尯缂栫爜", description = "鎵�灞炲垎搴�")
+ @Column(name = "DEPT_ID_", length = 50)
+ @PropertyDef(label = "搴撳尯缂栫爜")
private String deptId;
-
- @Column(name = "PLAN_ID_", length = 40)
- @PropertyDef(label = "璁″垝id", description = "璁″垝id涓庡悎鍚宨d浜岄�変竴")
- private String planId;
-
- @Column(name = "PLAN_NAME_", length = 50)
- @PropertyDef(label = "璁″垝鍚嶇О")
- private String planName;
-
- @Column(name = "CONTRACT_ID_", length = 40)
- @PropertyDef(label = "鍚堝悓缂栫爜", description = "璁″垝id涓庡悎鍚宨d浜岄�変竴")
- private String contractId;
-
- @Column(name = "CONTRACT_NAME_", length = 50)
- @PropertyDef(label = "鍚堝悓鍚嶇О")
- private String contractName;
@Column(name = "NAME_", length = 50)
@PropertyDef(label = "閫氱煡鍗曞悕绉�")
private String name;
+ @Column(name = "PLAN_ID_", length = 40)
+ @PropertyDef(label = "璁″垝鏄庣粏鍙�", description = "閽堝杞崲绮蹇呭～")
+ private String planId;
+
+ @Column(name = "CONTRACT_ID_", length = 40)
+ @PropertyDef(label = "鍚堝悓缂栫爜", description = "閽堝杞崲绮蹇呭～")
+ private String contractId;
+
+ @Column(name = "CONTRACT_NAME_", length = 50)
+ @PropertyDef(label = "鍚堝悓鍚嶇О", description = "閽堝杞崲绮蹇呭～")
+ private String contractName;
+
+// @Column(name = "PLAN_NAME_", length = 50)
+// @PropertyDef(label = "璁″垝鍚嶇О")
+// private String planName;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "鐩爣浠撳簱")
+ private String depotId;
+
@Column(name = "CUSTOMER_ID_", length = 40)
- @PropertyDef(label = "鍙戣揣瀹㈡埛ID")
+ @PropertyDef(label = "鍙戣揣瀹㈡埛")
private String customerId;
@Column(name = "CUSTOMER_NAME_", length = 50)
@@ -75,11 +79,11 @@
private String year;
@Column(name = "TARGET_NUMBER_")
- @PropertyDef(label = "鐩爣鏁伴噺", description = "鍗曚綅锛欿G")
+ @PropertyDef(label = "鐩爣鏁伴噺", description = "鍗曚綅锛氬惃锛屾墜鍔ㄥ～鎶�")
private double targetNumber = 0.0;
@Column(name = "COMPLETE_NUMBER_")
- @PropertyDef(label = "瀹屾垚鏁伴噺", description = "鍗曚綅锛欿G")
+ @PropertyDef(label = "瀹屾垚鏁伴噺", description = "鍗曚綅锛氬惃锛岀郴缁熻嚜鍔ㄥ悎璁�")
private double completeNumber = 0.0;
@Column(name = "AUDIT_STATUS_", length = 10)
@@ -90,9 +94,17 @@
@PropertyDef(label = "瀹℃牳浜�")
private String auditUser;
+ @Column(name = "AUDIT_DATE_")
+ @PropertyDef(label = "瀹℃壒鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+ private String auditDate;
+
@Column(name = "COMPLETE_STATUS_", length = 10)
@PropertyDef(label = "瀹屾垚鐘舵��", description = "鏈畬鎴愶紝宸插畬鎴�")
private String completeStatus = InoutConstant.COMPLETE_STATUS_NONE;
+
+ @Column(name = "COMPLETE_TIME_")
+ @PropertyDef(label = "瀹屾垚鏃堕棿")
+ private Date completeTime;
@Column(name = "CREATE_TIME_")
@PropertyDef(label = "鍒涘缓鏃堕棿")
@@ -102,21 +114,18 @@
@PropertyDef(label = "鍒涘缓浜�")
private String createUser;
- @Column(name = "COMPLETE_TIME_")
- @PropertyDef(label = "瀹屾垚鏃堕棿")
- private Date completeTime;
-
@Column(name = "REMARK_", length = 200)
@PropertyDef(label = "澶囨敞淇℃伅")
private String remark;
+
+ @Column(name = "TYPE_", length = 2)
+ @PropertyDef(label = "涓氬姟璇存槑", description = "杞崲绮锛岄潪杞崲绮紝濡傛灉涓鸿疆鎹㈢伯椋燂紝璁″垝鏄庣粏鍜屽悎鍚屽繀濉�")
+ private String type;
@Transient
@PropertyDef(label = "鏍囪", description = "鐢ㄤ簬鍒ゆ柇閫氱煡鍗曟槸鍚︿负鏂板")
private String tag;
- @Transient
- @PropertyDef(label = "绮鍝佺")
- private String foodVarietyName;
public String getFoodVarietyName() {
if (null != this.foodVariety) {
@@ -124,4 +133,12 @@
}
return null;
}
+
+ @Transient
+ @PropertyDef(label = "浠撳簱鍚嶇О")
+ private String depotName = "";
+
+ @Transient
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVarietyName;
}
--
Gitblit v1.9.3