From 3990ae574c221e3764ce9cbc2e4e3eb71b7b1b52 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 24 十月 2026 23:41:23 +0800
Subject: [PATCH] fix(mes): 修复批次正反向追溯链路
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/processparam/MesPdProcessParamServiceImpl.java | 82 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 82 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/processparam/MesPdProcessParamServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/processparam/MesPdProcessParamServiceImpl.java
index 8f2fc10..bb697fd 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/processparam/MesPdProcessParamServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/processparam/MesPdProcessParamServiceImpl.java
@@ -1,20 +1,31 @@
package cn.iocoder.yudao.module.mes.service.pd.processparam;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
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.pd.processparam.vo.MesPdProcessParamImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pd.processparam.vo.MesPdProcessParamImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.processparam.vo.MesPdProcessParamPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.processparam.vo.MesPdProcessParamSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pd.processparam.MesPdProcessParamDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.md.unitmeasure.MesMdUnitMeasureMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pd.processparam.MesPdProcessParamMapper;
import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
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.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -30,6 +41,9 @@
@Resource
private MesPdProcessParamMapper processParamMapper;
+
+ @Resource
+ private MesMdUnitMeasureMapper unitMeasureMapper;
@Resource
@Lazy
@@ -88,4 +102,72 @@
return processParamMapper.selectBatchIds(ids);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesPdProcessParamImportRespVO importProcessParamList(List<MesPdProcessParamImportExcelVO> importList,
+ boolean updateSupport) {
+ // 1. 鏍￠獙闈炵┖
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(PD_PROCESS_PARAM_IMPORT_LIST_IS_EMPTY);
+ }
+
+ // 2. 閫愯澶勭悊
+ MesPdProcessParamImportRespVO respVO = MesPdProcessParamImportRespVO.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.getParamCode(), "绗� " + currentIndex + " 琛�");
+ if (StrUtil.isBlank(importItem.getParamName())) {
+ respVO.getFailureCodes().put(key, "鍙傛暟鍚嶇О涓嶈兘涓虹┖");
+ return;
+ }
+ // 瑙ｆ瀽璁￠噺鍗曚綅锛堟寜鍚嶇О锛�
+ Long unitMeasureId = null;
+ if (StrUtil.isNotBlank(importItem.getUnitMeasureName())) {
+ MesMdUnitMeasureDO unitMeasure = unitMeasureMapper.selectByName(importItem.getUnitMeasureName());
+ if (unitMeasure == null) {
+ respVO.getFailureCodes().put(key, "璁￠噺鍗曚綅涓嶅瓨鍦細" + importItem.getUnitMeasureName());
+ return;
+ }
+ unitMeasureId = unitMeasure.getId();
+ }
+ // 2.1 鍒ゆ柇锛氬垱寤� or 鏇存柊锛堢紪鐮佷负绌烘椂鑷姩鐢熸垚锛�
+ if (StrUtil.isNotBlank(importItem.getParamCode())) {
+ MesPdProcessParamDO existParam = processParamMapper.selectByParamCode(importItem.getParamCode());
+ if (existParam == null) {
+ // 2.1.1 鎸囧畾缂栫爜鏂板
+ MesPdProcessParamDO param = BeanUtils.toBean(importItem, MesPdProcessParamDO.class);
+ param.setId(null);
+ param.setUnitMeasureId(unitMeasureId);
+ param.setRequired(ObjUtil.defaultIfNull(importItem.getRequired(), Boolean.FALSE));
+ processParamMapper.insert(param);
+ respVO.getCreateCodes().add(importItem.getParamCode());
+ } else if (updateSupport) {
+ // 2.1.2 鏇存柊
+ MesPdProcessParamDO updateObj = BeanUtils.toBean(importItem, MesPdProcessParamDO.class);
+ updateObj.setId(existParam.getId());
+ updateObj.setParamCode(existParam.getParamCode());
+ updateObj.setUnitMeasureId(unitMeasureId);
+ processParamMapper.updateById(updateObj);
+ respVO.getUpdateCodes().add(importItem.getParamCode());
+ } else {
+ respVO.getFailureCodes().put(key, "鍙傛暟缂栫爜宸插瓨鍦�");
+ }
+ } else {
+ // 2.1.3 缂栫爜涓虹┖锛氳嚜鍔ㄧ敓鎴愮紪鐮佹柊澧�
+ MesPdProcessParamDO param = BeanUtils.toBean(importItem, MesPdProcessParamDO.class);
+ param.setId(null);
+ param.setParamCode(autoCodeRecordService.generateAutoCode(
+ MesMdAutoCodeRuleCodeEnum.PD_PROCESS_PARAM_CODE.getCode()));
+ param.setUnitMeasureId(unitMeasureId);
+ param.setRequired(ObjUtil.defaultIfNull(importItem.getRequired(), Boolean.FALSE));
+ processParamMapper.insert(param);
+ respVO.getCreateCodes().add(param.getParamCode());
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3