From 6bacf93d628a974bb4882029e3a8847d5715572f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 25 六月 2026 15:19:38 +0800
Subject: [PATCH] feat(purchase): 采购添加实际合同金额字段并实现退货扣减逻辑
---
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index d937bad..ec96643 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
@@ -69,7 +69,7 @@
/**
* 褰曞叆鏃ユ湡
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date entryDate;
@@ -119,6 +119,12 @@
* 鍚堝悓閲戦锛堜骇鍝佸惈绋庢�讳环锛�
*/
private BigDecimal contractAmount;
+
+ /**
+ * 瀹為檯鍚堝悓閲戦锛堟墸鍑忛��璐у悗锛�
+ */
+ @Schema(description = "瀹為檯鍚堝悓閲戦")
+ private BigDecimal netContractAmount;
//
// /**
// * 涓氬姟鍛�
@@ -135,14 +141,6 @@
* 涓氬姟鍛樻墜鏈哄彿
*/
private String phoneNumber;
-
- @TableField(exist = false)
- @Schema(description = "鏉ョエ閲戦")
- private String receiptPaymentAmount;
-
- @Schema(description = "鏈潵绁ㄩ噾棰�")
- @TableField(exist = false)
- private String unReceiptPaymentAmount;
@Schema(description = "鏂囦欢绫诲瀷 鍙� 4")
@TableField(exist = false)
@@ -165,5 +163,4 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
-
}
--
Gitblit v1.9.3