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

liu

2026-09-04 569df4daf76eb586f1add62707d0ffa2b7ff20f2

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImpl.java

@@ -20,6 +20,8 @@
import org.springframework.validation.annotation.Validated;

import java.math.BigDecimal;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Objects;

@@ -52,6 +54,8 @@

        // 插入
        MesWmReturnIssueLineDO line = BeanUtils.toBean(createReqVO, MesWmReturnIssueLineDO.class);
        // 兜底：前端未传需要质检时默认不需要质检
        line.setRqcCheckFlag(Boolean.TRUE.equals(line.getRqcCheckFlag()));
        line.setQualityStatus(calculateQualityStatus(line.getRqcCheckFlag(), issue.getType())); // 质量状态自动赋值
        issueLineMapper.insert(line);
        return line.getId();
@@ -60,12 +64,16 @@
    @Override
    public void updateReturnIssueLine(MesWmReturnIssueLineSaveReqVO updateReqVO) {
        // 校验存在
        validateReturnIssueLineExists(updateReqVO.getId());
        MesWmReturnIssueLineDO line = validateReturnIssueLineExists(updateReqVO.getId());
        // 校验数据
        MesWmReturnIssueDO issue = validateReturnIssueLineSaveData(updateReqVO);

        // 更新
        MesWmReturnIssueLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnIssueLineDO.class);
        // 兜底：编辑时未传需要质检字段，沿用原值，避免误覆盖
        if (updateObj.getRqcCheckFlag() == null) {
            updateObj.setRqcCheckFlag(line.getRqcCheckFlag());
        }
        updateObj.setQualityStatus(calculateQualityStatus(updateObj.getRqcCheckFlag(), issue.getType())); // 质量状态自动赋值
        issueLineMapper.updateById(updateObj);
    }
@@ -199,4 +207,12 @@
        }
    }

    @Override
    public List<MesWmReturnIssueLineDO> getReturnIssueLineListByIssueLineIds(Collection<Long> issueLineIds) {
        if (CollUtil.isEmpty(issueLineIds)) {
            return Collections.emptyList();
        }
        return issueLineMapper.selectListByIssueLineIds(issueLineIds);
    }

}