From 9347c9a4a91f9e0b6562fe72a25aa06a76a928e7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 五月 2026 09:25:33 +0800
Subject: [PATCH] refactor(account): 移除AccountExpense相关代码
---
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
index f1fb4e8..e4c7bf7 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
@@ -1,13 +1,18 @@
package com.ruoyi.purchase.controller;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.pojo.AccountStatementDetails;
+import com.ruoyi.account.service.AccountStatementDetailsService;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.OrderUtils;
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.purchase.dto.PurchaseReturnOrderDto;
import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper;
+import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
import com.ruoyi.purchase.vo.PurchaseStockInProductVo;
import io.swagger.v3.oas.annotations.Operation;
@@ -29,43 +34,51 @@
@RequestMapping("/purchaseReturnOrders")
@Tag(name = "閲囪喘閫�璐у崟")
@AllArgsConstructor
-public class PurchaseReturnOrdersController extends BaseController {
+public class PurchaseReturnOrdersController {
private PurchaseReturnOrdersService purchaseReturnOrdersService;
private PurchaseReturnOrdersMapper purchaseReturnOrdersMapper;
+ private AccountStatementDetailsService accountStatementDetailsService;
@GetMapping("/listPage")
- public R<?> listPage(Page page, PurchaseReturnOrderDto purchaseReturnOrderDto) {
- return R.ok(purchaseReturnOrdersService.listPage(page, purchaseReturnOrderDto));
+ public AjaxResult listPage(Page page, PurchaseReturnOrderDto purchaseReturnOrderDto) {
+ return AjaxResult.success(purchaseReturnOrdersService.listPage(page, purchaseReturnOrderDto));
}
// 鏂板
@Log(title = "閲囪喘閫�璐у崟", businessType = BusinessType.INSERT)
@PostMapping("/add")
- public R<?> add(@RequestBody PurchaseReturnOrderDto purchaseReturnOrderDto) throws Exception {
+ public AjaxResult add(@RequestBody PurchaseReturnOrderDto purchaseReturnOrderDto) throws Exception {
if (purchaseReturnOrderDto.getIsDefaultNo()) {
purchaseReturnOrderDto.setNo(OrderUtils.countTodayByCreateTime(purchaseReturnOrdersMapper, "CGTL", "no"));
}
- return R.ok(purchaseReturnOrdersService.add(purchaseReturnOrderDto));
+ return AjaxResult.success(purchaseReturnOrdersService.add(purchaseReturnOrderDto));
}
@GetMapping("/selectById/{id}")
- public R<?> selectById(@PathVariable Long id) {
- return R.ok(purchaseReturnOrdersService.getPurchaseReturnOrderDtoById(id));
+ public AjaxResult selectById(@PathVariable Long id) {
+ return AjaxResult.success(purchaseReturnOrdersService.getPurchaseReturnOrderDtoById(id));
}
@PostMapping("/deleteById/{id}")
- public R<?> deleteById(@PathVariable Long id) {
+ public AjaxResult deleteById(@PathVariable Long id) {
+ //濡傛灉璇ラ噰璐��璐у凡缁忕敓鎴愬璐﹀崟鍒欐棤娉曞垹闄�
+ PurchaseReturnOrders purchaseReturnOrders = purchaseReturnOrdersService.getById(id);
+ List<AccountStatementDetails> accountStatementDetails = accountStatementDetailsService.list(Wrappers.<AccountStatementDetails>lambdaQuery()
+ .eq(AccountStatementDetails::getReceiptNumber, purchaseReturnOrders.getNo()));
+ if (CollectionUtils.isNotEmpty(accountStatementDetails)){
+ throw new ServiceException("璇ラ噰璐��璐у崟宸茬粡鐢熸垚瀵硅处鍗曪紝鏃犳硶鍒犻櫎");
+ }
purchaseReturnOrdersService.deleteById(id);
- return R.ok();
+ return AjaxResult.success();
}
@GetMapping("/getByPurchaseLedgerId")
@Operation(summary = "閲囪喘閫�璐�-鏍规嵁閲囪喘璁㈠崟id鏌ヨ閲囪喘璁㈠崟瀵瑰簲鐨勫叆搴撲骇鍝佷俊鎭�")
- public R<?> getByPurchaseLedgerId(Long purchaseLedgerId) {
+ public AjaxResult getByPurchaseLedgerId(Long purchaseLedgerId) {
List<PurchaseStockInProductVo> purchaseStockInProductVos = purchaseReturnOrdersService.getByPurchaseLedgerId(purchaseLedgerId);
- return R.ok(purchaseStockInProductVos);
+ return AjaxResult.success(purchaseStockInProductVos);
}
--
Gitblit v1.9.3