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

Merge remote-tracking branch 'origin/DM/发货前包问题修复' into test

This commit is contained in:
10001392 2024-09-26 08:49:57 +08:00
parent 6034fbf37d 7d22993707
commit 4660334bc9
3 changed files with 5 additions and 3 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/service/domain/EBom/EBomToPbomBase.java
View File

@ -400,7 +400,7 @@ public abstract class EBomToPbomBase {
//虚拟包 //虚拟包
if (firstLevelBom.getVirtualPartType() > 0) { if (firstLevelBom.getVirtualPartType() > 0) {
result.add(firstLevelBom); result.add(firstLevelBom);
if(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.equalsValue(firstLevelBom.getVirtualPartType()) && firstLevelBom.getBomRowId()<=0){ if((VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.equalsValue(firstLevelBom.getVirtualPartType()) ||VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.equalsValue(firstLevelBom.getVirtualPartType()) ) && firstLevelBom.getBomRowId()<=0){
firstLevelBom.setBomRowId(IdWorker.getId()); firstLevelBom.setBomRowId(IdWorker.getId());
firstLevelBom.setStatus(EBomStatusEnum.CHECKED.getValue()); firstLevelBom.setStatus(EBomStatusEnum.CHECKED.getValue());
} }

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

@ -125,7 +125,9 @@ public class EBomToPBomForFormalNew 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());

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

@ -380,7 +380,7 @@ public abstract class FormalEBomToPbomBase {
//虚拟包 //虚拟包
if (firstLevelBom.getVirtualPartType() > 0) { if (firstLevelBom.getVirtualPartType() > 0) {
result.add(firstLevelBom); result.add(firstLevelBom);
if(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.equalsValue(firstLevelBom.getVirtualPartType()) && firstLevelBom.getBomRowId()<=0){ if((VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.equalsValue(firstLevelBom.getVirtualPartType())|| VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.equalsValue(firstLevelBom.getVirtualPartType())) && firstLevelBom.getBomRowId()<=0){
firstLevelBom.setBomRowId(IdWorker.getId()); firstLevelBom.setBomRowId(IdWorker.getId());
firstLevelBom.setStatus(EBomStatusEnum.CHECKED.getValue()); firstLevelBom.setStatus(EBomStatusEnum.CHECKED.getValue());
} }