宁夏万通需求：出库单行支持主/辅单位录入；考勤节假日配置改为时间段；物料型号维护；设备批量删除；来料检验默认方案解析

吴羡

2026-09-30 e10c196ff7348a4461e8facee10a208779244ece

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueLineServiceImpl.java

@@ -11,25 +11,28 @@
import cn.iocoder.yudao.module.mes.dal.mysql.wm.outsourceissue.MesWmOutsourceIssueLineMapper;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderBomService;
import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
import cn.iocoder.yudao.module.mes.service.wm.unitconvert.MesWmItemUnitConvertService;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;

import java.math.BigDecimal;
import java.util.List;

import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_OUTSOURCE_ISSUE_LINE_NOT_EXISTS;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_OUTSOURCE_ISSUE_LINE_ITEM_NOT_IN_BOM;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_OUTSOURCE_ISSUE_LINE_QUANTITY_REQUIRED;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_OUTSOURCE_ISSUE_NOT_EXISTS;

/**
 * MES 外协发料单行 Service 实现类
 *
 * @author 芋道源码
 * @author 超级管理员
 */
@Service
@Validated
@@ -44,11 +47,13 @@
    @Lazy
    private MesWmOutsourceIssueService outsourceIssueService;
    @Resource
    private MesMdItemService itemService;
    private MesMdmItemService mdmItemService;
    @Resource
    private MesWmBatchService batchService;
    @Resource
    private MesProWorkOrderBomService workOrderBomService;
    @Resource
    private MesWmItemUnitConvertService itemUnitConvertService;

    @Override
    public Long createOutsourceIssueLine(MesWmOutsourceIssueLineSaveReqVO createReqVO) {
@@ -56,6 +61,8 @@
        validateOutsourceIssueLineSaveData(createReqVO);
        // 根据 batchCode 解析 batchId
        fillBatchId(createReqVO);
        // 双单位换算：按录入单位换算为物料主单位数量
        fillPrimaryQuantity(createReqVO);

        // 插入
        MesWmOutsourceIssueLineDO line = BeanUtils.toBean(createReqVO, MesWmOutsourceIssueLineDO.class);
@@ -71,10 +78,31 @@
        validateOutsourceIssueLineSaveData(updateReqVO);
        // 根据 batchCode 解析 batchId
        fillBatchId(updateReqVO);
        // 双单位换算：按录入单位换算为物料主单位数量
        fillPrimaryQuantity(updateReqVO);

        // 更新
        MesWmOutsourceIssueLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmOutsourceIssueLineDO.class);
        outsourceIssueLineMapper.updateById(updateObj);
    }

    /**
     * 双单位换算：选择了录入单位时，按「录入数量 × 换算比率」得到物料主单位口径的发料数量
     *
     * 未按辅单位录入时必须直接填写发料数量
     */
    private void fillPrimaryQuantity(MesWmOutsourceIssueLineSaveReqVO reqVO) {
        if (reqVO.getEnterUnitMeasureId() != null) {
            BigDecimal primaryQuantity = itemUnitConvertService.convertToPrimaryUnit(
                    reqVO.getItemId(), reqVO.getItemModelId(),
                    reqVO.getEnterUnitMeasureId(), reqVO.getEnterQuantity());
            if (primaryQuantity != null) {
                reqVO.setQuantity(primaryQuantity);
            }
        }
        if (reqVO.getQuantity() == null) {
            throw exception(WM_OUTSOURCE_ISSUE_LINE_QUANTITY_REQUIRED);
        }
    }

    @Override
@@ -121,7 +149,7 @@
            throw exception(WM_OUTSOURCE_ISSUE_NOT_EXISTS);
        }
        // 校验关联的物料存在
        itemService.validateItemExistsAndEnable(saveReqVO.getItemId());
        mdmItemService.validateItemExistsAndEnable(saveReqVO.getItemId());
        // 校验物料是否在工单 BOM 中
        validateItemInWorkOrderBom(issue.getWorkOrderId(), saveReqVO.getItemId());
    }