gaoluyang
6 天以前 6121117080cffd6528b7f233c98e4b1574d8c823
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -21,7 +22,7 @@
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderItemRespDTO;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum;
import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
@@ -30,6 +31,7 @@
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -46,6 +48,9 @@
@Validated
@Slf4j
public class MesWmArrivalNoticeServiceImpl implements MesWmArrivalNoticeService {
    @Resource
    private cn.iocoder.yudao.module.mes.service.qc.ncr.MesQcArrivalDispositionService arrivalDispositionService;
    @Resource
    private MesWmArrivalNoticeMapper arrivalNoticeMapper;
@@ -71,6 +76,10 @@
    @Lazy
    private MesQcIqcService iqcService;
    @Resource
    @Lazy
    private MesWmItemReceiptService itemReceiptService;
    @Override
    public Long createArrivalNotice(MesWmArrivalNoticeSaveReqVO createReqVO) {
        // 校验数据
@@ -78,6 +87,7 @@
        // 插入
        MesWmArrivalNoticeDO notice = BeanUtils.toBean(createReqVO, MesWmArrivalNoticeDO.class);
        fillContractNoFromPurchaseOrder(notice);
        notice.setStatus(MesWmArrivalNoticeStatusEnum.PREPARE.getStatus());
        arrivalNoticeMapper.insert(notice);
        return notice.getId();
@@ -92,7 +102,21 @@
        // 更新
        MesWmArrivalNoticeDO updateObj = BeanUtils.toBean(updateReqVO, MesWmArrivalNoticeDO.class);
        fillContractNoFromPurchaseOrder(updateObj);
        arrivalNoticeMapper.updateById(updateObj);
    }
    /**
     * 采购合同号未显式传入时,从关联的采购订单带入(换货到货必须能追溯到原采购合同)
     */
    private void fillContractNoFromPurchaseOrder(MesWmArrivalNoticeDO notice) {
        if (notice.getPurchaseOrderId() == null || cn.hutool.core.util.StrUtil.isNotBlank(notice.getContractNo())) {
            return;
        }
        ErpPurchaseOrderRespDTO purchaseOrder = purchaseOrderApi.getPurchaseOrder(notice.getPurchaseOrderId()).getCheckedData();
        if (purchaseOrder != null) {
            notice.setContractNo(purchaseOrder.getContractNo());
        }
    }
    private void validateArrivalNoticeSaveData(MesWmArrivalNoticeSaveReqVO reqVO) {
@@ -143,34 +167,72 @@
        }
        // 2. 检查所有行的 iqcCheckFlag:如果有需要检验的行,进入待质检状态
        // 注意:来料检验单不在提交时生成,由库管点击「执行质检」时通过 createIqcForArrivalNotice 生成
        boolean needCheck = CollectionUtils.anyMatch(lines,
                line -> Boolean.TRUE.equals(line.getIqcCheckFlag()));
        if (needCheck) {
            // 2.1 需要检验,进入待质检
            arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
                    .setId(id).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus()));
            // 2.2 为需要质检的行自动创建 IQC 检验单
            for (MesWmArrivalNoticeLineDO line : lines) {
                if (Boolean.TRUE.equals(line.getIqcCheckFlag()) && line.getIqcId() == null) {
                    try {
                        Long iqcId = iqcService.createIqcFromArrivalNotice(
                                id, line, notice.getCode(), notice.getVendorId());
                        // 更新行上的 iqcId
                        arrivalNoticeLineService.updateArrivalNoticeLineIqcId(line.getId(), iqcId);
                        log.info("[submitArrivalNotice][到货通知单({}) 行({}) 自动创建 IQC 检验单({})]",
                                id, line.getId(), iqcId);
                    } catch (Exception e) {
                        log.warn("[submitArrivalNotice][到货通知单({}) 行({}) 创建 IQC 失败: {}]",
                                id, line.getId(), e.getMessage());
                        // 继续处理其他行,不中断流程
                    }
                }
            }
            return;
        }
        // 不需要检验,直接进入待入库
        // 不需要检验,直接进入待入库,并自动生成采购入库单交给库管确认入库
        arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
                .setId(id).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT.getStatus()));
        autoGenerateItemReceipt(notice);
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Integer createIqcForArrivalNotice(Long id) {
        // 1. 校验到货通知单存在且为待质检状态
        MesWmArrivalNoticeDO notice = validateArrivalNoticeExists(id);
        if (ObjUtil.notEqual(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus(), notice.getStatus())) {
            String statusName = Arrays.stream(MesWmArrivalNoticeStatusEnum.values())
                    .filter(item -> ObjUtil.equal(item.getStatus(), notice.getStatus()))
                    .map(MesWmArrivalNoticeStatusEnum::getName).findFirst()
                    .orElse(String.valueOf(notice.getStatus()));
            throw new ServiceException(WM_ARRIVAL_NOTICE_STATUS_NOT_PENDING_QC.getCode(),
                    "到货通知单[" + notice.getCode() + "]当前状态为[" + statusName + "],只有「待质检」状态才能执行质检。"
                            + "请刷新列表确认单据状态;若该单据已执行过质检,请直接到【质量管理 - IQC检验】录入检测结果。");
        }
        // 2. 校验需检行
        List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(id);
        List<MesWmArrivalNoticeLineDO> needCheckLines = lines.stream()
                .filter(line -> Boolean.TRUE.equals(line.getIqcCheckFlag()))
                .toList();
        if (needCheckLines.isEmpty()) {
            throw new ServiceException(WM_ARRIVAL_NOTICE_NO_IQC_LINE.getCode(),
                    "到货通知单[" + notice.getCode() + "]的明细行均为「不需检验」,无需生成来料检验单。"
                            + "请直接到该单据执行入库;若本应检验,请核对采购订单行的检验标识(该标识由采购订单带入,到货通知单上不可修改)。");
        }
        List<MesWmArrivalNoticeLineDO> pendingLines = needCheckLines.stream()
                .filter(line -> line.getIqcId() == null)
                .toList();
        if (pendingLines.isEmpty()) {
            throw new ServiceException(WM_ARRIVAL_NOTICE_IQC_ALREADY_CREATED.getCode(),
                    "到货通知单[" + notice.getCode() + "]的 " + needCheckLines.size()
                            + " 条需检行均已生成来料检验单,无需重复生成。请直接到【质量管理 - IQC检验】录入检测结果;"
                            + "如需重新生成,请先删除原检验单。");
        }
        // 3. 逐行生成来料检验单
        int createdCount = 0;
        for (MesWmArrivalNoticeLineDO line : pendingLines) {
            Long iqcId;
            try {
                iqcId = iqcService.createIqcFromArrivalNotice(id, line, notice.getCode(), notice.getVendorId());
            } catch (Exception ex) {
                log.error("[createIqcForArrivalNotice][到货通知单({}) 行({}) 创建 IQC 失败]", id, line.getId(), ex);
                throw new ServiceException(WM_ARRIVAL_NOTICE_IQC_CREATE_FAILED.getCode(),
                        "到货通知单[" + notice.getCode() + "]的明细行(物料ID=" + line.getItemId()
                                + ")生成来料检验单失败:" + ex.getMessage()
                                + "。请稍后重试;若持续失败,请到【质量管理 - IQC检验】手工新建检验单。");
            }
            arrivalNoticeLineService.updateArrivalNoticeLineIqcId(line.getId(), iqcId);
            createdCount++;
            log.info("[createIqcForArrivalNotice][到货通知单({}) 行({}) 生成 IQC 检验单({})]",
                    id, line.getId(), iqcId);
        }
        return createdCount;
    }
    @Override
