From bd02d873d7bbcae36a2a1262d921f2fc6b0cce09 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 14:33:41 +0800
Subject: [PATCH] feat(sales): 新增发货台账详情功能并优化库存管理
---
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index 4808080..c6b1406 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.basic.dto.StorageBlobDTO;
+import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -15,6 +17,12 @@
@Data
public class PurchaseLedgerDto {
+ /**
+ * 瀹℃壒浜篿d鍒楄〃
+ */
+ @Schema(description = "瀹℃壒浜篿d鍒楄〃")
+ private String approveUserIds;
+
private String entryDateStart;
@@ -169,26 +177,29 @@
@TableField(exist = false)
- @ApiModelProperty("鏉ョエ閲戦")
+ @Schema(description = "鏉ョエ閲戦")
@Excel(name = "宸叉潵绁ㄩ噾棰�(鍏�)")
private BigDecimal receiptPaymentAmount = BigDecimal.ZERO;
- @ApiModelProperty("鏈潵绁ㄩ噾棰�")
+ @Schema(description = "鏈潵绁ㄩ噾棰�")
@TableField(exist = false)
@Excel(name = "鏈潵绁ㄩ噾棰�(鍏�)")
private BigDecimal unReceiptPaymentAmount =BigDecimal.ZERO;
- @ApiModelProperty("鏂囦欢绫诲瀷 鍙� 4")
+ @Schema(description = "鏂囦欢绫诲瀷 鍙� 4")
@TableField(exist = false)
private Integer type;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
- @ApiModelProperty("瀹℃壒鐘舵��")
+ @Schema(description = "瀹℃壒鐘舵��")
private Integer approvalStatus;
- @ApiModelProperty(value = "妯℃澘鍚嶇О")
+ @Schema(description = "妯℃澘鍚嶇О")
private String templateName;
- @ApiModelProperty(value = "瀹℃壒浜篿d")
+ @Schema(description = "瀹℃壒浜篿d")
private Integer approverId;
+
+ private List<StorageBlobVO> storageBlobVOS;
+ private List<StorageBlobDTO> storageBlobDTOS;
}
--
Gitblit v1.9.3