From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java | 23 +++++++++++++++++++++++
1 files changed, 23 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 a90270a..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
@@ -11,6 +11,8 @@
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;
@@ -23,6 +25,27 @@
@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<>();
query.selectAll(MesProTaskDO.class);
--
Gitblit v1.9.3