From 41ab7abd0b0ec0fefb03b60bbaf42c02fbda666b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 15:53:16 +0800
Subject: [PATCH] feat(production): 添加生产订单与销售台账关联功能
---
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
index b5dcb70..9173ce3 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
@@ -2,7 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -49,7 +49,7 @@
*/
private String customerName;
- private String salesLedgerProductId;
+ private Long salesLedgerProductId;
/**
* 鍑哄叆搴撴暟閲�
@@ -60,14 +60,14 @@
/**
* 鍏ュ簱鍗曚环
*/
- @ApiModelProperty(value = "鍏ュ簱鍗曚环")
+ @Schema(description = "鍏ュ簱鍗曚环")
@Excel(name = "鍏ュ簱鍗曚环")
private BigDecimal unitPrice;
/**
* 鍏ュ簱鎬讳环
*/
- @ApiModelProperty(value = "鍏ュ簱鎬讳环")
+ @Schema(description = "鍏ュ簱鎬讳环")
@Excel(name = "鍏ュ簱鎬讳环")
private BigDecimal totalPrice;
@@ -131,6 +131,11 @@
*/
@Excel(name = "浜у搧澶х被")
private String productCategory;
+ /**
+ * 浜у搧id
+ */
+ @Excel(name = "浜у搧id")
+ private Long productId;
/**
* 瑙勬牸鍨嬪彿
--
Gitblit v1.9.3