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

PBOM-全新逻辑： 1、直发包为升级问题 

2、31生成了A00.1版本
This commit is contained in:
大米 2024-08-27 11:00:49 +08:00
parent 839b983da6
commit fe50a7611d
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
View File

@ -366,13 +366,13 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable {
private String materialNoAndNumAndProjectType;
public String getMaterialNoAndNumAndProjectType() {
return MyStrUtil.join(getMaterialNo(),getNum(),getProjectType());
return MyStrUtil.joinStr(getMaterialNo(),getNum(),getProjectType());
}
private String materialNoAndNum;
public String getMaterialNoAndNum() {
return MyStrUtil.join(getMaterialNo(),getNum());
return MyStrUtil.joinStr(getMaterialNo(),getNum());
}
private static final long serialVersionUID = 1L;

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java
View File

@ -317,17 +317,17 @@ public class BomNewPbomParentVO extends BaseMaterialVO implements Serializable {
private String materialNoAndNumAndProjectType;
public String getMaterialNoAndProjectType() {
return MyStrUtil.join(getMaterialNo(),getProjectType());
return MyStrUtil.joinStr(getMaterialNo(),getProjectType());
}
public String getMaterialNoAndNumAndProjectType() {
return MyStrUtil.join(StrUtil.isNotBlank(getOriginalMaterialNo())?getOriginalMaterialNo(): getMaterialNo(),Objects.nonNull(getOriginalNum())?getOriginalNum(): getNum(),StrUtil.isNotBlank(getOriginalProjectType())?getOriginalProjectType(): getProjectType());
return MyStrUtil.joinStr(StrUtil.isNotBlank(getOriginalMaterialNo())?getOriginalMaterialNo(): getMaterialNo(),Objects.nonNull(getOriginalNum())?getOriginalNum(): getNum(),StrUtil.isNotBlank(getOriginalProjectType())?getOriginalProjectType(): getProjectType());
}
private String materialNoAndNum;
public String getMaterialNoAndNum() {
return MyStrUtil.join(StrUtil.isNotBlank(getOriginalMaterialNo())?getOriginalMaterialNo(): getMaterialNo(),Objects.nonNull(getOriginalNum())?getOriginalNum(): getNum());
return MyStrUtil.joinStr(StrUtil.isNotBlank(getOriginalMaterialNo())?getOriginalMaterialNo(): getMaterialNo(),Objects.nonNull(getOriginalNum())?getOriginalNum(): getNum());
}
//发布PBOM 时 ，对比Pbom已发布版是否一致，一致则不转PBOM正式，直接删除PBOM 草稿数据

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

@ -14,10 +14,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.common.collect.*;
import com.mzt.logapi.context.LogRecordContext;
import com.nflg.product.base.core.conmon.util.SessionUtil;
import com.nflg.product.base.core.exception.NflgBusinessException;
@ -1121,7 +1118,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
@Transactional(rollbackFor = Exception.class)
public boolean realesePbom(Long bomRowId) {
BomNewPbomParentEntity parent = this.getById(bomRowId);
VUtils.isTure(parent.getStatus() >= PBomStatusEnum.PUBLISH.getValue()).throwMessage("pbom已发布无需在发布，请刷新数据");
// VUtils.isTure(parent.getStatus() >= PBomStatusEnum.PUBLISH.getValue()).throwMessage("pbom已发布无需在发布，请刷新数据");
LogRecordContext.putVariable("bom", parent);
try {
List<BomNewPbomParentVO> allBom = getAllBom(bomRowId, 0);
@ -1144,7 +1141,19 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
parentMaterialNos.add(parent.getMaterialNo());
//Integer state = (parent.getMaterialNo().startsWith("31") && parent.getFacCode().equals(EBomConstant.MAIN_FACTORY_CODE_1010)) ? PBomStatusEnum.WAIT_FACTORY.getValue() : PBomStatusEnum.PUBLISH.getValue();
Integer state = parent.getMaterialNo().startsWith("31") ? PBomStatusEnum.FACTORY_CONFIRM.getValue() : PBomStatusEnum.PUBLISH.getValue();
bomRowIds.add(bomRowId);
BomNewPbomParentVO parentVo = Convert.convert(BomNewPbomParentVO.class, parent);
parentVo.setBomRowId(parentVo.getRowId());
List<BomNewPbomParentVO> parentList=new ArrayList<>();
parentList.add(parentVo);
initPBomCurrentVersion(parentList);
List<Long> delNoReleaseParentBom = parentList.stream().filter(u -> u.getDelIs().equals(1)).map(u->u.getBomRowId()).collect(Collectors.toList());
if(CollUtil.isNotEmpty(delNoReleaseParentBom)){
this.delPBom(delNoReleaseParentBom);
}
else {
bomRowIds.add(bomRowId);
}
this.getBaseMapper().bomRelease(state, SessionUtil.getUserName(), bomRowIds);
//同步sap
// saySyncDEMO();
@ -1173,6 +1182,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
}
/**
* 初始化Pbom版本号
* @param allPBom
@ -1184,7 +1195,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
BomNewPbomParentEntity oldParent = SpringUtil.getBean(BomNewPbomParentService.class).lambdaQuery()
.eq(BomNewPbomParentEntity::getMaterialNo, newPBom.getMaterialNo())
.ge(BomNewPbomParentEntity::getStatus,PBomStatusEnum.PUBLISH)
.ge(BomNewPbomParentEntity::getStatus,PBomStatusEnum.PUBLISH.getValue())
.eq(BomNewPbomParentEntity::getFacCode, newPBom.getFacCode()).last(" order by current_version desc limit 1").one();
//旧bom除T项之外
List<BomNewPbomParentVO> oldBomDetail = this.getBaseMapper().getParentChild(oldParent.getRowId());

3
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/MyStrUtil.java
View File

@ -6,7 +6,8 @@ import com.google.common.base.Joiner;
public class MyStrUtil extends StrUtil {
private static Joiner joiner=Joiner.on("").skipNulls();
public static String joinStr(String ... str){
public static String joinStr(Object ... str){
return joiner.join(str);
}
}