From 246752d298f9955b1112c3028f271d546fd3bc3b Mon Sep 17 00:00:00 2001 From: CZT <czt18638530771@163.com> Date: 星期三, 18 十月 2023 16:39:44 +0800 Subject: [PATCH] 调整单位、库区、仓房、廒间、货位等基础信息 --- src/main/java/com/fzzy/api/entity/Api1101.java | 110 +++++++++++++++++++++++++++++++++--------------------- 1 files changed, 67 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/fzzy/api/entity/Api1101.java b/src/main/java/com/fzzy/api/entity/Api1101.java index ca41c52..f6dfcf5 100644 --- a/src/main/java/com/fzzy/api/entity/Api1101.java +++ b/src/main/java/com/fzzy/api/entity/Api1101.java @@ -3,69 +3,65 @@ import com.alibaba.fastjson.annotation.JSONField; import com.bstek.dorado.annotation.PropertyDef; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; - import org.springframework.format.annotation.DateTimeFormat; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; - import java.io.Serializable; import java.util.Date; /** - * 鎺ュ彛琛�-鍗曚綅 + * 鎺ュ彛琛�-鍗曚綅锛屽悇鐪佷笉鍚屽瓧娈垫爣娉ㄦ竻妤� * - * @author chen - * @date 2022-09-02 14:18 + * @author czt + * @date 2023-10-18 */ @Data @Entity @Table(name = "API_1101") @EqualsAndHashCode(callSuper = false) -public class Api1101 extends ApiParent implements Serializable { - /** - * - */ +public class Api1101 implements Serializable { + private static final long serialVersionUID = 9157617424050247565L; + + /*----------鍥芥爣瀛楁----------*/ @Id @PropertyDef(label = "鍗曚綅浠g爜") - @Column(name = "dwdm", length = 18, nullable = false) + @Column(name = "dwdm", length = 18) private String dwdm; @PropertyDef(label = "鍗曚綅鍚嶇О") - @Column(name = "dwmc", length = 256, nullable = false) + @Column(name = "dwmc", length = 256) private String dwmc; @PropertyDef(label = "鍗曚綅绫诲瀷") - @Column(name = "dwlx", length = 2, nullable = false) + @Column(name = "dwlx", length = 2) private String dwlx; @PropertyDef(label = "娉ㄥ唽鏃ユ湡") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JSONField(format = "yyyy-MM-dd") - @Column(name = "zcrq", nullable = false) + @Column(name = "zcrq") private Date zcrq; @PropertyDef(label = "娉ㄥ唽璧勬湰") @Column(name = "zczb", precision = 20, scale = 6) - private double zczb; + private Double zczb; @PropertyDef(label = "璧勪骇鎬婚") @Column(name = "zcze", precision = 20, scale = 6) - private double zcze; + private Double zcze; @PropertyDef(label = "娉曞畾浠h〃浜�") - @Column(name = "fddbr", length = 100, nullable = false) + @Column(name = "fddbr", length = 100) private String fddbr; @PropertyDef(label = "娉曚汉韬唤璇佸彿") - @Column(name = "frsfzh", length = 18, nullable = false) + @Column(name = "frsfzh", length = 18) private String frsfzh; @PropertyDef(label = "娉曚汉鑱旂郴鏂瑰紡") @@ -73,15 +69,15 @@ private String frlxfs; @PropertyDef(label = "浼佷笟鑱旂郴浜�") - @Column(name = "qylxr", length = 100, nullable = false) + @Column(name = "qylxr", length = 100) private String qylxr; @PropertyDef(label = "鍔炲叕鐢佃瘽") - @Column(name = "bgdh", length = 50, nullable = false) + @Column(name = "bgdh", length = 50) private String bgdh; @PropertyDef(label = "娉ㄥ唽鍦板潃") - @Column(name = "zcdz", length = 512, nullable = false) + @Column(name = "zcdz", length = 512) private String zcdz; @PropertyDef(label = "鐢靛瓙閭") @@ -97,17 +93,12 @@ private String czhm; @PropertyDef(label = "閭斂缂栫爜") - @Column(name = "yzbm", length = 6, nullable = false) + @Column(name = "yzbm", length = 6) private String yzbm; @PropertyDef(label = "琛屾斂鍖哄垝浠g爜") - @Column(name = "xzqhdm", length = 6, nullable = false) + @Column(name = "xzqhdm", length = 6) private String xzqhdm; - - @JSONField(serialize = false) - @PropertyDef(label = "琛屾斂鍖哄垝鍚嶇О", description = "闈炲浗鏍囧瓧娈碉紝鍚庢湡澧炲姞") - @Column(name = "xzqhmc", length = 20) - private String xzqhmc; @PropertyDef(label = "涓婄骇鍗曚綅鍚嶇О") @Column(name = "sjdwmc", length = 256) @@ -118,29 +109,40 @@ private String sjdwdm; @PropertyDef(label = "搴撳尯鏁�") - @Column(name = "kqs", nullable = false) + @Column(name = "kqs") private Integer kqs; @PropertyDef(label = "浠撴埧鏁�") - @Column(name = "cfs", nullable = false) + @Column(name = "cfs") private Integer cfs; @PropertyDef(label = "娌圭綈鏁�") - @Column(name = "ygs", nullable = false) + @Column(name = "ygs") private Integer ygs; @PropertyDef(label = "缁忓害") - @Column(name = "jd", precision = 20, scale = 6, nullable = false) - private double jd; + @Column(name = "jd", precision = 20, scale = 6) + private Double jd; @PropertyDef(label = "绾害") - @Column(name = "wd", precision = 20, scale = 6, nullable = false) - private double wd; + @Column(name = "wd", precision = 20, scale = 6) + private Double wd; @PropertyDef(label = "鍗曚綅鐘舵��") @Column(name = "dwzt",length = 1) private String dwzt; + @PropertyDef(label = "鎿嶄綔鏍囧織") + @Column(name = "czbz", length = 1) + private String czbz; + + @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @Column(name = "zhgxsj") + private Date zhgxsj; + + + /*----------骞夸笢鐪佸钩鍙拌鑼冨瓧娈�----------*/ @Column(name = "balx", length = 1) @PropertyDef(label = "澶囨绫诲瀷", description = "0:鍒濇澶囨 1:鍙樻洿澶囨 2:閲嶆柊澶囨") private String balx; @@ -157,13 +159,35 @@ @PropertyDef(label = "澶囨鐘舵��") private String bazt; - @PropertyDef(label = "鎿嶄綔鏍囧織") - @Column(name = "czbz", length = 1, nullable = false) - private String czbz; - @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�") - @JSONField(format = "yyyy-MM-dd HH:mm:ss") - @Column(name = "zhgxsj", nullable = false) - private Date zhgxsj; + /*----------涓婃捣甯傚钩鍙拌鑼冨瓧娈�----------*/ + @PropertyDef(label = "寤掗棿鏁�") + @Column(name = "ajs") + private Integer ajs; + @PropertyDef(label = "鏍囪浣�") + @Column(name = "bjw", length = 40) + private String bjw; + + + /*----------鎺ュ彛绯荤粺鑷畾涔夊瓧娈�----------*/ + @JSONField(serialize = false) + @PropertyDef(label = "琛屾斂鍖哄垝鍚嶇О", description = "闈炲浗鏍囧瓧娈碉紝鍚庢湡澧炲姞") + @Column(name = "xzqhmc", length = 20) + private String xzqhmc; + + @JSONField(serialize = false) + @PropertyDef(label = "涓氬姟id") + @Column(name = "bizId", length = 40) + private String bizId; + + @JSONField(serialize = false) + @PropertyDef(label = "搴撳尯浠g爜") + @Column(name = "kqdm", length = 21) + private String kqdm; + + @JSONField(serialize = false) + @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠$悊涓績鐨勬椂闂�") + @Column(name = "syncTime") + private Date syncTime; } -- Gitblit v1.9.3