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/salesnotice/MesWmSalesNoticeMapper.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeMapper.java
index 23f7af4..7cad04f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/salesnotice/MesWmSalesNoticeMapper.java
@@ -23,6 +23,7 @@
.likeIfPresent(MesWmSalesNoticeDO::getName, reqVO.getName())
.likeIfPresent(MesWmSalesNoticeDO::getSaleOrderCode, reqVO.getSaleOrderCode())
.eqIfPresent(MesWmSalesNoticeDO::getClientId, reqVO.getClientId())
+ .likeIfPresent(MesWmSalesNoticeDO::getClientName, reqVO.getClientName())
.eqIfPresent(MesWmSalesNoticeDO::getStatus, reqVO.getStatus())
.orderByDesc(MesWmSalesNoticeDO::getId));
}
@@ -40,15 +41,17 @@
.likeIfPresent(MesWmSalesNoticeDO::getName, reqVO.getName())
.likeIfPresent(MesWmSalesNoticeDO::getSaleOrderCode, reqVO.getSaleOrderCode())
.eqIfPresent(MesWmSalesNoticeDO::getClientId, reqVO.getClientId())
+ .likeIfPresent(MesWmSalesNoticeDO::getClientName, reqVO.getClientName())
.eqIfPresent(MesWmSalesNoticeDO::getStatus, reqVO.getStatus())
.orderByDesc(MesWmSalesNoticeDO::getId);
- // 瀹㈡埛鏉冮檺杩囨护
+ // 瀹㈡埛鏉冮檺杩囨护锛涙墜宸ュ～鍐欏鎴峰悕绉帮紙鏈叧鑱斿鎴锋。妗堬級鐨勫崟鎹笉灞炰簬浠讳綍瀹㈡埛鏉冮檺鑼冨洿锛屽缁堝彲瑙�
if (permittedClientIds != null) {
- if (CollUtil.isEmpty(permittedClientIds)) {
- // 绌哄垪琛ㄨ〃绀烘病鏈変换浣曟潈闄愶紝杩斿洖绌虹粨鏋�
- return PageResult.empty();
- }
- wrapper.in(MesWmSalesNoticeDO::getClientId, permittedClientIds);
+ wrapper.and(w -> {
+ w.isNull(MesWmSalesNoticeDO::getClientId);
+ if (CollUtil.isNotEmpty(permittedClientIds)) {
+ w.or().in(MesWmSalesNoticeDO::getClientId, permittedClientIds);
+ }
+ });
}
return selectPage(reqVO, wrapper);
}
--
Gitblit v1.9.3