feat(mes,crm): 新增质检单批量导入、检测结果台账与开票导入

高

4 天以前 c6a2b472cde9dff4d21b95637ee6d99a412c785c

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java

@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.mes.dal.mysql.qc.oqc;

import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -7,10 +8,13 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO;
import org.apache.ibatis.annotations.Mapper;

import java.time.LocalDateTime;
import java.util.List;

/**
 * MES 出货检验单（OQC） Mapper
 *
 * @author 芋道源码
 * @author 超级管理员
 */
@Mapper
public interface MesQcOqcMapper extends BaseMapperX<MesQcOqcDO> {
@@ -22,11 +26,54 @@
                .likeIfPresent(MesQcOqcDO::getBatchCode, reqVO.getBatchCode())
                .eqIfPresent(MesQcOqcDO::getItemId, reqVO.getItemId())
                .eqIfPresent(MesQcOqcDO::getCheckResult, reqVO.getCheckResult())
                .betweenIfPresent(MesQcOqcDO::getInspectDate, reqVO.getInspectDate())
                .orderByDesc(MesQcOqcDO::getId));
    }

    /**
     * 分页查询（带客户权限过滤）
     */
    default PageResult<MesQcOqcDO> selectPage(MesQcOqcPageReqVO reqVO, List<Long> permittedClientIds) {
        LambdaQueryWrapperX<MesQcOqcDO> wrapper = new LambdaQueryWrapperX<MesQcOqcDO>()
                .likeIfPresent(MesQcOqcDO::getCode, reqVO.getCode())
                .eqIfPresent(MesQcOqcDO::getClientId, reqVO.getClientId())
                .likeIfPresent(MesQcOqcDO::getBatchCode, reqVO.getBatchCode())
                .eqIfPresent(MesQcOqcDO::getItemId, reqVO.getItemId())
                .eqIfPresent(MesQcOqcDO::getCheckResult, reqVO.getCheckResult())
                .betweenIfPresent(MesQcOqcDO::getInspectDate, reqVO.getInspectDate())
                .orderByDesc(MesQcOqcDO::getId);
        if (permittedClientIds != null) {
            // 未填客户的单据不属于任何客户，不受客户权限遮挡
            if (CollUtil.isEmpty(permittedClientIds)) {
                wrapper.isNull(MesQcOqcDO::getClientId);
            } else {
                wrapper.and(w -> w.isNull(MesQcOqcDO::getClientId)
                        .or().in(MesQcOqcDO::getClientId, permittedClientIds));
            }
        }
        return selectPage(reqVO, wrapper);
    }

    default MesQcOqcDO selectByCode(String code) {
        return selectOne(MesQcOqcDO::getCode, code);
    }

    /**
     * 按导入去重键查询：同一 物料 + 客户 + 批次号 + 出货日期 视为同一批出货检验数据
     *
     * 客户与出货日期在本分支可为空，故三个可空维度均做空值安全比较（null 比 null）。
     */
    default List<MesQcOqcDO> selectListByImportKey(Long itemId, Long clientId, String batchCode,
                                                   LocalDateTime outDate) {
        return selectList(new LambdaQueryWrapperX<MesQcOqcDO>()
                .eq(MesQcOqcDO::getItemId, itemId)
                .eq(clientId != null, MesQcOqcDO::getClientId, clientId)
                .isNull(clientId == null, MesQcOqcDO::getClientId)
                .eq(batchCode != null, MesQcOqcDO::getBatchCode, batchCode)
                .isNull(batchCode == null, MesQcOqcDO::getBatchCode)
                .eq(outDate != null, MesQcOqcDO::getOutDate, outDate)
                .isNull(outDate == null, MesQcOqcDO::getOutDate)
                .orderByAsc(MesQcOqcDO::getId));
    }

}