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/productsales/MesWmProductSalesMapper.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java
index 2218ba1..52310eb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales;
+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;
@@ -12,7 +13,7 @@
/**
* MES 閿�鍞嚭搴撳崟 Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface MesWmProductSalesMapper extends BaseMapperX<MesWmProductSalesDO> {
@@ -22,11 +23,36 @@
.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));
}
+ /**
+ * 鍒嗛〉鏌ヨ锛堝甫瀹㈡埛鏉冮檺杩囨护锛�
+ */
+ default PageResult<MesWmProductSalesDO> selectPage(MesWmProductSalesPageReqVO reqVO, List<Long> permittedClientIds) {
+ LambdaQueryWrapperX<MesWmProductSalesDO> wrapper = new LambdaQueryWrapperX<MesWmProductSalesDO>()
+ .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) {
+ // 鎵嬪伐濉啓瀹㈡埛鍚嶇О锛堟湭鍏宠仈瀹㈡埛妗ｆ锛夌殑鍗曟嵁涓嶅睘浜庝换浣曞鎴锋潈闄愯寖鍥达紝濮嬬粓鍙
+ wrapper.and(w -> {
+ w.isNull(MesWmProductSalesDO::getClientId);
+ if (CollUtil.isNotEmpty(permittedClientIds)) {
+ w.or().in(MesWmProductSalesDO::getClientId, permittedClientIds);
+ }
+ });
+ }
+ return selectPage(reqVO, wrapper);
+ }
+
default MesWmProductSalesDO selectByCode(String code) {
return selectOne(MesWmProductSalesDO::getCode, code);
}
--
Gitblit v1.9.3