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

gaoluyang

3 小时以前 7c03ac9182b338a13dce52631b2924da7793dd5e

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java

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