1、合并标准版
This commit is contained in:
parent
f7495c978f
commit
198dd1e76a
|
|
@ -194,29 +194,6 @@ public abstract class VirtualPackageBase {
|
||||||
return ent;
|
return ent;
|
||||||
}
|
}
|
||||||
|
|
||||||
private AddVirtrualMaterialDTO buildAddMaterialParamDo(String key, String drawingNo, String materialName, VirtualPackageTypeEnum virtualPackageType,Map<String,MaterialMainEntity> oldMaterialMap){
|
|
||||||
|
|
||||||
MaterialMainEntity oldMaterial = oldMaterialMap.get(drawingNo);
|
|
||||||
AddVirtrualMaterialDTO ent=new AddVirtrualMaterialDTO();
|
|
||||||
if(Objects.nonNull(oldMaterial)){
|
|
||||||
ent.setKey(key);
|
|
||||||
ent.setDrawingNo(drawingNo);
|
|
||||||
ent.setMaterialNo(oldMaterial.getMaterialNo());
|
|
||||||
ent.setMaterialName(oldMaterial.getMaterialName());
|
|
||||||
ent.setMaterialDesc(oldMaterial.getMaterialDesc());
|
|
||||||
ent.setMaterialCategoryCode(oldMaterial.getMaterialCategoryCode());
|
|
||||||
vMNos.put(ent.getKey(),ent);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
ent.setKey(key);
|
|
||||||
ent.setDrawingNo(drawingNo);
|
|
||||||
ent.setMaterialName(materialName);
|
|
||||||
ent.setMaterialDesc(materialName);
|
|
||||||
ent.setMaterialCategoryCode(virtualPackageType.getMaterialCategoryCode());
|
|
||||||
}
|
|
||||||
return ent;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 过渡临时版-创建BOM
|
* 过渡临时版-创建BOM
|
||||||
* @param rowId
|
* @param rowId
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue