From b0978a62cf2050170793e87fbd01db1760808043 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 09:50:30 +0800
Subject: [PATCH] feat: 从长辉移植新高缺失的六个业务模块(安全生产/能耗/数采/备件/质检台账/售后问题回访)
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
index 586c92b..0aa45c9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
@@ -67,6 +67,22 @@
return selectPage(reqVO, query);
}
+ /**
+ * 鎸夊伐浣滅珯缁熻寰呮姤宸ヤ换鍔℃暟锛屽彛寰勪笌 {@link #selectPendingFeedbackPage} 涓�鑷�
+ *
+ * @return 姣忚鍖呭惈 workstation_id銆乸ending_count
+ */
+ default List<Map<String, Object>> selectPendingFeedbackCountByWorkstation() {
+ return selectMaps(new QueryWrapper<MesProTaskDO>()
+ .select("workstation_id", "COUNT(*) AS pending_count")
+ .in("status", MesProTaskStatusEnum.PREPARE.getStatus(),
+ MesProTaskStatusEnum.PRODUCING.getStatus(), MesProTaskStatusEnum.PARTIAL_FINISHED.getStatus(),
+ MesProTaskStatusEnum.PAUSED.getStatus())
+ .apply("(quantity - IFNULL(produced_quantity, 0)) > 0")
+ .isNotNull("workstation_id")
+ .groupBy("workstation_id"));
+ }
+
default List<MesProTaskDO> selectListByWorkOrderId(Long workOrderId) {
return selectList(new LambdaQueryWrapperX<MesProTaskDO>()
.eqIfPresent(MesProTaskDO::getWorkOrderId, workOrderId)
@@ -117,4 +133,19 @@
.setSql("last_feedback_time = NOW()"));
}
+ /**
+ * 鏌ヨ宸ヤ綔绔欎笂姝e湪杩愯鐨勪换鍔★細鐢熶骇涓�侀儴鍒嗗畬鎴愩�佸凡鍋滃伐
+ *
+ * <p>鏁伴噰妯″潡鏍规嵁璁惧涓婃姤鐨勬暟鎹畾浣嶅綋鍓嶄换鍔℃椂浣跨敤銆�</p>
+ */
+ default MesProTaskDO selectRunningTaskByWorkstationId(Long workstationId) {
+ return selectOne(new LambdaQueryWrapperX<MesProTaskDO>()
+ .eq(MesProTaskDO::getWorkstationId, workstationId)
+ .in(MesProTaskDO::getStatus, MesProTaskStatusEnum.PRODUCING.getStatus(),
+ MesProTaskStatusEnum.PARTIAL_FINISHED.getStatus(), MesProTaskStatusEnum.PAUSED.getStatus())
+ .orderByDesc(MesProTaskDO::getLastFeedbackTime)
+ .orderByDesc(MesProTaskDO::getId)
+ .last("LIMIT 1"));
+ }
+
}
--
Gitblit v1.9.3