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

gaoluyang

8 小时以前 7c03ac9182b338a13dce52631b2924da7793dd5e

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/packages/MesWmPackageMapper.java

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

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;
@@ -14,7 +15,7 @@
/**
 * MES 装箱单 Mapper
 *
 * @author 芋道源码
 * @author 超级管理员
 */
@Mapper
public interface MesWmPackageMapper extends BaseMapperX<MesWmPackageDO> {
@@ -24,12 +25,38 @@
                .likeIfPresent(MesWmPackageDO::getCode, reqVO.getCode())
                .likeIfPresent(MesWmPackageDO::getSalesOrderCode, reqVO.getSalesOrderCode())
                .eqIfPresent(MesWmPackageDO::getClientId, reqVO.getClientId())
                .likeIfPresent(MesWmPackageDO::getClientName, reqVO.getClientName())
                .eqIfPresent(MesWmPackageDO::getParentId, reqVO.getParentId())
                .eqIfPresent(MesWmPackageDO::getInspectorUserId, reqVO.getInspectorUserId())
                .eqIfPresent(MesWmPackageDO::getStatus, reqVO.getStatus())
                .orderByDesc(MesWmPackageDO::getId));
    }

    /**
     * 分页查询（带客户权限过滤）
     */
    default PageResult<MesWmPackageDO> selectPage(MesWmPackagePageReqVO reqVO, List<Long> permittedClientIds) {
        LambdaQueryWrapperX<MesWmPackageDO> wrapper = new LambdaQueryWrapperX<MesWmPackageDO>()
                .likeIfPresent(MesWmPackageDO::getCode, reqVO.getCode())
                .likeIfPresent(MesWmPackageDO::getSalesOrderCode, reqVO.getSalesOrderCode())
                .eqIfPresent(MesWmPackageDO::getClientId, reqVO.getClientId())
                .likeIfPresent(MesWmPackageDO::getClientName, reqVO.getClientName())
                .eqIfPresent(MesWmPackageDO::getParentId, reqVO.getParentId())
                .eqIfPresent(MesWmPackageDO::getInspectorUserId, reqVO.getInspectorUserId())
                .eqIfPresent(MesWmPackageDO::getStatus, reqVO.getStatus())
                .orderByDesc(MesWmPackageDO::getId);
        if (permittedClientIds != null) {
            // 手工填写客户名称（未关联客户档案）的单据不属于任何客户权限范围，始终可见
            wrapper.and(w -> {
                w.isNull(MesWmPackageDO::getClientId);
                if (CollUtil.isNotEmpty(permittedClientIds)) {
                    w.or().in(MesWmPackageDO::getClientId, permittedClientIds);
                }
            });
        }
        return selectPage(reqVO, wrapper);
    }

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