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/task/MesProTaskMapper.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 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 02bcef1..1cf3bf0 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
@@ -8,16 +8,19 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
import cn.iocoder.yudao.module.mes.enums.pro.MesProTaskStatusEnum;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.List;
+import java.util.Map;
/**
* MES 鐢熶骇浠诲姟 Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface MesProTaskMapper extends BaseMapperX<MesProTaskDO> {
@@ -49,7 +52,9 @@
MPJLambdaWrapperX<MesProTaskDO> query = new MPJLambdaWrapperX<>();
query.selectAll(MesProTaskDO.class);
// 寰呮姤宸ュ彴璐︼細杩涜涓殑浠诲姟锛堟帓闄ゅ凡瀹屾垚/宸插彇娑堬級锛屼笖浠嶆湁寰呮姤宸ラ噺
- query.eq(MesProTaskDO::getStatus, MesProTaskStatusEnum.PREPARE.getStatus());
+ query.in(MesProTaskDO::getStatus, MesProTaskStatusEnum.PREPARE.getStatus(),
+ MesProTaskStatusEnum.PRODUCING.getStatus(), MesProTaskStatusEnum.PARTIAL_FINISHED.getStatus(),
+ MesProTaskStatusEnum.PAUSED.getStatus());
query.apply("(quantity - IFNULL(produced_quantity, 0)) > 0");
query.likeIfPresent(MesProTaskDO::getCode, reqVO.getCode())
.likeIfPresent(MesProTaskDO::getName, reqVO.getName())
@@ -62,16 +67,54 @@
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)
.orderByDesc(MesProTaskDO::getId));
}
+ default MesProTaskDO selectByCode(String code) {
+ return selectOne(MesProTaskDO::getCode, code);
+ }
+
default List<MesProTaskDO> selectListByWorkOrderIds(java.util.Collection<Long> workOrderIds) {
return selectList(new LambdaQueryWrapperX<MesProTaskDO>()
.in(MesProTaskDO::getWorkOrderId, workOrderIds)
.orderByDesc(MesProTaskDO::getId));
+ }
+
+ /**
+ * 鐝粍鎶ュ伐宸ユ椂缁熻锛氭寜鐝粍鑱氬悎浠诲姟鏁颁笌鐢熶骇鏃堕暱锛坉uration 浜烘棩锛�
+ *
+ * @param startTime 鐢熶骇寮�濮嬫椂闂翠笅闄�
+ * @param endTime 鐢熶骇寮�濮嬫椂闂翠笂闄�
+ */
+ default List<Map<String, Object>> selectWorkHourSummary(LocalDateTime startTime, LocalDateTime endTime) {
+ return selectMaps(new QueryWrapper<MesProTaskDO>()
+ .select("team_id", "team_name",
+ "COUNT(*) AS task_count",
+ "SUM(IFNULL(duration, 0)) AS total_duration")
+ // 鎶ュ伐鍙ｅ緞锛氭帓闄よ崏绋�/宸插彇娑堬紝浠呯粺璁″疄闄呰繘鍏ョ敓浜х殑浠诲姟
+ .notIn("status", MesProTaskStatusEnum.PREPARE.getStatus(), MesProTaskStatusEnum.CANCELED.getStatus())
+ .ge(startTime != null, "start_time", startTime)
+ .le(endTime != null, "start_time", endTime)
+ .groupBy("team_id", "team_name"));
}
default void updateProducedQuantity(Long id,
@@ -82,7 +125,12 @@
.eq(MesProTaskDO::getId, id)
.setSql("produced_quantity = IFNULL(produced_quantity, 0) + " + incrProducedQuantity)
.setSql("qualify_quantity = IFNULL(qualify_quantity, 0) + " + incrQualifyQuantity)
- .setSql("unqualify_quantity = IFNULL(unqualify_quantity, 0) + " + incrUnqualifyQuantity));
+ .setSql("unqualify_quantity = IFNULL(unqualify_quantity, 0) + " + incrUnqualifyQuantity)
+ .setSql("status = CASE WHEN IFNULL(produced_quantity, 0) > 0 THEN "
+ + MesProTaskStatusEnum.PARTIAL_FINISHED.getStatus() + " ELSE "
+ + MesProTaskStatusEnum.PRODUCING.getStatus() + " END")
+ .setSql("first_feedback_time = IFNULL(first_feedback_time, NOW())")
+ .setSql("last_feedback_time = NOW()"));
}
}
--
Gitblit v1.9.3