lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java
@@ -53,6 +53,8 @@ @Autowired private IProcessStreamService processStreamService; @Autowired private IWorkStepService workStepService; @Autowired private IProductMixService productMixService; @Autowired private IDocRelativeService iDocRelativeService; @@ -589,10 +591,18 @@ List<String> id =new ArrayList<>(); id.add(treeInfoRequest.getAttributionId()); treeInfoRequest.setComponentIds(id); //零件 List<DocInfo> partsInfos = partsInfoService.getByPartsInfo(treeInfoRequest); docInfos.addAll(partsInfos); //工艺规程版本 List<DocInfo> processSpecVersions = processSpecVersionService.getByProcessSpecVersion(treeInfoRequest); docInfos.addAll(processSpecVersions); //工序 List<DocInfo> processStreams = processStreamService.getByProcessStreamOtherFile(treeInfoRequest); docInfos.addAll(processStreams); //工步 List<DocInfo> workSteps = workStepService.getByWorkStepOtherFile(treeInfoRequest); docInfos.addAll(workSteps); } return docInfos; } lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
@@ -48,6 +48,10 @@ @Autowired private IProcessSpecVersionService processSpecVersionService; @Autowired private IProcessStreamService processStreamService; @Autowired private IWorkStepService workStepService; @Autowired private IDocRelativeService iDocRelativeService; @Autowired private IProductPermissionService productPermissionService; @@ -481,8 +485,15 @@ List<String> id =new ArrayList<>(); id.add(treeInfoRequest.getAttributionId()); treeInfoRequest.setPartsIds(id); //工艺规程版本 List<DocInfo> processSpecVersions = processSpecVersionService.getByProcessSpecVersion(treeInfoRequest); docInfos.addAll(processSpecVersions); //工序 List<DocInfo> processStreams = processStreamService.getByProcessStreamOtherFile(treeInfoRequest); docInfos.addAll(processStreams); //工步 List<DocInfo> workSteps = workStepService.getByWorkStepOtherFile(treeInfoRequest); docInfos.addAll(workSteps); } return docInfos; } lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessSpecVersionServiceImpl.java
@@ -515,8 +515,12 @@ List<String> id =new ArrayList<>(); id.add(treeInfoRequest.getAttributionId()); treeInfoRequest.setPsvIds(id); List<DocInfo> processSpecVersions = processStreamService.getByProcessStreamOtherFile(treeInfoRequest); docInfos.addAll(processSpecVersions); //工序 List<DocInfo> processStreams = processStreamService.getByProcessStreamOtherFile(treeInfoRequest); docInfos.addAll(processStreams); //工步 List<DocInfo> workSteps = workStepService.getByWorkStepOtherFile(treeInfoRequest); docInfos.addAll(workSteps); } } return docInfos; lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
@@ -498,8 +498,8 @@ List<String> id =new ArrayList<>(); id.add(treeInfoRequest.getAttributionId()); treeInfoRequest.setProcessIds(id); List<DocInfo> processSpecVersions = workStepService.getByWorkStepOtherFile(treeInfoRequest); docInfos.addAll(processSpecVersions); List<DocInfo> workSteps = workStepService.getByWorkStepOtherFile(treeInfoRequest); docInfos.addAll(workSteps); } } return docInfos; lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java
@@ -1041,7 +1041,6 @@ if (treeInfoRequest.getAttributionType() == 1 && StrUtil.isNotBlank(treeInfoRequest.getAttributionId())) { queryWrapper.eq(ProductInfo::getProductId, treeInfoRequest.getAttributionId()); } // 简化条件判断 queryWrapper.like(StrUtil.isNotBlank(treeInfoRequest.getTreeCode()), ProductInfo::getProductNo, treeInfoRequest.getTreeCode()) .like(StrUtil.isNotBlank(treeInfoRequest.getTreeName()), ProductInfo::getProductName, treeInfoRequest.getTreeName()); List<ProductInfo> productInfoList = super.list(queryWrapper); @@ -1050,15 +1049,12 @@ productInfoList=new ArrayList<>(); } if (CollectionUtil.isNotEmpty(productInfoList)) { // 使用ID列表而非拼接字符串 List<String> productIds = productInfoList.stream() .map(ProductInfo::getProductId) .collect(Collectors.toList()); String ids=productInfoList.stream().map(ProductInfo::getProductId).collect(Collectors.joining(",")); DocInfoQueryRequest docQuery = new DocInfoQueryRequest(); BeanUtil.copyProperties(treeInfoRequest, docQuery); docQuery.setAttributionIds(productIds.toString()); // 假设setAttributionIds接受List<String> docQuery.setAttributionIds(ids); docQuery.setDocClassCode("OTHER"); docQuery.setAttributionType(1); docQuery.setAttributionType(DocAttributionTypeEnum.PRODUCT.getCode()); docInfos = docInfoService.findListByDocQuery(docQuery); } // 创建新请求对象避免污染原参数 @@ -1069,6 +1065,8 @@ docInfos.addAll(componentInfoService.getByComponentInfo(componentRequest)); docInfos.addAll(partsInfoService.getByPartsInfo(componentRequest)); docInfos.addAll(processSpecVersionService.getByProcessSpecVersion(componentRequest)); docInfos.addAll(processStreamService.getByProcessStreamOtherFile(componentRequest)); docInfos.addAll(workStepService.getByWorkStepOtherFile(componentRequest)); return getByTreeOtherFileInfo(docInfos); case 2: return getByTreeOtherFileInfo(componentInfoService.getByComponentInfo(treeInfoRequest)); lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
@@ -31,13 +31,6 @@ import java.util.*; import java.util.stream.Collectors; /** * @Description: TODO * @Author: zhangherong * @Date: Created in 2020/9/20 9:19 * @Version: 1.0 * @Modified By: */ @Service public class WorkStepServiceImpl extends ServiceImpl<WorkStepMapper, WorkStep> implements IWorkStepService { @Autowired
