From db46314b9c56256a31c9114bd45d9bd63368cbd8 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 29 七月 2026 18:06:22 +0800
Subject: [PATCH] feat(crm): 实现CRM客户管理查看全部权限功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java | 88 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 81 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 20fbfb9..a0cca8c 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,11 +10,14 @@
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;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderPageReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
@@ -22,7 +25,7 @@
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.enums.MesBizTypeConstants;
-import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
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;
@@ -31,6 +34,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;
@@ -41,6 +45,9 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProcessService;
+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 java.io.IOException;
import java.math.BigDecimal;
@@ -69,11 +76,13 @@
@Resource
private MesMdItemService itemService;
@Resource
- private MesMdClientService clientService;
+ private CrmCustomerApi customerApi;
@Resource
private MesMdUnitMeasureService unitMeasureService;
@Resource
private MesProRouteProcessService routeProcessService;
+ @Resource
+ private MesProFeedbackService feedbackService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇浠诲姟")
@@ -90,6 +99,20 @@
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)
@@ -97,6 +120,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")
@@ -116,6 +156,14 @@
@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()));
+ }
+
+ @GetMapping("/pending-feedback-page")
+ @Operation(summary = "鑾峰緱寰呮姤宸ュ彴璐﹀垎椤�", description = "宸叉帓浜т笖浠嶆湁寰呮姤宸ユ暟閲忕殑浠诲姟锛堢姸鎬�=杩涜涓級")
+ @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
+ public CommonResult<PageResult<MesProTaskRespVO>> getPendingFeedbackPage(@Valid MesProTaskPageReqVO pageReqVO) {
+ PageResult<MesProTaskDO> pageResult = taskService.getPendingFeedbackPage(pageReqVO);
return success(new PageResult<>(buildTaskRespVOList(pageResult.getList()), pageResult.getTotal()));
}
@@ -219,22 +267,46 @@
convertSet(list, MesProTaskDO::getItemId));
Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
- Map<Long, MesMdClientDO> clientMap = clientService.getClientMap(
+ 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锛堣崏绋�/瀹℃壒涓�/寰呮楠� = 鍦ㄩ�旓紱宸插畬鎴� = 宸插鎵癸級
+ List<MesProFeedbackDO> taskFeedbacks = feedbackService.getFeedbackListByTaskIds(
+ convertSet(list, MesProTaskDO::getId));
+ Map<Long, BigDecimal> inTransitMap = new HashMap<>();
+ for (MesProFeedbackDO fb : taskFeedbacks) {
+ BigDecimal fbQty = fb.getFeedbackQuantity() == null ? BigDecimal.ZERO : fb.getFeedbackQuantity();
+ if (!ObjUtil.equal(fb.getStatus(), MesProFeedbackStatusEnum.FINISHED.getStatus())) {
+ inTransitMap.merge(fb.getTaskId(), fbQty, BigDecimal::add);
}
}
// 鎷兼帴 VO
return convertList(list, task -> {
MesProTaskRespVO vo = BeanUtils.toBean(task, MesProTaskRespVO.class);
+ // 寰呮姤宸ユ暟閲� = 鎺掍骇鏁伴噺 - 宸茬敓浜ф暟閲忥紱鎶ュ伐瀹屾垚鐜� = 宸茬敓浜� / 鎺掍骇 脳 100
+ BigDecimal quantity = task.getQuantity() == null ? BigDecimal.ZERO : task.getQuantity();
+ BigDecimal produced = task.getProducedQuantity() == null ? BigDecimal.ZERO : task.getProducedQuantity();
+ vo.setPendingQuantity(quantity.subtract(produced));
+ vo.setFeedbackRate(quantity.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO
+ : produced.multiply(new BigDecimal("100")).divide(quantity, 2, RoundingMode.HALF_UP));
+ // 鍦ㄩ�旀姤宸ラ噺锛堣崏绋�/瀹℃壒涓�/寰呮楠岋級+ 鍙姤宸ユ暟閲� = 鎺掍骇 - 宸茬敓浜� - 鍦ㄩ��
+ BigDecimal inTransit = inTransitMap.getOrDefault(task.getId(), BigDecimal.ZERO);
+ vo.setInTransitQuantity(inTransit);
+ vo.setReportableQuantity(quantity.subtract(produced).subtract(inTransit).max(BigDecimal.ZERO));
findAndThen(workOrderMap, task.getWorkOrderId(), wo ->
vo.setWorkOrderCode(wo.getCode()).setWorkOrderName(wo.getName()).setRequestDate(wo.getRequestDate()));
findAndThen(workstationMap, task.getWorkstationId(), ws ->
@@ -246,10 +318,12 @@
findAndThen(unitMeasureMap, item.getUnitMeasureId(), unit ->
vo.setUnitMeasureName(unit.getName()));
});
- findAndThen(clientMap, task.getClientId(), c ->
- vo.setClientName(c.getName()));
+ 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));
return vo;
});
}
--
Gitblit v1.9.3