diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/job/PBomFormalTreeTask.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/job/PBomFormalTreeTask.java index 6f759c68..9e16bd0e 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/job/PBomFormalTreeTask.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/job/PBomFormalTreeTask.java @@ -58,7 +58,8 @@ public class PBomFormalTreeTask extends RecursiveTask> for (BomNewPbomParentVO vo : bomDetail) { vo.setLevelNum(levelNum); - vo.setOrderNumber(inCountNum.getAndIncrement() + ""); + vo.setOrderNumberTemp(inCountNum.getAndIncrement() + ""); + vo.setOrderNumber(vo.getOrderNumber()); } diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java index dea5950a..7f731819 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java @@ -24,6 +24,9 @@ public class BomNewPBomVO extends BaseMaterialVO { + @ApiModelProperty("排序号(临时)") + private String orderNumberTemp; + @ApiModelProperty("排序号") private String orderNumber; diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPbomParentVO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPbomParentVO.java index f46680b8..f6fb7bde 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPbomParentVO.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPbomParentVO.java @@ -50,13 +50,18 @@ public class BomNewPbomParentVO extends BaseMaterialVO implements Serializable { private String facCode; + /** + * 排序号(临时) + */ + @ApiModelProperty(value = "排序号") + private String orderNumberTemp; + /** * 排序号 */ @ApiModelProperty(value = "排序号") private String orderNumber; - /** * 单重 */ 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 13216319..f291c3fe 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 @@ -326,6 +326,7 @@ public class ProcessRouteTaskService extends ServiceImpl childNode = listMap.get(pop.getBomRowId()); if (CollectionUtil.isNotEmpty(childNode)) { @@ -386,7 +387,7 @@ public class ProcessRouteTaskService extends ServiceImpl 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 bomDetails =new ArrayList<>(); List 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);