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

Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition

This commit is contained in:
10001392 2024-08-28 14:25:07 +08:00
parent bc87bd8a99 b8ff69b50c
commit 22fc635e7c
3 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1151,24 +1151,23 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
else { else {
bomRowIds.add(bomRowId); bomRowIds.add(bomRowId);
} }
this.getBaseMapper().bomRelease(state, SessionUtil.getUserName(), bomRowIds); if(CollUtil.isNotEmpty(bomRowIds)) {
//同步sap this.getBaseMapper().bomRelease(state, SessionUtil.getUserName(), bomRowIds);
// saySyncDEMO(); //记录-BOM版本RowId
// importSap(parent,allBom); List<BomNewPbomChildEntity> pBomChildren = new ArrayList<>();
//记录-BOM版本RowId allBom.forEach(k -> {
List<BomNewPbomChildEntity> pBomChildren = new ArrayList<>(); BomNewPbomChildEntity entChild = new BomNewPbomChildEntity();
allBom.forEach(k -> { entChild.setRowId(k.getRowId());
BomNewPbomChildEntity entChild = new BomNewPbomChildEntity(); entChild.setBomVersionRowId(k.getBomRowId());
entChild.setRowId(k.getRowId()); pBomChildren.add(entChild);
entChild.setBomVersionRowId(k.getBomRowId()); });
pBomChildren.add(entChild); if (CollUtil.isNotEmpty(pBomChildren)) {
}); pbomChildService.updateBatchById(pBomChildren);
if (CollUtil.isNotEmpty(pBomChildren)) { }
pbomChildService.updateBatchById(pBomChildren);
}
//历史版本转移到formal正式工作表 //历史版本转移到formal正式工作表
pBomToFormal(bomRowIds, parentMaterialNos,parent.getFacCode()); pBomToFormal(bomRowIds, parentMaterialNos, parent.getFacCode());
}
// SpringUtil.getBean(BomNewPbomParentFormalService.class).copyPbomFormal(bomRowId); // SpringUtil.getBean(BomNewPbomParentFormalService.class).copyPbomFormal(bomRowId);
} catch (Exception ex) { } catch (Exception ex) {

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

@ -3,12 +3,14 @@ package com.nflg.product.bomnew.service.domain.EBom.topbomnew;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import com.alibaba.excel.enums.BooleanEnum; import com.alibaba.excel.enums.BooleanEnum;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.base.core.conmon.util.SessionUtil;
import com.nflg.product.bomnew.constant.ConvertToPBomModelEnum; import com.nflg.product.bomnew.constant.ConvertToPBomModelEnum;
import com.nflg.product.bomnew.constant.EBomConstant; import com.nflg.product.bomnew.constant.EBomConstant;
import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum; import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum;
import com.nflg.product.bomnew.mapper.master.BomNewPbomParentMapper;
import com.nflg.product.bomnew.pojo.entity.BomNewPbomChildEntity; import com.nflg.product.bomnew.pojo.entity.BomNewPbomChildEntity;
import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity; import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity;
import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
@ -125,6 +127,13 @@ public class EBomToPBomForFormal31New extends FormalEBomToPbomBase {
if(Objects.isNull(parentEnt)){ if(Objects.isNull(parentEnt)){
continue; continue;
} }
//检查是否用户跟用户节点（）
if(parentEnt.getMaterialNo().equals(parent.getMaterialNo())) {
List<String> childMaterialNos = SpringUtil.getBean(BomNewPbomParentMapper.class).getPBomExistMaterialInChildForWorkList(parent.getMaterialNo());
if (CollUtil.isEmpty(childMaterialNos)) {
parentEnt.setUserRootIs(1);
}
}
//子级 //子级
if (CollUtil.isNotEmpty(child)) { if (CollUtil.isNotEmpty(child)) {

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

@ -89,10 +89,13 @@ public class EBomToPBomForFormalNew extends FormalEBomToPbomBase {
continue; continue;
} }
//检查是否用户跟用户节点（） //检查是否用户跟用户节点（）
List<String> childMaterialNos = SpringUtil.getBean(BomNewPbomParentMapper.class).getPBomExistMaterialInChildForWorkList(parentEnt.getMaterialNo()); if(parentEnt.getMaterialNo().equals(parent.getMaterialNo())) {
if(CollUtil.isEmpty(childMaterialNos)){ List<String> childMaterialNos = SpringUtil.getBean(BomNewPbomParentMapper.class).getPBomExistMaterialInChildForWorkList(parent.getMaterialNo());
parentEnt.setUserRootIs(1); if (CollUtil.isEmpty(childMaterialNos)) {
parentEnt.setUserRootIs(1);
}
} }
//子级 //子级
if (CollUtil.isNotEmpty(child)) { if (CollUtil.isNotEmpty(child)) {
//合并子级 //合并子级