From ac2e2b5af3726ee64dc37c3ebf26989a0346f22a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 07 十一月 2026 19:16:05 +0800
Subject: [PATCH] feat(feedback): 优化报工审批流程并增加报工人校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java | 76 ++++++++++++++++++++++++++++++++++++-
1 files changed, 73 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..7b1c681 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,19 +8,31 @@
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> {
+ @org.apache.ibatis.annotations.Select("SELECT id FROM mes_md_workstation WHERE deleted = 0 ORDER BY id FOR UPDATE")
+ List<Long> lockSchedulingResources();
+
+ default List<MesProTaskDO> selectSchedulingTasks() {
+ return selectList(new LambdaQueryWrapperX<MesProTaskDO>()
+ .and(query -> query.isNull(MesProTaskDO::getStatus).or()
+ .notIn(MesProTaskDO::getStatus, MesProTaskStatusEnum.CANCELED.getStatus(), MesProTaskStatusEnum.FINISHED.getStatus()))
+ .orderByAsc(MesProTaskDO::getId));
+ }
default PageResult<MesProTaskDO> selectPage(MesProTaskPageReqVO reqVO) {
MPJLambdaWrapperX<MesProTaskDO> query = new MPJLambdaWrapperX<>();
@@ -42,6 +54,7 @@
.inIfPresent(MesProTaskDO::getStatus, reqVO.getStatuses())
.betweenIfPresent(MesProTaskDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(MesProTaskDO::getId);
+ applyAssigneeFilter(query, reqVO.getAssigneeUserId());
return selectPage(reqVO, query);
}
@@ -49,7 +62,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())
@@ -59,7 +74,35 @@
.eqIfPresent(MesProTaskDO::getWorkstationId, reqVO.getWorkstationId())
.betweenIfPresent(MesProTaskDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(MesProTaskDO::getId);
+ applyAssigneeFilter(query, reqVO.getAssigneeUserId());
return selectPage(reqVO, query);
+ }
+
+ /**
+ * 闄愬埗鍙湅褰撳墠鐢ㄦ埛鏄姤宸ヤ汉鐨勪换鍔★紱鏈厤缃姤宸ヤ汉鐨勪换鍔′笉鍙備笌鍖归厤
+ */
+ default void applyAssigneeFilter(MPJLambdaWrapperX<MesProTaskDO> query, Long userId) {
+ if (userId == null) {
+ return;
+ }
+ query.apply("FIND_IN_SET({0}, assignee_user_ids)", userId);
+ }
+
+ /**
+ * 鎸夊伐浣滅珯缁熻寰呮姤宸ヤ换鍔℃暟锛屽彛寰勪笌 {@link #selectPendingFeedbackPage} 涓�鑷�
+ *
+ * @return 姣忚鍖呭惈 workstation_id銆乸ending_count
+ */
+ default List<Map<String, Object>> selectPendingFeedbackCountByWorkstation(Long assigneeUserId) {
+ 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")
+ .apply(assigneeUserId != null, "FIND_IN_SET({0}, assignee_user_ids)", assigneeUserId)
+ .isNotNull("workstation_id")
+ .groupBy("workstation_id"));
}
default List<MesProTaskDO> selectListByWorkOrderId(Long workOrderId) {
@@ -68,10 +111,32 @@
.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 +147,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