@@ -186,6 +248,8 @@
        // 2. 更新到货通知单行:绑定 iqcId + 质检结果 + 合格数量
        arrivalNoticeLineService.updateArrivalNoticeLineWhenIqcFinish(lineId, iqcId, checkResult, qualifiedQuantity);
        // 同时认可仓库已确认的来料退货;保留原始不合格结论。
        arrivalDispositionService.refresh(id);
        // 3.1 判断是否所有需检行都已完成质检
        List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(id);
        boolean hasUnchecked = CollectionUtils.anyMatch(lines,
@@ -195,18 +259,50 @@
            return;
        }
        // 3.2 判断是否所有需检行都可以入库(合格或特采)
        boolean hasNonInbound = CollectionUtils.anyMatch(lines,
                line -> Boolean.TRUE.equals(line.getIqcCheckFlag())
                        && !MesQcCheckResultEnum.canInbound(line.getIqcCheckResult()));
        if (hasNonInbound) {
            log.info("[updateArrivalNoticeWhenIqcFinish][到货通知单({}) 存在不可入库的行(退货/报废),状态保持待质检]", id);
        // 3.2 判断是否存在可入库的合格数量:需检行取质检合格数量,无需检行取到货数量。
        //     部分不合格时,合格部分照常入库;不合格部分由 NCR 单独处置(退货/让步接收),不再阻塞合格品入库。
        boolean hasReceivable = CollectionUtils.anyMatch(lines, line -> {
            BigDecimal receivable = resolveReceivableQuantity(line);
            return receivable != null && receivable.signum() > 0;
        });
        if (!hasReceivable) {
            log.info("[updateArrivalNoticeWhenIqcFinish][到货通知单({}) 各行的合格数量均为 0,状态保持待质检,等待不合格品处置]", id);
            return;
        }
        // 3.3 所有行检验完成且可入库,更新主表状态 PENDING_QC → PENDING_RECEIPT
        // 3.3 检验完成且存在可入库数量,更新主表状态 PENDING_QC → PENDING_RECEIPT
        arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
                .setId(id).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT.getStatus()));
        // 3.4 质检合格后直接生成采购入库单(待入库),库管只需核对数量并确认入库
        autoGenerateItemReceipt(notice);
    }
    /**
     * 计算到货通知行本次可入库数量:需检行取质检合格数量,无需检行取到货数量。
     */
    private BigDecimal resolveReceivableQuantity(MesWmArrivalNoticeLineDO line) {
        if (Boolean.TRUE.equals(line.getIqcCheckFlag())) {
            return line.getQualifiedQuantity();
        }
        return line.getArrivalQuantity();
    }
    /**
     * 到货通知单进入「待入库」后自动生成采购入库单。
     * 库管无需再回到到货通知点「执行入库」,直接到【采购入库】核对数量并确认入库即可。
     */
    private void autoGenerateItemReceipt(MesWmArrivalNoticeDO notice) {
        try {
            Long receiptId = itemReceiptService.generateItemReceiptFromArrivalNotice(notice.getId());
            log.info("[autoGenerateItemReceipt][到货通知单({}) 已自动生成采购入库单({})]",
                    notice.getId(), receiptId);
        } catch (ServiceException ex) {
            log.error("[autoGenerateItemReceipt][到货通知单({}) 自动生成采购入库单失败]",
                    notice.getId(), ex);
            throw new ServiceException(ex.getCode(),
                    "到货通知单[" + notice.getCode() + "]转入待入库后自动生成采购入库单失败:" + ex.getMessage()
                            + "。本次操作未生效,请稍后重试;若持续失败请联系管理员。");
        }
    }
    @Override
