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

移动 ebom 同步主数据

This commit is contained in:
jing's 2024-06-18 15:10:19 +08:00
parent e70fb3135a
commit ea95483620
4 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportChildVO.java
View File

@ -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 多选)
*/

10
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java
View File

@ -211,11 +211,17 @@ public class OptionalEbomConfigService extends ServiceImpl<OptionalEbomConfigMap
* @return
*/
public List<OptionalEbomImportChildVO> getTmpOptionList(Long rowId) {
return this.getBaseMapper().getTmpOptionList(rowId);
List<OptionalEbomImportChildVO> list= this.getBaseMapper().getTmpOptionList(rowId);
SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(list);
return list;
}
public List<OptionalEbomImportChildVO> getPreviewOptionList(Long rowId) {
return this.getBaseMapper().getPreviewOptionList(rowId);
List<OptionalEbomImportChildVO> list= this.getBaseMapper().getPreviewOptionList(rowId);
SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(list);
return list;
}

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java
View File

@ -48,7 +48,11 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
}
public List<OptionalEbomImportChildVO> getByRootRowList(OptionalEbomImportChildQuery query) {
return getBaseMapper().getByRootRowList(query);
List<OptionalEbomImportChildVO> list= getBaseMapper().getByRootRowList(query);
SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(list);
return list;
}

3
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java
View File

@ -259,6 +259,9 @@ public class AggregOptionConfigService {
tmpVo.setDeviceInfo(optionalEbomConfigVO);
List<OptionalEbomImportVO> listParent = optionalEbomImportService.getByRootIdList(optionalEbomConfigEntity.getParentRowId());
List<OptionalEbomImportChildVO> listChild = optionalEbomConfigService.getBaseMapper().getTmpOptionInfoList(rowId);
SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(listChild);
OptionalEbomConfigAggregVO optionalEbomConfigAggregVO= filterTree(listParent,listChild);
tmpVo.setSingleList(optionalEbomConfigAggregVO.getSingleList());
tmpVo.setMulList(optionalEbomConfigAggregVO.getMulList());