feat(aftersales): 售后退货单同步MES批次信息并优化工单处理流程

云

2026-10-25 daf9f8dbb7ba36eb283221d2c6022039aefaf97d

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java

@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.mes.service.wm.returnsales;

import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;

import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
@@ -9,6 +10,7 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesImportExcelVO;
import cn.iocoder.yudao.module.mes.api.event.MesReturnSalesProgressEvent;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesSaveReqVO;
@@ -27,6 +29,7 @@
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;

@@ -64,6 +67,8 @@
    private MesMdmItemService mdmItemService;
    @Resource
    private MesWmTransactionService wmTransactionService;
    @Resource
    private ApplicationEventPublisher eventPublisher;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -73,6 +78,7 @@

        // 2. 插入主表
        MesWmReturnSalesDO returnSales = BeanUtils.toBean(createReqVO, MesWmReturnSalesDO.class);
        returnSales.setAfterSaleReturnId(createReqVO.getAfterSaleReturnId());
        returnSales.setStatus(MesWmReturnSalesStatusEnum.PREPARE.getStatus());
        returnSalesMapper.insert(returnSales);
        return returnSales.getId();
@@ -82,12 +88,16 @@
    @Transactional(rollbackFor = Exception.class)
    public void updateReturnSales(MesWmReturnSalesSaveReqVO updateReqVO) {
        // 1.1 校验存在 + 准备中状态
        validateReturnSalesExistsAndPrepare(updateReqVO.getId());
        MesWmReturnSalesDO existing = validateReturnSalesExistsAndPrepare(updateReqVO.getId());
        if (existing.getAfterSaleReturnId() != null) {
            throw exception(WM_RETURN_SALES_AFTERSALE_LINKED);
        }
        // 1.2 校验关联数据
        validateSaveData(updateReqVO);

        // 2. 更新主表
        MesWmReturnSalesDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnSalesDO.class);
        updateObj.setAfterSaleReturnId(null); // 来源申请不可通过编辑接口改绑
        returnSalesMapper.updateById(updateObj);
    }

@@ -95,7 +105,10 @@
    @Transactional(rollbackFor = Exception.class)
    public void deleteReturnSales(Long id) {
        // 1. 校验存在 + 准备中状态
        validateReturnSalesExistsAndPrepare(id);
        MesWmReturnSalesDO returnSales = validateReturnSalesExistsAndPrepare(id);
        if (returnSales.getAfterSaleReturnId() != null) {
            throw exception(WM_RETURN_SALES_AFTERSALE_LINKED);
        }

        // 2.1 级联删除明细
        returnSalesDetailService.deleteReturnSalesDetailByReturnId(id);
@@ -133,8 +146,13 @@
        Integer targetStatus = hasPendingQc ? MesWmReturnSalesStatusEnum.CONFIRMED.getStatus()
                : MesWmReturnSalesStatusEnum.APPROVING.getStatus();
        // 2.2 提交（草稿 -> 待检验/待执行）
        returnSalesMapper.updateById(new MesWmReturnSalesDO()
                .setId(id).setStatus(targetStatus));
        if (updateStatusIfCurrent(id, MesWmReturnSalesStatusEnum.PREPARE.getStatus(), targetStatus) != 1) {
            throw exception(WM_RETURN_SALES_STATUS_NOT_PREPARE);
        }
        if (!hasPendingQc && validateReturnSalesExists(id).getAfterSaleReturnId() != null) {
            eventPublisher.publishEvent(new MesReturnSalesProgressEvent(id,
                    MesReturnSalesProgressEvent.Stage.QUALITY_FINISHED, "免检"));
        }
    }

    @Override
@@ -151,8 +169,10 @@
            throw exception(WM_RETURN_SALES_NO_LINE);
        }
        // 2. 执行退货（待执行 -> 待上架）
        returnSalesMapper.updateById(new MesWmReturnSalesDO()
                .setId(id).setStatus(MesWmReturnSalesStatusEnum.APPROVED.getStatus()));
        if (updateStatusIfCurrent(id, MesWmReturnSalesStatusEnum.APPROVING.getStatus(),
                MesWmReturnSalesStatusEnum.APPROVED.getStatus()) != 1) {
            throw exception(WM_RETURN_SALES_STATUS_NOT_APPROVING);
        }
    }

    @Override
@@ -184,12 +204,16 @@
            }
        }

        // 2. 遍历所有明细，创建库存事务（增加库存 + 记录流水）
        // 抢占状态后再记库存流水，避免两个并发上架请求重复入库；事务失败会回滚状态。
        if (updateStatusIfCurrent(id, MesWmReturnSalesStatusEnum.APPROVED.getStatus(),
                MesWmReturnSalesStatusEnum.FINISHED.getStatus()) != 1) {
            throw exception(WM_RETURN_SALES_STATUS_NOT_APPROVED);
        }
        createTransactionList(returnSales);

        // 3. 更新退货单状态
        returnSalesMapper.updateById(new MesWmReturnSalesDO()
                .setId(id).setStatus(MesWmReturnSalesStatusEnum.FINISHED.getStatus()));
        if (returnSales.getAfterSaleReturnId() != null) {
            eventPublisher.publishEvent(new MesReturnSalesProgressEvent(id,
                    MesReturnSalesProgressEvent.Stage.INBOUND_FINISHED, null));
        }
    }

    private void createTransactionList(MesWmReturnSalesDO returnSales) {
@@ -216,8 +240,13 @@
        }

        // 取消
        returnSalesMapper.updateById(new MesWmReturnSalesDO()
                .setId(id).setStatus(MesWmReturnSalesStatusEnum.CANCELED.getStatus()));
        if (updateStatusIfCurrent(id, returnSales.getStatus(), MesWmReturnSalesStatusEnum.CANCELED.getStatus()) != 1) {
            throw exception(WM_RETURN_SALES_CANCEL_NOT_ALLOWED);
        }
        if (returnSales.getAfterSaleReturnId() != null) {
            eventPublisher.publishEvent(new MesReturnSalesProgressEvent(id,
                    MesReturnSalesProgressEvent.Stage.CANCELED, null));
        }
    }

    @Override
@@ -257,8 +286,16 @@

    @Override
    public void updateReturnSalesStatus(Long id, Integer status) {
        validateReturnSalesExists(id);
        returnSalesMapper.updateById(new MesWmReturnSalesDO().setId(id).setStatus(status));
        if (updateStatusIfCurrent(id, MesWmReturnSalesStatusEnum.CONFIRMED.getStatus(), status) != 1) {
            throw exception(WM_RETURN_SALES_RQC_SOURCE_INVALID);
        }
    }

    private int updateStatusIfCurrent(Long id, Integer currentStatus, Integer targetStatus) {
        return returnSalesMapper.update(null, new LambdaUpdateWrapper<MesWmReturnSalesDO>()
                .eq(MesWmReturnSalesDO::getId, id)
                .eq(MesWmReturnSalesDO::getStatus, currentStatus)
                .set(MesWmReturnSalesDO::getStatus, targetStatus));
    }

    /**