diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportChildVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportChildVO.java index 61514ef5..23b68200 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportChildVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportChildVO.java @@ -20,7 +20,7 @@ import java.util.Date; @Data @ApiModel("ebom选配件表") @Accessors(chain = true) -public class OptionalEbomImportChildVO implements Serializable { +public class OptionalEbomImportChildVO extends BaseMaterialVO { /** * 主键 */ @@ -36,26 +36,26 @@ public class OptionalEbomImportChildVO implements Serializable { */ @ApiModelProperty(value = "根节点id") private Long rootRowId; - /** - * 物料编码 - */ - @ApiModelProperty(value = "物料编码") - private String materialNo; - /** - * 物料名 - */ - @ApiModelProperty(value = "物料名") - private String materialName; - /** - * 物料描述 - */ - @ApiModelProperty(value = "物料描述") - private String materialDesc; - /** - * 图号 - */ - @ApiModelProperty(value = "图号") - private String drawingNo; +// /** +// * 物料编码 +// */ +// @ApiModelProperty(value = "物料编码") +// private String materialNo; +// /** +// * 物料名 +// */ +// @ApiModelProperty(value = "物料名") +// private String materialName; +// /** +// * 物料描述 +// */ +// @ApiModelProperty(value = "物料描述") +// private String materialDesc; +// /** +// * 图号 +// */ +// @ApiModelProperty(value = "图号") +// private String drawingNo; /** * 部件类型(1 单选 2 多选) */ diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java index cea1d55d..5bda39eb 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java @@ -211,11 +211,17 @@ public class OptionalEbomConfigService extends ServiceImpl getTmpOptionList(Long rowId) { - return this.getBaseMapper().getTmpOptionList(rowId); + List list= this.getBaseMapper().getTmpOptionList(rowId); + SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(list); + + return list; } public List getPreviewOptionList(Long rowId) { - return this.getBaseMapper().getPreviewOptionList(rowId); + List list= this.getBaseMapper().getPreviewOptionList(rowId); + SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(list); + + return list; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java index 8ca721fa..2ad65441 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java @@ -48,7 +48,11 @@ public class OptionalEbomImportChildService extends ServiceImpl getByRootRowList(OptionalEbomImportChildQuery query) { - return getBaseMapper().getByRootRowList(query); + + List list= getBaseMapper().getByRootRowList(query); + SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(list); + + return list; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java index f528e3ab..49aa3480 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java @@ -259,6 +259,9 @@ public class AggregOptionConfigService { tmpVo.setDeviceInfo(optionalEbomConfigVO); List listParent = optionalEbomImportService.getByRootIdList(optionalEbomConfigEntity.getParentRowId()); List listChild = optionalEbomConfigService.getBaseMapper().getTmpOptionInfoList(rowId); + + SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(listChild); + OptionalEbomConfigAggregVO optionalEbomConfigAggregVO= filterTree(listParent,listChild); tmpVo.setSingleList(optionalEbomConfigAggregVO.getSingleList()); tmpVo.setMulList(optionalEbomConfigAggregVO.getMulList());