From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java | 35 +++--------------------------------
1 files changed, 3 insertions(+), 32 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 24e3405..318c36d 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;
@@ -29,13 +24,11 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerService;
import com.ruoyi.stock.mapper.StockOutRecordMapper;
-import com.ruoyi.stock.pojo.StockOutRecord;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
-import java.util.stream.Collectors;
/**
* <p>
@@ -52,7 +45,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;
@@ -84,21 +76,6 @@
}else {
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);
return true;
}
@@ -122,15 +99,9 @@
updateWrapper.eq(PurchaseReturnOrderProducts::getPurchaseReturnOrderId, id);
purchaseReturnOrderProductsMapper.delete(updateWrapper);
//(閲囪喘閫�璐х殑鏁版嵁闇�瑕佸垹鎺�)
- stockOutRecordMapper.delete(Wrappers.<StockOutRecord>lambdaQuery()
- .eq(StockOutRecord::getRecordType,StockOutQualifiedRecordTypeEnum.PURCHASE_RETURN_STOCK_OUT.getCode())
- .in(StockOutRecord::getRecordId, purchaseReturnOrderProducts.stream().map(PurchaseReturnOrderProducts::getId).collect(Collectors.toList())));
- // 璐㈠姟
- LambdaUpdateWrapper<AccountIncome> updateWrapperAccountIncome = new LambdaUpdateWrapper<>();
- updateWrapperAccountIncome.eq(AccountIncome::getBusinessId, id);
- updateWrapperAccountIncome.eq(AccountIncome::getBusinessType, 1);
- updateWrapperAccountIncome.eq(AccountIncome::getIncomeType, 4);
- accountIncomeService.remove(updateWrapperAccountIncome);
+ purchaseReturnOrderProducts.stream().forEach(purchaseReturnOrderProducts1 -> {
+ stockUtils.deleteStockOutRecord(purchaseReturnOrderProducts1.getId(),StockOutQualifiedRecordTypeEnum.PURCHASE_RETURN_STOCK_OUT.getCode());
+ });
}
@Override
--
Gitblit v1.9.3