@@ -336,6 +432,7 @@
        notice.setName(purchaseOrder.getNo() + "到货通知");
        notice.setPurchaseOrderId(purchaseOrderId);
        notice.setPurchaseOrderCode(purchaseOrder.getNo());
        notice.setContractNo(purchaseOrder.getContractNo());
        notice.setVendorId(purchaseOrder.getSupplierId());
        notice.setArrivalDate(java.time.LocalDateTime.now()); // 到货时间为当前时间
        notice.setStatus(MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT.getStatus());
@@ -362,21 +459,11 @@
            arrivalNoticeLineService.createArrivalNoticeLineFromPurchaseOrderItem(line);
        }
        // 7. 如果有需要质检的行,更新状态为待质检并自动创建 IQC 单
        // 7. 如果有需要质检的行,更新状态为待质检
        // 注意:来料检验单不在生成时创建,由库管点击「执行质检」时通过 createIqcForArrivalNotice 生成
        if (hasNeedQc) {
            arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
                    .setId(notice.getId()).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus()));
            // 为需要质检的行自动创建 IQC 检验单
            List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(notice.getId());
            for (MesWmArrivalNoticeLineDO line : lines) {
                if (Boolean.TRUE.equals(line.getIqcCheckFlag())) {
                    Long iqcId = iqcService.createIqcFromArrivalNotice(
                            notice.getId(), line, notice.getCode(), notice.getVendorId());
                    arrivalNoticeLineService.updateArrivalNoticeLineIqcId(line.getId(), iqcId);
                    log.info("[generateArrivalNoticeFromPurchaseOrder][到货通知单({}) 行({}) 自动创建 IQC 检验单({})]",
                            notice.getId(), line.getId(), iqcId);
                }
            }
        }
        return notice.getId();
@@ -414,6 +501,9 @@
        notice.setName(returnVendor.getCode() + "换货到货");
        notice.setPurchaseOrderId(returnVendor.getPurchaseOrderId());
        notice.setPurchaseOrderCode(returnVendor.getPurchaseOrderCode());
        // 换货重新关联原采购合同号:优先取退货单快照,退货单未快照时回填采购订单合同号
        notice.setContractNo(returnVendor.getContractNo());
        fillContractNoFromPurchaseOrder(notice);
        notice.setVendorId(returnVendor.getVendorId());
        notice.setArrivalDate(java.time.LocalDateTime.now());
        notice.setStatus(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus());