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/ApprovalTemplateController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApprovalTemplateController.java b/src/main/java/com/ruoyi/approve/controller/ApprovalTemplateController.java
index 8a9f08c..674d278 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApprovalTemplateController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApprovalTemplateController.java
@@ -4,6 +4,9 @@
import com.ruoyi.approve.bean.dto.ApprovalTemplateDto;
import com.ruoyi.approve.bean.vo.ApprovalTemplateVo;
import com.ruoyi.approve.service.ApprovalTemplateService;
+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,30 +27,34 @@
@RequestMapping("/approvalTemplate")
@Tag(name = "瀹℃壒妯℃澘琛�")
@AllArgsConstructor
-public class ApprovalTemplateController {
+public class ApprovalTemplateController extends BaseController {
private final ApprovalTemplateService approvalTemplateService;
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
+ @Log(title = "瀹℃壒妯℃澘鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public R listPage(Page<ApprovalTemplateVo> page, ApprovalTemplateDto approvalTemplateDto) {
return R.ok(approvalTemplateService.listPage(page, approvalTemplateDto));
}
@PostMapping("/add")
@Operation(summary = "娣诲姞")
+ @Log(title = "娣诲姞瀹℃壒妯℃澘", businessType = BusinessType.INSERT)
public R add(@RequestBody ApprovalTemplateDto approvalTemplateDto) {
return R.ok(approvalTemplateService.saveApprovalTemplateDto(approvalTemplateDto));
}
@PutMapping("/update")
@Operation(summary = "淇敼")
+ @Log(title = "淇敼瀹℃壒妯℃澘", businessType = BusinessType.UPDATE)
public R update(@RequestBody ApprovalTemplateDto approvalTemplateDto) {
return R.ok(approvalTemplateService.updateApprovalTemplateDto(approvalTemplateDto));
}
@PostMapping("/delete")
@Operation(summary = "鍒犻櫎")
+ @Log(title = "鍒犻櫎瀹℃壒妯℃澘", businessType = BusinessType.DELETE)
public R delete(@RequestBody List<Long> ids) {
return R.ok(approvalTemplateService.delete(ids));
}
@@ -60,6 +67,7 @@
@GetMapping("/detail/{id}")
@Operation(summary = "鏌ヨ瀹℃壒妯℃澘璇︽儏")
+ @Log(title = "鏌ヨ瀹℃壒妯℃澘璇︽儏", businessType = BusinessType.OTHER)
public R detail(@PathVariable("id") Long id) {
return R.ok(approvalTemplateService.getApprovalTemplateVoById(id));
}
--
Gitblit v1.9.3