From e0cfecb2b11b3d6ac91394e71c689a30356ead28 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 09:29:28 +0800
Subject: [PATCH] fix:1.生产按照特定工序更改 2.库存按照型号,工序类别，电压进行筛选 3.销售页面展示电压，类别 4.生产入库按照电压入库
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 43 ++++++++++++++-----------------------------
1 files changed, 14 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index d4f6460..e2d7955 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -1,37 +1,23 @@
package com.ruoyi.sales.dto;
import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonAlias;
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")
@@ -39,9 +25,9 @@
@TableField(exist = false)
private String invoiceNo;
+
@TableField(exist = false)
private String createUser;
-
private Boolean hasChildren = false;
private List<SalesLedgerProduct> productData;
@@ -49,18 +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;
- @ApiModelProperty(value = "浜よ揣鏃ユ湡")
- private LocalDate deliveryDate;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐢靛帇")
+ private String voltage;
- @ApiModelProperty(value = "鏄惁鐢熶骇")
- @JsonAlias("isProduce")
- private Boolean produce;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "c")
+ private String qty;
}
--
Gitblit v1.9.3