From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java | 100 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 90 insertions(+), 10 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 3100498..60962e5 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;
@@ -20,6 +24,7 @@
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;
@@ -34,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;
@@ -47,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;
@@ -63,11 +72,6 @@
@Validated
@Slf4j
public class MesProMpsServiceImpl implements MesProMpsService {
-
- /**
- * MPS 缂栫爜瑙勫垯
- */
- private static final String MPS_CODE_RULE = "MPS";
@Resource
private MesProMpsMapper mpsMapper;
@@ -93,6 +97,8 @@
private MesProRouteProcessService routeProcessService;
@Resource
private MesProWorkOrderProcessService workOrderProcessService;
+ @Resource
+ private ApplicationEventPublisher eventPublisher;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -306,6 +312,10 @@
mpsMapper.updateById(new MesProMpsDO()
.setId(id)
.setStatus(MesProMpsStatusEnum.CANCELED.getStatus()));
+ // 鏉ユ簮浜庨攢鍞鍗曟椂锛屽悓姝ユ仮澶嶉攢鍞鍗曠敓浜х姸鎬侊紝鍏佽閲嶆柊鍒涘缓鐢熶骇璁″垝
+ if (mps.getSaleOrderId() != null) {
+ eventPublisher.publishEvent(new ProductionCanceledEvent(mps.getSaleOrderId()));
+ }
}
@Override
@@ -429,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 鏄惁瀹屾垚
*/
@@ -461,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();
}
}
@@ -608,11 +686,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