From c0ababe8b64de64c8d7e09a80a9126f4ec99d50c Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期日, 08 十月 2023 15:22:43 +0800
Subject: [PATCH] 抓拍修改

---
 igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java |  149 ++++++++++++++++++++++++-------------------------
 1 files changed, 72 insertions(+), 77 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java b/igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java
index c923025..b92102a 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java
@@ -9,110 +9,105 @@
 import lombok.Data;
 
 /**
- * 鍑哄叆搴撴暟鎹褰曪紝褰撳墠璁板綍鍖呮嫭 鍏ュ簱淇℃伅鍜屽嚭鍏ュ簱淇℃伅锛�
+ * 鍑哄叆搴撶粨绠楋紝2023骞�5鏈�26鏃ワ紝鏍规嵁鏂板浗绮浼樺寲璋冩暣
  */
 @Data
 @Entity
 @Table(name = "D_INOUT_SETTLE")
 public class InoutSettle {
 
-	@Id
-	@Column(name = "ID_", length = 40)
-	@PropertyDef(label = "娴佹按鍙�")
-	private String id;
+    @Id
+    @Column(name = "ID_", length = 40)
+    @PropertyDef(label = "娴佹按鍙�",description = "缁撶畻鏃ユ湡锛坹yyyMMdd锛�+4浣嶉『搴忓彿缁勬垚")
+    private String id;
 
-	@Column(name = "COMPANY_ID_", length = 10)
-	@PropertyDef(label = "缁勭粐缂栫爜")
-	private String companyId;
+    @Column(name = "COMPANY_ID_", length = 10)
+    @PropertyDef(label = "缁勭粐缂栫爜")
+    private String companyId;
 
-	// 缁撶畻淇℃伅
-	@Column(name = "PAY_PRICE_")
-	@PropertyDef(label = "鍗曚环")
-	private Double payPrice = 0.0;
+    @Column(name = "DEPT_ID_", length = 50)
+    @PropertyDef(label = "搴撳尯缂栫爜")
+    private String deptId;
 
-	@Column(name = "PAY_SUM_")
-	@PropertyDef(label = "缁撶畻鎬婚")
-	private Double paySum = 0.0;
+    @Column(name = "INOUT_TYPE_")
+    @PropertyDef(label = "鍑哄叆搴撶被鍨�")
+    private String inoutType;
 
-	@Column(name = "PAY_TYPE_", length = 10)
-	@PropertyDef(label = "浠樻鏂瑰紡")
-	private String payType;
+    @Column(name = "BIZ_TYPE_")
+    @PropertyDef(label = "澶勭悊鏂瑰紡", description = "0=鍗曡溅缁撶畻/1=鍚堝悓缁撶畻")
+    private String bizType;
 
-	@Column(name = "CUSTOMER_ID_")
-	@PropertyDef(label = "瀹㈡埛缂栫爜")
-	private String customerId;
+    @Column(name = "DEPOT_ID_", length = 50)
+    @PropertyDef(label = "鎵�灞炰粨搴�")
+    private String depotId;
 
-	@Column(name = "CUSTOMER_NAME_")
-	@PropertyDef(label = "瀹㈡埛鍚嶇О")
-	private String customerName;
+    @Column(name = "CONTRACT_ID_", length = 40)
+    @PropertyDef(label = "鍚堝悓缂栫爜", description = "閽堝杞崲绮蹇呭~")
+    private String contractId;
 
-	@Column(name = "BANK_", length = 40)
-	@PropertyDef(label = "寮�鎴疯")
-	private String bank;
+    @Column(name = "CONTRACT_NAME_", length = 50)
+    @PropertyDef(label = "鍚堝悓鍚嶇О", description = "閽堝杞崲绮蹇呭~")
+    private String contractName;
 
-	@Column(name = "BANK_NUM_", length = 20)
-	@PropertyDef(label = "閾惰鍗″彿")
-	private String bankNum;
+    // 缁撶畻淇℃伅
+    @Column(name = "PAY_PRICE_")
+    @PropertyDef(label = "鍗曚环")
+    private Double payPrice = 0.0;
 
-	@Column(name = "PAY_USER_", length = 40)
-	@PropertyDef(label = "浠樻鎿嶄綔浜�")
-	private String payUser;
+    @Column(name = "PAY_MONEY_")
+    @PropertyDef(label = "缁撶畻鎬婚")
+    private Double payMoney = 0.0;
 
-	@Column(name = "PAY_TIME_")
-	@PropertyDef(label = "缁撶畻鏃堕棿")
-	private Date payTime;
+    @Column(name = "SETTLE_WEIGHT_")
+    @PropertyDef(label = "缁撶畻閲嶉噺")
+    private double settleWeight = 0.0;
 
-	@Column(name = "FULL_WEIGHT_")
-	@PropertyDef(label = "姣涢噸")
-	private double fullWeight = 0.0;
+    @Column(name = "PAY_TIME_")
+    @PropertyDef(label = "缁撶畻鏃堕棿")
+    private Date payTime;
 
-	@Column(name = "EMPTY_WEIGHT_")
-	@PropertyDef(label = "鐨噸")
-	private double emptyWeight = 0.0;
+    @Column(name = "PAY_TYPE_", length = 10)
+    @PropertyDef(label = "浠樻鏂瑰紡")
+    private String payType;
 
-	@Column(name = "NET_WEIGHT_")
-	@PropertyDef(label = "鍑�閲�", description = "鍗曚綅KG")
-	private Double netWeight = 0.0;
+    @Column(name = "PAYEE_")
+    @PropertyDef(label = "鏀舵浜�", description = "鏀舵鍗曚綅鎴栬�呬釜浜�")
+    private String payee;
 
-	@Column(name = "DE_SUM_")
-	@PropertyDef(label = "鎬绘墸閲�")
-	private double deSum;
+    @Column(name = "PAYEE_ID_")
+    @PropertyDef(label = "鏀舵浜虹渷浠借瘉鍙�")
+    private String payeeId;
 
-	@Column(name = "SETTLE_WEIGHT_")
-	@PropertyDef(label = "缁撶畻閲嶉噺")
-	private double settleWeight = 0.0;
+    @Column(name = "BANK_CATEGORY_", length = 10)
+    @PropertyDef(label = "閾惰琛屽埆浠g爜")
+    private String bankCategory;
 
-	@Column(name = "TYPE_")
-	@PropertyDef(label = "鍑哄叆搴撶被鍨�")
-	private String type;
+    @Column(name = "BANK_CODE_", length = 20)
+    @PropertyDef(label = "寮�鎴疯鍙�")
+    private String bankCode;
 
-	@Column(name = "OTHER_SUN_")
-	@PropertyDef(label = "鍏朵粬璐圭敤", description = "鍗曚綅锛氬厓")
-	private Double otherSum = 0.0;
+    @Column(name = "BANK_", length = 50)
+    @PropertyDef(label = "寮�鎴疯鍚嶇О")
+    private String bank;
 
-	@Column(name = "REMARKS_", length = 200)
-	@PropertyDef(label = "澶囨敞淇℃伅")
-	private String remarks;
-	
-	
-	@Transient
-	private String depotId;
+    @Column(name = "BANK_NUM_", length = 20)
+    @PropertyDef(label = "閾惰璐﹀彿")
+    private String bankNum;
 
-	@Transient
-	private String deptId;
+    @Column(name = "PAY_UNIT_", length = 50)
+    @PropertyDef(label = "浠樻鍗曚綅")
+    private String payUnit;
 
-	@Transient
-	private String userName;
+    @Column(name = "PAY_USER_", length = 40)
+    @PropertyDef(label = "浠樻鎿嶄綔浜�")
+    private String payUser;
 
-	@Transient
-	private String plateNum;
-	
-	@Transient
-	private String foodVariety;
+    @Column(name = "REMARKS_", length = 200)
+    @PropertyDef(label = "澶囨敞淇℃伅")
+    private String remarks;
 
-	@Transient
-	private String foodLevel;
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+    private Date updateTime;
 
-	@Transient
-	private Date completeTime;
 }

--
Gitblit v1.9.3