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/quality/controller/QualityInspectFileController.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java
index f32d87b..bc5df62 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java
@@ -2,7 +2,7 @@
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.quality.pojo.QualityInspect;
 import com.ruoyi.quality.pojo.QualityInspectFile;
 import com.ruoyi.quality.pojo.QualityInspectParam;
@@ -34,8 +34,8 @@
      * @return
      */
     @PostMapping("/add")
-    public R<?> add(@RequestBody QualityInspectFile qualityInspectFile) {
-        return R.ok(qualityInspectFileService.save(qualityInspectFile));
+    public AjaxResult add(@RequestBody QualityInspectFile qualityInspectFile) {
+        return AjaxResult.success(qualityInspectFileService.save(qualityInspectFile));
     }
 
     /**
@@ -44,12 +44,12 @@
      * @return
      */
     @DeleteMapping("/del")
-    public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
+    public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
         if(CollectionUtils.isEmpty(ids)){
-            return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+            return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
         }
         //鍒犻櫎妫�楠岄檮浠�
-        return R.ok(qualityInspectFileService.removeBatchByIds(ids));
+        return AjaxResult.success(qualityInspectFileService.removeBatchByIds(ids));
     }
 
     /**
@@ -59,8 +59,8 @@
      * @return
      */
     @GetMapping("/listPage")
-    public R<?> qualityInspectFileListPage(Page page, QualityInspectFile qualityInspectFile) {
-        return R.ok(qualityInspectFileService.qualityInspectFileListPage(page, qualityInspectFile));
+    public AjaxResult qualityInspectFileListPage(Page page, QualityInspectFile qualityInspectFile) {
+        return AjaxResult.success(qualityInspectFileService.qualityInspectFileListPage(page, qualityInspectFile));
     }
 
 

--
Gitblit v1.9.3