From 7a923e32e55e9c34830690341469cc170f65092e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 16 十一月 2026 09:32:35 +0800
Subject: [PATCH] feat: 完善销售和投标业务流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java
index 3dd668a..2b1c487 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java
@@ -7,6 +7,8 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessImportRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.process.MesProProcessMapper;
import cn.iocoder.yudao.module.mes.enums.pro.MesProProcessBillingTypeEnum;
@@ -20,6 +22,11 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -159,6 +166,65 @@
}
@Override
+ public MesProProcessImportRespVO importProcessList(List<MesProProcessImportExcelVO> rows, boolean updateSupport) {
+ if (CollUtil.isEmpty(rows)) {
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "瀵煎叆鏂囦欢娌℃湁宸ュ簭鏁版嵁");
+ }
+ MesProProcessImportRespVO result = MesProProcessImportRespVO.builder()
+ .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
+ .failureCodes(new LinkedHashMap<>()).build();
+ Set<String> seenCodes = new HashSet<>();
+ for (int index = 0; index < rows.size(); index++) {
+ MesProProcessImportExcelVO row = rows.get(index);
+ String code = row.getCode() == null ? "" : row.getCode().trim();
+ String key = code.isEmpty() ? "绗� " + (index + 2) + " 琛�" : code;
+ try {
+ if (code.isEmpty() || row.getName() == null || row.getName().isBlank()) {
+ throw new IllegalArgumentException("宸ュ簭缂栫爜鍜屽悕绉颁笉鑳戒负绌�");
+ }
+ if (!seenCodes.add(code)) throw new IllegalArgumentException("鏂囦欢鍐呭伐搴忕紪鐮侀噸澶�");
+ if (row.getBillingType() == null || row.getWageRate() == null) {
+ throw new IllegalArgumentException("璁¤垂绫诲瀷鍜屽伐璧勫畾棰濅笉鑳戒负绌�");
+ }
+ if (row.getStatus() != null && row.getStatus() != 0 && row.getStatus() != 1) {
+ throw new IllegalArgumentException("鐘舵�佸彧鑳藉~鍐� 0 鎴� 1");
+ }
+ MesProProcessSaveReqVO save = BeanUtils.toBean(row, MesProProcessSaveReqVO.class);
+ save.setStdTimeMode(parseStdTimeMode(row.getStdTimeModeName()));
+ save.setCode(code);
+ save.setName(row.getName().trim());
+ save.setStatus(row.getStatus() == null ? 0 : row.getStatus());
+ MesProProcessDO existing = processMapper.selectByCode(code);
+ if (existing == null) {
+ createProcess(save);
+ result.getCreateCodes().add(code);
+ } else if (updateSupport) {
+ save.setId(existing.getId());
+ updateProcess(save);
+ result.getUpdateCodes().add(code);
+ } else {
+ throw new IllegalArgumentException("宸ュ簭缂栫爜宸插瓨鍦紝鍕鹃�夎鐩栧悗鍙洿鏂�");
+ }
+ } catch (RuntimeException ex) {
+ result.getFailureCodes().put(key, ex.getMessage());
+ }
+ }
+ return result;
+ }
+
+ private Integer parseStdTimeMode(String value) {
+ if (value == null || value.isBlank()) return null;
+ String normalized = value.trim().replace(" ", "").replace("锛�", "脳").replace("*", "脳");
+ return switch (normalized) {
+ case "0", "鏈惎鐢�" -> 0;
+ case "1", "杞�熋楄妭璺�" -> 1;
+ case "2", "绾块�熷害鐩村彇" -> 2;
+ case "3", "婊¢�熺櫨鍒嗘瘮脳鑺傝窛" -> 3;
+ default -> throw new IllegalArgumentException("鏍囧噯宸ユ椂璁$畻鏂瑰紡璇峰~鍐欙細鏈惎鐢ㄣ�佽浆閫熋楄妭璺濄�佺嚎閫熷害鐩村彇銆佹弧閫熺櫨鍒嗘瘮脳鑺傝窛");
+ };
+ }
+
+ @Override
public List<MesProProcessDO> getProcessListByStatus(Integer status) {
return processMapper.selectListByStatus(status);
}
--
Gitblit v1.9.3