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/device/pojo/DeviceDefectRecord.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java b/src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java
index 6943b0a..f188b35 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java
@@ -4,7 +4,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -13,39 +13,39 @@
 @Data
 @TableName("device_defect_record")
 public class DeviceDefectRecord {
-    @ApiModelProperty("璁惧缂洪櫡璁板綍id")
+    @Schema(description = "璁惧缂洪櫡璁板綍id")
     private Long id;
-    @ApiModelProperty("璁惧鍙拌处id")
+    @Schema(description = "璁惧鍙拌处id")
     private Long deviceLedgerId;
-    @ApiModelProperty("缂洪櫡鎻忚堪")
+    @Schema(description = "缂洪櫡鎻忚堪")
     private String defectDescription;
-    @ApiModelProperty("鐘舵��")
+    @Schema(description = "鐘舵��")
     private String status;
-    @ApiModelProperty("娑堥櫎鏃堕棿")
+    @Schema(description = "娑堥櫎鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime eliminateTime;
-    @ApiModelProperty("鍒涘缓鏃堕棿")
+    @Schema(description = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
-    @ApiModelProperty("鏇存柊鏃堕棿")
+    @Schema(description = "鏇存柊鏃堕棿")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
-    @ApiModelProperty("鍒涘缓浜�")
+    @Schema(description = "鍒涘缓浜�")
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
 
-    @ApiModelProperty("鏇存柊浜�")
+    @Schema(description = "鏇存柊浜�")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Integer updateUser;
 
-    @ApiModelProperty("绉熸埛id")
+    @Schema(description = "绉熸埛id")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 

--
Gitblit v1.9.3