Merge remote-tracking branch 'origin/dev_南通_苏珩' into dev_南通_苏珩

gaoluyang

8 天以前 6b8585fc452ecdcaa82d86fab79a9f27bb442851

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java

@@ -67,6 +67,9 @@
public class MesQcOqcServiceImpl implements MesQcOqcService {

    @Resource
    private cn.iocoder.yudao.module.mes.service.qc.MesQcCompletionHelper completionHelper;

    @Resource
    private MesQcOqcMapper oqcMapper;

    @Resource
@@ -111,26 +114,11 @@
        // 1.2 校验来源单据参数，并验证数据存在
        String sourceDocCode = validateAndGetSourceDocCode(
                createReqVO.getSourceDocType(), createReqVO.getSourceLineId());
        // 1.3 根据产品 + OQC 类型查找可用质检方案（支持前端显式指定）
        List<MesQcTemplateItemDO> templateItems = templateItemService.getTemplateItemList(
                createReqVO.getItemId(), MesQcTypeEnum.OQC.getType(), null, null);
        if (CollUtil.isEmpty(templateItems)) {
            throw exception(QC_NO_TEMPLATE);
        }
        MesQcTemplateItemDO templateItem = templateItems.get(0);
        if (createReqVO.getTemplateId() != null) {
            templateItem = templateItems.stream()
                    .filter(available -> Objects.equals(available.getTemplateId(), createReqVO.getTemplateId()))
                    .findFirst().orElse(null);
            if (templateItem == null) {
                throw exception(QC_NO_TEMPLATE); // 指定了方案但不在匹配列表中，拒绝
            }
        }
        Long templateId = templateItem.getTemplateId();
        // 新建质检单不依赖质检方案。

        // 2. 插入主表
        MesQcOqcDO oqc = BeanUtils.toBean(createReqVO, MesQcOqcDO.class)
                .setTemplateId(templateId)
                .setTemplateId(null)
                .setSourceDocCode(sourceDocCode)
                .setStatus(MesQcStatusEnum.DRAFT.getStatus());
        if (createReqVO.getSourceLineId() != null) {
@@ -138,9 +126,6 @@
                    .validateProductSalesLineExists(createReqVO.getSourceLineId())));
        }
        oqcMapper.insert(oqc);

        // 3. 从模板指标自动生成检验行
        oqcLineService.createLinesFromTemplate(oqc.getId(), templateId);
        return oqc.getId();
    }

@@ -176,18 +161,16 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void finishOqc(Long id) {
        completionHelper.lockDocument("oqc", id);
        // 1.1 校验存在 + 草稿状态
        MesQcOqcDO oqc = validateOqcStatusPrepare(id);
        // 1.2 校验检测结论必填
        if (oqc.getCheckResult() == null) {
            throw exception(QC_OQC_CHECK_RESULT_EMPTY);
        }
        // 1.3 校验至少存在一条检测结果
        indicatorResultService.validateIndicatorResultExistsByQcIdAndType(id, MesQcTypeEnum.OQC.getType());
        int result = completionHelper.validateAndGetResult("oqc", id, oqc.getQualifiedQuantity(), oqc.getUnqualifiedQuantity(), oqc.getCheckQuantity());
        oqc.setCheckResult(result);


        // 2. 更新状态为已完成
        MesQcOqcDO updateObj = new MesQcOqcDO()
                .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus());
                .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus()).setCheckResult(result);
        oqcMapper.updateById(updateObj);

        // 3. 不合格时自动创建 NCR
@@ -367,17 +350,6 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long createOqcFromProductSales(Long salesId, MesWmProductSalesLineDO line, String salesCode, Long clientId) {
        // 1. 校验物料是否配置了 OQC 检验模板
        MesQcTemplateItemDO templateItem;
        try {
            templateItem = templateItemService.getRequiredTemplateByItemIdAndType(
                    line.getItemId(), MesQcTypeEnum.OQC.getType());
        } catch (Exception e) {
            // 获取物料信息，提供更明确的错误提示
            String itemInfo = getItemInfo(line.getItemId());
            throw exception(QC_NO_TEMPLATE_FOR_ITEM, itemInfo);
        }
        Long templateId = templateItem.getTemplateId();

        // 2. 生成检验单编码
        String code = "OQC" + System.currentTimeMillis();
@@ -386,7 +358,7 @@
        MesQcOqcDO oqc = new MesQcOqcDO();
        oqc.setCode(code);
        oqc.setName(salesCode + "-出货检验");
        oqc.setTemplateId(templateId);

        oqc.setSourceDocType(MesBizTypeConstants.WM_PRODUCT_SALES);
        oqc.setSourceDocId(salesId);
        oqc.setSourceLineId(line.getId());
@@ -407,8 +379,6 @@
        oqc.setStatus(MesQcStatusEnum.DRAFT.getStatus());
        oqcMapper.insert(oqc);

        // 4. 从模板指标自动生成检验行
        oqcLineService.createLinesFromTemplate(oqc.getId(), templateId);

        return oqc.getId();
    }