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/staff/controller/BankController.java |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/controller/BankController.java b/src/main/java/com/ruoyi/staff/controller/BankController.java
index 372998e..1e9aa1f 100644
--- a/src/main/java/com/ruoyi/staff/controller/BankController.java
+++ b/src/main/java/com/ruoyi/staff/controller/BankController.java
@@ -2,8 +2,7 @@
 
 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 com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.staff.pojo.Bank;
 import com.ruoyi.staff.service.BankService;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -26,37 +25,37 @@
 @RestController
 @RequestMapping("/bank")
 @AllArgsConstructor
-public class BankController extends BaseController {
+public class BankController {
 
     private BankService bankService;
 
     @GetMapping("/list")
-    public R<?> list() {
-        return R.ok(bankService.list());
+    public AjaxResult list() {
+        return AjaxResult.success(bankService.list());
     }
 
     @PostMapping("/add")
     @Operation(summary = "鏂板閾惰绠$悊琛�")
     @Transactional(rollbackFor = Exception.class)
     @Log(title = "閾惰绠$悊琛�", businessType = BusinessType.INSERT)
-    public R<?> add(@RequestBody Bank bank) {
-        return R.ok(bankService.save(bank));
+    public AjaxResult add(@RequestBody Bank bank) {
+        return AjaxResult.success(bankService.save(bank));
     }
 
     @PostMapping("/update")
     @Operation(summary = "鏇存柊閾惰绠$悊琛�")
     @Transactional(rollbackFor = Exception.class)
     @Log(title = "閾惰绠$悊琛�", businessType = BusinessType.UPDATE)
-    public R<?> update(@RequestBody Bank bank) {
-        return R.ok(bankService.updateById(bank));
+    public AjaxResult update(@RequestBody Bank bank) {
+        return AjaxResult.success(bankService.updateById(bank));
     }
 
     @DeleteMapping("/delete")
     @Operation(summary = "鍒犻櫎閾惰绠$悊琛�")
     @Transactional(rollbackFor = Exception.class)
     @Log(title = "閾惰绠$悊琛�", businessType = BusinessType.DELETE)
-    public R<?> delete(@RequestBody List<Long> ids) {
-        return R.ok(bankService.removeBatchByIds(ids));
+    public AjaxResult delete(@RequestBody List<Long> ids) {
+        return AjaxResult.success(bankService.removeBatchByIds(ids));
     }
 
 }

--
Gitblit v1.9.3