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/account/bean/vo/sales/SalesOutboundVo.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/bean/vo/sales/SalesOutboundVo.java b/src/main/java/com/ruoyi/account/bean/vo/sales/SalesOutboundVo.java
index 90d4d53..13c1b27 100644
--- a/src/main/java/com/ruoyi/account/bean/vo/sales/SalesOutboundVo.java
+++ b/src/main/java/com/ruoyi/account/bean/vo/sales/SalesOutboundVo.java
@@ -7,7 +7,7 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
 
 @Data
 @Schema(name = "SalesOutboundVo", description = "璐㈠姟绠$悊--閿�鍞嚭搴撳彴璐�(杩斿洖)")
@@ -28,7 +28,7 @@
     @Schema(description = "鍑哄簱鏃ユ湡")
     @Excel(name = "鍑哄簱鏃ユ湡")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date shippingDate;
+    private LocalDate shippingDate;
 
     @Schema(description = "浜у搧鍚嶇О")
     @Excel(name = "浜у搧鍚嶇О")
@@ -42,6 +42,9 @@
     @Excel(name = "閲戦")
     private BigDecimal outboundAmount;
 
+    @Schema(description = "绋庣巼")
+    private BigDecimal taxRate;
+
     @Schema(description = "鍙戣揣缂栧彿")
     @Excel(name = "鍙戣揣缂栧彿")
     private String shippingNo;

--
Gitblit v1.9.3