From 64984c01892d6fe51d8ab550c6a28f2d0e81d6fe Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 15 一月 2026 17:55:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java b/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
index 1a3396d..1b3c691 100644
--- a/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
@@ -5,6 +5,7 @@
import com.ruoyi.sales.pojo.CommonFile;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
@Data
@@ -25,14 +26,24 @@
private String purchaseContractNumber;
//渚涘簲鍟嗗悕绉�
private String supplierName;
+ private String projectName;
private Long issUerId;
private String issUer;
+ /**
+ * 鍚堝悓閲戦锛堜骇鍝佸惈绋庢�讳环锛�
+ */
+ private BigDecimal contractAmount = BigDecimal.ZERO;
//澧炲�肩◣
- private String invoiceAmount = "0";
-
- private String invoiceNumber = "0";
-
- private String unTicketsPrice = "0";
+ /**
+ * 宸叉潵绁ㄩ噾棰濓紙鍙戠エ閲戦锛�
+ */
+ private BigDecimal invoiceTotal = BigDecimal.ZERO;
+ private BigDecimal invoiceAmount = BigDecimal.ZERO;
+ /**
+ * 鍙戠エ鍙�
+ */
+ private String invoiceNumber;
+ private BigDecimal unTicketsPrice = BigDecimal.ZERO;
private List<CommonFile> commonFiles;
--
Gitblit v1.9.3