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/device/service/IDeviceRepairService.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java b/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
index c785435..ae0b913 100644
--- a/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
+++ b/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.device.dto.DeviceRepairDto;
 import com.ruoyi.device.pojo.DeviceRepair;
+import com.ruoyi.device.vo.DeviceRepairVo;
 import com.ruoyi.framework.web.domain.AjaxResult;
 
 import jakarta.servlet.http.HttpServletResponse;
@@ -12,13 +13,17 @@
 
 public interface IDeviceRepairService extends IService<DeviceRepair> {
 
-    IPage<DeviceRepairDto> queryPage(Page page, DeviceRepairDto deviceRepairDto);
+    IPage<DeviceRepairVo> queryPage(Page page, DeviceRepairDto deviceRepairDto);
 
-    AjaxResult saveDeviceRepair(DeviceRepair deviceRepair);
+    AjaxResult saveDeviceRepair(DeviceRepairDto deviceRepairDto);
 
-    AjaxResult updateDeviceRepair(DeviceRepair deviceRepair);
+    AjaxResult updateDeviceRepair(DeviceRepairDto deviceRepairDto);
+
+    AjaxResult confirmRepair(DeviceRepairDto deviceRepairDto);
+
+    AjaxResult approveRepairAcceptance(DeviceRepairDto deviceRepairDto);
 
     void export(HttpServletResponse response, Long[] ids);
 
-    DeviceRepairDto detailById(Long id);
+    DeviceRepairVo detailById(Long id);
 }

--
Gitblit v1.9.3