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/packages/MesWmPackageMapper.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/packages/MesWmPackageMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/packages/MesWmPackageMapper.java
index 9fcf694..3378e0a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/packages/MesWmPackageMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/packages/MesWmPackageMapper.java
@@ -15,7 +15,7 @@
/**
* MES 瑁呯鍗� Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface MesWmPackageMapper extends BaseMapperX<MesWmPackageDO> {
@@ -25,6 +25,7 @@
.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())
@@ -39,15 +40,19 @@
.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) {
- if (CollUtil.isEmpty(permittedClientIds)) {
- return PageResult.empty();
- }
- wrapper.in(MesWmPackageDO::getClientId, permittedClientIds);
+ // 鎵嬪伐濉啓瀹㈡埛鍚嶇О锛堟湭鍏宠仈瀹㈡埛妗ｆ锛夌殑鍗曟嵁涓嶅睘浜庝换浣曞鎴锋潈闄愯寖鍥达紝濮嬬粓鍙
+ wrapper.and(w -> {
+ w.isNull(MesWmPackageDO::getClientId);
+ if (CollUtil.isNotEmpty(permittedClientIds)) {
+ w.or().in(MesWmPackageDO::getClientId, permittedClientIds);
+ }
+ });
}
return selectPage(reqVO, wrapper);
}
--
Gitblit v1.9.3