From c924d59a94fc17d570610cbf2b691481dd0b2e4d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 16 一月 2026 17:50:09 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 308c7bf..4c04ce6 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -111,22 +111,22 @@
/**
* 鏈鏉ョエ鏁�
*/
- private BigDecimal ticketsNum;
+ private BigDecimal ticketsNum=BigDecimal.ZERO;
/**
* 鏈鏉ョエ閲戦(鍏�)
*/
- private BigDecimal ticketsAmount;
+ private BigDecimal ticketsAmount=BigDecimal.ZERO;
/**
* 鏈潵绁ㄦ暟
*/
- private BigDecimal futureTickets;
+ private BigDecimal futureTickets=BigDecimal.ZERO;
/**
* 鏈潵绁ㄩ噾棰�(鍏�)
*/
- private BigDecimal futureTicketsAmount;
+ private BigDecimal futureTicketsAmount=BigDecimal.ZERO;
@ApiModelProperty(value = "寮�绁ㄦ暟")
private BigDecimal invoiceNum;
@@ -207,18 +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;
+ private BigDecimal invoiceTotal = BigDecimal.ZERO;
@ApiModelProperty(value = "寰呬粯娆炬�婚噾棰�")
private BigDecimal pendingTicketsTotal;
@ApiModelProperty(value = "浠樻鎬婚噾棰�")
- private BigDecimal ticketsTotal;
+ private BigDecimal ticketsTotal = BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "鏄惁璐ㄦ")
+ private Boolean isChecked;
}
--
Gitblit v1.9.3