From 09d3c4a46e1b67415a716251acea7a1c592c8af7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 09:00:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260811' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java | 136 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 120 insertions(+), 16 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 152502e..b6233cd 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,19 +9,24 @@
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.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.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.md.vendor.MesMdVendorDO;
+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.service.md.client.MesMdClientService;
+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.md.vendor.MesMdVendorService;
+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.tags.Tag;
@@ -33,10 +38,12 @@
import org.springframework.web.bind.annotation.*;
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 鐢熶骇宸ュ崟")
@@ -50,11 +57,17 @@
@Resource
private MesMdItemService itemService;
@Resource
- private MesMdClientService clientService;
+ private CrmCustomerApi customerApi;
@Resource
- private MesMdVendorService vendorService;
+ 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 +113,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')")
@@ -139,6 +160,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,17 +183,30 @@
return Collections.emptyList();
}
// 1. 鎵归噺鑾峰彇鍏宠仈鏁版嵁
+ Set<Long> workOrderIds = convertSet(list, MesProWorkOrderDO::getId);
Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
convertSet(list, MesProWorkOrderDO::getProductId));
- Map<Long, MesMdClientDO> clientMap = clientService.getClientMap(
+ Map<Long, CrmCustomerRespDTO> customerMap = customerApi.getCustomerMap(
convertSet(list, MesProWorkOrderDO::getClientId));
- Map<Long, MesMdVendorDO> vendorMap = vendorService.getVendorMap(
- convertSet(list, MesProWorkOrderDO::getVendorId));
+ Map<Long, SrmSupplierRespDTO> supplierMap = srmSupplierApi.getSupplierList(
+ convertSet(list, MesProWorkOrderDO::getVendorId)).getCheckedData().stream()
+ .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 -> {
@@ -165,12 +215,66 @@
MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
});
- MapUtils.findAndThen(clientMap, vo.getClientId(),
- client -> vo.setClientName(client.getName()).setClientCode(client.getCode()));
- MapUtils.findAndThen(vendorMap, vo.getVendorId(),
- vendor -> vo.setVendorName(vendor.getName()).setVendorCode(vendor.getCode()));
+ MapUtils.findAndThen(customerMap, vo.getClientId(),
+ customer -> vo.setClientName(customer.getName()));
+ MapUtils.findAndThen(supplierMap, vo.getVendorId(),
+ 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