From 99e26030611fdc06ee3dd523072fe5516b78dc5b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 11 五月 2026 13:05:38 +0800
Subject: [PATCH] feat(sales): 添加销售订单和产品相关字段
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index aeea446..14cbefb 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.sales.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -18,20 +19,53 @@
private String projectName;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date entryDate;
+
+ private String entryDateStart;
+ private String entryDateEnd;
+
+
private String salesman;
private Long customerId;
private String customerName;
private String entryPerson;
private String remarks;
private String attachmentMaterials;
+
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate issueDate;
+
+ @TableField(exist = false)
+ private String invoiceNo;
+ @TableField(exist = false)
+ private String createUser;
+
+
private Boolean hasChildren = false;
private List<SalesLedgerProduct> productData;
+ private List<SalesLedgerProductDto> productDtoData;
private List<String> tempFileIds;
private List<CommonFile> SalesLedgerFiles;
- private Integer Type;
+ private Integer type;
@ApiModelProperty(value = "绛捐鏃ユ湡")
private LocalDate executionDate;
private Boolean status;
+
+ @ApiModelProperty(value = "浠樻鏂瑰紡")
+ private String paymentMethod;
+
+ @ApiModelProperty(value = "璁㈠崟绫诲瀷")
+ private String orderType;
+
+ @ApiModelProperty(value = "璁㈠崟琛�")
+ private String orderLine;
+
+ @ApiModelProperty(value = "闇�姹傛棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date demandDate;
+
+ @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+ private LocalDate deliveryDate;
}
--
Gitblit v1.9.3