gaoluyang
5 小时以前 7a923e32e55e9c34830690341469cc170f65092e
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
@@ -4,11 +4,15 @@
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.aftersales.api.AfterSaleTicketApi;
import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnStageReqDTO;
import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnCreateReqDTO;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
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.MesWmReturnSalesPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.detail.MesWmReturnSalesDetailSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDetailDO;
@@ -18,7 +22,7 @@
import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
@@ -31,6 +35,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -39,7 +44,7 @@
/**
 * MES 销售退货单 Service 实现类
 *
 * @author 芋道源码
 * @author 超级管理员
 */
@Service
@Validated
@@ -53,11 +58,13 @@
    @Resource
    private MesWmReturnSalesDetailService returnSalesDetailService;
    @Resource
    private MesMdClientService clientService;
    private CrmCustomerApi customerApi;
    @Resource
    private MesMdmItemService mdmItemService;
    @Resource
    private MesWmTransactionService wmTransactionService;
    @Resource
    private AfterSaleTicketApi afterSaleTicketApi;
    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -69,6 +76,15 @@
        MesWmReturnSalesDO returnSales = BeanUtils.toBean(createReqVO, MesWmReturnSalesDO.class);
        returnSales.setStatus(MesWmReturnSalesStatusEnum.PREPARE.getStatus());
        returnSalesMapper.insert(returnSales);
        // 3. 同步关联售后工单:仓储退货留痕 + 工单进入待退货
        AfterSaleWarehouseReturnCreateReqDTO returnReqDTO = new AfterSaleWarehouseReturnCreateReqDTO();
        returnReqDTO.setSaleOrderId(createReqVO.getSaleOrderId());
        returnReqDTO.setReturnSalesId(returnSales.getId());
        returnReqDTO.setReturnSalesCode(createReqVO.getCode());
        returnReqDTO.setReturnReason(createReqVO.getReturnReason());
        afterSaleTicketApi.onWarehouseReturnCreated(returnReqDTO);
        return returnSales.getId();
    }
@@ -106,7 +122,7 @@
    @Override
    public PageResult<MesWmReturnSalesDO> getReturnSalesPage(MesWmReturnSalesPageReqVO pageReqVO) {
        return returnSalesMapper.selectPage(pageReqVO);
        return returnSalesMapper.selectPage(pageReqVO, (List<Long>) null);
    }
    @Override
