Merge branch 'dev_business' of http://114.132.189.42:9002/r/mom-pro2-after ...

liyong

2026-07-10 80ddf4c9c0bcb0f6c31524e0d9f5599c8001e904

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java

@@ -5,8 +5,6 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.out.ErpSaleOutPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.out.ErpSaleOutSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
@@ -20,8 +18,11 @@
import cn.iocoder.yudao.module.erp.enums.stock.ErpStockRecordBizTypeEnum;
import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
import cn.iocoder.yudao.module.erp.service.product.ErpProductService;
import cn.iocoder.yudao.module.erp.service.product.mapping.ErpMdmMappingService;
import cn.iocoder.yudao.module.erp.service.stock.ErpStockRecordService;
import cn.iocoder.yudao.module.erp.service.stock.bo.ErpStockRecordCreateReqBO;
import cn.iocoder.yudao.module.wms.api.dto.WmsSalesOutboundReqDTO;
import cn.iocoder.yudao.module.wms.api.stock.WmsStockApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@@ -31,6 +32,7 @@
import org.springframework.validation.annotation.Validated;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -39,6 +41,8 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;

// TODO 芋艿：记录操作日志

/**
 * ERP 销售出库 Service 实现类
@@ -49,11 +53,6 @@
@Validated
@Slf4j
public class ErpSaleOutServiceImpl implements ErpSaleOutService {

    /**
     * BPM 销售出库审批流程标识
     */
    public static final String BPM_PROCESS_DEFINITION_KEY = "erp-sale-out-audit";

    @Resource
    private ErpSaleOutMapper saleOutMapper;
@@ -74,10 +73,13 @@
    private ErpStockRecordService stockRecordService;

    @Resource
    private AdminUserApi adminUserApi;
    private WmsStockApi wmsStockApi;

    @Resource
    private BpmProcessInstanceApi bpmProcessInstanceApi;
    private ErpMdmMappingService mdmMappingService;

    @Resource
    private AdminUserApi adminUserApi;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -100,7 +102,7 @@

        // 2.1 插入出库
        ErpSaleOutDO saleOut = BeanUtils.toBean(createReqVO, ErpSaleOutDO.class, in -> in
                .setNo(no).setStatus(ErpAuditStatus.DRAFT.getStatus()))
                .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus()))
                .setOrderNo(saleOrder.getNo()).setCustomerId(saleOrder.getCustomerId());
        calculateTotalPrice(saleOut, saleOutItems);
        saleOutMapper.insert(saleOut);
@@ -199,16 +201,71 @@
                : ErpStockRecordBizTypeEnum.SALE_OUT_CANCEL.getType();
        saleOutItems.forEach(saleOutItem -> {
            BigDecimal count = approve ? saleOutItem.getCount().negate() : saleOutItem.getCount();
            ErpStockRecordCreateReqBO stockRecordBO = new ErpStockRecordCreateReqBO();
            stockRecordBO.setProductId(saleOutItem.getProductId());
            stockRecordBO.setWarehouseId(saleOutItem.getWarehouseId());
            stockRecordBO.setCount(count);
            stockRecordBO.setBizType(bizType);
            stockRecordBO.setBizId(saleOutItem.getOutId());
            stockRecordBO.setBizItemId(saleOutItem.getId());
            stockRecordBO.setBizNo(saleOut.getNo());
            stockRecordService.createStockRecord(stockRecordBO);
            stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO(
                    saleOutItem.getProductId(), saleOutItem.getWarehouseId(), count,
                    bizType, saleOutItem.getOutId(), saleOutItem.getId(), saleOut.getNo()));
        });

        // 4. 同步 WMS 库存（MES 库存）
        if (approve) {
            syncToWmsSalesOutbound(saleOut, saleOutItems);
        }
    }

    /**
     * 同步销售出库到 WMS 库存
     */
    private void syncToWmsSalesOutbound(ErpSaleOutDO saleOut, List<ErpSaleOutItemDO> saleOutItems) {
        if (CollUtil.isEmpty(saleOutItems)) {
            return;
        }

        log.info("[syncToWmsSalesOutbound] 开始同步销售出库到WMS，saleOutId={}", saleOut.getId());

        // 构建出库请求
        WmsSalesOutboundReqDTO reqDTO = new WmsSalesOutboundReqDTO()
                .setBizId(saleOut.getId())
                .setBizCode(saleOut.getNo())
                .setOutboundTime(LocalDateTime.now());

        // 转换明细项
        List<WmsSalesOutboundReqDTO.Item> items = convertList(saleOutItems, item -> {
            // ERP 产品 ID -> MDM 物料 ID
            Long mdmItemId = mdmMappingService.getMdmItemId(item.getProductId());
            // ERP 仓库 ID -> MES 仓库 ID
            Long mesWarehouseId = mdmMappingService.getMesWarehouseId(item.getWarehouseId());

            if (mdmItemId == null) {
                log.warn("[syncToWmsSalesOutbound] 未找到MDM物料映射，erpProductId={}", item.getProductId());
                return null;
            }
            if (mesWarehouseId == null) {
                log.warn("[syncToWmsSalesOutbound] 未找到MES仓库映射，erpWarehouseId={}", item.getWarehouseId());
                return null;
            }

            return new WmsSalesOutboundReqDTO.Item()
                    .setItemId(mdmItemId)
                    .setWarehouseId(mesWarehouseId)
                    .setQuantity(item.getCount())
                    .setBizLineId(item.getId());
        });

        // 过滤掉映射失败的项
        items = items.stream().filter(java.util.Objects::nonNull).toList();
        if (CollUtil.isEmpty(items)) {
            log.warn("[syncToWmsSalesOutbound] 无有效的出库明细，跳过WMS同步");
            return;
        }

        reqDTO.setItems(items);

        try {
            Long transactionId = wmsStockApi.salesOutbound(reqDTO);
            log.info("[syncToWmsSalesOutbound] 同步成功，transactionId={}", transactionId);
        } catch (Exception e) {
            log.error("[syncToWmsSalesOutbound] 同步失败", e);
        }
    }

    @Override
