From fb747de6c40e2aa92d0dd81cca8b9fbc848aeff7 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期三, 19 八月 2026 12:39:59 +0800
Subject: [PATCH] Merge branch 'dev_business' into fix/hsy/20260811
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 110 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 7269c32..7557506 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;
@@ -34,6 +36,7 @@
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
@@ -47,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;
@@ -82,6 +90,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 = "鍒涘缓鐢熶骇浠诲姟")
@@ -98,12 +112,42 @@
return success(true);
}
+ @GetMapping("/calculate-duration")
+ @Operation(summary = "璁＄畻鐢熶骇鏃堕暱", description = "鏍规嵁宸ヤ綔绔欑粦瀹氳澶囩殑鐢熶骇鏁堢巼鍜屼紶閫佸饱甯︼紝鑷姩璁＄畻鐢熶骇鏃堕暱锛堝皬鏃讹級")
+ @Parameters({
+ @Parameter(name = "workstationId", description = "宸ヤ綔绔欑紪鍙�", required = true),
+ @Parameter(name = "quantity", description = "鎺掍骇鏁伴噺", required = true)
+ })
+ @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
+ public CommonResult<java.util.Map<String, Object>> calculateDuration(
+ @RequestParam("workstationId") Long workstationId,
+ @RequestParam("quantity") BigDecimal quantity) {
+ Integer duration = taskService.calculateDuration(workstationId, quantity);
+ return success(java.util.Map.of("duration", duration));
+ }
+
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎鐢熶骇浠诲姟")
@Parameter(name = "id", description = "缂栧彿", required = true)
@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);
}
@@ -148,8 +192,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")
@@ -254,15 +331,19 @@
convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
Map<Long, CrmCustomerRespDTO> customerMap = customerApi.getCustomerMap(
convertSet(list, MesProTaskDO::getClientId));
- // 宸ュ簭鐨� checkFlag锛氭壒閲忔煡璇㈠悗鏋勫缓 routeId -> processId -> checkFlag 鐨勫弻灞� Map
+ // 宸ュ簭鐨� checkFlag + backflushFlag锛氭壒閲忔煡璇㈠悗鏋勫缓 routeId -> processId -> flag 鐨勫弻灞� Map
Set<Long> routeIds = convertSet(list, MesProTaskDO::getRouteId);
Map<Long, Map<Long, Boolean>> routeProcessCheckFlagMap = new HashMap<>();
+ Map<Long, Map<Long, Boolean>> routeProcessBackflushFlagMap = new HashMap<>();
if (CollUtil.isNotEmpty(routeIds)) {
List<MesProRouteProcessDO> allRouteProcesses = routeProcessService.getRouteProcessListByRouteIds(routeIds);
for (MesProRouteProcessDO rp : allRouteProcesses) {
routeProcessCheckFlagMap
.computeIfAbsent(rp.getRouteId(), k -> new HashMap<>())
.put(rp.getProcessId(), Boolean.TRUE.equals(rp.getCheckFlag()));
+ routeProcessBackflushFlagMap
+ .computeIfAbsent(rp.getRouteId(), k -> new HashMap<>())
+ .put(rp.getProcessId(), Boolean.TRUE.equals(rp.getBackflushFlag()));
}
}
// 鎶ュ伐鍦ㄩ�旈噺锛氭寜浠诲姟鑱氬悎 feedbackQuantity锛堣崏绋�/瀹℃壒涓�/寰呮楠� = 鍦ㄩ�旓紱宸插畬鎴� = 宸插鎵癸級
@@ -275,6 +356,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);
@@ -303,6 +393,24 @@
vo.setClientName(customer.getName()));
findAndThen(routeProcessCheckFlagMap, task.getRouteId(), processCheckMap ->
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