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

EBOM-编辑-更新物料行时更新物料单位

This commit is contained in:
大米 2024-09-02 14:34:15 +08:00
parent 79740360fa
commit a0337e5a41
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java
View File

@ -22,6 +22,8 @@ public class EBomConstant {
public static final String[] EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2 = {"material", "materialTexture", "projectType", "materialUnit","materialNo", public static final String[] EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2 = {"material", "materialTexture", "projectType", "materialUnit","materialNo",
"materialName","materialDesc","drawingNo" "materialName","materialDesc","drawingNo"
}; };
//ebom编辑时，物料信息初始化时需忽略的字段
public static final String[] EBOM_EDIT_IGNORED_FIELDS = {"material", "materialTexture", "projectType", "materialNo", "materialName","materialDesc","drawingNo"};
public static final String[] EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT3 = {"material", "materialTexture", "projectType", "materialUnit","materialWeight"}; public static final String[] EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT3 = {"material", "materialTexture", "projectType", "materialUnit","materialWeight"};

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

@ -1855,7 +1855,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
childList.addAll(getChild(v.getBomRowId(), 0)); childList.addAll(getChild(v.getBomRowId(), 0));
}); });
} }
materialMainService.intiMaterialInfo(childList, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2); materialMainService.intiMaterialInfo(childList, EBomConstant.EBOM_EDIT_IGNORED_FIELDS);
vo.setDatas(childList); vo.setDatas(childList);
} }
@ -2341,11 +2341,13 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
public List<BomNewEbomParentVO> changeMaterial(BomNewEBomChangeDTO dto) { public List<BomNewEbomParentVO> changeMaterial(BomNewEBomChangeDTO dto) {
List<BaseMaterialVO> materialVOS = CheckEBomException.checkMaterialNoInMain(dto.getDatas()); List<BaseMaterialVO> materialVOS = CheckEBomException.checkMaterialNoInMain(dto.getDatas());
String[] editEditIgnoredFields = {"material", "materialTexture", "projectType", "materialNo", "materialName","materialDesc","drawingNo"}; SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(dto.getDatas(), materialVOS, EBomConstant.EBOM_EDIT_IGNORED_FIELDS);
SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(dto.getDatas(), materialVOS, editEditIgnoredFields);
for (BomNewEbomParentVO vo : dto.getDatas()) { for (BomNewEbomParentVO vo :
dto.getDatas()) {
vo.setTotalWeight(NumberUtil.mul(vo.getUnitWeight(), vo.getNum())); vo.setTotalWeight(NumberUtil.mul(vo.getUnitWeight(), vo.getNum()));
} }
return dto.getDatas(); return dto.getDatas();
} }