Merge remote-tracking branch 'origin/dev_business' into dev_business

liyong

6 天以前 274dd8b724dd4485658e1d2a3f825a007f625bd7

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineServiceImpl.java

@@ -8,7 +8,7 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.line.MesWmArrivalNoticeLineSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.arrivalnotice.MesWmArrivalNoticeLineMapper;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -34,7 +34,7 @@
    @Lazy
    private MesWmArrivalNoticeService arrivalNoticeService;
    @Resource
    private MesMdItemService itemService;
    private MesMdmItemService mdmItemService;

    @Override
    public Long createArrivalNoticeLine(MesWmArrivalNoticeLineSaveReqVO createReqVO) {
@@ -66,7 +66,7 @@
        // 校验父单据存在且为草稿状态
        arrivalNoticeService.validateArrivalNoticeExistsAndDraft(reqVO.getNoticeId());
        // 校验物料存在
        itemService.validateItemExistsAndEnable(reqVO.getItemId());
        mdmItemService.validateItemExistsAndEnable(reqVO.getItemId());
    }

    /**
@@ -112,12 +112,12 @@
    }

    @Override
    public void updateArrivalNoticeLineWhenIqcFinish(Long lineId, Long iqcId, BigDecimal qualifiedQuantity) {
    public void updateArrivalNoticeLineWhenIqcFinish(Long lineId, Long iqcId, Integer checkResult, BigDecimal qualifiedQuantity) {
        // 校验行存在
        validateArrivalNoticeLineExists(lineId);
        // 更新
        // 更新：绑定 iqcId + 质检结果 + 合格数量
        arrivalNoticeLineMapper.updateById(new MesWmArrivalNoticeLineDO()
                .setId(lineId).setIqcId(iqcId).setQualifiedQuantity(qualifiedQuantity));
                .setId(lineId).setIqcId(iqcId).setIqcCheckResult(checkResult).setQualifiedQuantity(qualifiedQuantity));
    }

    @Override
@@ -139,4 +139,17 @@
        return line;
    }

    @Override
    public void createArrivalNoticeLineFromPurchaseOrderItem(MesWmArrivalNoticeLineDO line) {
        // 内部方法，不做校验，直接插入
        initQualifiedQuantityIfNoIqc(line);
        arrivalNoticeLineMapper.insert(line);
    }

    @Override
    public void updateArrivalNoticeLineIqcId(Long lineId, Long iqcId) {
        arrivalNoticeLineMapper.updateById(new MesWmArrivalNoticeLineDO()
                .setId(lineId).setIqcId(iqcId));
    }

}