From 7e2abbf8f235d20e6c45aa6ce9dceb9eb93fd1c2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 23 一月 2026 11:39:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 7af592b..79cb32f 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -129,16 +129,16 @@
private BigDecimal futureTicketsAmount=BigDecimal.ZERO;
@ApiModelProperty(value = "寮�绁ㄦ暟")
- private BigDecimal invoiceNum;
+ private BigDecimal invoiceNum = BigDecimal.ZERO;
@ApiModelProperty(value = "鏈紑绁ㄦ暟")
- private BigDecimal noInvoiceNum;
+ private BigDecimal noInvoiceNum = BigDecimal.ZERO;
@ApiModelProperty(value = "寮�绁ㄩ噾棰�")
- private BigDecimal invoiceAmount;
+ private BigDecimal invoiceAmount = BigDecimal.ZERO;
@ApiModelProperty(value = "鏈紑绁ㄩ噾棰�")
- private BigDecimal noInvoiceAmount;
+ private BigDecimal noInvoiceAmount = BigDecimal.ZERO;
@ApiModelProperty(value = "鏈寮�绁ㄦ暟")
@TableField(exist = false)
@@ -207,6 +207,21 @@
* 鍙戣揣瀹℃壒鐘舵��
*/
// @TableField(exist = false)
- @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0鏈敓浜�,1宸茬敓浜�,2寰呭鏍�(瀹℃牳涓�),3瀹℃牳瀹屾垚,4瀹℃牳澶辫触")
+ @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0鏈敓浜�,1宸茬敓浜�,2宸插彂璐�")
private Integer approveStatus;
+
+ @ApiModelProperty(value = "寰呭洖娆炬�婚噾棰�")
+ private BigDecimal pendingInvoiceTotal;
+
+ @ApiModelProperty(value = "鍥炴鎬婚噾棰�")
+ private BigDecimal invoiceTotal = BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "寰呬粯娆炬�婚噾棰�")
+ private BigDecimal pendingTicketsTotal;
+
+ @ApiModelProperty(value = "浠樻鎬婚噾棰�")
+ private BigDecimal ticketsTotal = BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "鏄惁璐ㄦ")
+ private Boolean isChecked;
}
--
Gitblit v1.9.3