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/controller/admin/pro/task/MesProTaskController.java | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 158 insertions(+), 11 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..e5aebdd 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
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -12,6 +13,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;
@@ -44,10 +47,17 @@
import org.springframework.web.bind.annotation.*;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderProcessDO;
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProcessService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
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;
@@ -58,12 +68,31 @@
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "绠＄悊鍚庡彴 - MES 鐢熶骇浠诲姟")
@RestController
@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 = "鎵归噺涓�閿帓浜ч瑙�")
+ @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;
@@ -82,7 +111,13 @@
@Resource
private MesProRouteProcessService routeProcessService;
@Resource
+ private MesProWorkOrderProcessService workOrderProcessService;
+ @Resource
private MesProFeedbackService feedbackService;
+ @Resource
+ private MesProTaskPauseRecordMapper pauseRecordMapper;
+ @Resource
+ private AdminUserApi adminUserApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇浠诲姟")
@@ -105,7 +140,6 @@
@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) {
@@ -119,6 +153,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);
}
@@ -142,7 +192,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鐢熶骇浠诲姟")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<MesProTaskRespVO> getTask(@RequestParam("id") Long id) {
MesProTaskDO task = taskService.getTask(id);
if (task == null) {
@@ -153,7 +202,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鐢熶骇浠诲姟鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<PageResult<MesProTaskRespVO>> getTaskPage(@Valid MesProTaskPageReqVO pageReqVO) {
PageResult<MesProTaskDO> pageResult = taskService.getTaskPage(pageReqVO);
return success(new PageResult<>(buildTaskRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -161,15 +209,52 @@
@GetMapping("/pending-feedback-page")
@Operation(summary = "鑾峰緱寰呮姤宸ュ彴璐﹀垎椤�", description = "宸叉帓浜т笖浠嶆湁寰呮姤宸ユ暟閲忕殑浠诲姟锛堢姸鎬�=杩涜涓級")
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<PageResult<MesProTaskRespVO>> getPendingFeedbackPage(@Valid MesProTaskPageReqVO pageReqVO) {
+ if (Boolean.TRUE.equals(pageReqVO.getOnlyMine())) {
+ pageReqVO.setAssigneeUserId(getLoginUserId());
+ }
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("/pending-count-by-workstation")
+ @Operation(summary = "鎸夊伐浣滅珯鑾峰緱寰呮姤宸ヤ换鍔℃暟", description = "宸ヤ綔鍙伴�夋嫨宸ヤ綔绔欏崱鐗囧睍绀猴紝鍙ｅ緞鍚屽緟鎶ュ伐鍙拌处")
+ public CommonResult<Map<Long, Long>> getPendingFeedbackCountByWorkstation(
+ @RequestParam(value = "onlyMine", required = false) Boolean onlyMine) {
+ Long assigneeUserId = Boolean.TRUE.equals(onlyMine) ? getLoginUserId() : null;
+ return success(taskService.getPendingFeedbackCountByWorkstation(assigneeUserId));
}
@GetMapping("/gantt-list")
@Operation(summary = "鑾峰緱鐢樼壒鍥句换鍔″垪琛�", description = "鍚庣缁勮宸ュ崟=project + 浠诲姟=task 鍒楄〃")
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<List<GanttDataRespVO>> listGanttTaskList(@Valid MesProWorkOrderPageReqVO reqVO) {
// 1.1 鏌ヨ鍖归厤鐨勫伐鍗曪紙涓嶅垎椤碉級
reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
@@ -269,7 +354,25 @@
convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
Map<Long, CrmCustomerRespDTO> customerMap = customerApi.getCustomerMap(
convertSet(list, MesProTaskDO::getClientId));
- // 宸ュ簭鐨� checkFlag + backflushFlag锛氭壒閲忔煡璇㈠悗鏋勫缓 routeId -> processId -> flag 鐨勫弻灞� Map
+ Map<Long, AdminUserRespDTO> assigneeUserMap = adminUserApi.getUserMap(
+ list.stream().flatMap(task -> parseUserIds(task.getAssigneeUserIds()).stream())
+ .collect(java.util.stream.Collectors.toSet()));
+ // 宸ュ簭鐨� checkFlag + backflushFlag锛氬伐鍗曞伐搴忓揩鐓т紭鍏堬紝宸ヨ壓璺嚎鍏滃簳
+ Set<Long> workOrderIds = convertSet(list, MesProTaskDO::getWorkOrderId);
+ Map<Long, Map<Long, Boolean>> workOrderProcessCheckFlagMap = new HashMap<>();
+ Map<Long, Map<Long, Boolean>> workOrderProcessBackflushFlagMap = new HashMap<>();
+ if (CollUtil.isNotEmpty(workOrderIds)) {
+ List<MesProWorkOrderProcessDO> allWorkOrderProcesses =
+ workOrderProcessService.getWorkOrderProcessListByWorkOrderIds(workOrderIds);
+ for (MesProWorkOrderProcessDO wp : allWorkOrderProcesses) {
+ workOrderProcessCheckFlagMap
+ .computeIfAbsent(wp.getWorkOrderId(), k -> new HashMap<>())
+ .put(wp.getProcessId(), Boolean.TRUE.equals(wp.getCheckFlag()));
+ workOrderProcessBackflushFlagMap
+ .computeIfAbsent(wp.getWorkOrderId(), k -> new HashMap<>())
+ .put(wp.getProcessId(), Boolean.TRUE.equals(wp.getBackflushFlag()));
+ }
+ }
Set<Long> routeIds = convertSet(list, MesProTaskDO::getRouteId);
Map<Long, Map<Long, Boolean>> routeProcessCheckFlagMap = new HashMap<>();
Map<Long, Map<Long, Boolean>> routeProcessBackflushFlagMap = new HashMap<>();
@@ -307,6 +410,14 @@
BigDecimal inTransit = inTransitMap.getOrDefault(task.getId(), BigDecimal.ZERO);
vo.setInTransitQuantity(inTransit);
vo.setReportableQuantity(quantity.subtract(produced).subtract(inTransit).max(BigDecimal.ZERO));
+ List<Long> assigneeUserIds = parseUserIds(task.getAssigneeUserIds());
+ vo.setAssigneeUserIds(assigneeUserIds);
+ if (CollUtil.isNotEmpty(assigneeUserIds)) {
+ vo.setAssigneeUserNames(assigneeUserIds.stream()
+ .map(assigneeUserMap::get).filter(Objects::nonNull)
+ .map(AdminUserRespDTO::getNickname)
+ .collect(java.util.stream.Collectors.joining("銆�")));
+ }
findAndThen(workOrderMap, task.getWorkOrderId(), wo ->
vo.setWorkOrderCode(wo.getCode()).setWorkOrderName(wo.getName()).setRequestDate(wo.getRequestDate()));
findAndThen(workstationMap, task.getWorkstationId(), ws ->
@@ -320,15 +431,51 @@
});
findAndThen(customerMap, task.getClientId(), customer ->
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));
+ Boolean checkFlag = resolveProcessFlag(task, workOrderProcessCheckFlagMap, routeProcessCheckFlagMap);
+ if (checkFlag != null) vo.setCheckFlag(checkFlag);
+ Boolean backflushFlag = resolveProcessFlag(task, workOrderProcessBackflushFlagMap, routeProcessBackflushFlagMap);
+ if (backflushFlag != null) vo.setBackflushFlag(backflushFlag);
return vo;
});
}
/**
+ * 瑙ｆ瀽浠诲姟宸ュ簭鐨勬爣璇嗭細宸ュ崟宸ュ簭蹇収浼樺厛锛屽伐鑹鸿矾绾垮厹搴�
+ */
+ private Boolean resolveProcessFlag(MesProTaskDO task,
+ Map<Long, Map<Long, Boolean>> workOrderProcessMap,
+ Map<Long, Map<Long, Boolean>> routeProcessMap) {
+ Map<Long, Boolean> workOrderFlags = workOrderProcessMap.get(task.getWorkOrderId());
+ Boolean flag = workOrderFlags != null ? workOrderFlags.get(task.getProcessId()) : null;
+ if (flag != null) {
+ return flag;
+ }
+ Map<Long, Boolean> routeFlags = routeProcessMap.get(task.getRouteId());
+ return routeFlags != null ? routeFlags.get(task.getProcessId()) : null;
+ }
+
+ /**
+ * 瑙ｆ瀽閫楀彿鍒嗛殧鐨勭敤鎴风紪鍙蜂覆
+ */
+ private static List<Long> parseUserIds(String csv) {
+ if (StrUtil.isBlank(csv)) {
+ return Collections.emptyList();
+ }
+ List<Long> userIds = new ArrayList<>();
+ for (String part : csv.split(",")) {
+ String trimmed = part.trim();
+ if (trimmed.isEmpty()) {
+ continue;
+ }
+ try {
+ userIds.add(Long.valueOf(trimmed));
+ } catch (NumberFormatException ignored) {
+ }
+ }
+ return userIds;
+ }
+
+ /**
* 鎷兼帴鐢樼壒鍥炬樉绀烘枃鏈紝鏍煎紡锛�"[浜у搧鍚峕[鏁伴噺][鍗曚綅]"
*/
private String buildGanttText(MesMdItemDO item, BigDecimal quantity,
--
Gitblit v1.9.3