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

Merge remote-tracking branch 'origin/master-bom-lhj1106'

This commit is contained in:
10001392 2024-11-12 09:42:11 +08:00
parent 5949729eef 6995b568ca
commit 75198b7ca2
6 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -451,8 +451,9 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
child.setEditStatus(parent.getEditStatus()); child.setEditStatus(parent.getEditStatus());
child.setVirtualPackageIs(parent.getVirtualPackageIs()); child.setVirtualPackageIs(parent.getVirtualPackageIs());
child.setSuperMaterialStatus(parent.getSuperMaterialStatus()); child.setSuperMaterialStatus(parent.getSuperMaterialStatus());
// 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012 // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料、项目类别为T项，版本号显示B00 by 10002327 241012
if(MaterialshouldBomExistUtil.checkNoNeedBom(child)){ if(MaterialshouldBomExistUtil.checkNoNeedBom(child)
|| Objects.equals(child.getProjectType(),"T")){
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);
@ -3212,8 +3213,14 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean deleteBomV2(Long bomRowId) { public Boolean deleteBomV2(Long bomRowId) {
BomNewEbomParentEntity parent = getById(bomRowId); BomNewEbomParentEntity parent = getById(bomRowId);
VUtils.isTure(Objects.isNull(parent)).throwMessage("bom不存在"); if(parent == null){
//如果是发起变更后，再删除市，用户页面缓存再次提交删除，则直接返回成功，刷新页面 10002327 241107
return true;
}
//VUtils.isTure(Objects.isNull(parent)).throwMessage("bom不存在");
// VUtils.isTure(root.getRootIs() != 1 && root.getUserRootIs() != 1).throwMessage("请选择根节点"); // VUtils.isTure(root.getRootIs() != 1 && root.getUserRootIs() != 1).throwMessage("请选择根节点");
//校验状态，发布PBOM以后，不能再删除 10002327 241106
VUtils.isTure(parent.getStatus() != null && parent.getStatus() >= EBomStatusEnum.PUBLISHED.getValue()).throwMessage("发布PBOM之后，不能再删除~");
LogRecordContext.putVariable("bom", parent); LogRecordContext.putVariable("bom", parent);

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

@ -429,7 +429,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);
@ -514,7 +515,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

@ -313,7 +313,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);
} }
}); });
@ -493,7 +493,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);
} }
} }
@ -536,7 +536,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);
} }
} }

1
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
View File

@ -598,7 +598,6 @@
SELECT *, row_id AS bomRowId SELECT *, row_id AS bomRowId
FROM t_bom_new_ebom_parent FROM t_bom_new_ebom_parent
WHERE status = 4 WHERE status = 4
AND (root_is = 1 OR user_root_is = 1)
AND sap_state > 3 AND sap_state > 3
AND created_by = #{userCode} AND created_by = #{userCode}
<include refid="whr"/> <include refid="whr"/>