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/ai/controller/SalesAiController.java |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ruoyi/ai/controller/SalesAiController.java b/src/main/java/com/ruoyi/ai/controller/SalesAiController.java
index b6ca0e9..0c92ad6 100644
--- a/src/main/java/com/ruoyi/ai/controller/SalesAiController.java
+++ b/src/main/java/com/ruoyi/ai/controller/SalesAiController.java
@@ -10,7 +10,7 @@
 import com.ruoyi.common.utils.StringUtils;
 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 dev.langchain4j.data.message.AiMessage;
 import dev.langchain4j.data.message.UserMessage;
 import io.swagger.v3.oas.annotations.Operation;
@@ -99,22 +99,21 @@
 
     @Operation(summary = "閿�鍞姪鎵嬩細璇濆垪琛�")
     @GetMapping("/history/sessions")
-    public R<?> listSessions() {
-        return R.ok(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
+    public AjaxResult listSessions() {
+        return success(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
     }
 
     @Operation(summary = "閿�鍞姪鎵嬩細璇濇秷鎭�")
     @GetMapping("/history/messages/{memoryId}")
-    public R<?> listMessages(@PathVariable String memoryId) {
-        return R.ok(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
+    public AjaxResult listMessages(@PathVariable String memoryId) {
+        return success(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
     }
 
     @Operation(summary = "鍒犻櫎閿�鍞姪鎵嬩細璇�")
     @DeleteMapping("/history/{memoryId}")
-    public R<?> deleteSession(@PathVariable String memoryId) {
+    public AjaxResult deleteSession(@PathVariable String memoryId) {
         aiSessionUserContext.remove(memoryId);
-        aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser());
-        return R.ok();
+        return toAjax(aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser()));
     }
 
     private boolean isBusinessDataIntent(String message) {

--
Gitblit v1.9.3