From d8047152e563ba7816208a3fe9cf1ffdc9cddc83 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 21 六月 2023 23:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java b/igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java
index a3a8283..bba89f9 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java
@@ -19,10 +19,12 @@
@Table(name = "D_INOUT_STOCK_CHANGE")
public class InoutStockChange {
-
+ /**
+ * 鍊掍粨鍗曞彿
+ */
@Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "涓婚敭")
+ @Column(name = "ID_", length = 32)
+ @PropertyDef(label = "鍊掍粨鍗曞彿", description = "鐢卞�掍粨鏃ユ湡(yyyyMMdd)+4浣嶉『搴忓彿缁勬垚")
private String id;
@Column(name = "COMPANY_ID_", length = 10)
@@ -46,7 +48,7 @@
private String noticeId;
@Column(name = "FOOD_VARIETY_", length = 10)
- @PropertyDef(label = "绮鍝佺")
+ @PropertyDef(label = "绮鍝佺", description = "浠ｇ爜涓嶈冻7浣嶉渶鍦ㄦ湯浣嶈ˉ0")
private String foodVariety;
@Column(name = "DEPOT_ID_IN", length = 50)
@@ -58,18 +60,43 @@
private String depotIdOut;
@Column(name = "CHANGE_DATE_")
- @PropertyDef(label = "鍊掍粨鏃ユ湡")
+ @PropertyDef(label = "鍊掍粨鏃ユ湡", description = "yyyy-MM-dd")
private Date changeDate;
@Column(name = "NUMBER_")
- @PropertyDef(label = "鍊掍粨鏁伴噺")
+ @PropertyDef(label = "鍊掍粨鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
private Double number = 0.0;
+ @Column(name = "czbz", length = 1)
+ @PropertyDef(label = "鎿嶄綔鏍囧織", description = "i:鏂板鏁版嵁锛堥粯璁わ級u:鏇存柊鏁版嵁 d:鍒犻櫎鏁版嵁")
+ private String czbz;
+
@Column(name = "UPDATE_TIME_")
- @PropertyDef(label = "鏇存柊鏃堕棿")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date updateTime;
@Column(name = "UPDATE_USER_", length = 50)
@PropertyDef(label = "鏇存柊浜�")
private String updateUser;
+
+ @Column(name = "dchwdm", length = 30)
+ @PropertyDef(label = "鍊掑嚭璐т綅浠ｇ爜", description = "鍏宠仈璐т綅淇℃伅鎺ュ彛璐т綅浠ｇ爜")
+ private String dchwdm;
+
+ @Column(name = "drhwdm", length = 30)
+ @PropertyDef(label = "鍊掑叆璐т綅浠ｇ爜", description = "鍏宠仈璐т綅淇℃伅鎺ュ彛璐т綅浠ｇ爜")
+ private String drhwdm;
+
+ @Column(name = "bzw", length = 1)
+ @PropertyDef(label = "鍖呰鐗�", description = "1锛氶夯琚� 2锛氱紪缁囪 3锛氭暎瑁� 9锛氬叾浠�")
+ private String bzw;
+
+ @Column(name = "bzbjs")
+ @PropertyDef(label = "鏍囧噯鍖呬欢鏁�", description = "鍗曚綅锛氫欢")
+ private Integer bzbjs = 0;
+
+ @Column(name = "zxzydw", length = 256)
+ @PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅", description = "瑁呭嵏浣滀笟鐨勪汉鍛樺鍚嶆垨鍗曚綅鍚嶇О锛岀敤鍗婅閫楀彿鍒嗛殧")
+ private String zxzydw;
+
}
--
Gitblit v1.9.3