From 0857cf1830039d60ce73005f386f284cf575e511 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 14:00:19 +0800
Subject: [PATCH] feat(mes): 新增ERP销售订单生产状态枚举及MES工艺路线优化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java | 137 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 121 insertions(+), 16 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
index e380ac7..848f5d2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
@@ -3,10 +3,14 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsSaveReqVO;
+import cn.iocoder.yudao.module.mes.api.event.ProductionCanceledEvent;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.mps.MesProMpsDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.mps.MesProMpsMergeItemDO;
@@ -17,6 +21,11 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductBomDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemTypeDO;
+import cn.iocoder.yudao.module.mes.enums.md.MesMdItemTypeEnum;
+import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemTypeService;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.enums.pro.MesProMpsStatusEnum;
@@ -30,9 +39,11 @@
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.process.MesProWorkOrderProcessSaveReqVO;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.context.ApplicationEventPublisher;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -43,8 +54,10 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -53,17 +66,12 @@
/**
* MES 鐢熶骇涓昏鍒掞紙MPS锛塖ervice 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@Slf4j
public class MesProMpsServiceImpl implements MesProMpsService {
-
- /**
- * MPS 缂栫爜瑙勫垯
- */
- private static final String MPS_CODE_RULE = "MPS";
@Resource
private MesProMpsMapper mpsMapper;
@@ -73,6 +81,8 @@
private MesProWorkOrderService workOrderService;
@Resource
private MesMdItemService itemService;
+ @Resource
+ private MesMdItemTypeService itemTypeService;
@Resource
private MesMdAutoCodeRecordService autoCodeRecordService;
@Resource
@@ -87,6 +97,8 @@
private MesProRouteProcessService routeProcessService;
@Resource
private MesProWorkOrderProcessService workOrderProcessService;
+ @Resource
+ private ApplicationEventPublisher eventPublisher;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -94,11 +106,12 @@
Long mdmItemId, String productName, BigDecimal quantity, Long clientId,
String requestDate, String remark) {
// 1. 鏍规嵁 MDM 鐗╂枡 ID 鏌ユ壘 MES 浜у搧
- cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO mesItem = itemService.getItemByMdmItemId(mdmItemId);
+ MesMdItemDO mesItem = itemService.getItemByMdmItemId(mdmItemId);
if (mesItem == null) {
// MES 浜у搧涓嶅瓨鍦紝鎶涘嚭寮傚父骞跺寘鍚骇鍝佸悕绉版彁绀�
throw exception(PRO_MPS_MES_PRODUCT_NOT_EXISTS, productName != null ? productName : mdmItemId);
}
+ validateProductItem(mesItem.getId());
// 2. 鐢熸垚 MPS 缂栫爜
String code = generateMpsCode();
@@ -138,8 +151,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long createMps(MesProMpsSaveReqVO createReqVO) {
- // 鏍￠獙浜у搧瀛樺湪
- itemService.validateItemExists(createReqVO.getProductId());
+ // 鏍￠獙浜у搧瀛樺湪銆佸惎鐢ㄤ笖涓轰骇鍝佺被鍨�
+ validateProductItem(createReqVO.getProductId());
// 濡傛灉鏈～鍐欑紪鐮侊紝鑷姩鐢熸垚
if (StrUtil.isBlank(createReqVO.getCode())) {
@@ -165,6 +178,8 @@
public void updateMps(MesProMpsSaveReqVO updateReqVO) {
// 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
validateMpsExistsAndDraft(updateReqVO.getId());
+ // 鏍￠獙浜у搧瀛樺湪銆佸惎鐢ㄤ笖涓轰骇鍝佺被鍨�
+ validateProductItem(updateReqVO.getProductId());
// 鏍￠獙缂栫爜鍞竴
validateMpsCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
@@ -297,6 +312,10 @@
mpsMapper.updateById(new MesProMpsDO()
.setId(id)
.setStatus(MesProMpsStatusEnum.CANCELED.getStatus()));
+ // 鏉ユ簮浜庨攢鍞鍗曟椂锛屽悓姝ユ仮澶嶉攢鍞鍗曠敓浜х姸鎬侊紝鍏佽閲嶆柊鍒涘缓鐢熶骇璁″垝
+ if (mps.getSaleOrderId() != null) {
+ eventPublisher.publishEvent(new ProductionCanceledEvent(mps.getSaleOrderId()));
+ }
}
@Override
@@ -420,6 +439,73 @@
return false;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesProMpsImportRespVO importMpsList(List<MesProMpsImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(MES_PRO_MPS_IMPORT_LIST_IS_EMPTY);
+ }
+ MesProMpsImportRespVO respVO = MesProMpsImportRespVO.builder()
+ .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
+ .failureCodes(new LinkedHashMap<>()).build();
+ AtomicInteger index = new AtomicInteger(1);
+ importList.forEach(importItem -> {
+ int currentIndex = index.getAndIncrement();
+ String key = StrUtil.blankToDefault(importItem.getCode(), "绗� " + currentIndex + " 琛�");
+ // 1. 瑙ｆ瀽浜у搧
+ if (StrUtil.isBlank(importItem.getProductCode())) {
+ respVO.getFailureCodes().put(key, "浜у搧缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ MesMdItemDO item = itemService.getItemByCode(importItem.getProductCode().trim());
+ if (item == null) {
+ respVO.getFailureCodes().put(key, "浜у搧缂栫爜[" + importItem.getProductCode() + "]涓嶅瓨鍦�");
+ return;
+ }
+ // 2. 瑙ｆ瀽瀹㈡埛
+ Long clientId = null;
+ if (StrUtil.isNotBlank(importItem.getClientName())) {
+ CrmCustomerRespDTO customer = customerApi.getCustomerByName(importItem.getClientName().trim());
+ if (customer == null) {
+ respVO.getFailureCodes().put(key, "瀹㈡埛鍚嶇О[" + importItem.getClientName() + "]涓嶅瓨鍦�");
+ return;
+ }
+ clientId = customer.getId();
+ }
+ // 3. 鏋勫缓璇锋眰骞跺垱寤�/鏇存柊锛堝鐢ㄧ幇鏈� create/update 鏈嶅姟锛�
+ MesProMpsSaveReqVO reqVO = BeanUtils.toBean(importItem, MesProMpsSaveReqVO.class);
+ reqVO.setProductId(item.getId());
+ reqVO.setUnitMeasureId(item.getUnitMeasureId());
+ reqVO.setClientId(clientId);
+ try {
+ if (StrUtil.isBlank(importItem.getCode())) {
+ // 缂栫爜涓虹┖锛氫粎鍒涘缓锛堣嚜鍔ㄧ敓鎴愮紪鐮侊級
+ reqVO.setId(null);
+ reqVO.setCode(null);
+ createMps(reqVO);
+ respVO.getCreateCodes().add(StrUtil.isBlank(reqVO.getCode())
+ ? String.valueOf(currentIndex) : reqVO.getCode());
+ } else {
+ MesProMpsDO existMps = mpsMapper.selectByCode(importItem.getCode());
+ if (existMps == null) {
+ reqVO.setId(null);
+ createMps(reqVO);
+ respVO.getCreateCodes().add(importItem.getCode());
+ } else if (updateSupport) {
+ reqVO.setId(existMps.getId());
+ updateMps(reqVO);
+ respVO.getUpdateCodes().add(importItem.getCode());
+ } else {
+ respVO.getFailureCodes().put(key, "MPS 缂栫爜宸插瓨鍦�");
+ }
+ }
+ } catch (ServiceException e) {
+ respVO.getFailureCodes().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
/**
* 鍒ゆ柇鍗曚釜 MPS 鏄惁瀹屾垚
*/
@@ -452,10 +538,11 @@
*/
private String generateMpsCode() {
try {
- return autoCodeRecordService.generateAutoCode(MPS_CODE_RULE);
+ return autoCodeRecordService.generateAutoCode(MesMdAutoCodeRuleCodeEnum.PRO_MPS_CODE.getCode());
} catch (Exception e) {
// 濡傛灉缂栫爜瑙勫垯涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�
- log.warn("[generateMpsCode] 缂栫爜瑙勫垯 {} 涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�", MPS_CODE_RULE);
+ log.warn("[generateMpsCode] 缂栫爜瑙勫垯 {} 涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�",
+ MesMdAutoCodeRuleCodeEnum.PRO_MPS_CODE.getCode(), e);
return "MPS" + System.currentTimeMillis();
}
}
@@ -509,6 +596,17 @@
}
/**
+ * 鏍￠獙浜у搧瀛樺湪銆佸惎鐢ㄤ笖涓轰骇鍝佺被鍨�
+ */
+ private void validateProductItem(Long itemId) {
+ MesMdItemDO item = itemService.validateItemExistsAndEnable(itemId);
+ MesMdItemTypeDO itemType = itemTypeService.getItemType(item.getItemTypeId());
+ if (itemType == null || !MesMdItemTypeEnum.isProduct(itemType.getItemOrProduct())) {
+ throw exception(PRO_MPS_PRODUCT_TYPE_INVALID);
+ }
+ }
+
+ /**
* 鏍规嵁 MPS 鍒涘缓鐢熶骇宸ュ崟
*/
private Long createWorkOrderFromMps(MesProMpsDO mps, BigDecimal quantity) {
@@ -519,8 +617,9 @@
}
Long routeId = routeProduct.getRouteId();
- // 2. 鏍￠獙宸ヨ壓璺嚎鏄惁鏈夊伐搴�
- List<MesProRouteProcessDO> routeProcesses = routeProcessService.getRouteProcessListByRouteId(routeId);
+ // 2. 鏍￠獙宸ヨ壓璺嚎鏄惁鏈夊伐搴忥紙鎸変骇鍝佽繃婊ゅ叾瀹冧骇鍝佺殑浜у嚭鐗╂枡锛�
+ List<MesProRouteProcessDO> routeProcesses = routeProcessService
+ .getRouteProcessListByProductId(mps.getProductId());
if (CollUtil.isEmpty(routeProcesses)) {
throw exception(PRO_ROUTE_ENABLE_NO_PROCESS);
}
@@ -560,6 +659,10 @@
.map(Long::valueOf).collect(Collectors.toList()));
}
process.setColorCode(rp.getColorCode());
+ // 甯﹀叆宸ヨ壓璺嚎浜у搧閰嶇疆鐨勬姤宸ヤ粨搴�
+ process.setWarehouseId(routeProduct.getWarehouseId());
+ process.setLocationId(routeProduct.getLocationId());
+ process.setAreaId(routeProduct.getAreaId());
// 甯﹀叆宸ュ簭鎶曟枡BOM
List<MesProRouteProductBomDO> routeBomItems = bomMap != null ? bomMap.get(rp.getProcessId()) : null;
if (CollUtil.isNotEmpty(routeBomItems)) {
@@ -588,11 +691,13 @@
*/
private String generateWorkOrderCode() {
try {
- return autoCodeRecordService.generateAutoCode("WO");
+ return autoCodeRecordService.generateAutoCode(
+ MesMdAutoCodeRuleCodeEnum.PRO_WORK_ORDER_CODE.getCode());
} catch (Exception e) {
- log.warn("[generateWorkOrderCode] 缂栫爜瑙勫垯 WO 涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�");
+ log.warn("[generateWorkOrderCode] 缂栫爜瑙勫垯 {} 涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�",
+ MesMdAutoCodeRuleCodeEnum.PRO_WORK_ORDER_CODE.getCode(), e);
return "WO" + System.currentTimeMillis();
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3