From 71b15a5c69dcc421bad71d558e191e12cb7bae3e Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 13 八月 2026 10:18:54 +0800
Subject: [PATCH] 其他模块引用供应商时，限制不能删除，给出提示
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java
index db221d8..8294d56 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.mes.dal.mysql.wm.batch;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
@@ -15,7 +16,7 @@
/**
* 鎵规绠＄悊 Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface MesWmBatchMapper extends BaseMapperX<MesWmBatchDO> {
@@ -50,6 +51,37 @@
}
/**
+ * 鍒嗛〉鏌ヨ锛堝甫瀹㈡埛鏉冮檺杩囨护锛�
+ */
+ default PageResult<MesWmBatchDO> selectPage(MesWmBatchPageReqVO reqVO, List<Long> permittedClientIds) {
+ LambdaQueryWrapperX<MesWmBatchDO> wrapper = new LambdaQueryWrapperX<MesWmBatchDO>()
+ .likeIfPresent(MesWmBatchDO::getCode, reqVO.getCode())
+ .eqIfPresent(MesWmBatchDO::getItemId, reqVO.getItemId())
+ .eqIfPresent(MesWmBatchDO::getVendorId, reqVO.getVendorId())
+ .eqIfPresent(MesWmBatchDO::getClientId, reqVO.getClientId())
+ .likeIfPresent(MesWmBatchDO::getSalesOrderCode, reqVO.getSalesOrderCode())
+ .likeIfPresent(MesWmBatchDO::getPurchaseOrderCode, reqVO.getPurchaseOrderCode())
+ .eqIfPresent(MesWmBatchDO::getWorkOrderId, reqVO.getWorkOrderId())
+ .eqIfPresent(MesWmBatchDO::getTaskId, reqVO.getTaskId())
+ .eqIfPresent(MesWmBatchDO::getWorkstationId, reqVO.getWorkstationId())
+ .eqIfPresent(MesWmBatchDO::getToolId, reqVO.getToolId())
+ .eqIfPresent(MesWmBatchDO::getMoldId, reqVO.getMoldId())
+ .likeIfPresent(MesWmBatchDO::getLotNumber, reqVO.getLotNumber())
+ .eqIfPresent(MesWmBatchDO::getQualityStatus, reqVO.getQualityStatus())
+ .betweenIfPresent(MesWmBatchDO::getProduceDate, reqVO.getProduceDate())
+ .betweenIfPresent(MesWmBatchDO::getExpireDate, reqVO.getExpireDate())
+ .betweenIfPresent(MesWmBatchDO::getReceiptDate, reqVO.getReceiptDate())
+ .orderByDesc(MesWmBatchDO::getId);
+// if (permittedClientIds != null) {
+// if (CollUtil.isEmpty(permittedClientIds)) {
+// return PageResult.empty();
+// }
+// wrapper.in(MesWmBatchDO::getClientId, permittedClientIds);
+// }
+ return selectPage(reqVO, wrapper);
+ }
+
+ /**
* 鏍规嵁鍙傛暟鏌ヨ鍖归厤鐨勭涓�鏉℃壒娆¤褰�
* <p>
* 浣跨敤 NULL 鍊肩簿纭尮閰嶏紝杩斿洖 ID 鏈�灏忕殑鎵规
--
Gitblit v1.9.3