云
2 天以前 657698fd2fb32794932474648dbaee9e284e38c8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
@@ -151,11 +151,18 @@
    }
    private void validateIqcSaveData(MesQcIqcSaveReqVO reqVO) {
        // 空字符串也需要写入,以支持编辑时清空手填名称。
        if (reqVO.getVendorName() != null) {
            reqVO.setVendorName(reqVO.getVendorName().trim());
        }
        // 校验编号唯一
        validateIqcCodeUnique(reqVO.getId(), reqVO.getCode());
        // 校验供应商存在
        if (reqVO.getVendorId() != null) {
            srmSupplierApi.getSupplier(reqVO.getVendorId());
            var supplier = srmSupplierApi.getSupplier(reqVO.getVendorId()).getCheckedData();
            if (reqVO.getVendorName() == null && supplier != null) {
                reqVO.setVendorName(supplier.getName());
            }
        }
        // 校验物料存在(使用 MDM 物料)
        if (reqVO.getItemId() != null) {
@@ -405,6 +412,12 @@
        iqc.setSourceLineId(line.getId());
        iqc.setSourceDocCode(noticeCode);
        iqc.setVendorId(vendorId);
        if (vendorId != null) {
            var supplier = srmSupplierApi.getSupplier(vendorId).getCheckedData();
            if (supplier != null) {
                iqc.setVendorName(supplier.getName());
            }
        }
        iqc.setItemId(line.getItemId());
        iqc.setReceivedQuantity(line.getArrivalQuantity());
        iqc.setCheckQuantity(BigDecimal.ZERO); // 待填写
@@ -507,7 +520,7 @@
        }
        reqVO.setName(row.getName().trim());
        reqVO.setItemId(qcImportHelper.resolveItemId(row.getItemCode()));
        reqVO.setVendorId(qcImportHelper.resolveVendorId(row.getVendorName()));
        reqVO.setVendorName(StrUtil.trimToEmpty(row.getVendorName()));
        reqVO.setVendorBatch(StrUtil.trimToNull(row.getVendorBatch()));
        reqVO.setTemplateId(qcImportHelper.resolveTemplateId(row.getTemplateName()));
        // 3. 数量:合格品 + 不合格品 必须等于本次接收数量(接收数量留空则自动合计)
@@ -525,7 +538,7 @@
        reqVO.setReceiveDate(qcImportHelper.parseRequiredDateTime(row.getReceiveDate(), "来料日期"));
        reqVO.setRemark(StrUtil.trimToNull(row.getRemark()));
        // 5. 去重:同一 物料 + 供应商 + 供应商批次 + 来料日期 的来料检验单不可重复导入
        MesQcIqcDO duplicate = CollUtil.getFirst(iqcMapper.selectListByImportKey(reqVO.getItemId(), reqVO.getVendorId(),
        MesQcIqcDO duplicate = CollUtil.getFirst(iqcMapper.selectListByImportKey(reqVO.getItemId(), reqVO.getVendorName(),
                reqVO.getVendorBatch(), reqVO.getReceiveDate()));
        if (duplicate != null) {
            throw MesQcImportHelper.duplicateExistingException(buildImportKeyDesc(row), "来料检验单",