feat(mes): 优化MES模块生产调度与数据管理功能

云

11 小时以前 e09f103259fa602382bb5ce2a03361a6397af46a

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

@@ -26,6 +26,7 @@
                .likeIfPresent(MesQcOqcDO::getBatchCode, reqVO.getBatchCode())
                .eqIfPresent(MesQcOqcDO::getItemId, reqVO.getItemId())
                .eqIfPresent(MesQcOqcDO::getCheckResult, reqVO.getCheckResult())
                .eqIfPresent(MesQcOqcDO::getInspectorUserId, reqVO.getInspectorUserId())
                .betweenIfPresent(MesQcOqcDO::getInspectDate, reqVO.getInspectDate())
                .orderByDesc(MesQcOqcDO::getId));
    }
@@ -40,13 +41,17 @@
                .likeIfPresent(MesQcOqcDO::getBatchCode, reqVO.getBatchCode())
                .eqIfPresent(MesQcOqcDO::getItemId, reqVO.getItemId())
                .eqIfPresent(MesQcOqcDO::getCheckResult, reqVO.getCheckResult())
                .eqIfPresent(MesQcOqcDO::getInspectorUserId, reqVO.getInspectorUserId())
                .betweenIfPresent(MesQcOqcDO::getInspectDate, reqVO.getInspectDate())
                .orderByDesc(MesQcOqcDO::getId);
        if (permittedClientIds != null) {
            if (CollUtil.isEmpty(permittedClientIds)) {
                return PageResult.empty();
                wrapper.isNull(MesQcOqcDO::getClientId);
            } else {
                // 未关联客户的检验单可见；已关联客户仍按 CRM 权限过滤。
                wrapper.and(w -> w.isNull(MesQcOqcDO::getClientId)
                        .or().in(MesQcOqcDO::getClientId, permittedClientIds));
            }
            wrapper.in(MesQcOqcDO::getClientId, permittedClientIds);
        }
        return selectPage(reqVO, wrapper);
    }
@@ -62,7 +67,8 @@
                                                   LocalDateTime outDate) {
        return selectList(new LambdaQueryWrapperX<MesQcOqcDO>()
                .eq(MesQcOqcDO::getItemId, itemId)
                .eq(MesQcOqcDO::getClientId, clientId)
                .eq(clientId != null, MesQcOqcDO::getClientId, clientId)
                .isNull(clientId == null, MesQcOqcDO::getClientId)
                .eq(batchCode != null, MesQcOqcDO::getBatchCode, batchCode)
                .isNull(batchCode == null, MesQcOqcDO::getBatchCode)
                .eq(MesQcOqcDO::getOutDate, outDate)