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

Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition

This commit is contained in:
曹鹏飞 2024-05-18 17:15:27 +08:00
parent 2fe03c4e80 8bf4612a31
commit c78f0fc151
2 changed files with 2 additions and 2 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/BomNewEbomParentService.java
View File

@ -1121,7 +1121,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
try { try {
this.getBaseMapper().updateRootState(); this.getBaseMapper().updateRootState();
ebomChildService.getBaseMapper().updateEBomMaterialUse(); ebomChildService.getBaseMapper().updateEBomMaterialUse();
this.compucteLevelNum(); //this.compucteLevelNum();
} catch (Exception e) { } catch (Exception e) {
log.info("计算层级出错:" + e.getMessage()); log.info("计算层级出错:" + e.getMessage());

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

@ -587,7 +587,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
VUtils.isTure(root.getMaterialNo().startsWith("31")).throwMessage("31码物料不能进行复制"); VUtils.isTure(root.getMaterialNo().startsWith("31")).throwMessage("31码物料不能进行复制");
BomNewPbomChildEntity child = pbomChildService.getById(rowId); BomNewPbomChildEntity child = pbomChildService.getById(rowId);
if (child.getVirtualPartRootMaterialNo().startsWith("31") && child.getVirtualPartType() > 0) { if (Objects.nonNull(child) && child.getVirtualPartRootMaterialNo().startsWith("31") && child.getVirtualPartType() > 0) {
VUtils.isTure(true).throwMessage("31下的虚拟包不能复制"); VUtils.isTure(true).throwMessage("31下的虚拟包不能复制");
} }