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/pd/ctc/ProductCtcServiceImpl.java | 64 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/ctc/ProductCtcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/ctc/ProductCtcServiceImpl.java
index 6b268e7..906e44d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/ctc/ProductCtcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/ctc/ProductCtcServiceImpl.java
@@ -1,21 +1,31 @@
package cn.iocoder.yudao.module.mes.service.pd.ctc;
+import cn.hutool.core.collection.CollUtil;
+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.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.ctc.vo.*;
import cn.iocoder.yudao.module.mes.dal.dataobject.pd.ctc.ProductCtcDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pd.ctc.ProductCtcMapper;
import cn.iocoder.yudao.module.mes.service.pd.reel.ProductCtcReelService;
import jakarta.annotation.Resource;
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.util.ArrayList;
+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.PD_CTC_CALC_PARAM_INVALID;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PD_CTC_IMPORT_LIST_IS_EMPTY;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PD_CTC_ITEM_DUPLICATE;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PD_CTC_NOT_EXISTS;
@@ -62,6 +72,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void deleteCtc(Long id) {
// 鏍￠獙瀛樺湪
validateCtcExists(id);
@@ -74,6 +85,11 @@
@Override
public ProductCtcDO getCtc(Long id) {
return ctcMapper.selectById(id);
+ }
+
+ @Override
+ public ProductCtcDO getCtcByOrderSpec(String orderSpec) {
+ return ctcMapper.selectByOrderSpec(orderSpec);
}
@Override
@@ -144,7 +160,7 @@
double l2 = reqVO.getReelWidth().doubleValue();
double ct = reqVO.getCtcThickness().doubleValue();
double cw = reqVO.getCtcWidth().doubleValue();
- if (d1 <= d2 || l2 <= 0 || ct <= 0 || cw <= 0) {
+ if (d1 - 70 <= d2 || l2 <= 0 || ct <= 0 || cw <= 0) {
throw exception(PD_CTC_CALC_PARAM_INVALID);
}
// 鐩樺叿瀹归噺鍏紡锛堝弬鐓ч渶姹傛枃妗ｇ洏鍏疯绠� sheet锛夛細
@@ -157,6 +173,52 @@
return respVO;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public ProductCtcImportRespVO importCtcList(List<ProductCtcImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(PD_CTC_IMPORT_LIST_IS_EMPTY);
+ }
+ ProductCtcImportRespVO respVO = ProductCtcImportRespVO.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.getItemCode(), "绗� " + currentIndex + " 琛�");
+ if (StrUtil.isBlank(importItem.getItemCode())) {
+ respVO.getFailureCodes().put(key, "鐗╂枡缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ // 1. 瑙ｆ瀽鐗╂枡锛堝叧鑱� mdm_item锛�
+ MdmItemRespDTO mdmItem = mdmItemApi.getItemByCode(importItem.getItemCode().trim()).getCheckedData();
+ if (mdmItem == null) {
+ respVO.getFailureCodes().put(key, "鐗╂枡缂栫爜[" + importItem.getItemCode() + "]涓嶅瓨鍦�");
+ return;
+ }
+ // 2. 鏋勫缓璇锋眰骞跺垱寤�/鏇存柊锛堝鐢ㄧ幇鏈� create/update 鏈嶅姟锛�
+ ProductCtcSaveReqVO reqVO = BeanUtils.toBean(importItem, ProductCtcSaveReqVO.class);
+ reqVO.setItemId(mdmItem.getId());
+ ProductCtcDO existCtc = ctcMapper.selectByItemId(mdmItem.getId());
+ try {
+ if (existCtc == null) {
+ reqVO.setId(null);
+ createCtc(reqVO);
+ respVO.getCreateCodes().add(importItem.getItemCode());
+ } else if (updateSupport) {
+ reqVO.setId(existCtc.getId());
+ updateCtc(reqVO);
+ respVO.getUpdateCodes().add(importItem.getItemCode());
+ } else {
+ respVO.getFailureCodes().put(key, "鐗╂枡缂栫爜宸插瓨鍦ㄦ妧鏈弬鏁�");
+ }
+ } catch (ServiceException e) {
+ respVO.getFailureCodes().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
private void validateItemUnique(Long itemId, Long excludeId) {
ProductCtcDO ctc = ctcMapper.selectByItemId(itemId);
if (ctc != null && !ctc.getId().equals(excludeId)) {
--
Gitblit v1.9.3