@@ -132,32 +148,56 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void finishReturnSales(Long id) {
        // 1.1 校验存在 + 待执行状态
        MesWmReturnSalesDO returnSales = validateReturnSalesExists(id);
    public void confirmReturnSales(Long id, Long warehouseId, Long locationId, Long areaId) {
        if (warehouseId == null || locationId == null || areaId == null) {
            throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "请选择入库仓库、库区和库位");
        }
        MesWmReturnSalesDO returnSales = returnSalesMapper.selectByIdForUpdate(id);
        if (returnSales == null) throw exception(WM_RETURN_SALES_NOT_EXISTS);
        if (ObjUtil.notEqual(MesWmReturnSalesStatusEnum.APPROVING.getStatus(), returnSales.getStatus())) {
            throw exception(WM_RETURN_SALES_STATUS_NOT_APPROVING);
        }
        // 1.2 校验至少有一条行
        List<MesWmReturnSalesLineDO> lines = returnSalesLineService.getReturnSalesLineListByReturnId(id);
        if (CollUtil.isEmpty(lines)) {
            throw exception(WM_RETURN_SALES_NO_LINE);
        if (CollUtil.isEmpty(lines)) throw exception(WM_RETURN_SALES_NO_LINE);
        if (CollUtil.isNotEmpty(returnSalesDetailService.getReturnSalesDetailListByReturnId(id))) {
            throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "退货单已有上架明细,请按原流程完成");
        }
        // 2. 执行退货(待执行 -> 待上架)
        // 明细服务会校验质检结果、库位层级、混放规则和批次。
        returnSalesMapper.updateById(new MesWmReturnSalesDO()
                .setId(id).setStatus(MesWmReturnSalesStatusEnum.APPROVED.getStatus()));
        for (MesWmReturnSalesLineDO line : lines) {
            if (line.getNcrDispositionId() != null
                    && Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.FAIL.getStatus())) continue;
            if (ObjUtil.notEqual(line.getQualityStatus(), MesWmQualityStatusEnum.PASS.getStatus())) {
                throw exception(WM_RETURN_SALES_LINE_NOT_QUALIFIED);
            }
            MesWmReturnSalesDetailSaveReqVO detail = new MesWmReturnSalesDetailSaveReqVO();
            detail.setReturnId(id);
            detail.setLineId(line.getId());
            detail.setItemId(line.getItemId());
            detail.setQuantity(line.getQuantity());
            detail.setWarehouseId(warehouseId);
            detail.setLocationId(locationId);
            detail.setAreaId(areaId);
            returnSalesDetailService.createReturnSalesDetail(detail);
        }
        stockReturnSales(id);
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void stockReturnSales(Long id) {
        // 1.1 校验存在 + 待上架状态
        MesWmReturnSalesDO returnSales = validateReturnSalesExists(id);
        MesWmReturnSalesDO returnSales = returnSalesMapper.selectByIdForUpdate(id);
        if (returnSales == null) throw exception(WM_RETURN_SALES_NOT_EXISTS);
        if (ObjUtil.notEqual(MesWmReturnSalesStatusEnum.APPROVED.getStatus(), returnSales.getStatus())) {
            throw exception(WM_RETURN_SALES_STATUS_NOT_APPROVED);
        }
        // 1.2 检查每个行的明细数量是否完成上架
        List<MesWmReturnSalesLineDO> lines = returnSalesLineService.getReturnSalesLineListByReturnId(id);
        if (CollUtil.isEmpty(lines)) {
            throw exception(WM_RETURN_SALES_NO_LINE);
        }
        if (CollUtil.isNotEmpty(lines)) {
            // 批量查询所有明细
            List<MesWmReturnSalesDetailDO> allDetails = returnSalesDetailService.getReturnSalesDetailListByReturnId(id);
@@ -165,11 +205,20 @@
                    allDetails, MesWmReturnSalesDetailDO::getLineId);
            // 检查每行的明细数量
            for (MesWmReturnSalesLineDO line : lines) {
                if (line.getNcrDispositionId() != null && Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.FAIL.getStatus())) {
                    if (!detailMap.getOrDefault(line.getId(), Collections.emptyList()).isEmpty()) {
                        throw exception(WM_RETURN_SALES_LINE_NOT_QUALIFIED);
                    }
                    continue; // 不合格数量由 NCR 独立处理,不在原退货单再次入库
                }
                if (ObjUtil.notEqual(line.getQualityStatus(), MesWmQualityStatusEnum.PASS.getStatus())) {
                    throw exception(WM_RETURN_SALES_LINE_NOT_QUALIFIED);
                }
                List<MesWmReturnSalesDetailDO> details = detailMap.getOrDefault(line.getId(), Collections.emptyList());
                BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details,
                        MesWmReturnSalesDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
                // 对比行数量与明细总数量,不满足直接抛出
                if (line.getQuantity().compareTo(totalDetailQuantity) > 0) {
                if (line.getQuantity() == null || line.getQuantity().compareTo(totalDetailQuantity) != 0) {
                    MesMdmItemDO item = mdmItemService.validateItemExistsAndEnable(line.getItemId());
                    throw exception(WM_RETURN_SALES_DETAIL_QUANTITY_MISMATCH,
                            item.getCode() + " " + item.getName() + " 未完成上架");
@@ -183,6 +232,12 @@
        // 3. 更新退货单状态
        returnSalesMapper.updateById(new MesWmReturnSalesDO()
                .setId(id).setStatus(MesWmReturnSalesStatusEnum.FINISHED.getStatus()));
        if (returnSales.getSaleOrderId() != null) {
            afterSaleTicketApi.onWarehouseReturnInboundFinished(new AfterSaleWarehouseReturnStageReqDTO()
                    .setSaleOrderId(returnSales.getSaleOrderId())
                    .setReturnSalesId(returnSales.getId())
                    .setReturnSalesCode(returnSales.getCode()));
        }
    }
    private void createTransactionList(MesWmReturnSalesDO returnSales) {
@@ -200,7 +255,8 @@
    @Transactional(rollbackFor = Exception.class)
    public void cancelReturnSales(Long id) {
        // 校验存在
        MesWmReturnSalesDO returnSales = validateReturnSalesExists(id);
        MesWmReturnSalesDO returnSales = returnSalesMapper.selectByIdForUpdate(id);
        if (returnSales == null) throw exception(WM_RETURN_SALES_NOT_EXISTS);
        // 已完成和已取消不允许取消
        if (ObjectUtils.equalsAny(returnSales.getStatus(),
                MesWmReturnSalesStatusEnum.FINISHED.getStatus(),
@@ -217,6 +273,9 @@
    public Boolean checkReturnSalesQuantity(Long id) {
        List<MesWmReturnSalesLineDO> lines = returnSalesLineService.getReturnSalesLineListByReturnId(id);
        for (MesWmReturnSalesLineDO line : lines) {
            if (line.getNcrDispositionId() != null && Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.FAIL.getStatus())) {
                continue;
            }
            List<MesWmReturnSalesDetailDO> details = returnSalesDetailService.getReturnSalesDetailListByLineId(line.getId());
            BigDecimal totalDetailQty = CollectionUtils.getSumValue(details,
                    MesWmReturnSalesDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
@@ -272,7 +331,7 @@
     */
    private void validateSaveData(MesWmReturnSalesSaveReqVO reqVO) {
        validateCodeUnique(reqVO.getId(), reqVO.getCode());
        clientService.validateClientExistsAndEnable(reqVO.getClientId());
        customerApi.validateCustomer(reqVO.getClientId());
    }
}