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/procurementrecord/pojo/CustomStorage.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
index 776eaf7..934552e 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
@@ -29,6 +29,12 @@
     @Excel(name = "鍏ュ簱鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
     private Date inboundDate;
 
+    /**
+     * 缂栧彿
+     */
+    @Excel(name = "缂栧彿")
+    private String code;
+
     @TableField(exist = false)
     private String timeStr;
 
@@ -43,7 +49,7 @@
      */
     @Excel(name = "鍑哄簱鏁伴噺")
     @TableField(exist = false)
-    private BigDecimal totalInboundNum;
+    private BigDecimal totalInboundNum = BigDecimal.ZERO;
     // 鐗╁搧绫诲瀷
     @Excel(name = "鐗╁搧绫诲瀷")
     private String itemType;
@@ -91,9 +97,8 @@
     /**
      * 鍏ュ簱鏃堕棿
      */
-    @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime createTime;
 
     /**
@@ -116,4 +121,7 @@
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3