From 6f4a366cad9109ddc338fd13c9d43ca2ce516f6b Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 26 五月 2023 16:53:07 +0800
Subject: [PATCH] 调整计划管理模块4
---
igds-core/src/main/java/com/ld/igds/models/DepotStore.java | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/DepotStore.java b/igds-core/src/main/java/com/ld/igds/models/DepotStore.java
index 7845f41..f8e0650 100644
--- a/igds-core/src/main/java/com/ld/igds/models/DepotStore.java
+++ b/igds-core/src/main/java/com/ld/igds/models/DepotStore.java
@@ -35,7 +35,7 @@
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
- @Column(name = "DEPT_ID_", length = 20)
+ @Column(name = "DEPT_ID_", length = 40)
@PropertyDef(label = "鎵�灞炲簱鍖�")
private String deptId;
@@ -43,9 +43,17 @@
@PropertyDef(label = "鎵�灞炰粨搴�")
private String depotId;
+ @Column(name = "COUNTRY_", length = 10)
+ @PropertyDef(label = "鍥藉埆")
+ private String country;
+
@Column(name = "STORE_TYPE_", length = 6)
@PropertyDef(label = "鍌ㄧ伯鏂瑰紡", description = "1:鏁ｈ鍌ㄧ伯 2:鍖呰鍌ㄧ伯 3:鍥村寘鏁ｅ瓨 9:鍏朵粬")
private String storeType;
+
+ @Column(name = "MANAGE_TYPE_", length = 6)
+ @PropertyDef(label = "绠＄悊鏂瑰紡", description = "01 鐩村偍02 浠ｅ偍03 绉熶粨04 濮旀墭")
+ private String manageType;
@Column(name = "FOOD_TYPE_", length = 10)
@PropertyDef(label = "绮鎬ц川")
@@ -59,33 +67,41 @@
@PropertyDef(label = "绮绛夌骇")
private String foodLevel;
+ @Column(name = "FOOD_LOCATION_ID_", length = 50)
+ @PropertyDef(label = "绮浜у湴")
+ private String foodLocationId;
+
@Column(name = "FOOD_LOCATION_", length = 50)
@PropertyDef(label = "绮浜у湴")
private String foodLocation;
-
- @Column(name = "DEPOT_STATUS_", length = 10)
- @PropertyDef(label = "浠撳簱鐘舵��")
- private String depotStatus;
@Column(name = "FOOD_YEAR_", length = 10)
@PropertyDef(label = "鏀惰揣骞村害")
private String foodYear;
+ @Column(name = "DEPOT_STATUS_", length = 10)
+ @PropertyDef(label = "浠撳簱鐘舵��", description = "1=绌轰粨銆�2=鍏ュ簱涓��3=婊′粨銆�4=鍑哄簱涓��9=鍏朵粬")
+ private String depotStatus;
+
@Column(name = "STORE_DATE_")
@PropertyDef(label = "鍏ュ簱鏃堕棿", description = "鍏ュ簱鏃堕棿锛岀涓�杞︾伯椋熷叆浠撴椂闂�,鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
private Date storeDate;
-
- @Column(name = "STORAGE_REAL_")
- @PropertyDef(label = "瀹為檯鍌ㄩ噺", description = "鍗曚綅锛欿G")
- private Double storageReal;
@Column(name = "FULL_DATE_")
@PropertyDef(label = "灏佷粨鏃ユ湡", description = "褰撹揣浣嶏紙娌圭綈锛夌姸鎬佷负灏佷粨鏃讹紝姝ら」涓哄繀濉」")
private Date fullDate;
@Column(name = "OUT_DATE_")
- @PropertyDef(label = "鍑轰粨鏃堕棿", description = "鍏ュ簱鏃堕棿锛岀涓�杞︾伯椋熷嚭浠撴椂闂�,鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍑轰粨鏃堕棿", description = "鍑哄簱鏃堕棿锛屾渶鍚庝竴杞︾伯椋熷嚭浠撳畬鎴愭椂闂�,鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
private Date outDate;
+
+ @Column(name = "STORAGE_REAL_")
+ @PropertyDef(label = "瀹為檯鍌ㄩ噺", description = "鍗曚綅锛欿G")
+ private Double storageReal;
+
+ @Column(name = "STORE_SETTLE__")
+ @PropertyDef(label = "璁′环鏁伴噺", description = "鍗曚綅锛欿G")
+ private Double storageSettle;
@Column(name = "GRAIN_HEIGHT_")
@PropertyDef(label = "瑁呯伯绾块珮", description = "鍗曚綅锛氱背")
@@ -106,10 +122,6 @@
@Column(name = "UPDATE_DATE_")
@PropertyDef(label = "淇敼鏃堕棿")
private Date updateDate;
-
- @Column(name = "CREATE_DATE_")
- @PropertyDef(label = "鍒涘缓鏃堕棿")
- private Date createDate;
public DepotStore() {
}
@@ -135,7 +147,6 @@
this.remark = remark;
this.updateUser = updateUser;
this.updateDate = updateDate;
- this.createDate = createDate;
}
public DepotStore(Depot depot, String depotStatus) {
@@ -152,6 +163,5 @@
this.storageReal = depot.getStorageReal();
this.storeDate = new Date();
this.updateDate = new Date();
- this.createDate = new Date();
}
}
--
Gitblit v1.9.3