rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【工艺路线】获取PBOM列表，序号

This commit is contained in:
10001392 2024-12-09 14:01:29 +08:00
parent 5f9fdf4cff
commit 4a18917359
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/job/PBomFormalTreeTask.java
View File

@ -58,7 +58,8 @@ public class PBomFormalTreeTask extends RecursiveTask<List<BomNewPbomParentVO>>
for (BomNewPbomParentVO vo :
bomDetail) {
vo.setLevelNum(levelNum);
vo.setOrderNumber(inCountNum.getAndIncrement() + "");
vo.setOrderNumberTemp(inCountNum.getAndIncrement() + "");
vo.setOrderNumber(vo.getOrderNumber());
}

3
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java
View File

@ -24,6 +24,9 @@ public class BomNewPBomVO extends BaseMaterialVO {
@ApiModelProperty("排序号（临时）")
private String orderNumberTemp;
@ApiModelProperty("排序号")
private String orderNumber;

7
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPbomParentVO.java
View File

@ -50,13 +50,18 @@ public class BomNewPbomParentVO extends BaseMaterialVO implements Serializable {
private String facCode;
/**
* 排序号（临时）
*/
@ApiModelProperty(value = "排序号")
private String orderNumberTemp;
/**
* 排序号
*/
@ApiModelProperty(value = "排序号")
private String orderNumber;
/**
* 单重
*/

7
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
View File

@ -326,6 +326,7 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
}
item.setSapOrderNum(BomUtil.generateSapOrderNum(item.getProjectType(), item.getMaterialCategoryCode()
, item.getFacCode(), item.getMaterialNo(), item.getBomExist()));
item.setLevelNum(item.getLevelNum() - 1); // 最顶级不返回，所以-1
});
// 最顶级不返回
nodesList.remove(0);
@ -364,7 +365,7 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
BomNewPBomVO pop = majorStack.poll();
if (pop != null) {
pop.setOrderNumber(noCode.incrementAndGet() + "");
pop.setOrderNumberTemp(noCode.incrementAndGet() + "");
rootList.add(pop);
List<BomNewPBomVO> childNode = listMap.get(pop.getBomRowId());
if (CollectionUtil.isNotEmpty(childNode)) {
@ -386,7 +387,7 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
List<BomNewPBomVO> rootList = null;
//列表
rootList = listToList(bomList, parentRowId);
Collections.sort(rootList, (option0, option1) -> Integer.parseInt(option0.getOrderNumber()) - Integer.parseInt(option1.getOrderNumber()));
Collections.sort(rootList, (option0, option1) -> Integer.parseInt(option0.getOrderNumberTemp()) - Integer.parseInt(option1.getOrderNumberTemp()));
return rootList;
}
@ -449,7 +450,7 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
List<BomNewPbomParentVO> bomDetails =new ArrayList<>();
List<BomNewPbomParentVO> childs = bomDetailList(parentBomRow.getRowId(),parentBomRow.getFacCode());
parentBomRow.setLevelNum(1);
parentBomRow.setOrderNumber("1");
parentBomRow.setOrderNumberTemp("1");
bomDetails.add(parentBomRow);
if(CollUtil.isNotEmpty(childs)){
bomDetails.addAll(childs);