From f67161d150eb5720b28fd3f9fbb40c4145d1146c Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 10 六月 2026 11:42:37 +0800
Subject: [PATCH] feat:1.已审核只能编辑单价 2.添加完成按钮 3.添加标签打印和单据打印次数展示

---
 src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java |   64 +++++++++++++++++++++++++++++++
 1 files changed, 63 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..d7de2c3 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;
@@ -7,6 +8,8 @@
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -18,20 +21,79 @@
     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 customerRemarks;
     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 LocalDate deliveryDate;
+
+    @ApiModelProperty(value = "鍙戣揣鐘舵�侊細1-鏈彂璐э紝2-瀹℃壒涓紝3-瀹℃壒涓嶉�氳繃锛�4-瀹℃壒閫氳繃锛�5-宸插彂璐э紝6-閮ㄥ垎鍙戣揣")
+    private Integer deliveryStatus;
+
+    @ApiModelProperty(value = "鍏ュ簱鐘舵��")
+    private Integer stockStatus;
+
+    @ApiModelProperty(value = "浜у搧瀹�")
+    private BigDecimal width;
+
+    @ApiModelProperty(value = "浜у搧楂�")
+    private BigDecimal height;
+    /**
+     * 瀹℃牳鐘舵�侊細0-鏈鏍革紝1-宸插鏍革紝2-鍙嶅
+     */
+    @ApiModelProperty("瀹℃牳鐘舵�侊紙鍗曞�兼煡璇級")
+    private Integer reviewStatus;
+
+    @ApiModelProperty("瀹℃牳鐘舵�佸垪琛紙澶氶�夋煡璇細0-鏈鏍革紝1-宸插鏍革紝2-鍙嶅锛�")
+    private List<Integer> reviewStatusList;
+
+    @ApiModelProperty("鍙嶅鏃堕棿")
+    private LocalDateTime counterReviewTime;
+
+    @ApiModelProperty("鍙嶅浜�")
+    private String counterReviewPerson;
+
+    @ApiModelProperty("鍙嶅鏍哥被鍨嬶細1=浣滃簾锛�2=閲嶆柊鐢熸垚")
+    private Integer counterReviewType;
+
+    @ApiModelProperty("鍙嶅鏍告弿杩�")
+    private String counterReviewDesc;
+
+    @ApiModelProperty("璁㈠崟鐘舵�侊細0-杩涜涓紝1-宸插畬鎴�")
+    private Integer orderStatus;
 }

--
Gitblit v1.9.3