From 6bacf93d628a974bb4882029e3a8847d5715572f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 25 六月 2026 15:19:38 +0800
Subject: [PATCH] feat(purchase): 采购添加实际合同金额字段并实现退货扣减逻辑
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java | 39 +++++++++++++--------------------------
1 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
index 9da4a11..dd8fa0f 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
@@ -6,12 +6,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.pojo.AccountIncome;
-import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.purchase.dto.PurchaseReturnOrderDto;
import com.ruoyi.purchase.dto.PurchaseReturnOrderHasAllInfoDto;
@@ -19,6 +14,7 @@
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper;
+import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.pojo.PurchaseReturnOrderProducts;
import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
@@ -33,6 +29,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -50,7 +47,6 @@
private final PurchaseReturnOrdersMapper purchaseReturnOrdersMapper;
private final PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
private final ISalesLedgerService salesLedgerService;
- private final AccountIncomeService accountIncomeService;
private final StockUtils stockUtils;
private final SalesLedgerProductMapper salesLedgerProductMapper;
private final PurchaseLedgerMapper purchaseLedgerMapper;
@@ -83,20 +79,17 @@
throw new RuntimeException("璇烽�夋嫨閫�璐у晢鍝�");
}
- // 瀵硅储鍔＄鐞嗗彴璐︽坊鍔犱竴绗旇繘璐︽敹鍏�.
- AccountIncome accountIncome = new AccountIncome();
- LoginUser loginUser = SecurityUtils.getLoginUser();
- accountIncome.setInputUser(loginUser.getUsername());
- accountIncome.setIncomeMoney(purchaseReturnOrderDto.getTotalAmount());
- accountIncome.setIncomeDate(DateUtils.toDate(purchaseReturnOrderDto.getPreparedAt()));
- accountIncome.setInputTime(DateUtils.toDate(purchaseReturnOrderDto.getPreparedAt()));
- accountIncome.setBusinessId(purchaseReturnOrderDto.getId());
- accountIncome.setBusinessType(1);
- accountIncome.setIncomeType("4");
- accountIncome.setCustomerName(purchaseReturnOrderDto.getSupplierName());
- accountIncome.setIncomeDescribed(purchaseReturnOrderDto.getRemark());
- accountIncome.setIncomeMethod(String.valueOf(purchaseReturnOrderDto.getIncomeType()));
- accountIncomeService.save(accountIncome);
+ // 鏇存柊閲囪喘鍙拌处鐨勫疄闄呭悎鍚岄噾棰�
+ if (purchaseReturnOrderDto.getPurchaseLedgerId() != null && purchaseReturnOrderDto.getTotalAmount() != null) {
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(purchaseReturnOrderDto.getPurchaseLedgerId());
+ if (purchaseLedger != null) {
+ BigDecimal baseAmount = purchaseLedger.getNetContractAmount() != null
+ ? purchaseLedger.getNetContractAmount()
+ : purchaseLedger.getContractAmount();
+ purchaseLedger.setNetContractAmount(baseAmount.subtract(purchaseReturnOrderDto.getTotalAmount()));
+ purchaseLedgerMapper.updateById(purchaseLedger);
+ }
+ }
return true;
}
@@ -123,12 +116,6 @@
purchaseReturnOrderProducts.stream().forEach(purchaseReturnOrderProducts1 -> {
stockUtils.deleteStockOutRecord(purchaseReturnOrderProducts1.getId(),StockOutQualifiedRecordTypeEnum.PURCHASE_RETURN_STOCK_OUT.getCode());
});
- // 璐㈠姟
- LambdaUpdateWrapper<AccountIncome> updateWrapperAccountIncome = new LambdaUpdateWrapper<>();
- updateWrapperAccountIncome.eq(AccountIncome::getBusinessId, id);
- updateWrapperAccountIncome.eq(AccountIncome::getBusinessType, 1);
- updateWrapperAccountIncome.eq(AccountIncome::getIncomeType, 4);
- accountIncomeService.remove(updateWrapperAccountIncome);
}
@Override
--
Gitblit v1.9.3