From 9fce552f48c898b61fa1cb9be73aa4ae7dfc5bb4 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 28 三月 2025 14:07:53 +0800
Subject: [PATCH] 设备导入优化
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index 4bc4557..0c9167c 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -2,23 +2,19 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.mapper.*;
+import com.ruoyi.basic.pojo.*;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.basic.dto.CopyStandardProductListDto;
import com.ruoyi.basic.dto.InsSampleReceiveDto;
import com.ruoyi.basic.dto.ProductDto;
import com.ruoyi.basic.dto.ResetTreeDragDTO;
-import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
-import com.ruoyi.basic.mapper.StandardProductListMapper;
-import com.ruoyi.basic.mapper.StandardProductListSupplierAskMapper;
-import com.ruoyi.basic.mapper.StandardTreeMapper;
-import com.ruoyi.basic.pojo.StandardProductList;
-import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
-import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.basic.service.StandardProductListService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -47,6 +43,10 @@
private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;
private StandardProductListSupplierAskMapper standardProductListSupplierAskMapper;
+
+ private ProductPartMapper productPartMapper;
+
+ private StructureTestObjectPartMapper structureTestObjectPartMapper;
@Override
@@ -185,6 +185,25 @@
}
}
+ ProductPart productPart = productPartMapper.selectOne(new LambdaQueryWrapper<ProductPart>().eq(ProductPart::getPartNo, insSample.getPartNo()));
+ if (productPart != null){
+ if (StringUtils.isNotEmpty(productPart.getInspectionItem())){
+ String inspectionItem = productPart.getInspectionItem();
+ list = list.stream()
+ .filter(standardProductList -> inspectionItem.equals(standardProductList.getInspectionItem()))
+ .collect(Collectors.toList());
+ }
+ }
+
+ StructureTestObjectPart structureTestObjectPart = structureTestObjectPartMapper.selectOne(new LambdaQueryWrapper<StructureTestObjectPart>().eq(StructureTestObjectPart::getPartNo, insSample.getPartNo()));
+ if (structureTestObjectPart != null){
+ if (StringUtils.isNotEmpty(structureTestObjectPart.getInspectionItem())){
+ String inspectionItem = structureTestObjectPart.getInspectionItem();
+ list = list.stream()
+ .filter(standardProductList -> inspectionItem.equals(standardProductList.getInspectionItem()))
+ .collect(Collectors.toList());
+ }
+ }
return list;
}
@@ -428,7 +447,9 @@
}).collect(Collectors.toList());
// this.saveBatch(productLists);
// 鎵归噺娣诲姞鏍囧噯
- baseMapper.saveBatchProductLists(productLists);
+ if (CollectionUtils.isNotEmpty(productLists)) {
+ baseMapper.saveBatchProductLists(productLists);
+ }
Collections.sort(list, (o1, o2) -> {
--
Gitblit v1.9.3