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

Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition

This commit is contained in:
曹鹏飞 2024-08-21 08:58:46 +08:00
parent f4aae74c93 12fa508e49
commit 5eea13aaa4
4 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java
View File

@ -79,4 +79,11 @@ public interface BomNewPbomParentMapper extends BaseMapper<BomNewPbomParentEntit
Integer getSapErrorNum(String userCode);
List<BomNewPbomParentVO> getReverseBoms(Long parentRowId);
/**
* 检查PBOM 是否待处理跟节点
* @param materialNo
* @return
*/
List<String> getPBomExistMaterialInChildForWorkList(@Param("materialNo")String materialNo);
}

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

@ -3,10 +3,12 @@ package com.nflg.product.bomnew.service.domain.EBom;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import com.alibaba.excel.enums.BooleanEnum;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.nflg.product.bomnew.constant.ConvertToPBomModelEnum;
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.BomNewPbomParentEntity;
import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
@ -86,6 +88,11 @@ public class EBomToPBomForFormal extends EBomToPbomBase {
if(Objects.isNull(parentEnt)){
continue;
}
//检查是否用户跟用户节点（）
List<String> childMaterialNos = SpringUtil.getBean(BomNewPbomParentMapper.class).getPBomExistMaterialInChildForWorkList(parentEnt.getMaterialNo());
if(CollUtil.isEmpty(childMaterialNos)){
parentEnt.setUserRootIs(1);
}
//子级
if (CollUtil.isNotEmpty(child)) {
//合并子级

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

@ -3,12 +3,14 @@ package com.nflg.product.bomnew.service.domain.EBom;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import com.alibaba.excel.enums.BooleanEnum;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.nflg.product.bomnew.constant.ConvertToPBomModelEnum;
import com.nflg.product.bomnew.constant.EBomConstant;
import com.nflg.product.bomnew.constant.EBomStatusEnum;
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.BomNewPbomParentEntity;
import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
@ -131,6 +133,11 @@ public class EBomToPBomForFormal31 extends EBomToPbomBase {
if(Objects.isNull(parentEnt)){
continue;
}
//检查是否用户跟用户节点（）
List<String> childMaterialNos = SpringUtil.getBean(BomNewPbomParentMapper.class).getPBomExistMaterialInChildForWorkList(parentEnt.getMaterialNo());
if(CollUtil.isEmpty(childMaterialNos)){
parentEnt.setUserRootIs(1);
}
//子级
if (CollUtil.isNotEmpty(child)) {
//合并子级

7
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
View File

@ -369,6 +369,13 @@
</delete>
<select id="getPBomExistMaterialInChildForWorkList" resultType="java.lang.String">
select b.material_no from t_bom_new_pbom_parent a
join t_bom_new_pbom_child b on a.row_id=b.parent_row_id and b.material_no=#{materialNo}
where a.`status` &lt; 4
</select>