From 4055787f3331bd59f958464c2c96b862fbc7a63c Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 19 一月 2026 15:47:30 +0800
Subject: [PATCH] feat(procurement): 添加产品型号筛选功能并优化待入库数量计算
---
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
index 8e253da..1d06eb6 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -50,15 +51,30 @@
/**
* 瀹㈡埛鍚嶇О
*/
+ @Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
- private String salesLedgerProductId;
+ private Long salesLedgerProductId;
/**
* 鍑哄叆搴撴暟閲�
*/
@Excel(name = "鍏ュ簱鏁伴噺")
private BigDecimal inboundNum;
+
+ /**
+ * 鍏ュ簱鍗曚环
+ */
+ @ApiModelProperty(value = "鍏ュ簱鍗曚环")
+ @Excel(name = "鍏ュ簱鍗曚环")
+ private BigDecimal unitPrice;
+
+ /**
+ * 鍏ュ簱鎬讳环
+ */
+ @ApiModelProperty(value = "鍏ュ簱鎬讳环")
+ @Excel(name = "鍏ュ簱鎬讳环")
+ private BigDecimal totalPrice;
@Excel(name = "棰勮鏁伴噺")
private BigDecimal warnNum;
@@ -104,6 +120,11 @@
*/
@Excel(name = "浜у搧澶х被")
private String productCategory;
+ /**
+ * 浜у搧id
+ */
+ @Excel(name = "浜у搧id")
+ private Long productId;
/**
* 瑙勬牸鍨嬪彿
@@ -171,4 +192,6 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate endDate;
+ private Long productModelId;
+
}
--
Gitblit v1.9.3