From 9d66bfbfcda297f628e6a857e343f98422f4534a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 09:32:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_New_pro_OA
---
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
index bb669b6..e4c7bf7 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
@@ -1,12 +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.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;
@@ -31,6 +37,7 @@
public class PurchaseReturnOrdersController {
private PurchaseReturnOrdersService purchaseReturnOrdersService;
private PurchaseReturnOrdersMapper purchaseReturnOrdersMapper;
+ private AccountStatementDetailsService accountStatementDetailsService;
@GetMapping("/listPage")
@@ -56,6 +63,13 @@
@PostMapping("/deleteById/{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 AjaxResult.success();
}
--
Gitblit v1.9.3