From c2053d7017625f270577bc0f6c523d04f52db6ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 24 七月 2026 14:20:29 +0800
Subject: [PATCH] refactor(crm): 重构文件上传功能，替换原有的fileUrls字段为统一的StorageAttachmentApi
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 7bad646..19dd295 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
@@ -10,6 +10,8 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
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.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;
@@ -103,6 +105,23 @@
public CommonResult<Boolean> deleteTask(@RequestParam("id") Long id) {
taskService.deleteTask(id);
return success(true);
+ }
+
+ @PostMapping("/auto-generate/preview")
+ @Operation(summary = "涓�閿帓浜ч瑙�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-task:create')")
+ public CommonResult<MesProTaskAutoGeneratePreviewRespVO> previewAutoGenerate(
+ @Valid @RequestBody MesProTaskAutoGenerateReqVO reqVO) {
+ return success(taskService.previewAutoGenerate(reqVO));
+ }
+
+ @PostMapping("/auto-generate")
+ @Operation(summary = "涓�閿帓浜ф墽琛�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-task:create')")
+ public CommonResult<java.util.Map<String, Object>> autoGenerate(
+ @Valid @RequestBody MesProTaskAutoGenerateReqVO reqVO) {
+ List<Long> taskIds = taskService.autoGenerateTasks(reqVO);
+ return success(java.util.Map.of("taskIds", taskIds));
}
@GetMapping("/get")
@@ -235,15 +254,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锛堣崏绋�/瀹℃壒涓�/寰呮楠� = 鍦ㄩ�旓紱宸插畬鎴� = 宸插鎵癸級
@@ -284,6 +307,8 @@
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));
return vo;
});
}
--
Gitblit v1.9.3