fix(mes-dv): 设备模块列表查询补充按创建时间降序排序

gaoluyang

16 小时以前 2efc05d570d23d86b02b6fd8f73491b3d520bde0

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/iqc/MesQcIqcMapper.java

@@ -7,6 +7,9 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO;
import org.apache.ibatis.annotations.Mapper;

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

/**
 * MES 来料检验单（IQC） Mapper
 *
@@ -19,6 +22,7 @@
        return selectPage(reqVO, new LambdaQueryWrapperX<MesQcIqcDO>()
                .likeIfPresent(MesQcIqcDO::getCode, reqVO.getCode())
                .eqIfPresent(MesQcIqcDO::getVendorId, reqVO.getVendorId())
                .likeIfPresent(MesQcIqcDO::getVendorName, reqVO.getVendorName())
                .likeIfPresent(MesQcIqcDO::getVendorBatch, reqVO.getVendorBatch())
                .eqIfPresent(MesQcIqcDO::getItemId, reqVO.getItemId())
                .eqIfPresent(MesQcIqcDO::getCheckResult, reqVO.getCheckResult())
@@ -36,4 +40,20 @@
        return selectCount(MesQcIqcDO::getVendorId, vendorId);
    }

    /**
     * 按导入去重键查询：同一 物料 + 供应商 + 供应商批次 + 来料日期 视为同一批来料数据
     */
    default List<MesQcIqcDO> selectListByImportKey(Long itemId, String vendorName, String vendorBatch,
                                                   LocalDateTime receiveDate) {
        return selectList(new LambdaQueryWrapperX<MesQcIqcDO>()
                .eq(MesQcIqcDO::getItemId, itemId)
                .eq(vendorName != null && !vendorName.isEmpty(), MesQcIqcDO::getVendorName, vendorName)
                .and(vendorName == null || vendorName.isEmpty(), wrapper -> wrapper
                        .isNull(MesQcIqcDO::getVendorName).or().eq(MesQcIqcDO::getVendorName, ""))
                .eq(vendorBatch != null, MesQcIqcDO::getVendorBatch, vendorBatch)
                .isNull(vendorBatch == null, MesQcIqcDO::getVendorBatch)
                .eq(MesQcIqcDO::getReceiveDate, receiveDate)
                .orderByAsc(MesQcIqcDO::getId));
    }

}