From da8d45df31aebdf0eda2c57155d1a915e2e1e89f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 26 十一月 2025 18:02:25 +0800
Subject: [PATCH] yys 1.生产管理逻辑修改
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 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..0874b3e 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;
@@ -8,7 +9,9 @@
import java.time.LocalDate;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
@Data
public class SalesLedgerDto {
@@ -16,22 +19,47 @@
private String salesContractNo;
private String customerContractNo;
private String projectName;
+ private String productCategory;
+ private Set<Long> ids; //
+ /**
+ * 鏄惁寮�绁� 1-鍚� 2-鏄�
+ */
+ private Integer isInvoice;
@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<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;
}
--
Gitblit v1.9.3