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 | 105 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 98 insertions(+), 7 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 259df32..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;
@@ -46,7 +47,9 @@
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;
@@ -65,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;
@@ -88,6 +110,8 @@
private MesMdUnitMeasureService unitMeasureService;
@Resource
private MesProRouteProcessService routeProcessService;
+ @Resource
+ private MesProWorkOrderProcessService workOrderProcessService;
@Resource
private MesProFeedbackService feedbackService;
@Resource
@@ -186,6 +210,9 @@
@GetMapping("/pending-feedback-page")
@Operation(summary = "鑾峰緱寰呮姤宸ュ彴璐﹀垎椤�", description = "宸叉帓浜т笖浠嶆湁寰呮姤宸ユ暟閲忕殑浠诲姟锛堢姸鎬�=杩涜涓級")
public CommonResult<PageResult<MesProTaskRespVO>> getPendingFeedbackPage(@Valid MesProTaskPageReqVO pageReqVO) {
+ if (Boolean.TRUE.equals(pageReqVO.getOnlyMine())) {
+ pageReqVO.setAssigneeUserId(getLoginUserId());
+ }
PageResult<MesProTaskDO> pageResult = taskService.getPendingFeedbackPage(pageReqVO);
List<MesProTaskRespVO> respVOList = buildTaskRespVOList(pageResult.getList());
@@ -220,8 +247,10 @@
@GetMapping("/pending-count-by-workstation")
@Operation(summary = "鎸夊伐浣滅珯鑾峰緱寰呮姤宸ヤ换鍔℃暟", description = "宸ヤ綔鍙伴�夋嫨宸ヤ綔绔欏崱鐗囧睍绀猴紝鍙ｅ緞鍚屽緟鎶ュ伐鍙拌处")
- public CommonResult<Map<Long, Long>> getPendingFeedbackCountByWorkstation() {
- return success(taskService.getPendingFeedbackCountByWorkstation());
+ 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")
@@ -325,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<>();
@@ -363,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 ->
@@ -376,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