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

Merge branch 'DM/nflg-新需求' into test

This commit is contained in:
大米 2024-09-14 18:03:53 +08:00
parent 011fa21d25 4f26f1425f
commit 6788ab790a
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
View File

@ -123,7 +123,9 @@ public class EBomToPBomFor31 extends EBomToPbomBase {
continue; continue;
} }
//处理bom子级 //处理bom子级
mergeChild= handlerArtPackage(parentEnt,mergeChild,facCode,parentList,vo.getVirtualPartType()); if(!VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.equalsValue(vo.getVirtualPartType()) && !VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.equalsValue(vo.getVirtualPartType())) {
mergeChild = handlerArtPackage(parentEnt, mergeChild, facCode, parentList, vo.getVirtualPartType());
}
//子级 //子级
if (CollUtil.isNotEmpty(mergeChild)) { if (CollUtil.isNotEmpty(mergeChild)) {
for (BomNewEbomParentVO eb : mergeChild) { for (BomNewEbomParentVO eb : mergeChild) {

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
View File

@ -250,9 +250,9 @@ public abstract class EBomToPbomBase {
buildPBomAddChild(parent, facCode, oldPBomAddItem); buildPBomAddChild(parent, facCode, oldPBomAddItem);
} }
//直发包，发货前-允许物料重复 //直发包，发货前-允许物料重复
if(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.equalsValue(parentVirtualPartType) || VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.equalsValue(parentVirtualPartType)) { // if(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.equalsValue(parentVirtualPartType) || VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.equalsValue(parentVirtualPartType)) {
buildPBomAddChild(parent, facCode, oldPBomAddItem); // buildPBomAddChild(parent, facCode, oldPBomAddItem);
} // }
//如为工艺包，且在当前BOM中不存在 //如为工艺包，且在当前BOM中不存在
if (BomConstant.ART_PACKAGE_MATERIAL_CATEGORY_CODE.equals(oldPBomAddItem.getMaterialCategoryCode()) && !newBomChildrenMap.containsKey(oldPBomAddItem.getMaterialNo())) { if (BomConstant.ART_PACKAGE_MATERIAL_CATEGORY_CODE.equals(oldPBomAddItem.getMaterialCategoryCode()) && !newBomChildrenMap.containsKey(oldPBomAddItem.getMaterialNo())) {

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/EBomToPBomForFormal31New.java
View File

@ -125,7 +125,9 @@ public class EBomToPBomForFormal31New extends FormalEBomToPbomBase {
continue; continue;
} }
//处理子级 //处理子级
mergeChild=handlerArtPackage(parentEnt,mergeChild,facCode,parentList,vo.getVirtualPartType()); if(!VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.equalsValue(vo.getVirtualPartType()) && !VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.equalsValue(vo.getVirtualPartType())) {
mergeChild = handlerArtPackage(parentEnt, mergeChild, facCode, parentList, vo.getVirtualPartType());
}
//检查是否用户跟用户节点（） //检查是否用户跟用户节点（）
if(parentEnt.getMaterialNo().equals(parent.getMaterialNo())) { if(parentEnt.getMaterialNo().equals(parent.getMaterialNo())) {
List<String> childMaterialNos = SpringUtil.getBean(BomNewPbomParentMapper.class).getPBomExistMaterialInChildForWorkList(parent.getMaterialNo()); List<String> childMaterialNos = SpringUtil.getBean(BomNewPbomParentMapper.class).getPBomExistMaterialInChildForWorkList(parent.getMaterialNo());