From ee96821fc7990857ad6477690a5758f8c0ebaa66 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 22 九月 2025 10:32:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutSettle.java |  130 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 130 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutSettle.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutSettle.java
new file mode 100644
index 0000000..c0ae211
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutSettle.java
@@ -0,0 +1,130 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.async.fzzy30.entity.InoutRecord;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鍑哄叆搴撶粨绠楋紝2023骞�5鏈�26鏃ワ紝鏍规嵁鏂板浗绮浼樺寲璋冩暣
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_SETTLE")
+public class Fz61InoutSettle {
+
+    public static String SORT_PROP = "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 = "DEPT_ID_", length = 50)
+    @PropertyDef(label = "搴撳尯缂栫爜")
+    private String deptId;
+
+    @Column(name = "INOUT_TYPE_")
+    @PropertyDef(label = "鍑哄叆搴撶被鍨�")
+    private String inoutType;
+
+    @Column(name = "BIZ_TYPE_")
+    @PropertyDef(label = "澶勭悊鏂瑰紡", description = "0=鍗曡溅缁撶畻/1=鍚堝悓缁撶畻")
+    private String bizType;
+
+    @Column(name = "DEPOT_ID_", length = 50)
+    @PropertyDef(label = "鎵�灞炰粨搴�")
+    private String depotId;
+
+    @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 = "PAY_PRICE_")
+    @PropertyDef(label = "鍗曚环")
+    private Double payPrice = 0.0;
+
+    @Column(name = "PAY_MONEY_")
+    @PropertyDef(label = "缁撶畻鎬婚")
+    private Double payMoney = 0.0;
+
+    @Column(name = "SETTLE_WEIGHT_")
+    @PropertyDef(label = "缁撶畻閲嶉噺")
+    private double settleWeight = 0.0;
+
+    @Column(name = "PAY_TIME_")
+    @PropertyDef(label = "缁撶畻鏃堕棿")
+    private Date payTime;
+
+    @Column(name = "PAY_TYPE_", length = 10)
+    @PropertyDef(label = "浠樻鏂瑰紡")
+    private String payType;
+
+    @Column(name = "PAYEE_")
+    @PropertyDef(label = "鏀舵浜�", description = "鏀舵鍗曚綅鎴栬�呬釜浜�")
+    private String payee;
+
+    @Column(name = "PAYEE_ID_")
+    @PropertyDef(label = "鏀舵浜虹渷浠借瘉鍙�")
+    private String payeeId;
+
+    @Column(name = "BANK_CATEGORY_", length = 10)
+    @PropertyDef(label = "閾惰琛屽埆浠g爜")
+    private String bankCategory;
+
+    @Column(name = "BANK_CODE_", length = 40)
+    @PropertyDef(label = "寮�鎴疯鍙�")
+    private String bankCode;
+
+    @Column(name = "BANK_", length = 50)
+    @PropertyDef(label = "寮�鎴疯鍚嶇О")
+    private String bank;
+
+    @Column(name = "BANK_NUM_", length = 40)
+    @PropertyDef(label = "閾惰璐﹀彿")
+    private String bankNum;
+
+    @Column(name = "PAY_UNIT_", length = 50)
+    @PropertyDef(label = "浠樻鍗曚綅")
+    private String payUnit;
+
+    @Column(name = "PAY_USER_", length = 40)
+    @PropertyDef(label = "浠樻鎿嶄綔浜�")
+    private String payUser;
+
+    @Column(name = "REMARKS_", length = 200)
+    @PropertyDef(label = "澶囨敞淇℃伅")
+    private String remarks;
+
+    @Column(name = "fphm", length = 10)
+    @PropertyDef(label = "鍙戠エ鍙风爜")
+    private String fphm;
+
+    @Column(name = "fpzt", length = 10)
+    @PropertyDef(label = "鍙戠エ鐘舵��",description = "1锛氭甯�,0锛氫綔搴�")
+    private String fpzt;
+
+    @Column(name = "INOUT_RECORD_ID_", length = 40)
+    @PropertyDef(label = "娴佹按鍙�", description = "鏍规嵁涓�瀹氱殑瑙勫垯鐢熸垚")
+    private String inoutRecordId;
+
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+    private Date updateTime;
+
+    @Transient
+    private List<InoutRecord> recordItems;
+
+}

--
Gitblit v1.9.3