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

fix(ebom): 从excel导入时物料单位的设置

This commit is contained in:
曹鹏飞 2024-05-10 15:59:20 +08:00
parent a1d4e7078b
commit fb77d05288
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,6 +294,8 @@ public class EBomImportService {
child.setDrawingNo(parent.getDrawingNo()); child.setDrawingNo(parent.getDrawingNo());
child.setMaterialDesc(parent.getMaterialDesc()); child.setMaterialDesc(parent.getMaterialDesc());
child.setUnitWeight(parent.getUnitWeight()); child.setUnitWeight(parent.getUnitWeight());
child.setMaterialUnit(parent.getMaterialUnit());
child.setMaterialOriginalUnit(parent.getMaterialOriginalUnit());
child.setNum(parent.getNum()); child.setNum(parent.getNum());
child.setTotalWeight(parent.getTotalWeight()); child.setTotalWeight(parent.getTotalWeight());
child.setProjectType(projectType); child.setProjectType(projectType);
@ -324,11 +326,12 @@ public class EBomImportService {
parent.setUnitWeight(vo.getMaterialWeight()); parent.setUnitWeight(vo.getMaterialWeight());
parent.setMaterialName(vo.getMaterialName()); parent.setMaterialName(vo.getMaterialName());
parent.setMaterialTexture(vo.getMaterialTexture()); parent.setMaterialTexture(vo.getMaterialTexture());
parent.setMaterialUnit(vo.getMaterialUnit());
if (StrUtil.isBlank(data.getMaterialDesc())) { if (StrUtil.isBlank(data.getMaterialDesc())) {
parent.setMaterialDesc(vo.getMaterialDesc()); parent.setMaterialDesc(vo.getMaterialDesc());
} }
} }
parent.setMaterialUnit(data.getUnit()); parent.setMaterialOriginalUnit(data.getUnit());
parent.setNum(data.getNum()); parent.setNum(data.getNum());
parent.setTotalWeight(BomUtil.calculateTotalWeight(parent.getNum(), parent.getUnitWeight())); parent.setTotalWeight(BomUtil.calculateTotalWeight(parent.getNum(), parent.getUnitWeight()));
parent.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION); parent.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION);
@ -382,11 +385,12 @@ public class EBomImportService {
parent.setUnitWeight(vo.getMaterialWeight()); parent.setUnitWeight(vo.getMaterialWeight());
parent.setMaterialName(vo.getMaterialName()); parent.setMaterialName(vo.getMaterialName());
parent.setMaterialTexture(vo.getMaterialTexture()); parent.setMaterialTexture(vo.getMaterialTexture());
parent.setMaterialUnit(vo.getMaterialUnit());
parent.setMaterialOriginalUnit(vo.getMaterialUnit());
if (StrUtil.isBlank(materialDesc)) { if (StrUtil.isBlank(materialDesc)) {
parent.setMaterialDesc(vo.getMaterialDesc()); parent.setMaterialDesc(vo.getMaterialDesc());
} }
} }
parent.setMaterialUnit("PC");
//parent.setUnitWeight(BigDecimal.ZERO); //parent.setUnitWeight(BigDecimal.ZERO);
parent.setNum(BigDecimal.ONE); parent.setNum(BigDecimal.ONE);
//parent.setTotalWeight(BomUtil.calculateTotalWeight(data.getNum(), data.getUnitWeight())); //parent.setTotalWeight(BomUtil.calculateTotalWeight(data.getNum(), data.getUnitWeight()));