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/collaborativeApproval/service/MeetingService.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/MeetingService.java b/src/main/java/com/ruoyi/collaborativeApproval/service/MeetingService.java
index 898ca94..d3b0d89 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/MeetingService.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/MeetingService.java
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.collaborativeApproval.dto.MeetSummaryDto;
 import com.ruoyi.collaborativeApproval.dto.MeetUseDto;
 import com.ruoyi.collaborativeApproval.dto.MeetingSimpleDto;
@@ -13,11 +14,12 @@
 import com.ruoyi.collaborativeApproval.vo.SearchMeetingDraftVo;
 import com.ruoyi.collaborativeApproval.vo.SearchMeetingRoomVo;
 import com.ruoyi.collaborativeApproval.vo.SearchMeetingUseVo;
+import com.ruoyi.framework.web.domain.R;
 
 
 import java.util.List;
 
-public interface MeetingService{
+public interface MeetingService extends IService<MeetingRoom> {
 //****************浼氳瀹�********************************
     IPage<MeetingRoom> getMeetingRoomList(SearchMeetingRoomVo vo);
 
@@ -41,7 +43,7 @@
 
 // ************鐢宠浼氳************
 
-    void saveMeetApplication(MeetApplication meetApplication);
+    R<Void> saveMeetApplication(MeetApplication meetApplication);
 
 // ************鐢宠瀹℃壒************
 

--
Gitblit v1.9.3