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

1、3个问题处理

This commit is contained in:
大米 2024-06-24 19:07:37 +08:00
parent c564a5fb92
commit 64b81b88b3
3 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,6 +193,7 @@ public abstract class BaseConvert {
childEntity.setUnitWeight(parent.getUnitWeight()); childEntity.setUnitWeight(parent.getUnitWeight());
childEntity.setNum(parent.getUnitWeight()); childEntity.setNum(parent.getUnitWeight());
childEntity.setCreatedBy(SessionUtil.getUserCode()); childEntity.setCreatedBy(SessionUtil.getUserCode());
childEntity.setMaterialOriginalUnit(material.getMaterialUnit());
this.resultChild.add(childEntity); this.resultChild.add(childEntity);
return childEntity; return childEntity;

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

@ -348,6 +348,8 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
childEntity.setCreatedBy(SessionUtil.getUserCode()); childEntity.setCreatedBy(SessionUtil.getUserCode());
childEntity.setMaterialUnit("KG"); childEntity.setMaterialUnit("KG");
childEntity.setProjectType("L"); childEntity.setProjectType("L");
childEntity.setMaterialOriginalUnit(material.getMaterialUnit());
childEntity.setSourceRowId(parent.getRowId().toString());
parent.setBomExist(1); parent.setBomExist(1);
// this.eBomChildResult.add(childEntity); // this.eBomChildResult.add(childEntity);

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

@ -111,25 +111,25 @@ public class PlmBomToOriginalConvertV2 extends BaseConvert {
} else } else
{ {
// 一般零部件 // 一般零部件
if (StrUtil.isNotBlank(parent.getMaterialCategoryCode()) && parent.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE) && CollUtil.isEmpty(childs)) { // if (StrUtil.isNotBlank(parent.getMaterialCategoryCode()) && parent.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE) && CollUtil.isEmpty(childs)) {
// 有物料编码，则通过规则匹配物料作为下级 // // 有物料编码，则通过规则匹配物料作为下级
if (StrUtil.isNotBlank(parent.getMaterialNo())) { // if (StrUtil.isNotBlank(parent.getMaterialNo())) {
BomNewOriginalParentEntity parentEntity = buildParentEntity(parent, "", originalSourceEnum); // BomNewOriginalParentEntity parentEntity = buildParentEntity(parent, "", originalSourceEnum);
parentEntity.setStatus(OriginalStatusEnum.OVER_CONVERT.getValue()); // parentEntity.setStatus(OriginalStatusEnum.OVER_CONVERT.getValue());
parentEntity.setEditStatus(OriginalEditStatusEnum.HANDLER_FINISHED.getValue()); // parentEntity.setEditStatus(OriginalEditStatusEnum.HANDLER_FINISHED.getValue());
//
handlerCommonMaterial(parentEntity); // handlerCommonMaterial(parentEntity);
} else { //无物料编码，则通过规则找物料 ，找到则替换，未找到则直接进库。ebom 再处理 // } else { //无物料编码，则通过规则找物料 ，找到则替换，未找到则直接进库。ebom 再处理
handlerCommonMaterialForReplace(parent); // handlerCommonMaterialForReplace(parent);
BomNewOriginalParentEntity parentEntity = buildParentEntity(parent, "", originalSourceEnum); // BomNewOriginalParentEntity parentEntity = buildParentEntity(parent, "", originalSourceEnum);
parentEntity.setStatus(OriginalStatusEnum.OVER_CONVERT.getValue()); // parentEntity.setStatus(OriginalStatusEnum.OVER_CONVERT.getValue());
parentEntity.setEditStatus(OriginalEditStatusEnum.HANDLER_FINISHED.getValue()); // parentEntity.setEditStatus(OriginalEditStatusEnum.HANDLER_FINISHED.getValue());
} // }
} else { // } else {
BomNewOriginalParentEntity parentEntity = buildParentEntity(parent, "", originalSourceEnum); BomNewOriginalParentEntity parentEntity = buildParentEntity(parent, "", originalSourceEnum);
parentEntity.setStatus(OriginalStatusEnum.OVER_CONVERT.getValue()); parentEntity.setStatus(OriginalStatusEnum.OVER_CONVERT.getValue());
parentEntity.setEditStatus(OriginalEditStatusEnum.HANDLER_FINISHED.getValue()); parentEntity.setEditStatus(OriginalEditStatusEnum.HANDLER_FINISHED.getValue());
} // }
} }
@ -142,16 +142,7 @@ public class PlmBomToOriginalConvertV2 extends BaseConvert {
for (BomOriginalPlmBomVO childVo : childs) { for (BomOriginalPlmBomVO childVo : childs) {
//一般零部件 //一般零部件
if (StrUtil.isNotBlank(childVo.getMaterialCategoryCode()) && childVo.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE)) { if (StrUtil.isNotBlank(childVo.getMaterialCategoryCode()) && childVo.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE)) {
//通过规则- 获取子级物料
// BomNewOriginalParentEntity originalBomForMaterial = getOriginalBomForMaterial(childVo.getChartNo());
// List<BomNewOriginalParentEntity> parentResultOne = this.resultParent.stream().filter(u -> u.getDrawingNo().equals(childVo.getChartNo())).collect(Collectors.toList());
// if(StrUtil.isNotBlank(childVo.getMaterialNo())) {
// if (Objects.isNull(originalBomForMaterial) && CollUtil.isEmpty(parentResultOne)) {
// childVo.setCreatedBy(parentEntity.getCreatedBy());
// BomNewOriginalParentEntity parentEntity1 = buildParentEntity(childVo, "", originalSourceEnum);
// handlerCommonMaterial(parentEntity1);
// }
// }else
if (StrUtil.isBlank(childVo.getMaterialNo())) { if (StrUtil.isBlank(childVo.getMaterialNo())) {
handlerCommonMaterialForReplace(childVo); handlerCommonMaterialForReplace(childVo);
} }