feat(mes): 仓储物流单据跨模块关联字段支持手工填写

gaoluyang

4 小时以前 7c03ac9182b338a13dce52631b2924da7793dd5e

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesMapper.java

@@ -24,6 +24,7 @@
                .likeIfPresent(MesWmReturnSalesDO::getName, reqVO.getName())
                .likeIfPresent(MesWmReturnSalesDO::getSalesOrderCode, reqVO.getSalesOrderCode())
                .eqIfPresent(MesWmReturnSalesDO::getClientId, reqVO.getClientId())
                .likeIfPresent(MesWmReturnSalesDO::getClientName, reqVO.getClientName())
                .eqIfPresent(MesWmReturnSalesDO::getStatus, reqVO.getStatus())
                .betweenIfPresent(MesWmReturnSalesDO::getReturnDate, reqVO.getReturnDate())
                .orderByDesc(MesWmReturnSalesDO::getId));
@@ -38,14 +39,18 @@
                .likeIfPresent(MesWmReturnSalesDO::getName, reqVO.getName())
                .likeIfPresent(MesWmReturnSalesDO::getSalesOrderCode, reqVO.getSalesOrderCode())
                .eqIfPresent(MesWmReturnSalesDO::getClientId, reqVO.getClientId())
                .likeIfPresent(MesWmReturnSalesDO::getClientName, reqVO.getClientName())
                .eqIfPresent(MesWmReturnSalesDO::getStatus, reqVO.getStatus())
                .betweenIfPresent(MesWmReturnSalesDO::getReturnDate, reqVO.getReturnDate())
                .orderByDesc(MesWmReturnSalesDO::getId);
        if (permittedClientIds != null) {
            if (CollUtil.isEmpty(permittedClientIds)) {
                return PageResult.empty();
            // 手工填写客户名称（未关联客户档案）的单据不属于任何客户权限范围，始终可见
            wrapper.and(w -> {
                w.isNull(MesWmReturnSalesDO::getClientId);
                if (CollUtil.isNotEmpty(permittedClientIds)) {
                    w.or().in(MesWmReturnSalesDO::getClientId, permittedClientIds);
            }
            wrapper.in(MesWmReturnSalesDO::getClientId, permittedClientIds);
            });
        }
        return selectPage(reqVO, wrapper);
    }