From f4d4d29368ccacb807f93e2033cd4a643a3ddade Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 10:20:28 +0800
Subject: [PATCH] yys 1.修改bug
---
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index 51437ec..9c17885 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -11,6 +11,7 @@
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.IProductModelService;
+import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
@@ -18,6 +19,8 @@
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
+import com.ruoyi.production.mapper.ProductProcessMapper;
+import com.ruoyi.production.pojo.ProductProcess;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -31,10 +34,7 @@
import java.io.IOException;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
-import java.util.AbstractMap;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -51,6 +51,7 @@
private final SalesLedgerProductMapper salesLedgerProductMapper;
private ProductModelMapper productModelMapper;
private final CommonFileServiceImpl commonFileService;
+ private final ProductProcessMapper productProcessMapper;
private final TempFileServiceImpl tempFileService;
@@ -82,6 +83,7 @@
product1.setProductName(productModelDto.getProductName());
productMapper.updateById(product1);
}
+ commonFileService.deleteByBusinessIds(Collections.singletonList(productModelDto.getId()), FileNameType.PRODUCT_MODEL.getValue());
if(CollectionUtils.isNotEmpty(productModelDto.getTempFileIds())){
commonFileService.migrateTempFilesToFormal(productModelDto.getId(), productModelDto.getTempFileIds());
}
@@ -194,15 +196,27 @@
*/
private void processProductModel(List<ProductModelExcelCopyDto> dtoList,
Long productId, String model, String drawingNumber) {
+ // 鏌ヨ鎵�鏈夊伐鑹鸿矾绾�
+ List<ProductProcess> productRoutes = productProcessMapper.selectList(new QueryWrapper<ProductProcess>());
+ if(CollectionUtils.isEmpty(productRoutes)){
+ throw new RuntimeException("璇峰厛鍒涘缓浜у搧宸ヨ壓璺嚎");
+ }
for (ProductModelExcelCopyDto dto : dtoList) {
// 鏌ヨ鏉′欢锛氬瀷鍙�+鍥剧焊缂栧彿锛堟洿绮惧噯锛岀鍚堝垎缁勯�昏緫锛�
ProductModel productModel = productModelMapper.selectOne(new LambdaQueryWrapper<ProductModel>()
.eq(ProductModel::getModel, model)
.last("limit 1"));
-
+ // 閫氳繃宸ヨ壓璺嚎鍚嶇О鍖归厤鏈�鏂颁竴鏉″伐鑹鸿矾绾�
+ ProductProcess productRoute = productRoutes.stream()
+ .filter(route -> route.getName().equals(dto.getProcessRoute()))
+ .max(Comparator.comparing(ProductProcess::getCreateTime))
+ .orElse(null);
if (productModel == null) {
productModel = new ProductModel();
BeanUtils.copyProperties(dto, productModel);
+ if (productRoute != null) {
+ productModel.setRouteId(productRoute.getId());
+ }
// 鍏滃簳榛樿鍊硷紝閬垮厤绌哄��
if (productModel.getProductType() == null) {
productModel.setProductType(1);
@@ -210,6 +224,7 @@
productModel.setProductId(productId);
productModelMapper.insert(productModel);
} else {
+ productModel.setRouteId(productRoute != null ? productRoute.getId() : null);
BeanUtils.copyProperties(dto, productModel);
productModel.setProductId(productId);
productModelMapper.updateById(productModel);
--
Gitblit v1.9.3