From 59defbfd6f8966d9166ef5c447e4ba58d15653a0 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 22 四月 2026 10:00:15 +0800
Subject: [PATCH] fix: 新增销售订单时未保存产品单位
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index a3f2f1d..daf8781 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -8,6 +8,7 @@
import lombok.Data;
import java.time.LocalDate;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -17,13 +18,19 @@
private String salesContractNo;
private String customerContractNo;
private String projectName;
-// @JsonFormat(pattern = "yyyy-MM-dd")
- private String entryDate;
+ @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 customerRemarks;
private String attachmentMaterials;
@TableField(exist = false)
@@ -38,10 +45,11 @@
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;
@@ -49,4 +57,19 @@
@ApiModelProperty(value = "浠樻鏂瑰紡")
private String paymentMethod;
+
+ @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+ private LocalDate deliveryDate;
+
+ @ApiModelProperty(value = "鏄惁鍙戣揣")
+ private Integer deliveryStatus;
+
+ @ApiModelProperty(value = "鍏ュ簱鐘舵��")
+ private Integer stockStatus;
+
+ @ApiModelProperty(value = "浜у搧瀹�")
+ private BigDecimal width;
+
+ @ApiModelProperty(value = "浜у搧楂�")
+ private BigDecimal height;
}
--
Gitblit v1.9.3