From 3ff6604c75c887f4056ee03545d204bc9323286c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 15 十月 2026 17:47:19 +0800
Subject: [PATCH] feat(mes): 新增报工设备快照功能并优化状态校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 112 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
index a0cca8c..50eeb52 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
@@ -12,6 +12,8 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.GanttDataRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskAutoGeneratePreviewRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskAutoGenerateReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskPauseReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskResumeReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskSaveReqVO;
@@ -48,6 +50,11 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
import cn.iocoder.yudao.module.mes.enums.pro.MesProFeedbackStatusEnum;
import cn.iocoder.yudao.module.mes.service.pro.feedback.MesProFeedbackService;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskPauseRecordDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskPauseRecordMapper;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskPauseRecordRespVO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import java.io.IOException;
import java.math.BigDecimal;
@@ -64,6 +71,25 @@
@RequestMapping("/mes/pro/task")
@Validated
public class MesProTaskController {
+
+ @Resource
+ private cn.iocoder.yudao.module.mes.service.pro.task.schedule.MesProBatchScheduleService batchScheduleService;
+
+ @PostMapping("/auto-schedule/preview")
+ @Operation(summary = "鎵归噺涓�閿帓浜ч瑙堬紙09鈥�18鐐癸紝鎺掗櫎鍛ㄦ湯鍜岃妭鍋囨棩锛�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-task:create')")
+ public CommonResult<cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProBatchSchedulePreviewRespVO> previewBatchSchedule(
+ @Valid @RequestBody cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProBatchScheduleReqVO request) {
+ return success(batchScheduleService.preview(request));
+ }
+
+ @PostMapping("/auto-schedule")
+ @Operation(summary = "纭鎵归噺涓�閿帓浜э紙閲嶆柊鏍￠獙棰勮锛屾暣鎵瑰師瀛愭彁浜わ級")
+ @PreAuthorize("@ss.hasPermission('mes:pro-task:create')")
+ public CommonResult<java.util.Map<String, Object>> executeBatchSchedule(
+ @Valid @RequestBody cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProBatchScheduleReqVO request) {
+ return success(java.util.Map.of("taskIds", batchScheduleService.execute(request)));
+ }
@Resource
private MesProTaskService taskService;
@@ -83,6 +109,12 @@
private MesProRouteProcessService routeProcessService;
@Resource
private MesProFeedbackService feedbackService;
+ @Resource
+ private MesProTaskPauseRecordMapper pauseRecordMapper;
+ @Resource
+ private AdminUserApi adminUserApi;
+ @Resource
+ private cn.iocoder.yudao.module.system.api.permission.PermissionApi permissionApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇浠诲姟")
@@ -119,6 +151,22 @@
@PreAuthorize("@ss.hasPermission('mes:pro-task:delete')")
public CommonResult<Boolean> deleteTask(@RequestParam("id") Long id) {
taskService.deleteTask(id);
+ return success(true);
+ }
+
+ @PutMapping("/pause")
+ @Operation(summary = "鐢熶骇浠诲姟鍋滃伐")
+ @PreAuthorize("@ss.hasPermission('mes:pro-task:update')")
+ public CommonResult<Boolean> pauseTask(@Valid @RequestBody MesProTaskPauseReqVO pauseReqVO) {
+ taskService.pauseTask(pauseReqVO);
+ return success(true);
+ }
+
+ @PutMapping("/resume")
+ @Operation(summary = "鐢熶骇浠诲姟澶嶅伐")
+ @PreAuthorize("@ss.hasPermission('mes:pro-task:update')")
+ public CommonResult<Boolean> resumeTask(@Valid @RequestBody MesProTaskResumeReqVO resumeReqVO) {
+ taskService.resumeTask(resumeReqVO);
return success(true);
}
@@ -163,8 +211,41 @@
@Operation(summary = "鑾峰緱寰呮姤宸ュ彴璐﹀垎椤�", description = "宸叉帓浜т笖浠嶆湁寰呮姤宸ユ暟閲忕殑浠诲姟锛堢姸鎬�=杩涜涓級")
@PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<PageResult<MesProTaskRespVO>> getPendingFeedbackPage(@Valid MesProTaskPageReqVO pageReqVO) {
+ Long loginUserId = cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId();
+ // 濡傛灉褰撳墠鐧诲綍浜轰笉鏄秴绾х鐞嗗憳锛屽垯浠呮煡璇㈠垎閰嶇粰鑷繁鐨勭敓浜у伐鍗�
+ if (loginUserId != null && !permissionApi.hasAnyRoles(loginUserId, cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum.SUPER_ADMIN.getCode())) {
+ pageReqVO.setAssigneeUserId(loginUserId);
+ }
PageResult<MesProTaskDO> pageResult = taskService.getPendingFeedbackPage(pageReqVO);
- return success(new PageResult<>(buildTaskRespVOList(pageResult.getList()), pageResult.getTotal()));
+ List<MesProTaskRespVO> respVOList = buildTaskRespVOList(pageResult.getList());
+
+ if (CollUtil.isNotEmpty(respVOList)) {
+ Set<Long> taskIds = convertSet(respVOList, MesProTaskRespVO::getId);
+ List<MesProTaskPauseRecordDO> records = pauseRecordMapper.selectListByTaskIds(taskIds);
+ if (CollUtil.isNotEmpty(records)) {
+ Set<Long> userIds = new HashSet<>();
+ records.forEach(r -> {
+ if (r.getPauseUserId() != null) userIds.add(r.getPauseUserId());
+ if (r.getResumeUserId() != null) userIds.add(r.getResumeUserId());
+ });
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
+
+ Map<Long, List<MesProTaskPauseRecordRespVO>> pauseRecordMap = new HashMap<>();
+ for (MesProTaskPauseRecordDO record : records) {
+ MesProTaskPauseRecordRespVO vo = BeanUtils.toBean(record, MesProTaskPauseRecordRespVO.class);
+ if (record.getPauseUserId() != null && userMap.containsKey(record.getPauseUserId())) {
+ vo.setPauseUserName(userMap.get(record.getPauseUserId()).getNickname());
+ }
+ if (record.getResumeUserId() != null && userMap.containsKey(record.getResumeUserId())) {
+ vo.setResumeUserName(userMap.get(record.getResumeUserId()).getNickname());
+ }
+ pauseRecordMap.computeIfAbsent(record.getTaskId(), k -> new ArrayList<>()).add(vo);
+ }
+ respVOList.forEach(vo -> vo.setPauseRecords(pauseRecordMap.get(vo.getId())));
+ }
+ }
+
+ return success(new PageResult<>(respVOList, pageResult.getTotal()));
}
@GetMapping("/gantt-list")
@@ -195,6 +276,7 @@
convertSet(allTasks, MesProTaskDO::getProcessId));
// 2.2 缁勮鐢樼壒鍥炬暟鎹�
List<GanttDataRespVO> ganttData = new java.util.ArrayList<>();
+ Set<Long> visibleWorkOrderIds = convertSet(workOrders, MesProWorkOrderDO::getId);
for (MesProWorkOrderDO workOrder : workOrders) {
// 2.2.a 宸ュ崟 -> project 琛�
MesMdItemDO item = itemMap.get(workOrder.getProductId());
@@ -208,7 +290,10 @@
.setQuantity(workOrder.getQuantity())
.setDuration(0L)
.setProgress(calcProgress(workOrder.getQuantityProduced(), workOrder.getQuantity()));
- if (ObjUtil.notEqual(workOrder.getParentId(), MesProWorkOrderDO.PARENT_ID_NULL)) {
+ if (workOrder.getParentId() != null
+ && !Objects.equals(workOrder.getParentId(), MesProWorkOrderDO.PARENT_ID_NULL)
+ && !Objects.equals(workOrder.getParentId(), workOrder.getId())
+ && visibleWorkOrderIds.contains(workOrder.getParentId())) {
woData.setParent(MesBizTypeConstants.PRO_WORKORDER + "_" + workOrder.getParentId());
}
ganttData.add(woData);
@@ -294,6 +379,15 @@
inTransitMap.merge(fb.getTaskId(), fbQty, BigDecimal::add);
}
}
+
+ // 鏌ヨ鎸囨淳鎶ュ伐浜哄憳
+ Set<Long> taskIds = convertSet(list, MesProTaskDO::getId);
+ Map<Long, List<cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskAssigneeDO>> assigneeMap = taskService.getTaskAssigneeMap(taskIds);
+ Set<Long> allAssigneeUserIds = new HashSet<>();
+ assigneeMap.values().forEach(assignees ->
+ assignees.forEach(assignee -> allAssigneeUserIds.add(assignee.getUserId())));
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(allAssigneeUserIds);
+
// 鎷兼帴 VO
return convertList(list, task -> {
MesProTaskRespVO vo = BeanUtils.toBean(task, MesProTaskRespVO.class);
@@ -324,6 +418,22 @@
findAndThen(processCheckMap, task.getProcessId(), vo::setCheckFlag));
findAndThen(routeProcessBackflushFlagMap, task.getRouteId(), processBackflushMap ->
findAndThen(processBackflushMap, task.getProcessId(), vo::setBackflushFlag));
+
+ // 璁剧疆鎸囨淳鎶ュ伐浜哄憳
+ List<cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskAssigneeDO> assignees = assigneeMap.get(task.getId());
+ if (CollUtil.isNotEmpty(assignees)) {
+ List<Long> assigneeUserIds = convertList(assignees, cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskAssigneeDO::getUserId);
+ vo.setAssigneeUserIds(assigneeUserIds);
+ List<String> assigneeUserNames = new ArrayList<>();
+ for (Long userId : assigneeUserIds) {
+ AdminUserRespDTO user = userMap.get(userId);
+ if (user != null && user.getNickname() != null) {
+ assigneeUserNames.add(user.getNickname());
+ }
+ }
+ vo.setAssigneeUserNames(assigneeUserNames);
+ }
+
return vo;
});
}
--
Gitblit v1.9.3