From 8bcec29715251194f7358bd1035033293e955ce1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 04 十一月 2026 18:11:25 +0800
Subject: [PATCH] feat(mes): 重构质检完成与来源关联流程并新增工单技术文件快照
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 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..f5bf7fc 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
@@ -6,10 +6,13 @@
import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskPageReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskAssigneeDO;
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.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import java.math.BigDecimal;
import java.util.List;
@@ -17,10 +20,31 @@
/**
* MES 鐢熶骇浠诲姟 Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface MesProTaskMapper extends BaseMapperX<MesProTaskDO> {
+
+ @Select({"<script>",
+ "SELECT t.workstation_id AS workstationId, COUNT(*) AS pendingCount FROM mes_pro_task t",
+ "WHERE t.deleted = 0 AND t.workstation_id IS NOT NULL AND t.status IN (#{prepare}, #{producing}, #{partial}, #{paused})",
+ "<if test='assigneeId != null'>AND EXISTS (SELECT 1 FROM mes_pro_task_assignee a",
+ "WHERE a.task_id=t.id AND a.user_id=#{assigneeId} AND a.deleted=0)</if>",
+ "GROUP BY t.workstation_id", "</script>"})
+ java.util.List<cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProWorkstationPendingCountVO> selectPendingCounts(
+ @Param("assigneeId") Long assigneeId, @Param("prepare") Integer prepare,
+ @Param("producing") Integer producing, @Param("partial") Integer partial, @Param("paused") Integer paused);
+
+ /** 鎵�鏈夋帓浜у啓鍏ュ彛浠ョ浉鍚岄『搴忛攣瀹氬伐浣滅珯锛涗簨鍔℃彁浜ゅ悗閲婃斁锛岃法杩涚▼闃叉璧勬簮绔炴�併�� */
+ @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<>();
@@ -48,8 +72,14 @@
default PageResult<MesProTaskDO> selectPendingFeedbackPage(MesProTaskPageReqVO reqVO) {
MPJLambdaWrapperX<MesProTaskDO> query = new MPJLambdaWrapperX<>();
query.selectAll(MesProTaskDO.class);
+ // 褰撻渶瑕佹寜 assigneeUserId 杩囨护鏃讹紝INNER JOIN mes_pro_task_assignee
+ if (reqVO.getAssigneeUserId() != null) {
+ query.innerJoin(MesProTaskAssigneeDO.class, on -> on
+ .eq(MesProTaskAssigneeDO::getTaskId, MesProTaskDO::getId));
+ query.eq(MesProTaskAssigneeDO::getUserId, reqVO.getAssigneeUserId());
+ }
// 寰呮姤宸ュ彴璐︼細杩涜涓殑浠诲姟锛堟帓闄ゅ凡瀹屾垚/宸插彇娑堬級锛屼笖浠嶆湁寰呮姤宸ラ噺
- query.eq(MesProTaskDO::getStatus, MesProTaskStatusEnum.PREPARE.getStatus());
+ query.in(MesProTaskDO::getStatus, MesProTaskStatusEnum.PREPARE.getStatus(),MesProTaskStatusEnum.PAUSED.getStatus());
query.apply("(quantity - IFNULL(produced_quantity, 0)) > 0");
query.likeIfPresent(MesProTaskDO::getCode, reqVO.getCode())
.likeIfPresent(MesProTaskDO::getName, reqVO.getName())
--
Gitblit v1.9.3