From 55d694aaae4e421b5e55cd941500e08f85cb5d4d Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 27 八月 2026 18:21:33 +0800
Subject: [PATCH] feat(sales): 添加框架合同订单功能并优化销售台账管理
---
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 15 ++++++++++++++-
1 files changed, 14 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..9561391 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -35,6 +35,16 @@
private String salesContractNo;
/**
+ * 鍚堝悓绫诲瀷锛�1鏅�氶攢鍞悎鍚岋紝2妗嗘灦鍚堝悓锛�3妗嗘灦璁㈠崟
+ */
+ private Integer contractType = 1;
+
+ /**
+ * 鐖舵鏋跺悎鍚孖D
+ */
+ private Long parentContractId;
+
+ /**
* 瀹㈡埛鍚堝悓鍙�
*/
@Excel(name = "瀹㈡埛鍚堝悓鍙�", type = Excel.Type.IMPORT)
@@ -50,7 +60,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 +119,9 @@
@Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
+ @Schema(description = "瀹為檯鍚堝悓閲戦")
+ private BigDecimal netContractAmount;
+
@TableField(exist = false)
@Schema(description = "鐢熶骇鐘舵��")
private String productionStatus = "鏈紑濮�";
--
Gitblit v1.9.3