From 9075785a9e14f6220783d052d231f915c6930b87 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:21:45 +0800
Subject: [PATCH] revert(collect): 撤销 collect 数采模块（新高设备管理已有自己的采集方式）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/mps/MesProMpsMapper.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/mps/MesProMpsMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/mps/MesProMpsMapper.java
index 80152be..e38e8a3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/mps/MesProMpsMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/mps/MesProMpsMapper.java
@@ -18,7 +18,7 @@
/**
* MES 鐢熶骇涓昏鍒掞紙MPS锛塎apper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface MesProMpsMapper extends BaseMapperX<MesProMpsDO> {
@@ -63,15 +63,34 @@
return selectOne(MesProMpsDO::getCode, code);
}
+ /**
+ * 鎸夊伐鍗曟煡璇� MPS銆�
+ *
+ * 鍚堝苟涓嬪彂鏃跺涓� MPS 浼氭寚鍚戝悓涓�涓伐鍗曪紝鍥犳杩欓噷蹇呴』闄愬埗鍙彇涓�鏉★紝
+ * 鍚﹀垯 MyBatis-Plus 鐨� selectOne 浼氭姏 TooManyResultsException锛屽鑷存姤宸ユ棤娉曞畬宸ャ��
+ */
+ default MesProMpsDO selectByWorkOrderId(Long workOrderId) {
+ return selectOne(new LambdaQueryWrapperX<MesProMpsDO>()
+ .eq(MesProMpsDO::getWorkOrderId, workOrderId)
+ .orderByDesc(MesProMpsDO::getId)
+ .last("LIMIT 1"));
+ }
+
default MesProMpsDO selectBySaleOrderItemId(Long saleOrderItemId) {
- return selectOne(MesProMpsDO::getSaleOrderItemId, saleOrderItemId);
+ return selectOne(new LambdaQueryWrapperX<MesProMpsDO>()
+ .eq(MesProMpsDO::getSaleOrderItemId, saleOrderItemId)
+ .orderByDesc(MesProMpsDO::getId)
+ .last("LIMIT 1"));
}
default List<MesProMpsDO> selectListBySaleOrderItemIds(Collection<Long> saleOrderItemIds) {
if (saleOrderItemIds == null || saleOrderItemIds.isEmpty()) {
return Collections.emptyList();
}
- return selectList(MesProMpsDO::getSaleOrderItemId, saleOrderItemIds);
+ // 鍚屼竴閿�鍞槑缁嗗彲鑳藉瓨鍦ㄢ�滄棫璁″垝宸插彇娑堛�佹柊璁″垝閲嶆柊鍒涘缓鈥濈殑鍘嗗彶璁板綍锛涙寜 ID 鍗囧簭锛岃皟鐢ㄦ柟鍙栨渶鍚庝竴鏉″嵆鏈�鏂拌鍒�
+ return selectList(new LambdaQueryWrapperX<MesProMpsDO>()
+ .in(MesProMpsDO::getSaleOrderItemId, saleOrderItemIds)
+ .orderByAsc(MesProMpsDO::getId));
}
/**
--
Gitblit v1.9.3