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/warehouse/controller/DocumentationFileController.java |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
index 71df814..f272150 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
@@ -1,15 +1,12 @@
 package com.ruoyi.warehouse.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.pojo.AccountFile;
-import com.ruoyi.account.service.AccountFileService;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.warehouse.pojo.DocumentationFile;
 import com.ruoyi.warehouse.service.DocumentationFileService;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 /**
@@ -39,7 +36,7 @@
      * @return
      */
     @DeleteMapping("/del")
-    public AjaxResult delDocumentationFile(@RequestBody List<Integer> ids) {
+    public AjaxResult delDocumentationFile(@RequestBody List<Long> ids) {
         if(CollectionUtils.isEmpty(ids)){
             return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
         }
@@ -48,14 +45,14 @@
     }
 
     /**
-     *鍒嗛〉鏌ヨ
-     * @param page
+     *鏌ヨ
+     * @param
      * @param documentationFile
      * @return
      */
     @GetMapping("/listPage")
-    public AjaxResult documentationFileListPage(Page page, DocumentationFile documentationFile) {
-        return AjaxResult.success(documentationFileService.documentationFileListPage(page, documentationFile));
+    public AjaxResult documentationFileListPage(DocumentationFile documentationFile) {
+        return AjaxResult.success(documentationFileService.documentationFileListPage( documentationFile));
     }
 
 

--
Gitblit v1.9.3