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

T项的版本和11类一样，都是B00

This commit is contained in:
10002327 2024-11-06 17:01:03 +08:00
parent a5d7c025b1
commit f6afff1bfb
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -402,7 +402,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
child.setTechnologyUserCode(parent.getTechnologyUserCode()); child.setTechnologyUserCode(parent.getTechnologyUserCode());
child.setTechnologyUserName(parent.getTechnologyUserName()); child.setTechnologyUserName(parent.getTechnologyUserName());
// 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012
if(MaterialshouldBomExistUtil.checkNoNeedBom(child)){ if(MaterialshouldBomExistUtil.checkNoNeedBom(child) ||
Objects.equals("T",child.getProjectType())){
child.setCurrentVersion(OriginalConstant.NO_NEED_BOM); child.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
}else if (MaterialshouldBomExistUtil.checkShouldBomExist(child)) { }else if (MaterialshouldBomExistUtil.checkShouldBomExist(child)) {
child.setCurrentVersion(OriginalConstant.NO_BOM_VERSION); child.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
@ -487,7 +488,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
//child.setSource(Objects.nonNull(parent) ? parent.getSource() : EBomSourceEnum.FROM_BOM.getValue()); //child.setSource(Objects.nonNull(parent) ? parent.getSource() : EBomSourceEnum.FROM_BOM.getValue());
child.setBomRowId(0L); child.setBomRowId(0L);
// 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012
if(MaterialshouldBomExistUtil.checkNoNeedBom(child)){ if(MaterialshouldBomExistUtil.checkNoNeedBom(child) ||
Objects.equals("T",child.getProjectType())){
child.setCurrentVersion(OriginalConstant.NO_NEED_BOM); child.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
}else if (MaterialshouldBomExistUtil.checkShouldBomExist(child)) { }else if (MaterialshouldBomExistUtil.checkShouldBomExist(child)) {
child.setCurrentVersion(OriginalConstant.NO_BOM_VERSION); child.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);

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

@ -251,7 +251,8 @@ public class ForwardReportService {
vo.setExpireEndTime(parentEntity.getExpireEndTime()); vo.setExpireEndTime(parentEntity.getExpireEndTime());
} }
// 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012
if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){ if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) ||
Objects.equals("T",vo.getProjectType())){
vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
}else if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) { }else if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) {
vo.setCurrentVersion(OriginalConstant.NO_BOM_VERSION); vo.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
@ -349,7 +350,8 @@ public class ForwardReportService {
} }
// 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012
if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){ if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) ||
Objects.equals("T",vo.getProjectType())){
vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
}else if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) { }else if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) {
vo.setCurrentVersion(OriginalConstant.NO_BOM_VERSION); vo.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);

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

@ -312,7 +312,7 @@ public class EBomForwardReport extends BaseForwardReport {
item.setBomVersion(parentFormal.getCurrentVersion()); item.setBomVersion(parentFormal.getCurrentVersion());
// 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101
if(MaterialshouldBomExistUtil.checkNoNeedBom(item)){ if(MaterialshouldBomExistUtil.checkNoNeedBom(item) || Objects.equals("T",item.getProjectType())){
item.setCurrentVersion(OriginalConstant.NO_NEED_BOM); item.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
} }
}); });
@ -492,7 +492,7 @@ public class EBomForwardReport extends BaseForwardReport {
// vo.setDeviseName(parentFormal.getDeviseName()); // vo.setDeviseName(parentFormal.getDeviseName());
// vo.setExpireEndTime(parentFormal.getConvertToEbomTime()); // vo.setExpireEndTime(parentFormal.getConvertToEbomTime());
// 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101
if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){ if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) || Objects.equals("T",vo.getProjectType())){
vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
} }
} }
@ -535,7 +535,7 @@ public class EBomForwardReport extends BaseForwardReport {
vo.setOrderNumber(orderNum.incrementAndGet() + ""); vo.setOrderNumber(orderNum.incrementAndGet() + "");
// 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101
if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){ if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) || Objects.equals("T",vo.getProjectType())){
vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
} }
} }

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

@ -324,7 +324,7 @@ public class PBomForwardReport extends BaseForwardReport {
nodeList.forEach(item->{ nodeList.forEach(item->{
item.setBomVersion(parentFormal.getCurrentVersion()); item.setBomVersion(parentFormal.getCurrentVersion());
// 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101
if(MaterialshouldBomExistUtil.checkNoNeedBom(item)){ if(MaterialshouldBomExistUtil.checkNoNeedBom(item) || Objects.equals("T",item.getProjectType())){
item.setCurrentVersion(OriginalConstant.NO_NEED_BOM); item.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
} }
}); });
@ -521,7 +521,7 @@ public class PBomForwardReport extends BaseForwardReport {
// vo.setCreatedTime(parentFormal.getCreatedTime()); // vo.setCreatedTime(parentFormal.getCreatedTime());
// vo.setExpireEndTime(parentFormal.getReleaseTime()); // vo.setExpireEndTime(parentFormal.getReleaseTime());
// 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101
if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){ if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) || Objects.equals("T",vo.getProjectType())){
vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
} }
} }
@ -561,7 +561,7 @@ public class PBomForwardReport extends BaseForwardReport {
// vo.setLevelNum(1); // vo.setLevelNum(1);
vo.setOrderNumber(orderNum.incrementAndGet() + ""); vo.setOrderNumber(orderNum.incrementAndGet() + "");
// 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101
if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){ if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) || Objects.equals("T",vo.getProjectType())){
vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
} }
} }