From abf1c0a35d85d38239ff5d2ed746a4e4b797c9d1 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 20 八月 2026 14:05:02 +0800
Subject: [PATCH] feat 功能修正
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 210 insertions(+), 17 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
index 99332dd..ad02742 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
@@ -13,18 +13,30 @@
import cn.iocoder.yudao.module.mes.enums.wm.BarcodeBizTypeEnum;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemBatchConfigService;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderProgressRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
+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.MesProWorkOrderProcessDO;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProTaskStatusEnum;
+import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
+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.wm.barcode.MesWmBarcodeService;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderRespDTO;
import jakarta.annotation.Resource;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -32,7 +44,7 @@
/**
* MES 鐢熶骇宸ュ崟 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -44,6 +56,8 @@
@Resource
private MesProWorkOrderBomService workOrderBomService;
@Resource
+ private MesProWorkOrderProcessService workOrderProcessService;
+ @Resource
private MesMdItemService itemService;
@Resource
private MesMdItemBatchConfigService itemBatchConfigService;
@@ -51,12 +65,24 @@
private MesWmBarcodeService barcodeService;
@Resource
private MesProTaskService taskService;
+ @Resource
+ private MesProProcessService processService;
+ @Resource
+ private MesMdWorkstationService workstationService;
+ @Resource
+ private CrmCustomerApi customerApi;
+
+ @Resource
+ @Lazy // 閬垮厤 erpSaleOrderApiImpl -> ... -> mesProWorkOrderServiceImpl 鐨勫惊鐜緷璧�
+ private ErpSaleOrderApi saleOrderApi;
@Override
@Transactional(rollbackFor = Exception.class)
public Long createWorkOrder(MesProWorkOrderSaveReqVO createReqVO) {
// 1. 鏍￠獙鏁版嵁
validateWorkOrderSaveData(null, createReqVO);
+ // 1.1 鍏宠仈钀ラ攢璁㈠崟淇℃伅鍥炲～
+ fillSaleOrderInfo(createReqVO);
// 2.1 璁剧疆榛樿鍊�
if (createReqVO.getParentId() == null) {
@@ -67,10 +93,14 @@
workOrder.setStatus(MesProWorkOrderStatusEnum.PREPARE.getStatus());
workOrderMapper.insert(workOrder);
- // 3. 鑷姩鐢熸垚 BOM锛氭牴鎹骇鍝� BOM 鐢熸垚宸ュ崟 BOM
- workOrderBomService.generateWorkOrderBom(workOrder.getId(), createReqVO, false);
+ // 3. 鑷姩鐢熸垚 BOM锛氭牴鎹骇鍝� BOM 鐢熸垚宸ュ崟 BOM锛堟棤浜у搧鐨勮繍缁�/鍙戠數/妫�淇被宸ュ崟璺宠繃锛�
+ if (createReqVO.getProductId() != null) {
+ workOrderBomService.generateWorkOrderBom(workOrder.getId(), createReqVO, false);
+ }
- // 4. 鑷姩鐢熸垚鏉＄爜
+ // 4. 宸ュ簭鐢卞墠绔�夋嫨浜у搧鍚庡甫鍏ワ紝涓嶅啀鑷姩鐢熸垚
+
+ // 5. 鑷姩鐢熸垚鏉＄爜
barcodeService.autoGenerateBarcode(BarcodeBizTypeEnum.WORKORDER.getValue(),
workOrder.getId(), workOrder.getCode(), workOrder.getName());
return workOrder.getId();
@@ -86,13 +116,16 @@
}
// 1.2 鏍￠獙鏁版嵁
validateWorkOrderSaveData(updateReqVO.getId(), updateReqVO);
+ // 1.3 鍏宠仈钀ラ攢璁㈠崟淇℃伅鍥炲～
+ fillSaleOrderInfo(updateReqVO);
- // 2. 鍒ゆ柇浜у搧鎴栨暟閲忔槸鍚﹀彉鏇达紝濡傛灉鍙樻洿鍒欓噸鏂扮敓鎴� BOM锛坲pdated=true 浼氬厛娓呯悊鏃ф暟鎹級
+ // 2. 鍒ゆ柇浜у搧鎴栨暟閲忔槸鍚﹀彉鏇达紝濡傛灉鍙樻洿鍒欓噸鏂扮敓鎴� BOM锛坲pdated=true 浼氬厛娓呯悊鏃ф暟鎹紱鏃犱骇鍝佺殑杩愮淮绫诲伐鍗曡烦杩囷級
boolean productChanged = ObjUtil.notEqual(oldWorkOrder.getProductId(), updateReqVO.getProductId());
boolean quantityChanged = oldWorkOrder.getQuantity().compareTo(updateReqVO.getQuantity()) != 0;
- if (productChanged || quantityChanged) {
+ if ((productChanged || quantityChanged) && updateReqVO.getProductId() != null) {
workOrderBomService.generateWorkOrderBom(updateReqVO.getId(), updateReqVO, true);
}
+ // 2.1 宸ュ簭鐢卞墠绔鐞嗭紝浜у搧鍙樻洿鏃跺墠绔細閲嶆柊鑾峰彇宸ヨ壓璺嚎宸ュ簭
// 3. 鏇存柊
MesProWorkOrderDO updateObj = BeanUtils.toBean(updateReqVO, MesProWorkOrderDO.class);
@@ -114,9 +147,10 @@
throw exception(PRO_WORK_ORDER_HAS_CHILDREN);
}
- // 2. 鍒犻櫎宸ュ崟 + BOM
+ // 2. 鍒犻櫎宸ュ崟 + BOM + 宸ュ簭
workOrderMapper.deleteById(id);
workOrderBomService.deleteWorkOrderBomByWorkOrderId(id);
+ workOrderProcessService.deleteWorkOrderProcessByWorkOrderId(id);
}
@Override
@@ -140,7 +174,16 @@
@Override
public PageResult<MesProWorkOrderDO> getWorkOrderPage(MesProWorkOrderPageReqVO pageReqVO) {
- return workOrderMapper.selectPage(pageReqVO);
+ // 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
+ List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
+ return workOrderMapper.selectPage(pageReqVO, permittedClientIds);
+ }
+
+ @Override
+ public PageResult<MesProWorkOrderDO> getWorkOrderSchedulePage(MesProWorkOrderPageReqVO pageReqVO) {
+ // 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
+ List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
+ return workOrderMapper.selectSchedulePage(pageReqVO, permittedClientIds);
}
@Override
@@ -215,12 +258,14 @@
private void validateWorkOrderSaveData(Long id, MesProWorkOrderSaveReqVO reqVO) {
// 1. 鏍￠獙缂栫爜鍞竴
validateWorkOrderCodeUnique(id, reqVO.getCode());
- // 2. 鏍￠獙浜у搧瀛樺湪
- itemService.validateItemExists(reqVO.getProductId());
- // 3. 鏍￠獙鎵规閰嶇疆锛堝鏋滀骇鍝佹湁 clientFlag=true锛屽垯 clientId 蹇呭～锛�
- MesMdItemBatchConfigDO batchConfig = itemBatchConfigService.getItemBatchConfigByItemId(reqVO.getProductId());
- if (batchConfig != null && Boolean.TRUE.equals(batchConfig.getClientFlag()) && reqVO.getClientId() == null) {
- throw exception(MD_CLIENT_NOT_EXISTS);
+ // 2. 浜у搧闈炵┖鏃舵牎楠屼骇鍝佸瓨鍦紙杩愮淮/鍙戠數/妫�淇被宸ュ崟鍙棤浜у搧锛�
+ if (reqVO.getProductId() != null) {
+ itemService.validateItemExists(reqVO.getProductId());
+ // 3. 鏍￠獙鎵规閰嶇疆锛堝鏋滀骇鍝佹湁 clientFlag=true锛屽垯 clientId 蹇呭～锛�
+ MesMdItemBatchConfigDO batchConfig = itemBatchConfigService.getItemBatchConfigByItemId(reqVO.getProductId());
+ if (batchConfig != null && Boolean.TRUE.equals(batchConfig.getClientFlag()) && reqVO.getClientId() == null) {
+ throw exception(MD_CLIENT_NOT_EXISTS);
+ }
}
}
@@ -237,6 +282,23 @@
}
}
+ /**
+ * 鍏宠仈钀ラ攢璁㈠崟锛圗RP 閿�鍞鍗曪級锛氭牎楠屽瓨鍦ㄦ�у苟鍥炲～鍗曞彿銆佸鎴�
+ */
+ private void fillSaleOrderInfo(MesProWorkOrderSaveReqVO reqVO) {
+ if (reqVO.getSaleOrderId() == null) {
+ return;
+ }
+ ErpSaleOrderRespDTO saleOrder = saleOrderApi.getSaleOrder(reqVO.getSaleOrderId()).getCheckedData();
+ if (saleOrder == null) {
+ throw exception(PRO_WORK_ORDER_SALE_ORDER_NOT_EXISTS);
+ }
+ reqVO.setSaleOrderNo(saleOrder.getNo());
+ if (reqVO.getClientId() == null && saleOrder.getCustomerId() != null) {
+ reqVO.setClientId(saleOrder.getCustomerId());
+ }
+ }
+
@Override
public void updateProducedQuantity(Long id, BigDecimal incrQuantityProduced) {
// 鏍￠獙宸ュ崟瀛樺湪
@@ -246,6 +308,137 @@
}
@Override
+ public void updateScheduledQuantity(Long id, BigDecimal incrQuantityScheduled) {
+ // 鏍￠獙宸ュ崟瀛樺湪
+ validateWorkOrderExists(id);
+ // 鏇存柊鏁伴噺
+ workOrderMapper.updateScheduledQuantity(id, incrQuantityScheduled);
+ }
+
+ @Override
+ public void validateScheduleQuantity(Long id, BigDecimal scheduleQuantity) {
+ MesProWorkOrderDO workOrder = validateWorkOrderExists(id);
+ BigDecimal currentScheduled = workOrder.getQuantityScheduled() != null ? workOrder.getQuantityScheduled() : BigDecimal.ZERO;
+ BigDecimal totalScheduled = currentScheduled.add(scheduleQuantity);
+ if (totalScheduled.compareTo(workOrder.getQuantity()) > 0) {
+ throw exception(PRO_WORK_ORDER_SCHEDULE_QUANTITY_EXCEED,
+ workOrder.getCode(),
+ workOrder.getQuantity(),
+ currentScheduled,
+ scheduleQuantity);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean checkAndAutoFinishWorkOrder(Long id) {
+ MesProWorkOrderDO workOrder = getWorkOrder(id);
+ if (workOrder == null) {
+ return false;
+ }
+ // 鏈紑鍚嚜鍔ㄥ畬鎴�
+ if (!Boolean.TRUE.equals(workOrder.getAutoFinishFlag())) {
+ return false;
+ }
+ // 鐘舵�佷笉鏄凡纭
+ if (!ObjUtil.equal(workOrder.getStatus(), MesProWorkOrderStatusEnum.CONFIRMED.getStatus())) {
+ return false;
+ }
+ // 宸茬敓浜ф暟閲� >= 鐢熶骇鏁伴噺
+ BigDecimal quantityProduced = workOrder.getQuantityProduced() != null ? workOrder.getQuantityProduced() : BigDecimal.ZERO;
+ if (quantityProduced.compareTo(workOrder.getQuantity()) >= 0) {
+ finishWorkOrder(id);
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public MesProWorkOrderProgressRespVO getWorkOrderProgress(Long id) {
+ MesProWorkOrderDO workOrder = getWorkOrder(id);
+ if (workOrder == null) {
+ return null;
+ }
+ // 1. 鑾峰彇宸ュ崟宸ュ簭鍒楄〃
+ List<MesProWorkOrderProcessDO> processes = workOrderProcessService.getWorkOrderProcessListByWorkOrderId(id);
+ // 2. 鑾峰彇宸ュ崟涓嬫墍鏈変换鍔★紝鎸夊伐搴忓垎缁�
+ List<MesProTaskDO> allTasks = taskService.getTaskListByWorkOrderIds(Collections.singletonList(id));
+ Map<Long, List<MesProTaskDO>> taskMap = allTasks.stream()
+ .collect(Collectors.groupingBy(t -> t.getProcessId() != null ? t.getProcessId() : 0L));
+ // 3. 鎵归噺鏌ヨ宸ュ簭鍚嶇О鍜屽伐浣滅珯鍚嶇О
+ Set<Long> processIds = processes.stream().map(MesProWorkOrderProcessDO::getProcessId).collect(Collectors.toSet());
+ Map<Long, MesProProcessDO> processMap = processService.getProcessMap(processIds);
+ Set<Long> workstationIds = allTasks.stream().map(MesProTaskDO::getWorkstationId).filter(Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, MesMdWorkstationDO> workstationMap = workstationService.getWorkstationMap(workstationIds);
+ // 4. 璁＄畻杩涘害
+ BigDecimal quantity = workOrder.getQuantity() != null ? workOrder.getQuantity() : BigDecimal.ZERO;
+ BigDecimal quantityProduced = workOrder.getQuantityProduced() != null ? workOrder.getQuantityProduced() : BigDecimal.ZERO;
+ BigDecimal quantityScheduled = workOrder.getQuantityScheduled() != null ? workOrder.getQuantityScheduled() : BigDecimal.ZERO;
+ MesProWorkOrderProgressRespVO vo = new MesProWorkOrderProgressRespVO()
+ .setWorkOrderId(workOrder.getId())
+ .setWorkOrderCode(workOrder.getCode())
+ .setQuantity(quantity)
+ .setQuantityScheduled(quantityScheduled)
+ .setQuantityProduced(quantityProduced)
+ .setProgressPercent(calcPercent(quantityProduced, quantity));
+ // 5. 缁勮宸ュ簭杩涘害
+ List<MesProWorkOrderProgressRespVO.ProcessProgress> processList = new ArrayList<>();
+ for (MesProWorkOrderProcessDO wp : processes) {
+ MesProProcessDO proc = processMap.get(wp.getProcessId());
+ List<MesProTaskDO> procTasks = taskMap.getOrDefault(wp.getProcessId(), Collections.emptyList());
+ BigDecimal procProduced = procTasks.stream()
+ .map(t -> t.getProducedQuantity() != null ? t.getProducedQuantity() : BigDecimal.ZERO)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal plannedQty = Boolean.TRUE.equals(wp.getKeyFlag()) ? quantity : null;
+ int procStatus = calcProcessStatus(procTasks);
+ List<MesProWorkOrderProgressRespVO.TaskInfo> taskInfoList = procTasks.stream().map(t -> {
+ MesMdWorkstationDO ws = workstationMap.get(t.getWorkstationId());
+ BigDecimal tQty = t.getQuantity() != null ? t.getQuantity() : BigDecimal.ZERO;
+ BigDecimal tProduced = t.getProducedQuantity() != null ? t.getProducedQuantity() : BigDecimal.ZERO;
+ return new MesProWorkOrderProgressRespVO.TaskInfo()
+ .setTaskId(t.getId())
+ .setTaskCode(t.getCode())
+ .setWorkstationName(ws != null ? ws.getName() : null)
+ .setQuantity(tQty)
+ .setProducedQuantity(tProduced)
+ .setProgressPercent(calcPercent(tProduced, tQty))
+ .setStatus(t.getStatus());
+ }).collect(Collectors.toList());
+ processList.add(new MesProWorkOrderProgressRespVO.ProcessProgress()
+ .setProcessId(wp.getProcessId())
+ .setProcessCode(proc != null ? proc.getCode() : null)
+ .setProcessName(proc != null ? proc.getName() : null)
+ .setKeyFlag(wp.getKeyFlag())
+ .setPlannedQuantity(plannedQty)
+ .setProducedQuantity(procProduced)
+ .setProgressPercent(calcPercent(procProduced, plannedQty))
+ .setStatus(procStatus)
+ .setTaskList(taskInfoList));
+ }
+ vo.setProcessList(processList);
+ return vo;
+ }
+
+ private BigDecimal calcPercent(BigDecimal produced, BigDecimal total) {
+ if (total == null || total.compareTo(BigDecimal.ZERO) <= 0 || produced == null) {
+ return BigDecimal.ZERO;
+ }
+ return produced.multiply(new BigDecimal("100")).divide(total, 2, RoundingMode.HALF_UP);
+ }
+
+ private int calcProcessStatus(List<MesProTaskDO> tasks) {
+ if (tasks.isEmpty()) {
+ return 0; // 鏈紑濮�
+ }
+ boolean allFinished = tasks.stream().allMatch(t -> MesProTaskStatusEnum.isEndStatus(t.getStatus()));
+ if (allFinished) {
+ return 2; // 宸插畬鎴�
+ }
+ boolean anyStarted = tasks.stream().anyMatch(t -> !MesProTaskStatusEnum.PREPARE.getStatus().equals(t.getStatus()));
+ return anyStarted ? 1 : 0; // 杩涜涓� : 鏈紑濮�
+ }
+
+ @Override
public Long getWorkOrderCountByVendorId(Long vendorId) {
return workOrderMapper.selectCountByVendorId(vendorId);
}
--
Gitblit v1.9.3