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

修复问题1

This commit is contained in:
luoliming 2024-05-25 14:54:59 +08:00
parent 4f74c84fd7
commit 4643194820
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,6 +195,9 @@ public class BomOriginalListVO extends BaseMaterialVO {
@ApiModelProperty("是否通过规则替换 0-否 1-是")
private Integer regReplaceIs;
@ApiModelProperty("项目类别输入方式: 0-自动匹配 1-手工录入 2-来自物料主数据 3-来自历史统计")
private Integer projectTypeInputType=1;
public Integer getVirtualPartType() {
if( drawingNo.contains(VirtualPackageTypeEnum.DELIVERY_PACKAGE.getConMaterialName())){
return VirtualPackageTypeEnum.DELIVERY_PACKAGE.getValue();

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java
View File

@ -62,7 +62,7 @@ public class PlmBomToOriginalConvertV2 extends BaseConvert {
//初始化物料信息
SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(parent), "material", "materialTexture", "materialUnit");
SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(childs, "material", "materialTexture", "materialUnit");
SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(childs, "material", "materialTexture", "materialUnit","projectType");
SpringUtil.getBean(MaterialMainService.class).initShouldBomExist(ImmutableList.of(parent), BomOriginalPlmBomVO::getMaterialCategoryCode, BomOriginalPlmBomVO::setShouldBomExist, BomOriginalPlmBomVO::getMaterialGetType);
SpringUtil.getBean(MaterialMainService.class).initShouldBomExist(childs, BomOriginalPlmBomVO::getMaterialCategoryCode, BomOriginalPlmBomVO::setShouldBomExist, BomOriginalPlmBomVO::getMaterialGetType);