huminmin
2026-04-30 751f8b198ef1f7988d3de17516b752aeaa7f4ea4
采购退货后,仓储物流生成对应的采购退货记录
已修改3个文件
76 ■■■■■ 文件已修改
src/main/java/com/ruoyi/common/enums/StockOutUnQualifiedRecordTypeEnum.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/common/enums/StockOutUnQualifiedRecordTypeEnum.java
@@ -7,8 +7,8 @@
public enum StockOutUnQualifiedRecordTypeEnum implements BaseEnum<String> {
    CUSTOMIZATION_UNSTOCK_OUT("10", "不合格自定义出库");
    CUSTOMIZATION_UNSTOCK_OUT("10", "不合格自定义出库"),
    PURCHASE_RETURN_STOCK_OUT("11", "采购退货");
    private final String code;
    private final String value;
src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
@@ -51,10 +51,10 @@
     * @param recordType
     * @param recordId
     */
    public void subtractUnStock(Long productModelId, BigDecimal quantity, Integer recordType,Long recordId) {
    public void subtractUnStock(Long productModelId, BigDecimal quantity, String recordType,Long recordId) {
        StockUninventoryDto stockUninventoryDto = new StockUninventoryDto();
        stockUninventoryDto.setRecordId(recordId);
        stockUninventoryDto.setRecordType(String.valueOf(recordType));
        stockUninventoryDto.setRecordType(recordType);
        stockUninventoryDto.setQualitity(quantity);
        stockUninventoryDto.setProductModelId(productModelId);
        stockUninventoryService.subtractStockUninventory(stockUninventoryDto);
src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
@@ -9,10 +9,15 @@
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;
@@ -55,6 +60,12 @@
    @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);
@@ -66,6 +77,16 @@
        this.save(purchaseReturnOrderDto);
        if (!purchaseReturnOrderDto.getPurchaseReturnOrderProductsDtos().isEmpty()) {
            // 先查询所有销售台账产品信息,用于后续库存扣减
            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());
@@ -73,6 +94,51 @@
                // 这里为新增因此id为null
                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("请选择退货商品");
@@ -134,4 +200,4 @@
        updateWrapperAccountIncome.eq(AccountIncome::getIncomeType, 4);
        accountIncomeService.remove(updateWrapperAccountIncome);
    }
}
}