diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskMapper.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskMapper.java
index 2da67712..4e2fd0a9 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskMapper.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskMapper.java
@@ -10,6 +10,7 @@ import com.nflg.product.technology.pojo.vo.ProcessRouteTaskVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Set;
/**
*
@@ -30,6 +31,7 @@ public interface ProcessRouteTaskMapper extends BaseMapper selectPBomParentBatch(@Param("status") Integer status, @Param("factory") String factory, @Param("materialNoList") List materialNoList);
BomNewPbomParentVO selectPBomParentByRowId(@Param("rowId") Long rowId);
+ List selectPBomParentByRowIdList(@Param("rowIdList") Set rowIdList);
List selectPBomChildByParentRowId(@Param("parentRowIdList") List parentRowIdList);
}
diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
index 78962016..d4af4c02 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
@@ -320,11 +320,21 @@ public class ProcessRouteTaskService extends ServiceImpl parentRowIds = nodesList.stream().map(BomNewPBomVO::getParentRowId).collect(Collectors.toSet());
+ List parentVOs = processRouteTaskMapper.selectPBomParentByRowIdList(parentRowIds);
nodesList.forEach(item -> {
+ // 从现有集合取父级
List parents = nodesList.stream().filter(parent -> item.getParentRowId().equals(parent.getRowId())).collect(Collectors.toList());
if (CollUtil.isNotEmpty(parents)) {
item.setParentMaterialNo(parents.get(0).getMaterialNo());
item.setParentMaterialDesc(parents.get(0).getMaterialDesc());
+ } else {
+ // 从数据库集合取父级
+ List parents2 = parentVOs.stream().filter(parent -> item.getParentRowId().equals(parent.getRowId())).collect(Collectors.toList());
+ if (CollUtil.isNotEmpty(parents2)) {
+ item.setParentMaterialNo(parents2.get(0).getMaterialNo());
+ item.setParentMaterialDesc(parents2.get(0).getMaterialDesc());
+ }
}
item.setSapOrderNum(BomUtil.generateSapOrderNum(item.getProjectType(), item.getMaterialCategoryCode()
, item.getFacCode(), item.getMaterialNo(), item.getBomExist()));
diff --git a/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskMapper.xml b/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskMapper.xml
index c72346d9..6fae8472 100644
--- a/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskMapper.xml
+++ b/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskMapper.xml
@@ -87,7 +87,20 @@
+
+