From 4d99e718536ac77dff26dde8da7a59cdc9b52de8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 10:13:57 +0800
Subject: [PATCH] fix:1.生产报工优化
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 38 ++++++++++++++++----------------------
1 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index bd19d51..e2d7955 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -3,33 +3,21 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.sales.pojo.CommonFile;
+import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.time.LocalDate;
-import java.util.Date;
import java.util.List;
@Data
-public class SalesLedgerDto {
- private Long id;
- private String salesContractNo;
- private String customerContractNo;
- private String projectName;
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date entryDate;
+@EqualsAndHashCode(callSuper = true)
+public class SalesLedgerDto extends SalesLedger {
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")
@@ -37,9 +25,9 @@
@TableField(exist = false)
private String invoiceNo;
+
@TableField(exist = false)
private String createUser;
-
private Boolean hasChildren = false;
private List<SalesLedgerProduct> productData;
@@ -47,11 +35,17 @@
private List<CommonFile> SalesLedgerFiles;
private Integer type;
- @ApiModelProperty(value = "绛捐鏃ユ湡")
- private LocalDate executionDate;
-
private Boolean status;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
- private String paymentMethod;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍨嬪彿")
+ private String model;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐢靛帇")
+ private String voltage;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "c")
+ private String qty;
}
--
Gitblit v1.9.3