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

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

This commit is contained in:
曹鹏飞 2024-07-02 08:07:04 +08:00
parent 212edc584a 453d504219
commit 92fabbd964
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,7 +233,8 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP {
LOGGER.debug("{} 物料提层到顶级发货包且合并 编号：{}，父级编号：{}，数量：{}，合并后总数：{}，描述：{}", TAG, it.getMaterialNo(), p.getMaterialNo(), it.getNum().toString(), cct.getMENGE(), it.getMaterialDesc()); LOGGER.debug("{} 物料提层到顶级发货包且合并 编号：{}，父级编号：{}，数量：{}，合并后总数：{}，描述：{}", TAG, it.getMaterialNo(), p.getMaterialNo(), it.getNum().toString(), cct.getMENGE(), it.getMaterialDesc());
} }
} }
} else if (!Objects.equals(it.getVirtualPartType(), VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue())) { // } else if (!Objects.equals(it.getVirtualPartType(), VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue())) {
} else {
LOGGER.debug("{} 添加物料 编号：{}，父级编号：{}，数量：{}，描述：{}", TAG, it.getMaterialNo(), p.getMaterialNo(), it.getNum().toString(), it.getMaterialDesc()); LOGGER.debug("{} 添加物料 编号：{}，父级编号：{}，数量：{}，描述：{}", TAG, it.getMaterialNo(), p.getMaterialNo(), it.getNum().toString(), it.getMaterialDesc());
children.add(convert(cp, it, p.getMaterialNo(), ignore)); children.add(convert(cp, it, p.getMaterialNo(), ignore));
} }

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

@ -135,7 +135,7 @@ public abstract class EBomToPbomBase {
List<BomNewEbomParentVO> result = child.stream().filter(u -> StrUtil.isBlank(u.getMaterialNo())).collect(Collectors.toList()); List<BomNewEbomParentVO> result = child.stream().filter(u -> StrUtil.isBlank(u.getMaterialNo())).collect(Collectors.toList());
Map<String, List<BomNewEbomParentVO>> listMp = child.stream().collect(Collectors.groupingBy(BomNewEbomParentVO::getMaterialNo)); Map<String, List<BomNewEbomParentVO>> listMp = child.stream().filter(u->StrUtil.isNotBlank(u.getMaterialNo())).collect(Collectors.groupingBy(BomNewEbomParentVO::getMaterialNo));
for (String key : listMp.keySet()) { for (String key : listMp.keySet()) {
List<BomNewEbomParentVO> voList = listMp.get(key); List<BomNewEbomParentVO> voList = listMp.get(key);

14
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
View File

@ -335,25 +335,25 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
} }
protected BomNewEbomChildEntity buildCommonEbomChildEntity(BaseMaterialVO material, BomOriginalListVO parent) { protected BomNewEbomChildEntity buildCommonEbomChildEntity(BaseMaterialVO material, BomOriginalListVO parentV) {
BomNewEbomChildEntity childEntity = new BomNewEbomChildEntity(); BomNewEbomChildEntity childEntity = new BomNewEbomChildEntity();
childEntity.setParentRowId(parent.getEBomRowId() > 0 ? parent.getEBomRowId() : parent.getRowId()); childEntity.setParentRowId(parentV.getEBomRowId() > 0 ? parentV.getEBomRowId() : parentV.getRowId());
childEntity.setOrderNumber("001"); childEntity.setOrderNumber("001");
childEntity.setIdentityNo(StrUtil.join("-", parent.getMaterialNo(), material.getMaterialNo())); childEntity.setIdentityNo(StrUtil.join("-", parentV.getMaterialNo(), material.getMaterialNo()));
//图号=物料编码 //图号=物料编码
childEntity.setDrawingNo(material.getMaterialNo()); childEntity.setDrawingNo(material.getMaterialNo());
childEntity.setMaterialNo(material.getMaterialNo()); childEntity.setMaterialNo(material.getMaterialNo());
childEntity.setMaterialName(material.getMaterialName()); childEntity.setMaterialName(material.getMaterialName());
childEntity.setMaterialDesc(material.getMaterialDesc()); childEntity.setMaterialDesc(material.getMaterialDesc());
childEntity.setMaterialTexture(material.getMaterial()); childEntity.setMaterialTexture(material.getMaterial());
childEntity.setUnitWeight(parent.getUnitWeight()); childEntity.setUnitWeight(parentV.getUnitWeight());
childEntity.setNum(parent.getUnitWeight()); childEntity.setNum(parentV.getUnitWeight());
childEntity.setCreatedBy(SessionUtil.getUserCode()); childEntity.setCreatedBy(SessionUtil.getUserCode());
childEntity.setMaterialUnit("KG"); childEntity.setMaterialUnit("KG");
childEntity.setProjectType("L"); childEntity.setProjectType("L");
childEntity.setMaterialOriginalUnit(material.getMaterialUnit()); childEntity.setMaterialOriginalUnit(material.getMaterialUnit());
childEntity.setSourceRowId(parent.getRowId().toString()); childEntity.setSourceRowId(parentV.getRowId().toString());
parent.setBomExist(1); parentV.setBomExist(1);
// this.eBomChildResult.add(childEntity); // this.eBomChildResult.add(childEntity);
return childEntity; return childEntity;