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/feedback/MesProFeedbackController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
index c62a5a3..713feee 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
@@ -4,6 +4,9 @@
import cn.hutool.core.collection.ListUtil;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
+import cn.iocoder.yudao.module.mes.service.pro.feedback.dto.MesTaskParamSnapshot;
+import cn.iocoder.yudao.module.mes.service.pro.feedback.dto.MesFeedbackParamSnapshot;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -29,6 +32,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderProcessDO;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
@@ -37,6 +41,7 @@
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProcessService;
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteService;
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -100,6 +105,8 @@
@Resource
private MesProRouteProcessService routeProcessService;
@Resource
+ private MesProWorkOrderProcessService workOrderProcessService;
+ @Resource
private MesProTaskService taskService;
@Resource
@@ -158,6 +165,17 @@
return success(new PageResult<>(buildFeedbackRespVOList(pageResult.getList()), pageResult.getTotal()));
}
+ @GetMapping("/param-config")
+ @Operation(summary = "鑾峰緱鐢熶骇浠诲姟鍐荤粨鐨勫弬鏁伴噰闆嗛厤缃�")
+ public CommonResult<Map<String, Object>> getParamConfig(@RequestParam("taskId") Long taskId) {
+ MesProTaskDO task = taskService.validateTaskExists(taskId);
+ Map<String, Object> result = new LinkedHashMap<>();
+ result.put("mode", task.getParamCollectMode() == null ? 0 : task.getParamCollectMode());
+ result.put("template", JsonUtils.parseObject(task.getParamTemplateSnapshot(), MesTaskParamSnapshot.class));
+ result.put("shared", JsonUtils.parseObject(task.getParamSharedSnapshot(), MesFeedbackParamSnapshot.class));
+ return success(result);
+ }
+
@GetMapping("/list-by-task")
@Operation(summary = "鎸変换鍔¤幏寰楁姤宸ュ巻鍙插垪琛�")
@Parameter(name = "taskId", description = "浠诲姟缂栧彿", required = true, example = "1024")
@@ -193,7 +211,7 @@
.remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鐢熶骇鎶ュ伐瀵煎叆妯℃澘.xls", "鐢熶骇鎶ュ伐鍒楄〃", MesProFeedbackImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鐢熶骇鎶ュ伐瀵煎叆妯℃澘.xls", "鐢熶骇鎶ュ伐鍒楄〃", MesProFeedbackImportExcelVO.class, list);
}
@PostMapping("/import")
@@ -319,7 +337,18 @@
// 1.6 宸ュ簭
Map<Long, MesProProcessDO> processMap = processService.getProcessMap(
new ArrayList<>(convertSet(list, MesProFeedbackDO::getProcessId)));
- // 1.7 宸ュ簭鐨� checkFlag锛氭壒閲忔煡璇㈠悗鐩存帴鏋勫缓 routeId -> processId -> checkFlag 鐨勫弻灞� Map
+ // 1.7 宸ュ簭鐨� checkFlag锛氬伐鍗曞伐搴忓揩鐓т紭鍏堬紝宸ヨ壓璺嚎鍏滃簳
+ Set<Long> workOrderIds = convertSet(list, MesProFeedbackDO::getWorkOrderId);
+ Map<Long, Map<Long, Boolean>> workOrderProcessCheckFlagMap = 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()));
+ }
+ }
List<MesProRouteProcessDO> allRouteProcesses = routeProcessService.getRouteProcessListByRouteIds(routeIds);
Map<Long, Map<Long, Boolean>> routeProcessCheckFlagMap = new HashMap<>();
for (MesProRouteProcessDO rp : allRouteProcesses) {
@@ -343,9 +372,19 @@
// 宸ュ簭
findAndThen(processMap, vo.getProcessId(), process ->
vo.setProcessCode(process.getCode()).setProcessName(process.getName()));
- // checkFlag
- findAndThen(routeProcessCheckFlagMap, vo.getRouteId(), processCheckMap ->
- findAndThen(processCheckMap, vo.getProcessId(), vo::setCheckFlag));
+ // checkFlag锛氬伐鍗曞伐搴忓揩鐓т紭鍏堬紝宸ヨ壓璺嚎鍏滃簳
+ Boolean checkFlag = null;
+ Map<Long, Boolean> workOrderCheckFlags = workOrderProcessCheckFlagMap.get(vo.getWorkOrderId());
+ if (workOrderCheckFlags != null) {
+ checkFlag = workOrderCheckFlags.get(vo.getProcessId());
+ }
+ if (checkFlag == null) {
+ Map<Long, Boolean> routeCheckFlags = routeProcessCheckFlagMap.get(vo.getRouteId());
+ checkFlag = routeCheckFlags != null ? routeCheckFlags.get(vo.getProcessId()) : null;
+ }
+ if (checkFlag != null) {
+ vo.setCheckFlag(checkFlag);
+ }
// 宸ュ崟
findAndThen(workOrderMap, vo.getWorkOrderId(), wo ->
vo.setWorkOrderCode(wo.getCode()).setWorkOrderName(wo.getName()));
--
Gitblit v1.9.3