fix(ebom): 从excel导入时识别虚拟包
This commit is contained in:
parent
29215e70ef
commit
0a40731042
|
|
@ -308,6 +308,7 @@ public class EBomImportService {
|
||||||
if (!Objects.isNull(vo)) {
|
if (!Objects.isNull(vo)) {
|
||||||
child.setMaterialCategoryCode(vo.getMaterialCategoryCode());
|
child.setMaterialCategoryCode(vo.getMaterialCategoryCode());
|
||||||
}
|
}
|
||||||
|
setVirtualPackageType(child);
|
||||||
children.add(child);
|
children.add(child);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -360,6 +361,7 @@ public class EBomImportService {
|
||||||
parent.setDeptName(SessionUtil.getDepartName());
|
parent.setDeptName(SessionUtil.getDepartName());
|
||||||
parent.setSource(EBomSourceEnum.FROM_EXCE.getValue());
|
parent.setSource(EBomSourceEnum.FROM_EXCE.getValue());
|
||||||
parent.setSourceRowId("");
|
parent.setSourceRowId("");
|
||||||
|
setVirtualPackageType(parent);
|
||||||
return parent;
|
return parent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -425,6 +427,26 @@ public class EBomImportService {
|
||||||
parent.setDeptName(SessionUtil.getDepartName());
|
parent.setDeptName(SessionUtil.getDepartName());
|
||||||
parent.setSource(EBomSourceEnum.FROM_EXCE.getValue());
|
parent.setSource(EBomSourceEnum.FROM_EXCE.getValue());
|
||||||
parent.setSourceRowId("");
|
parent.setSourceRowId("");
|
||||||
|
setVirtualPackageType(parent);
|
||||||
return parent;
|
return parent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void setVirtualPackageType(BomNewEbomParentEntity parent) {
|
||||||
|
if (parent.getMaterialDesc().endsWith(")(发货)") || parent.getMaterialDesc().endsWith(")(制作)")
|
||||||
|
|| parent.getMaterialDesc().endsWith(")(直发)") || parent.getMaterialDesc().endsWith(")(发货前装配)")) {
|
||||||
|
parent.setVirtualPackageIs(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setVirtualPackageType(BomNewEbomChildEntity child) {
|
||||||
|
if (child.getMaterialDesc().endsWith(")(发货)")) {
|
||||||
|
child.setVirtualPartType(VirtualPackageTypeEnum.DELIVERY_PACKAGE.getValue());
|
||||||
|
} else if (child.getMaterialDesc().endsWith(")(制作)")) {
|
||||||
|
child.setVirtualPartType(VirtualPackageTypeEnum.MAKING_PACKAGE.getValue());
|
||||||
|
} else if (child.getMaterialDesc().endsWith(")(直发)")) {
|
||||||
|
child.setVirtualPartType(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue());
|
||||||
|
} else if (child.getMaterialDesc().endsWith(")(发货前装配)")) {
|
||||||
|
child.setVirtualPartType(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getValue());
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue