From 7c03ac9182b338a13dce52631b2924da7793dd5e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 17 十月 2026 18:36:50 +0800
Subject: [PATCH] feat(mes): 仓储物流单据跨模块关联字段支持手工填写
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesMapper.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesMapper.java
index 8b3942b..28e8373 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesMapper.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.mes.dal.mysql.wm.returnsales;
+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;
@@ -7,10 +8,12 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
/**
* MES 閿�鍞��璐у崟 Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface MesWmReturnSalesMapper extends BaseMapperX<MesWmReturnSalesDO> {
@@ -21,11 +24,37 @@
.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));
}
+ /**
+ * 鍒嗛〉鏌ヨ锛堝甫瀹㈡埛鏉冮檺杩囨护锛�
+ */
+ default PageResult<MesWmReturnSalesDO> selectPage(MesWmReturnSalesPageReqVO reqVO, List<Long> permittedClientIds) {
+ LambdaQueryWrapperX<MesWmReturnSalesDO> wrapper = new LambdaQueryWrapperX<MesWmReturnSalesDO>()
+ .likeIfPresent(MesWmReturnSalesDO::getCode, reqVO.getCode())
+ .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) {
+ // 鎵嬪伐濉啓瀹㈡埛鍚嶇О锛堟湭鍏宠仈瀹㈡埛妗ｆ锛夌殑鍗曟嵁涓嶅睘浜庝换浣曞鎴锋潈闄愯寖鍥达紝濮嬬粓鍙
+ wrapper.and(w -> {
+ w.isNull(MesWmReturnSalesDO::getClientId);
+ if (CollUtil.isNotEmpty(permittedClientIds)) {
+ w.or().in(MesWmReturnSalesDO::getClientId, permittedClientIds);
+ }
+ });
+ }
+ return selectPage(reqVO, wrapper);
+ }
+
default MesWmReturnSalesDO selectByCode(String code) {
return selectOne(new LambdaQueryWrapperX<MesWmReturnSalesDO>()
.eq(MesWmReturnSalesDO::getCode, code));
--
Gitblit v1.9.3