From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 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..a3fd001 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;
@@ -27,6 +28,26 @@
                 .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())
+                .eqIfPresent(MesWmProductSalesDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(MesWmProductSalesDO::getSalesDate, reqVO.getShipmentDate())
+                .orderByDesc(MesWmProductSalesDO::getId);
+        if (permittedClientIds != null) {
+            if (CollUtil.isEmpty(permittedClientIds)) {
+                return PageResult.empty();
+            }
+            wrapper.in(MesWmProductSalesDO::getClientId, permittedClientIds);
+        }
+        return selectPage(reqVO, wrapper);
+    }
+
     default MesWmProductSalesDO selectByCode(String code) {
         return selectOne(MesWmProductSalesDO::getCode, code);
     }

--
Gitblit v1.9.3