From 83a2ac0bbf44d550a4d0add970d14623298a8574 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 08 一月 2026 16:10:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd' into sqd
---
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
index 5d4810d..61b0e88 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
@@ -2,6 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -17,6 +18,8 @@
private Integer id;
+ private String ids;
+
private Long createUser;
/**
@@ -25,10 +28,28 @@
@Excel(name = "鍏ュ簱鎵规")
private String inboundBatches;
+ private BigDecimal warnNum;
+
/**
* 鍚堝悓鍙�
*/
private String purchaseContractNumber;
+
+
+ /**
+ * 閿�鍞悎鍚屽彿
+ */
+ private String salesContractNo;
+
+ /**
+ * 瀹㈡埛鍚堝悓鍙�
+ */
+ private String customerContractNo;
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ private String customerName;
private String salesLedgerProductId;
@@ -39,6 +60,20 @@
private BigDecimal inboundNum;
/**
+ * 鍏ュ簱鍗曚环
+ */
+ @ApiModelProperty(value = "鍏ュ簱鍗曚环")
+ @Excel(name = "鍏ュ簱鍗曚环")
+ private BigDecimal unitPrice;
+
+ /**
+ * 鍏ュ簱鎬讳环
+ */
+ @ApiModelProperty(value = "鍏ュ簱鎬讳环")
+ @Excel(name = "鍏ュ簱鎬讳环")
+ private BigDecimal totalPrice;
+
+ /**
* 寰呭嚭搴撴暟閲�
*/
@Excel(name = "寰呭嚭搴撴暟閲�")
@@ -47,7 +82,7 @@
* 鍑哄簱鏁伴噺
*/
@Excel(name = "鍑哄簱鏁伴噺")
- private BigDecimal totalInboundNum;
+ private BigDecimal totalInboundNum = BigDecimal.ZERO;
/**
* 鏈�浣庡簱瀛樻暟閲�
@@ -134,6 +169,22 @@
*/
@Excel(name = "涓嶅惈绋庢�讳环")
private BigDecimal taxExclusiveTotalPrice;
+
+ /**
+ * 姣忕鏁伴噺
+ */
+ @Excel(name = "姣忕鏁伴噺")
+ private Integer boxNum;
+ /**
+ * 姣忕瑙勬牸
+ */
+ @Excel(name = "姣忕瑙勬牸")
+ private String cartonSpecifications;
+ /**
+ * 缇庡厓姣忎欢
+ */
+ @Excel(name = "缇庡厓姣忎欢")
+ private BigDecimal dollarPrice;
/**
* 鎶ヨ〃鏃ユ姤
*/
--
Gitblit v1.9.3