From 05ab6e3f69a5e73624b2573db043f5923e8f7d8b Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 05 十一月 2026 14:17:19 +0800
Subject: [PATCH] fix 修复bug

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java
index 5e39c3d..6c3904b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java
@@ -8,10 +8,12 @@
 import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * MES 璁惧鍙拌处 Mapper
  *
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
  */
 @Mapper
 public interface MesDvMachineryMapper extends BaseMapperX<MesDvMachineryDO> {
@@ -24,6 +26,9 @@
                 .eqIfPresent(MesDvMachineryDO::getMachineryTypeId, reqVO.getMachineryTypeId())
                 .inIfPresent(MesDvMachineryDO::getMachineryTypeId, reqVO.getMachineryTypeIds())
                 .eqIfPresent(MesDvMachineryDO::getWorkshopId, reqVO.getWorkshopId())
+                .eqIfPresent(MesDvMachineryDO::getWorkstationId, reqVO.getWorkstationId())
+                .eqIfPresent(MesDvMachineryDO::getCollectDeviceCode, reqVO.getCollectDeviceCode())
+                .eqIfPresent(MesDvMachineryDO::getCollectEnabled, reqVO.getCollectEnabled())
                 .eqIfPresent(MesDvMachineryDO::getStatus, reqVO.getStatus())
                 .orderByDesc(MesDvMachineryDO::getId));
     }
@@ -32,6 +37,16 @@
         return selectOne(MesDvMachineryDO::getCode, code);
     }
 
+    default MesDvMachineryDO selectByCollectDeviceCode(String collectDeviceCode) {
+        return selectOne(MesDvMachineryDO::getCollectDeviceCode, collectDeviceCode);
+    }
+
+    default List<MesDvMachineryDO> selectListWithCollectDeviceCode() {
+        return selectList(new LambdaQueryWrapperX<MesDvMachineryDO>()
+                .isNotNull(MesDvMachineryDO::getCollectDeviceCode)
+                .orderByAsc(MesDvMachineryDO::getId));
+    }
+
     default Long selectCountByMachineryTypeId(Long machineryTypeId) {
         return selectCount(MesDvMachineryDO::getMachineryTypeId, machineryTypeId);
     }

--
Gitblit v1.9.3