From 7e8edd4b59fb22146b90d01ca38f75148f3fd774 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 20 四月 2026 17:57:18 +0800
Subject: [PATCH] feat(bom): 添加BOM管理功能模块,工序 管理,基础 - 新增CustomerPrivatePoolMapper.xml实现客户私池映射 - 添加SysLoginController支持登录验证和用户信息获取 - 创建TechnologyBomController提供BOM的增删改查接口 - 定义TechnologyBomDto数据传输对象 - 实现TechnologyBomMapper和相关XML映射文件 - 开发TechnologyBomService业务逻辑层 - 添加TechnologyBomStructure结构管理功能 - 集成Excel导入导出BOM数据功能 - 实现BOM结构树形展示和维护功能

---
 src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java |   15 ++++++++++++---
 1 files changed, 12 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..05bd888 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -17,8 +17,13 @@
     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;
@@ -38,10 +43,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 +55,7 @@
 
     @ApiModelProperty(value = "浠樻鏂瑰紡")
     private String paymentMethod;
+
+    @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+    private LocalDate deliveryDate;
 }

--
Gitblit v1.9.3