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/approve/controller/ApprovalInstanceController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java b/src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java
index c7225c2..36dcfc3 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java
@@ -4,6 +4,9 @@
import com.ruoyi.approve.bean.dto.ApprovalInstanceDto;
import com.ruoyi.approve.bean.vo.ApprovalInstanceVo;
import com.ruoyi.approve.service.ApprovalInstanceService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -24,28 +27,32 @@
@RequestMapping("/approvalInstance")
@Tag(name = "瀹℃壒瀹炰緥琛�")
@AllArgsConstructor
-public class ApprovalInstanceController {
+public class ApprovalInstanceController extends BaseController {
private final ApprovalInstanceService approvalInstanceService;
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
+ @Log(title = "瀹℃壒鍒楄〃鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public R listPage(Page<ApprovalInstanceVo> page, ApprovalInstanceDto approvalInstanceDto) {
return approvalInstanceService.listPage(page, approvalInstanceDto);
}
@PostMapping("/save")
@Operation(summary = "淇濆瓨")
+ @Log(title = "瀹℃壒鍒楄〃淇濆瓨", businessType = BusinessType.INSERT)
public R save(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
return approvalInstanceService.add(approvalInstanceDto) ? R.ok() : R.fail();
}
@PutMapping("/update")
@Operation(summary = "鏇存柊")
+ @Log(title = "瀹℃壒鍒楄〃鏇存柊", businessType = BusinessType.UPDATE)
public R update(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
- return approvalInstanceService.updateById(approvalInstanceDto) ? R.ok() : R.fail();
+ return approvalInstanceService.update(approvalInstanceDto) ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
+ @Log(title = "瀹℃壒鍒楄〃鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎")
public R delete(@RequestBody List<Long> ids) {
return approvalInstanceService.delete(ids) ? R.ok() : R.fail();
@@ -53,6 +60,7 @@
@Operation(summary = "瀹℃壒")
@PostMapping("/approve")
+ @Log(title = "瀹℃壒鍒楄〃瀹℃壒", businessType = BusinessType.UPDATE)
public R approve(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
return approvalInstanceService.approve(approvalInstanceDto);
}
--
Gitblit v1.9.3