@@ -327,85 +384,6 @@
            return Collections.emptyList();
        }
        return saleOutItemMapper.selectListByOutIds(outIds);
    }

    // ==================== BPM 流程审批 ====================

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void submitSaleOut(Long id, Long userId) {
        // 1. 校验销售出库处于草稿状态
        ErpSaleOutDO saleOut = validateSaleOutExists(id);
        if (ObjectUtil.notEqual(saleOut.getStatus(), ErpAuditStatus.DRAFT.getStatus())) {
            throw exception(SALE_OUT_SUBMIT_FAIL_NOT_DRAFT);
        }

        // 2. 创建销售出库审批流程实例
        String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
                .setProcessDefinitionKey(BPM_PROCESS_DEFINITION_KEY)
                .setBusinessKey(String.valueOf(id)));

        // 3. 更新销售出库工作流编号、状态
        saleOutMapper.updateById(new ErpSaleOutDO()
                .setId(id)
                .setProcessInstanceId(processInstanceId)
                .setStatus(ErpAuditStatus.PROCESS.getStatus()));
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateSaleOutAuditStatus(Long id, Integer bpmResult) {
        // 1. 校验销售出库存在
        ErpSaleOutDO saleOut = validateSaleOutExists(id);

        // 2. 校验销售出库处于审批中
        if (ObjectUtil.notEqual(saleOut.getStatus(), ErpAuditStatus.PROCESS.getStatus())) {
            log.error("[updateSaleOutAuditStatus][saleOut({}) 不处于审批中，无法更新审批结果({})]",
                    saleOut.getId(), bpmResult);
            throw exception(SALE_OUT_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
        }

        // 3. 更新销售出库审批结果
        Integer auditStatus = convertBpmResultToAuditStatus(bpmResult);
        saleOutMapper.updateById(new ErpSaleOutDO()
                .setId(id)
                .setStatus(auditStatus));

        // 4. 审批通过时变更库存（减少库存）
        if (ErpAuditStatus.APPROVE.getStatus().equals(auditStatus)) {
            List<ErpSaleOutItemDO> saleOutItems = saleOutItemMapper.selectListByOutId(id);
            saleOutItems.forEach(saleOutItem -> {
                ErpStockRecordCreateReqBO stockRecordBO = new ErpStockRecordCreateReqBO();
                stockRecordBO.setProductId(saleOutItem.getProductId());
                stockRecordBO.setWarehouseId(saleOutItem.getWarehouseId());
                stockRecordBO.setCount(saleOutItem.getCount().negate());
                stockRecordBO.setBizType(ErpStockRecordBizTypeEnum.SALE_OUT.getType());
                stockRecordBO.setBizId(saleOutItem.getOutId());
                stockRecordBO.setBizItemId(saleOutItem.getId());
                stockRecordBO.setBizNo(saleOut.getNo());
                stockRecordService.createStockRecord(stockRecordBO);
            });
        }
    }

    /**
     * 将 BPM 审批结果转换为 ERP 审批状态
     *
     * @param bpmResult BPM 审批结果
     * @return ERP 审批状态
     */
    private Integer convertBpmResultToAuditStatus(Integer bpmResult) {
        // BPM 审批结果：2=通过，3=不通过，4=已取消
        if (bpmResult == 2) {
            return ErpAuditStatus.APPROVE.getStatus();
        } else if (bpmResult == 3) {
            return ErpAuditStatus.REJECT.getStatus();
        } else if (bpmResult == 4) {
            return ErpAuditStatus.DRAFT.getStatus();
        } else {
            log.warn("[convertBpmResultToAuditStatus][未知的 BPM 审批结果({})]", bpmResult);
            return ErpAuditStatus.PROCESS.getStatus();
        }
    }

}