From 6e3d8e950e7dec3551bee3512673e1fc2d384d2b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 18 十月 2026 20:25:55 +0800
Subject: [PATCH] fix(mes): 修复能耗抄表控制器启动时的 bean 名称冲突
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java | 151 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 143 insertions(+), 8 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
index ac42fac..f1fa44d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
@@ -9,21 +9,27 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
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.workorder.vo.MesProWorkOrderPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderRespVO;
-import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderSaveReqVO;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
-import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
-import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.*;
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.pro.process.MesProProcessDO;
+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.enums.pro.MesProWorkOrderProductionStatusEnum;
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.pro.process.MesProProcessService;
+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.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
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;
@@ -31,12 +37,15 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.math.BigDecimal;
import java.util.*;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
@Tag(name = "绠＄悊鍚庡彴 - MES 鐢熶骇宸ュ崟")
@@ -52,9 +61,15 @@
@Resource
private CrmCustomerApi customerApi;
@Resource
- private ErpSupplierApi supplierApi;
+ private SrmSupplierApi srmSupplierApi;
@Resource
private MesMdUnitMeasureService unitMeasureService;
+ @Resource
+ private MesProWorkOrderProcessService workOrderProcessService;
+ @Resource
+ private MesProTaskService taskService;
+ @Resource
+ private MesProProcessService processService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇宸ュ崟")
@@ -100,6 +115,14 @@
return success(new PageResult<>(buildWorkOrderRespVOList(pageResult.getList()), pageResult.getTotal()));
}
+ @GetMapping("/schedule-page")
+ @Operation(summary = "鑾峰緱鐢熶骇宸ュ崟璋冨害鐘舵�佸垎椤�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-work-order:query')")
+ public CommonResult<PageResult<MesProWorkOrderRespVO>> getWorkOrderSchedulePage(@Valid MesProWorkOrderPageReqVO pageReqVO) {
+ PageResult<MesProWorkOrderDO> pageResult = workOrderService.getWorkOrderSchedulePage(pageReqVO);
+ return success(new PageResult<>(buildWorkOrderRespVOList(pageResult.getList()), pageResult.getTotal()));
+ }
+
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭鐢熶骇宸ュ崟 Excel")
@PreAuthorize("@ss.hasPermission('mes:pro-work-order:export')")
@@ -110,6 +133,36 @@
List<MesProWorkOrderDO> list = workOrderService.getWorkOrderPage(pageReqVO).getList();
List<MesProWorkOrderRespVO> voList = buildWorkOrderRespVOList(list);
ExcelUtils.write(response, "鐢熶骇宸ュ崟.xls", "鏁版嵁", MesProWorkOrderRespVO.class, voList);
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱鐢熶骇宸ュ崟瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesProWorkOrderImportExcelVO> list = Collections.singletonList(
+ MesProWorkOrderImportExcelVO.builder()
+ .code("WO-001").name("绀轰緥鐢熶骇宸ュ崟").type(1).orderSourceType(1)
+ .orderSourceCode("").productCode("").quantity(new BigDecimal("100"))
+ .clientName("").saleOrderNo("").batchCode("")
+ .requestDate(java.time.LocalDateTime.of(2026, 10, 16, 9, 0, 0))
+ .remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "鐢熶骇宸ュ崟瀵煎叆妯℃澘.xls", "鐢熶骇宸ュ崟鍒楄〃", MesProWorkOrderImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆鐢熶骇宸ュ崟")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('mes:pro-work-order:import')")
+ public CommonResult<MesProWorkOrderImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesProWorkOrderImportExcelVO> list = ExcelUtils.read(file, MesProWorkOrderImportExcelVO.class);
+ return success(workOrderService.importWorkOrderList(list, updateSupport));
}
@PutMapping("/confirm")
@@ -139,6 +192,22 @@
return success(true);
}
+ @GetMapping("/progress/{id}")
+ @Operation(summary = "鑾峰彇宸ュ崟杩涘害璇︽儏")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:pro-work-order:query')")
+ public CommonResult<MesProWorkOrderProgressRespVO> getWorkOrderProgress(@PathVariable("id") Long id) {
+ return success(workOrderService.getWorkOrderProgress(id));
+ }
+
+ @PostMapping("/check-auto-finish/{id}")
+ @Operation(summary = "妫�鏌ュ苟鑷姩瀹屾垚宸ュ崟")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:pro-work-order:update')")
+ public CommonResult<Boolean> checkAutoFinish(@PathVariable("id") Long id) {
+ return success(workOrderService.checkAndAutoFinishWorkOrder(id));
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesProWorkOrderRespVO> buildWorkOrderRespVOList(List<MesProWorkOrderDO> list) {
@@ -146,18 +215,30 @@
return Collections.emptyList();
}
// 1. 鎵归噺鑾峰彇鍏宠仈鏁版嵁
+ Set<Long> workOrderIds = convertSet(list, MesProWorkOrderDO::getId);
Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
convertSet(list, MesProWorkOrderDO::getProductId));
Map<Long, CrmCustomerRespDTO> customerMap = customerApi.getCustomerMap(
convertSet(list, MesProWorkOrderDO::getClientId));
- Map<Long, ErpSupplierRespDTO> supplierMap = supplierApi.getSupplierList(
+ Map<Long, SrmSupplierRespDTO> supplierMap = srmSupplierApi.getSupplierList(
convertSet(list, MesProWorkOrderDO::getVendorId)).getCheckedData().stream()
- .collect(java.util.stream.Collectors.toMap(ErpSupplierRespDTO::getId, s -> s));
+ .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, s -> s));
// 鍗曚綅浠庝骇鍝佸叧鑱旂殑 item 鑾峰緱
Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
Map<Long, MesProWorkOrderDO> parentMap = workOrderService.getWorkOrderMap(
convertSet(list, MesProWorkOrderDO::getParentId));
+
+ // 鑾峰彇鎵�鏈夊叧鑱旂殑宸ュ崟宸ュ簭鍜屼换鍔�
+ List<MesProWorkOrderProcessDO> allProcesses = workOrderProcessService.getWorkOrderProcessListByWorkOrderIds(workOrderIds);
+ List<MesProTaskDO> allTasks = taskService.getTaskListByWorkOrderIds(workOrderIds);
+
+ Set<Long> processIds = convertSet(allProcesses, MesProWorkOrderProcessDO::getProcessId);
+ Map<Long, MesProProcessDO> processMap = processService.getProcessMap(processIds);
+
+ Map<Long, List<MesProWorkOrderProcessDO>> woProcessMap = convertMultiMap(allProcesses, MesProWorkOrderProcessDO::getWorkOrderId);
+ Map<Long, List<MesProTaskDO>> woTaskMap = convertMultiMap(allTasks, MesProTaskDO::getWorkOrderId);
+
// 2. 鎷兼帴 VO锛堝崟浣嶅悕绉颁粠浜у搧鍏宠仈鐨� item 鑾峰緱锛�
return BeanUtils.toBean(list, MesProWorkOrderRespVO.class, vo -> {
MapUtils.findAndThen(itemMap, vo.getProductId(), item -> {
@@ -172,6 +253,60 @@
supplier -> vo.setVendorName(supplier.getName()));
MapUtils.findAndThen(parentMap, vo.getParentId(),
parent -> vo.setParentCode(parent.getCode()));
+
+ // 璁＄畻瀹屽伐杩涘害 (quantityProduced / quantity * 100)
+ BigDecimal produced = vo.getQuantityProduced() != null ? vo.getQuantityProduced() : BigDecimal.ZERO;
+ if (vo.getQuantity() != null && vo.getQuantity().compareTo(BigDecimal.ZERO) > 0) {
+ vo.setCompletionProgress(produced.multiply(new BigDecimal("100")).divide(vo.getQuantity(), 2, java.math.RoundingMode.HALF_UP));
+ } else {
+ vo.setCompletionProgress(produced.compareTo(BigDecimal.ZERO) > 0 ? new BigDecimal("100.00") : BigDecimal.ZERO);
+ }
+
+ // 璁＄畻杩涘害鍜岀姸鎬�
+ List<MesProWorkOrderProcessDO> processes = woProcessMap.getOrDefault(vo.getId(), Collections.emptyList());
+ List<MesProTaskDO> tasks = woTaskMap.getOrDefault(vo.getId(), Collections.emptyList());
+
+ List<MesProWorkOrderProcessProgressVO> progressList = new ArrayList<>();
+ boolean allCompleted = !processes.isEmpty();
+ boolean anyStarted = false;
+
+ Map<Long, List<MesProTaskDO>> processTaskMap = convertMultiMap(tasks, MesProTaskDO::getProcessId);
+
+ for (MesProWorkOrderProcessDO process : processes) {
+ List<MesProTaskDO> pTasks = processTaskMap.getOrDefault(process.getProcessId(), Collections.emptyList());
+
+ BigDecimal totalQty = pTasks.stream().map(t -> t.getQuantity() != null ? t.getQuantity() : BigDecimal.ZERO).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal totalProduced = pTasks.stream().map(t -> t.getProducedQuantity() != null ? t.getProducedQuantity() : BigDecimal.ZERO).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ MesProWorkOrderProcessProgressVO progressVO = new MesProWorkOrderProcessProgressVO();
+ MesProProcessDO processDO = processMap.get(process.getProcessId());
+ progressVO.setProcessName(processDO != null ? processDO.getName() : "");
+
+ if (totalQty.compareTo(BigDecimal.ZERO) > 0) {
+ progressVO.setProgress(totalProduced.multiply(new BigDecimal("100")).divide(totalQty, 2, java.math.RoundingMode.HALF_UP));
+ } else {
+ progressVO.setProgress(totalProduced.compareTo(BigDecimal.ZERO) > 0 ? new BigDecimal("100.00") : BigDecimal.ZERO);
+ }
+ progressList.add(progressVO);
+
+ if (totalProduced.compareTo(BigDecimal.ZERO) > 0) {
+ anyStarted = true;
+ }
+ if (totalQty.compareTo(BigDecimal.ZERO) == 0 || totalProduced.compareTo(totalQty) < 0) {
+ allCompleted = false;
+ }
+ }
+
+ vo.setProcessProgressList(progressList);
+ if (processes.isEmpty()) {
+ vo.setProductionStatus(MesProWorkOrderProductionStatusEnum.WAITING.getStatus()); // 寰呯敓浜�
+ } else if (allCompleted) {
+ vo.setProductionStatus(MesProWorkOrderProductionStatusEnum.FINISHED.getStatus()); // 鐢熶骇瀹屾垚
+ } else if (anyStarted) {
+ vo.setProductionStatus(MesProWorkOrderProductionStatusEnum.PRODUCING.getStatus()); // 鐢熶骇涓�
+ } else {
+ vo.setProductionStatus(MesProWorkOrderProductionStatusEnum.WAITING.getStatus()); // 寰呯敓浜�
+ }
});
}
--
Gitblit v1.9.3