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/project/system/controller/SysUserClientController.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
index f6a2732..cb921a0 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
@@ -2,13 +2,15 @@
 
 import com.ruoyi.framework.security.LoginUser;
 import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.domain.GetuiConfig;
 import com.ruoyi.project.system.domain.SysUserClient;
 import com.ruoyi.project.system.service.SysUserClientService;
 import com.ruoyi.common.utils.SecurityUtils;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,10 +36,10 @@
      */
     @PostMapping("/addOrUpdateClientId")
     @Operation(summary = "娣诲姞/鏇存柊鐢ㄦ埛cid")
-    public R<?> addOrUpdateClientId(@RequestBody SysUserClient sysUserClient) {
+    public AjaxResult addOrUpdateClientId(@RequestBody SysUserClient sysUserClient) {
         Long userId = SecurityUtils.getUserId();
         sysUserClient.setUserId(userId);
         boolean result = sysUserClientService.addOrUpdateClientId(sysUserClient);
-        return result ? R.ok() : R.fail("璁惧缁戝畾澶辫触");
+        return result ? success() : error("璁惧缁戝畾澶辫触");
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3