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/sales/dto/InvoiceRegistrationProductDto.java | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
index 13819da..4f94afc 100644
--- a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
@@ -1,49 +1,73 @@
package com.ruoyi.sales.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.vo.FileVo;
+import com.ruoyi.sales.pojo.CommonFile;
+import com.ruoyi.sales.pojo.InvoiceLedgerFile;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
@Data
public class InvoiceRegistrationProductDto extends InvoiceRegistrationProduct {
- @ApiModelProperty(name = "瀹㈡埛鍚堝悓鍙�")
+ @Schema(description = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
- @ApiModelProperty(name = "瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty(name = "閿�鍞悎鍚屽彿")
+ @Schema(description = "閿�鍞悎鍚屽彿")
private String salesContractNo;
- @ApiModelProperty(name = "闄勪欢")
+ @Schema(description = "闄勪欢")
private List<FileVo> fileList;
- @ApiModelProperty(value = "鍙戠エ鍙�")
+ @Schema(description = "鍙戠エ鍙�")
private String invoiceNo;
- @ApiModelProperty(value = "鍙戠エ閲戦")
+ @Schema(description = "鍙戠エ閲戦")
private BigDecimal invoiceTotal;
- @ApiModelProperty(value = "寮�绁ㄤ汉")
+ @Schema(description = "寮�绁ㄤ汉")
private String invoicePerson;
- @ApiModelProperty(value = "寮�绁ㄦ椂闂�")
+ @Schema(description = "寮�绁ㄦ椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate invoiceDate;
- @ApiModelProperty(value = "寮�绁ㄥ彴璐d")
+ @TableField(exist = false)
+ private String invoiceDateStart;
+ @TableField(exist = false)
+ private String invoiceDateEnd;
+
+ @Schema(description = "寮�绁ㄥ彴璐d")
private Integer invoiceLedgerId;
- @ApiModelProperty(value = "鍙戠エ鏂囦欢鍚�")
+ @Schema(description = "鍙戠エ鏂囦欢鍚�")
private String invoiceFileName;
+ private List<InvoiceLedgerFile> commonFiles;
+
+ private String searchText;
+
+ private Boolean status;
+
+ private String projectName;
+
+
+ @TableField(exist = false)
+ private String createTimeStart;
+ @TableField(exist = false)
+ private String createTimeEnd;
+
+
}
--
Gitblit v1.9.3