From 260dd6fe156265832544715192ce1491e9c2afd6 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 26 六月 2026 13:41:13 +0800
Subject: [PATCH] fix(stock): 解决库存管理中的重复键异常问题 - 在采购台账服务中添加净合同金额字段设置 - 在销售台账服务中添加净合同金额字段设置 - 在入库记录服务中为库存插入操作添加重复键异常处理 - 在入库记录服务中为非库存插入操作添加重复键异常处理 - 在库存服务中为库存插入操作添加重复键异常处理 - 统一处理数据库唯一键约束冲突，避免系统错误
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 62 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index 49fda54..a4fc57c 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -1,4 +1,66 @@
package com.ruoyi.sales.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.basic.dto.StorageBlobDTO;
+import com.ruoyi.basic.dto.StorageBlobVO;
+import com.ruoyi.sales.pojo.CommonFile;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+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", timezone = "GMT+8")
+ 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<SalesLedgerProductDto> productDtoData;
+ private List<String> tempFileIds;
+ private List<CommonFile> SalesLedgerFiles;
+
+ private Integer type;
+ @Schema(description = "绛捐鏃ユ湡")
+ private LocalDate executionDate;
+
+ private Boolean status;
+
+ @Schema(description = "浠樻鏂瑰紡")
+ private String paymentMethod;
+
+ @Schema(description = "浜よ揣鏃ユ湡")
+ private LocalDate deliveryDate;
+
+ private List<StorageBlobDTO> storageBlobDTOs;
+ private List<StorageBlobVO> StorageBlobVOs;
}
--
Gitblit v1.9.3