Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
# Conflicts: # nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
This commit is contained in:
commit
da13cbe9f0
|
|
@ -197,7 +197,7 @@ public class PBomApi extends BaseApi {
|
||||||
public ResultVO<Boolean> convertToMBom(@RequestParam("bomRowId") Long bomRowId) throws ExecutionException, InterruptedException {
|
public ResultVO<Boolean> convertToMBom(@RequestParam("bomRowId") Long bomRowId) throws ExecutionException, InterruptedException {
|
||||||
BomNewPbomParentEntity parent = bomNewPbomParentService.getById(bomRowId);
|
BomNewPbomParentEntity parent = bomNewPbomParentService.getById(bomRowId);
|
||||||
VUtils.isTure(!parent.getMaterialNo().startsWith("31")).throwMessage("只有31开头的物料才可以发布");
|
VUtils.isTure(!parent.getMaterialNo().startsWith("31")).throwMessage("只有31开头的物料才可以发布");
|
||||||
VUtils.isTure(parent.getStatus()> PBomStatusEnum.PUBLISH.getValue()).throwMessage("只有已发布的BOM才能生成MBom");
|
VUtils.isTure(parent.getStatus()< PBomStatusEnum.PUBLISH.getValue()).throwMessage("只有已发布的BOM才能生成MBom");
|
||||||
//
|
//
|
||||||
VUtils.isTure(!parent.getFacCode().equals(EBomConstant.MAIN_FACTORY_CODE_1010)).throwMessage("只有1010工厂BOM才能进行分工厂");
|
VUtils.isTure(!parent.getFacCode().equals(EBomConstant.MAIN_FACTORY_CODE_1010)).throwMessage("只有1010工厂BOM才能进行分工厂");
|
||||||
return ResultVO.success(bomNewPbomParentService.convertToMBom(bomRowId));
|
return ResultVO.success(bomNewPbomParentService.convertToMBom(bomRowId));
|
||||||
|
|
|
||||||
|
|
@ -681,12 +681,15 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
|
||||||
List<BomNewEbomParentEntity> list = this.lambdaQuery().in(BomNewEbomParentEntity::getRowId, paramDTO.getBomRowIds()).list();
|
List<BomNewEbomParentEntity> list = this.lambdaQuery().in(BomNewEbomParentEntity::getRowId, paramDTO.getBomRowIds()).list();
|
||||||
List<String> notConvertToPbom = list.stream().filter(u -> u.getStatus() < EBomStatusEnum.PUBLISHED.getValue()).map(u -> u.getMaterialNo()).collect(Collectors.toList());
|
List<String> notConvertToPbom = list.stream().filter(u -> u.getStatus() < EBomStatusEnum.PUBLISHED.getValue()).map(u -> u.getMaterialNo()).collect(Collectors.toList());
|
||||||
VUtils.isTure(CollUtil.isNotEmpty(notConvertToPbom)).throwMessage(StrUtil.join(",", notConvertToPbom) + "未转PBom,不能发起变更");
|
VUtils.isTure(CollUtil.isNotEmpty(notConvertToPbom)).throwMessage(StrUtil.join(",", notConvertToPbom) + "未转PBom,不能发起变更");
|
||||||
|
|
||||||
List<BomNewEbomParentEntity> parentResult = new ArrayList<>();
|
List<BomNewEbomParentEntity> parentResult = new ArrayList<>();
|
||||||
List<BomNewEbomChildEntity> childResult = new ArrayList<>();
|
List<BomNewEbomChildEntity> childResult = new ArrayList<>();
|
||||||
for (Long bomRowId : paramDTO.getBomRowIds()) {
|
for (Long bomRowId : paramDTO.getBomRowIds()) {
|
||||||
BomNewEbomParentEntity parent = this.getById(bomRowId);
|
BomNewEbomParentEntity parent = this.getById(bomRowId);
|
||||||
|
List<BomNewEbomParentEntity> existEnt = this.lambdaQuery().eq(BomNewEbomParentEntity::getMaterialNo, parent.getMaterialNo()).lt(BomNewEbomParentEntity::getStatus, EBomStatusEnum.PUBLISHED.getValue()).list();
|
||||||
|
//含发布前版本则无需升级
|
||||||
|
if(CollUtil.isEmpty(existEnt)) {
|
||||||
List<BomNewEbomChildEntity> child = ebomChildService.lambdaQuery().eq(BomNewEbomChildEntity::getParentRowId, bomRowId).list();
|
List<BomNewEbomChildEntity> child = ebomChildService.lambdaQuery().eq(BomNewEbomChildEntity::getParentRowId, bomRowId).list();
|
||||||
|
|
||||||
BomNewEbomParentEntity newParent = new BomNewEbomParentEntity();
|
BomNewEbomParentEntity newParent = new BomNewEbomParentEntity();
|
||||||
BeanUtil.copyProperties(parent, newParent);
|
BeanUtil.copyProperties(parent, newParent);
|
||||||
newParent.setRowId(IdWorker.getId());
|
newParent.setRowId(IdWorker.getId());
|
||||||
|
|
@ -699,8 +702,6 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
|
||||||
parent.setLastVersionIs(0);
|
parent.setLastVersionIs(0);
|
||||||
parentResult.add(newParent);
|
parentResult.add(newParent);
|
||||||
parentResult.add(parent);
|
parentResult.add(parent);
|
||||||
|
|
||||||
|
|
||||||
for (BomNewEbomChildEntity childEnt : child) {
|
for (BomNewEbomChildEntity childEnt : child) {
|
||||||
BomNewEbomChildEntity newChild = new BomNewEbomChildEntity();
|
BomNewEbomChildEntity newChild = new BomNewEbomChildEntity();
|
||||||
BeanUtil.copyProperties(childEnt, newChild);
|
BeanUtil.copyProperties(childEnt, newChild);
|
||||||
|
|
@ -709,6 +710,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
|
||||||
childResult.add(newChild);
|
childResult.add(newChild);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (CollUtil.isNotEmpty(parentResult)) {
|
if (CollUtil.isNotEmpty(parentResult)) {
|
||||||
this.saveOrUpdateBatch(parentResult);
|
this.saveOrUpdateBatch(parentResult);
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
|
||||||
import cn.hutool.core.convert.Convert;
|
import cn.hutool.core.convert.Convert;
|
||||||
import cn.hutool.core.util.NumberUtil;
|
import cn.hutool.core.util.NumberUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
|
import com.alibaba.excel.enums.BooleanEnum;
|
||||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
|
@ -159,6 +160,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取物料所有子级
|
* 获取物料所有子级
|
||||||
|
*
|
||||||
* @param materialNo
|
* @param materialNo
|
||||||
* @param
|
* @param
|
||||||
* @return
|
* @return
|
||||||
|
|
@ -186,7 +188,6 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 已
|
* 已
|
||||||
*
|
*
|
||||||
|
|
@ -201,6 +202,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 导出工作列表
|
* 导出工作列表
|
||||||
|
*
|
||||||
* @param query
|
* @param query
|
||||||
* @param response
|
* @param response
|
||||||
* @throws IOException
|
* @throws IOException
|
||||||
|
|
@ -214,6 +216,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 导出正式工作表
|
* 导出正式工作表
|
||||||
|
*
|
||||||
* @param query
|
* @param query
|
||||||
* @param response
|
* @param response
|
||||||
* @throws IOException
|
* @throws IOException
|
||||||
|
|
@ -511,6 +514,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
return result;
|
return result;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void generateDrawingNo(List<BomNewPbomParentVO> saveBomDetailParamDTO, Long bomRowID, String parentDrawingNo) {
|
public void generateDrawingNo(List<BomNewPbomParentVO> saveBomDetailParamDTO, Long bomRowID, String parentDrawingNo) {
|
||||||
List<BomNewPbomParentVO> firstLevelBoms = saveBomDetailParamDTO.stream().filter(u -> u.getParentRowId().equals(bomRowID)).collect(Collectors.toList());
|
List<BomNewPbomParentVO> firstLevelBoms = saveBomDetailParamDTO.stream().filter(u -> u.getParentRowId().equals(bomRowID)).collect(Collectors.toList());
|
||||||
parentDrawingNo = StrUtil.isNotBlank(parentDrawingNo) ? parentDrawingNo : "";
|
parentDrawingNo = StrUtil.isNotBlank(parentDrawingNo) ? parentDrawingNo : "";
|
||||||
|
|
@ -556,16 +560,16 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
|
|
||||||
VUtils.isTure(StrUtil.isBlank(params.getRuleGroupCode())).throwMessage("规则编码不能为空");
|
VUtils.isTure(StrUtil.isBlank(params.getRuleGroupCode())).throwMessage("规则编码不能为空");
|
||||||
|
|
||||||
List<BomNewPbomParentVO> childrenVO = getAllBom(params.getBomRowId(), 0);
|
List<BomNewPbomParentVO> childrenVO = getAllBom(params.getBomRowId(), 0, true);
|
||||||
materialMainService.intiMaterialInfo(childrenVO, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
|
materialMainService.intiMaterialInfo(childrenVO, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
|
||||||
List<BomFactorySplitRuleEntity> relList = bomFactorySplitRuleService.lambdaQuery().eq(BomFactorySplitRuleEntity::getRuleGroupCode, params.getRuleGroupCode()).list();
|
List<BomFactorySplitRuleEntity> relList = bomFactorySplitRuleService.lambdaQuery().eq(BomFactorySplitRuleEntity::getRuleGroupCode, params.getRuleGroupCode()).list();
|
||||||
StringBuilder relPattern = new StringBuilder();
|
StringBuilder relPattern = new StringBuilder();
|
||||||
List<BomNewPbomChildEntity> result = new ArrayList<>();
|
List<BomNewPbomChildEntity> result = new ArrayList<>();
|
||||||
|
|
||||||
for (BomNewPbomParentVO child : childrenVO) {
|
for (BomNewPbomParentVO child : childrenVO) {
|
||||||
if (StrUtil.isNotBlank(child.getProductionFactoryCode()) && ProductionFactoryCodeInputTypeEnum.MANUAL.equalsValue(child.getProductionFactoryCodeInputType())) {
|
// if (StrUtil.isNotBlank(child.getProductionFactoryCode()) && ProductionFactoryCodeInputTypeEnum.MANUAL.equalsValue(child.getProductionFactoryCodeInputType())) {
|
||||||
continue;
|
// continue;
|
||||||
}
|
// }
|
||||||
for (BomFactorySplitRuleEntity role : relList) {
|
for (BomFactorySplitRuleEntity role : relList) {
|
||||||
Boolean match = true;
|
Boolean match = true;
|
||||||
if (StrUtil.isNotBlank(role.getMaterialCategoryCode())) {
|
if (StrUtil.isNotBlank(role.getMaterialCategoryCode())) {
|
||||||
|
|
@ -603,19 +607,28 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if(child.getProjectType().equals("Q")){
|
//Q项
|
||||||
intiQFac(child,childrenVO);
|
List<BomNewPbomParentVO> qList = childrenVO.stream().filter(u -> u.getProjectType().equals("Q")).collect(Collectors.toList());
|
||||||
}else {
|
{
|
||||||
intiNotQFac(child,childrenVO);
|
for (BomNewPbomParentVO qVo : qList) {
|
||||||
|
intiQFac(qVo, childrenVO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//非Q
|
||||||
|
// List<BomNewPbomParentVO> noQList = childrenVO.stream().filter(u -> !u.getProjectType().equals("Q")).collect(Collectors.toList());
|
||||||
|
// {
|
||||||
|
// for (BomNewPbomParentVO noQVo : noQList) {
|
||||||
|
// intiNotQFac(noQVo, childrenVO);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
if (CollUtil.isNotEmpty(result)) {
|
if (CollUtil.isNotEmpty(result)) {
|
||||||
pbomChildService.saveOrUpdateBatch(result);
|
pbomChildService.saveOrUpdateBatch(result);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//处理Q下子级分工厂
|
//处理Q下子级分工厂
|
||||||
private void intiQFac(BomNewPbomParentVO parentVO, List<BomNewPbomParentVO> child) {
|
private void intiQFac(BomNewPbomParentVO parentVO, List<BomNewPbomParentVO> child) {
|
||||||
|
|
||||||
|
|
@ -623,6 +636,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
setSubNodeFac(parentVO, child, parentVO.getProductionFactoryCode());
|
setSubNodeFac(parentVO, child, parentVO.getProductionFactoryCode());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//非Q
|
//非Q
|
||||||
private void intiNotQFac(BomNewPbomParentVO parentVO, List<BomNewPbomParentVO> child) {
|
private void intiNotQFac(BomNewPbomParentVO parentVO, List<BomNewPbomParentVO> child) {
|
||||||
|
|
||||||
|
|
@ -639,7 +653,6 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setParentFac(BomNewPbomParentVO parentVO, List<BomNewPbomParentVO> child, String facCode) {
|
private void setParentFac(BomNewPbomParentVO parentVO, List<BomNewPbomParentVO> child, String facCode) {
|
||||||
|
|
@ -655,8 +668,9 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setSubNodeFac(BomNewPbomParentVO parentVO, List<BomNewPbomParentVO> child, String facCode) {
|
private void setSubNodeFac(BomNewPbomParentVO parentVO, List<BomNewPbomParentVO> child, String facCode) {
|
||||||
String zero ="1"+ StrUtil.padAfter("0", parentVO.getLevelNum().toString().split(".")[1].length(), "0");
|
String[] numSplit = parentVO.getLevelNumber().toString().split(".");
|
||||||
BigDecimal bNodeLevel = NumberUtil.add(parentVO.getLevelNumber(), new BigDecimal(1).divide(NumberUtil.div ( new BigDecimal(1) , new BigDecimal(zero))) );
|
String zero = "1" + StrUtil.padAfter("0", (numSplit.length > 1 ? numSplit[1].length() : 0), "0");
|
||||||
|
BigDecimal bNodeLevel = NumberUtil.add(parentVO.getLevelNumber(), (NumberUtil.div(new BigDecimal(1), new BigDecimal(zero))));
|
||||||
List<BomNewPbomParentVO> subNodes = child.stream().filter(u -> u.getLevelNumber().compareTo(parentVO.getLevelNumber()) > 0 && u.getLevelNumber().compareTo(bNodeLevel) < 0).collect(Collectors.toList());
|
List<BomNewPbomParentVO> subNodes = child.stream().filter(u -> u.getLevelNumber().compareTo(parentVO.getLevelNumber()) > 0 && u.getLevelNumber().compareTo(bNodeLevel) < 0).collect(Collectors.toList());
|
||||||
for (BomNewPbomParentVO node : subNodes) {
|
for (BomNewPbomParentVO node : subNodes) {
|
||||||
node.setProductionFactoryCode(facCode);
|
node.setProductionFactoryCode(facCode);
|
||||||
|
|
@ -665,8 +679,6 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public void reConvertToMBom(Long bomRowId, List<Long> backRowId) {
|
public void reConvertToMBom(Long bomRowId, List<Long> backRowId) {
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -697,7 +709,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
List<String> noProductionFactoryCodeList = allChild.stream().filter(u -> StrUtil.isBlank(u.getProductionFactoryCode())).map(u -> u.getMaterialNo()).collect(Collectors.toList());
|
List<String> noProductionFactoryCodeList = allChild.stream().filter(u -> StrUtil.isBlank(u.getProductionFactoryCode())).map(u -> u.getMaterialNo()).collect(Collectors.toList());
|
||||||
VUtils.isTure(CollUtil.isNotEmpty(noProductionFactoryCodeList)).throwMessage(StrUtil.join(",", noProductionFactoryCodeList) + "物料暂未分工厂,请分完工厂再进行发布");
|
VUtils.isTure(CollUtil.isNotEmpty(noProductionFactoryCodeList)).throwMessage(StrUtil.join(",", noProductionFactoryCodeList) + "物料暂未分工厂,请分完工厂再进行发布");
|
||||||
ConvertToMBom convertToMBom = new ConvertToMBom(rootParent, allChild);
|
ConvertToMBom convertToMBom = new ConvertToMBom(rootParent, allChild);
|
||||||
convertToMBom.convertToMBom();
|
convertToMBom.convertToMBom(true, true);
|
||||||
if (CollUtil.isNotEmpty(convertToMBom.getMBomParentResult())) {
|
if (CollUtil.isNotEmpty(convertToMBom.getMBomParentResult())) {
|
||||||
mBomParentService.saveOrUpdateBatch(convertToMBom.getMBomParentResult());
|
mBomParentService.saveOrUpdateBatch(convertToMBom.getMBomParentResult());
|
||||||
}
|
}
|
||||||
|
|
@ -718,6 +730,40 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* MBOM退回后,重新发布调用
|
||||||
|
*
|
||||||
|
* @param bomRowId
|
||||||
|
* @return
|
||||||
|
* @throws ExecutionException
|
||||||
|
* @throws InterruptedException
|
||||||
|
*/
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
|
public Boolean convertToMBomFor1020(Long bomRowId) throws ExecutionException, InterruptedException {
|
||||||
|
|
||||||
|
BomNewPbomParentEntity rootParent = this.getById(bomRowId);
|
||||||
|
List<BomNewPbomParentVO> allChild = getAllBom(bomRowId, 0);
|
||||||
|
|
||||||
|
if (StrUtil.isBlank(rootParent.getOrderNo())) {
|
||||||
|
String orderNo = crmService.getOrderNo(rootParent.getMaterialNo());
|
||||||
|
rootParent.setOrderNo(orderNo);
|
||||||
|
}
|
||||||
|
VUtils.isTure(StrUtil.isBlank(rootParent.getOrderNo())).throwMessage("没有获取到订单号");
|
||||||
|
|
||||||
|
List<String> noProductionFactoryCodeList = allChild.stream().filter(u -> StrUtil.isBlank(u.getProductionFactoryCode())).map(u -> u.getMaterialNo()).collect(Collectors.toList());
|
||||||
|
VUtils.isTure(CollUtil.isNotEmpty(noProductionFactoryCodeList)).throwMessage(StrUtil.join(",", noProductionFactoryCodeList) + "物料暂未分工厂,请分完工厂再进行发布");
|
||||||
|
ConvertToMBom convertToMBom = new ConvertToMBom(rootParent, allChild);
|
||||||
|
convertToMBom.convertToMBom(false, true);
|
||||||
|
if (CollUtil.isNotEmpty(convertToMBom.getMBomParentResult())) {
|
||||||
|
mBomParentService.saveOrUpdateBatch(convertToMBom.getMBomParentResult());
|
||||||
|
}
|
||||||
|
if (CollUtil.isNotEmpty(convertToMBom.getMBomDetailResult())) {
|
||||||
|
mBomDetailService.saveOrUpdateBatch(convertToMBom.getMBomDetailResult());
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 发布Pbom
|
* 发布Pbom
|
||||||
*
|
*
|
||||||
|
|
@ -823,7 +869,6 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取CRM 订单号
|
* 获取CRM 订单号
|
||||||
*
|
*
|
||||||
|
|
@ -837,6 +882,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 发起变更
|
* 发起变更
|
||||||
|
*
|
||||||
* @param bomRowId
|
* @param bomRowId
|
||||||
*/
|
*/
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
|
|
|
||||||
|
|
@ -9,14 +9,17 @@ 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.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
|
import com.google.common.collect.ImmutableMap;
|
||||||
import com.nflg.product.base.core.conmon.util.SessionUtil;
|
import com.nflg.product.base.core.conmon.util.SessionUtil;
|
||||||
import com.nflg.product.bomnew.constant.EBomConstant;
|
import com.nflg.product.bomnew.constant.EBomConstant;
|
||||||
|
import com.nflg.product.bomnew.constant.MBomConstantEnum;
|
||||||
import com.nflg.product.bomnew.constant.ProductionFactoryCodeInputTypeEnum;
|
import com.nflg.product.bomnew.constant.ProductionFactoryCodeInputTypeEnum;
|
||||||
import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum;
|
import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum;
|
||||||
import com.nflg.product.bomnew.pojo.entity.BomNewMbomDetailEntity;
|
import com.nflg.product.bomnew.pojo.entity.BomNewMbomDetailEntity;
|
||||||
import com.nflg.product.bomnew.pojo.entity.BomNewMbomParentEntity;
|
import com.nflg.product.bomnew.pojo.entity.BomNewMbomParentEntity;
|
||||||
import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity;
|
import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity;
|
||||||
import com.nflg.product.bomnew.pojo.vo.BomNewPbomParentVO;
|
import com.nflg.product.bomnew.pojo.vo.BomNewPbomParentVO;
|
||||||
|
import com.nflg.product.bomnew.service.BomNewMbomDetailService;
|
||||||
import com.nflg.product.bomnew.service.BomNewMbomParentService;
|
import com.nflg.product.bomnew.service.BomNewMbomParentService;
|
||||||
import com.nflg.product.bomnew.service.BomNewPbomParentService;
|
import com.nflg.product.bomnew.service.BomNewPbomParentService;
|
||||||
import com.nflg.product.bomnew.util.CTreePBomUtils;
|
import com.nflg.product.bomnew.util.CTreePBomUtils;
|
||||||
|
|
@ -68,13 +71,17 @@ public class ConvertToMBom {
|
||||||
/**
|
/**
|
||||||
* 转换MBom
|
* 转换MBom
|
||||||
*/
|
*/
|
||||||
public void convertToMBom() {
|
public void convertToMBom(Boolean convert1010 ,Boolean convert1020) {
|
||||||
//handler1010();
|
//handler1010();
|
||||||
|
if(convert1020) {
|
||||||
handler1020();
|
handler1020();
|
||||||
|
|
||||||
buildMBom(EBomConstant.MAIN_FACTORY_CODE_1010);
|
|
||||||
buildMBom(EBomConstant.XIAN_TAO_FACTORY_CODE_1020);
|
buildMBom(EBomConstant.XIAN_TAO_FACTORY_CODE_1020);
|
||||||
}
|
}
|
||||||
|
if(convert1010) {
|
||||||
|
buildMBom(EBomConstant.MAIN_FACTORY_CODE_1010);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 构建MBom明细
|
* 构建MBom明细
|
||||||
|
|
@ -87,9 +94,17 @@ public class ConvertToMBom {
|
||||||
BomNewMbomParentEntity oldParent = SpringUtil.getBean(BomNewMbomParentService.class).lambdaQuery().eq(BomNewMbomParentEntity::getMaterialNo, parent.getMaterialNo())
|
BomNewMbomParentEntity oldParent = SpringUtil.getBean(BomNewMbomParentService.class).lambdaQuery().eq(BomNewMbomParentEntity::getMaterialNo, parent.getMaterialNo())
|
||||||
.eq(BomNewMbomParentEntity::getLastVersionIs, 1).eq(BomNewMbomParentEntity::getFacCode, facCode).one();
|
.eq(BomNewMbomParentEntity::getLastVersionIs, 1).eq(BomNewMbomParentEntity::getFacCode, facCode).one();
|
||||||
if (Objects.nonNull(oldParent)) {
|
if (Objects.nonNull(oldParent)) {
|
||||||
|
if(MBomConstantEnum.MBomStatusEnum.PUB_SAP.equalsValue(oldParent.getStatus()) ) {
|
||||||
|
|
||||||
mBomParent.setCurrentVersion(VersionUtil.getNextVersion(oldParent.getCurrentVersion()));
|
mBomParent.setCurrentVersion(VersionUtil.getNextVersion(oldParent.getCurrentVersion()));
|
||||||
oldParent.setLastVersionIs(0);
|
oldParent.setLastVersionIs(0);
|
||||||
this.mBomParentResult.add(oldParent);
|
this.mBomParentResult.add(oldParent);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
SpringUtil.getBean(BomNewMbomDetailService.class).getBaseMapper().deleteByMap(ImmutableMap.of("bom_row_id", oldParent.getRowId()));
|
||||||
|
SpringUtil.getBean(BomNewMbomParentService.class).getBaseMapper().deleteById(oldParent.getRowId());
|
||||||
|
mBomParent.setCurrentVersion(oldParent.getCurrentVersion());
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
mBomParent.setCurrentVersion(VersionUtil.getNextVersion(""));
|
mBomParent.setCurrentVersion(VersionUtil.getNextVersion(""));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue