From 684e4306a08feeae188070f264148e6765da8dcf Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 20 九月 2026 19:25:15 +0800
Subject: [PATCH] feat(account): 更新往来付款回款流水表及接口
---
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 00736ba..dff6269 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -50,7 +50,7 @@
/**
* 褰曞叆鏃ユ湡
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date entryDate;
@@ -109,6 +109,9 @@
@Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
+ @Schema(description = "瀹為檯鍚堝悓閲戦")
+ private BigDecimal netContractAmount;
+
@TableField(exist = false)
@Schema(description = "鐢熶骇鐘舵��")
private String productionStatus = "鏈紑濮�";
@@ -140,5 +143,46 @@
@TableField(exist = false)
private Boolean hasProductionRecord;
+ /**
+ * 閿�鍞被鍨嬶細鍗栨补 / 浠ｅ偍锛堝崠瀛樺偍浣嶇疆锛�
+ * 娉ㄦ剰锛氫笉瑕佷笌瀛愯〃琛岀殑 SaleEnum(type) 娣风敤锛岄偅鏄攢鍞�/閲囪喘/椤圭洰
+ */
+ @Schema(description = "閿�鍞被鍨嬶細鍗栨补/浠ｅ偍")
+ @Excel(name = "閿�鍞被鍨�")
+ private String ledgerType;
+
+ @Schema(description = "娌瑰簱id锛堢被鍨�=浠ｅ偍鏃朵娇鐢級")
+ private Long oilDepotId;
+
+ @Schema(description = "娌瑰簱鍚嶇О")
+ @Excel(name = "娌瑰簱")
+ private String oilDepotName;
+
+ @Schema(description = "鍌ㄧ綈id锛堢被鍨�=浠ｅ偍鏃朵娇鐢級")
+ private Long tankId;
+
+ @Schema(description = "鍌ㄧ綈鍙�")
+ @Excel(name = "鍌ㄧ綈鍙�")
+ private String tankNo;
+
+ @Schema(description = "瀹℃壒鐘舵�侊細寰呭鎵�/瀹℃牳涓�/閫氳繃/鎷掔粷")
+ @Excel(name = "瀹℃壒鐘舵��")
+ private String approvalStatus;
+
+ /**
+ * 瀹㈡埛淇℃墭鍩洪噾锛堟煡璇㈡椂鐢辨湇鍔″眰鎸� customerId 鍥炲～锛屼笉鏄湰琛ㄥ瓧娈碉級
+ */
+ @Schema(description = "瀹㈡埛淇℃墭鍩洪噾")
+ @TableField(exist = false)
+ @Excel(name = "瀹㈡埛淇℃墭鍩洪噾")
+ private BigDecimal trustFund;
+
+ /**
+ * 鏈瑪鍚堝悓閲戦鏄惁瓒呭嚭瀹㈡埛淇℃墭鍩洪噾锛堣秴鍑哄垯鍓嶇鏍囩孩锛屼笉鏄湰琛ㄥ瓧娈碉級
+ */
+ @Schema(description = "鏈瑪鍚堝悓閲戦鏄惁瓒呭嚭瀹㈡埛淇℃墭鍩洪噾")
+ @TableField(exist = false)
+ private Boolean exceedsTrustFund;
+
}
--
Gitblit v1.9.3