From 751f8b198ef1f7988d3de17516b752aeaa7f4ea4 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 30 四月 2026 10:46:04 +0800
Subject: [PATCH] 采购退货后，仓储物流生成对应的采购退货记录
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 157 insertions(+), 5 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 37c2f5b..aa25cd0 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
@@ -1,22 +1,47 @@
package com.ruoyi.purchase.service.impl;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.SaleEnum;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockOutUnQualifiedRecordTypeEnum;
+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.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.purchase.dto.PurchaseReturnOrderDto;
import com.ruoyi.purchase.dto.PurchaseReturnOrderProductsDto;
import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
-import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper;
+import com.ruoyi.purchase.pojo.PurchaseReturnOrderProducts;
+import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.purchase.vo.PurchaseReturnDetailsVo;
import com.ruoyi.purchase.vo.PurchaseReturnOrderVo;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.service.ISalesLedgerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
@@ -29,6 +54,18 @@
@Autowired
private PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
+ @Autowired
+ private ISalesLedgerService salesLedgerService;
+
+ @Resource
+ private AccountIncomeService accountIncomeService;
+
+ @Resource
+ private StockUtils stockUtils;
+
+ @Resource
+ private QualityInspectMapper qualityInspectMapper;
+
@Override
public IPage<PurchaseReturnOrderVo> listPage(Page page, PurchaseReturnOrderDto purchaseReturnOrderDto) {
return purchaseReturnOrdersMapper.listPage(page, purchaseReturnOrderDto);
@@ -38,14 +75,129 @@
@Transactional(rollbackFor = Exception.class)
public Boolean add(PurchaseReturnOrderDto purchaseReturnOrderDto) {
this.save(purchaseReturnOrderDto);
+
if (!purchaseReturnOrderDto.getPurchaseReturnOrderProductsDtos().isEmpty()) {
- for (PurchaseReturnOrderProductsDto purchaseReturnOrderProductsDto :purchaseReturnOrderDto.getPurchaseReturnOrderProductsDtos()) {
+ // 鍏堟煡璇㈡墍鏈夐攢鍞彴璐︿骇鍝佷俊鎭紝鐢ㄤ簬鍚庣画搴撳瓨鎵ｅ噺
+ List<Long> productIds = purchaseReturnOrderDto.getPurchaseReturnOrderProductsDtos().stream()
+ .map(PurchaseReturnOrderProductsDto::getSalesLedgerProductId)
+ .distinct()
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ List<SalesLedgerProduct> salesLedgerProducts = salesLedgerService.getSalesLedgerProductListByIds(productIds, SaleEnum.PURCHASE);
+ Map<Long, SalesLedgerProduct> productMap = salesLedgerProducts.stream()
+ .collect(Collectors.toMap(SalesLedgerProduct::getId, product -> product));
+
+ for (PurchaseReturnOrderProductsDto purchaseReturnOrderProductsDto : purchaseReturnOrderDto.getPurchaseReturnOrderProductsDtos()) {
purchaseReturnOrderProductsDto.setSalesLedgerProductId(purchaseReturnOrderProductsDto.getSalesLedgerProductId());
purchaseReturnOrderProductsDto.setPurchaseReturnOrderId(purchaseReturnOrderDto.getId());
purchaseReturnOrderProductsDto.setReturnQuantity(purchaseReturnOrderProductsDto.getReturnQuantity());
+ // 杩欓噷涓烘柊澧炲洜姝d涓簄ull
+ purchaseReturnOrderProductsDto.setId(null);
purchaseReturnOrderProductsMapper.insert(purchaseReturnOrderProductsDto);
+
+ // 鍚屾杩涜搴撳瓨鎵ｅ噺鍜屽嚭搴撹褰�
+ SalesLedgerProduct salesLedgerProduct = productMap.get(purchaseReturnOrderProductsDto.getSalesLedgerProductId());
+ if (salesLedgerProduct != null && salesLedgerProduct.getProductModelId() != null) {
+ // 鏍规嵁 SalesLedgerProduct 涓殑 isChecked 鍒ゆ柇鏄惁闇�瑕佽川妫�
+ Boolean isChecked = salesLedgerProduct.getIsChecked();
+ if (Boolean.TRUE.equals(isChecked)) {
+ // 闇�瑕佽川妫�锛屾牴鎹川妫�缁撴灉鍒ゆ柇
+ LambdaQueryWrapper<QualityInspect> inspectQueryWrapper = new LambdaQueryWrapper<>();
+ inspectQueryWrapper.eq(QualityInspect::getPurchaseLedgerId, purchaseReturnOrderDto.getPurchaseLedgerId());
+ QualityInspect inspect = qualityInspectMapper.selectOne(inspectQueryWrapper);
+ if (inspect == null) {
+ throw new RuntimeException("璇ラ噰璐鍗曟病鏈夎川妫�璁板綍");
+ }
+ // 鑾峰彇璐ㄦ璁板綍鐨勭粨鏋�
+ String checkResult = inspect.getCheckResult();
+ if ("鍚堟牸".equals(checkResult)) {
+ // 璐ㄦ鍚堟牸锛屾墸鍑忓悎鏍煎簱瀛�
+ stockUtils.substractStock(
+ salesLedgerProduct.getProductModelId(),
+ purchaseReturnOrderProductsDto.getReturnQuantity(),
+ StockOutQualifiedRecordTypeEnum.PURCHASE_RETURN_STOCK_OUT.getCode(),
+ purchaseReturnOrderDto.getId()
+ );
+ } else if ("涓嶅悎鏍�".equals(checkResult)) {
+ // 璐ㄦ涓嶅悎鏍硷紝鎵ｅ噺涓嶅悎鏍煎簱瀛�
+ stockUtils.subtractUnStock(
+ salesLedgerProduct.getProductModelId(),
+ purchaseReturnOrderProductsDto.getReturnQuantity(),
+ StockOutUnQualifiedRecordTypeEnum.PURCHASE_RETURN_STOCK_OUT.getCode(),
+ purchaseReturnOrderDto.getId()
+ );
+ } else {
+ throw new RuntimeException("璐ㄦ缁撴灉涓嶆纭�: " + checkResult);
+ }
+ } else {
+ // 涓嶉渶瑕佽川妫�锛屾墸鍑忓悎鏍煎簱瀛�
+ stockUtils.substractStock(
+ salesLedgerProduct.getProductModelId(),
+ purchaseReturnOrderProductsDto.getReturnQuantity(),
+ StockOutQualifiedRecordTypeEnum.PURCHASE_RETURN_STOCK_OUT.getCode(),
+ purchaseReturnOrderDto.getId()
+ );
+ }
+ }
}
+ }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;
}
-}
+
+ @Override
+ public PurchaseReturnDetailsVo getPurchaseReturnOrderDtoById(Long id) {
+ PurchaseReturnOrders purchaseReturnOrders = purchaseReturnOrdersMapper.selectById(id);
+ PurchaseReturnDetailsVo purchaseReturnOrderDto = BeanUtil.copyProperties(purchaseReturnOrders, PurchaseReturnDetailsVo.class);
+ // 鏌ヨ鍑轰粬鍏蜂綋瀵瑰簲鐨勯��璐�
+ LambdaQueryWrapper<PurchaseReturnOrderProducts> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(PurchaseReturnOrderProducts::getPurchaseReturnOrderId, purchaseReturnOrders.getId());
+
+ List<PurchaseReturnOrderProducts> purchaseReturnOrderProducts = purchaseReturnOrderProductsMapper.selectList(queryWrapper);
+ List<PurchaseReturnDetailsVo.PurchaseReturnOrderProductsDetailVo> purchaseReturnOrderProductsDetailVos = BeanUtil.copyToList(purchaseReturnOrderProducts, PurchaseReturnDetailsVo.PurchaseReturnOrderProductsDetailVo.class);
+ // 鏌ヨ鍑哄搴旂殑鍟嗗搧淇℃伅
+ List<Long> productIds = purchaseReturnOrderProductsDetailVos.stream().map(PurchaseReturnDetailsVo.PurchaseReturnOrderProductsDetailVo::getSalesLedgerProductId).distinct().filter(Objects::nonNull).collect(Collectors.toList());
+ List<SalesLedgerProduct> salesLedgerProducts = salesLedgerService.getSalesLedgerProductListByIds(productIds, SaleEnum.PURCHASE);
+ Map<Long, SalesLedgerProduct> productmap = salesLedgerProducts.stream().collect(Collectors.toMap(SalesLedgerProduct::getId, product -> product));
+ purchaseReturnOrderProductsDetailVos.forEach(purchaseReturnOrderProductsDetailVo -> {
+ purchaseReturnOrderProductsDetailVo.setSalesLedgerProduct(productmap.get(purchaseReturnOrderProductsDetailVo.getSalesLedgerProductId()));
+ });
+
+ purchaseReturnOrderDto.setPurchaseReturnOrderProductsDetailVoList(purchaseReturnOrderProductsDetailVos);
+
+
+ return purchaseReturnOrderDto;
+ }
+
+ @Override
+ @Transactional
+ public void deleteById(Long id) {
+ purchaseReturnOrdersMapper.deleteById(id);
+ LambdaUpdateWrapper<PurchaseReturnOrderProducts> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(PurchaseReturnOrderProducts::getPurchaseReturnOrderId, id);
+ purchaseReturnOrderProductsMapper.delete(updateWrapper);
+
+ // 璐㈠姟
+ LambdaUpdateWrapper<AccountIncome> updateWrapperAccountIncome = new LambdaUpdateWrapper<>();
+ updateWrapperAccountIncome.eq(AccountIncome::getBusinessId, id);
+ updateWrapperAccountIncome.eq(AccountIncome::getBusinessType, 1);
+ updateWrapperAccountIncome.eq(AccountIncome::getIncomeType, 4);
+ accountIncomeService.remove(updateWrapperAccountIncome);
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3