From 530b456eded06e0692e1d8bd5891069439c8f8f8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 17 四月 2026 15:10:56 +0800
Subject: [PATCH] fix: 1.已发货的销售台账对应的出入库记录做限制不能删除;2.销售台账入库操作后，点击删除，对应的销售入库记录未一并删除；3.销售台账入库状态新增部分入库
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
index 52c3b22..1aad365 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
@@ -7,6 +7,7 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -18,31 +19,45 @@
* @date : 2026/1/19 9:50
*/
@Data
-public class SalesLedgerImportDto extends SalesLedgerProductImportDto{
+@EqualsAndHashCode(callSuper = false)
+public class SalesLedgerImportDto extends SalesLedgerProductImportDto {
@Excel(name = "閿�鍞崟鍙�")
private String salesContractNo;
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- private Date entryDate;
+ @Excel(name = "椤圭洰鍚嶇О")
+ private String projectName;
@Excel(name = "涓氬姟鍛�")
private String salesman;
+
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
- @Excel(name = "褰曞叆浜�")
- private String entryPerson;
- @Excel(name = "澶囨敞")
- private String remarks;
@ApiModelProperty(value = "绛捐鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "绛捐鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date executionDate;
- @Excel(name = "鍚堝悓閲戦")
- private BigDecimal contractAmount;
+ @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "浜よ揣鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date deliveryDate;
+ @Excel(name = "褰曞叆浜�")
+ private String entryPerson;
-}
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date entryDate;
+
+ @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Excel(name = "浠樻鏂瑰紡")
+ private String paymentMethod;
+
+ @Excel(name = "澶囨敞")
+ private String remarks;
+
+ @Excel(name = "瀹㈡埛澶囨敞")
+ private String customerRemarks;
+}
\ No newline at end of file
--
Gitblit v1.9.3