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

1、31F项问题修复

This commit is contained in:
大米 2024-05-28 12:13:20 +08:00
parent a990f4804e
commit ec0ab3f202
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/VirtualPackageTypeEnum.java
View File

@ -9,17 +9,18 @@ import lombok.Getter;
public enum VirtualPackageTypeEnum implements ValueEnum<Integer>{ public enum VirtualPackageTypeEnum implements ValueEnum<Integer>{
//1-发货包 2-制作包 4-直发包 8-发货前装配包 //1-发货包 2-制作包 4-直发包 8-发货前装配包
UN_VIRTUAL_PACKAGE(0,"非虚拟包","" ,"", ""), UN_VIRTUAL_PACKAGE(0,"非虚拟包","" ,"", "",""),
DELIVERY_PACKAGE(1,"发货包","(发货)" ,"201101", ""), DELIVERY_PACKAGE(1,"发货包","发货" ,"201101", "","(发货)"),
MAKING_PACKAGE(2,"制作包","(制作)","201101",""), MAKING_PACKAGE(2,"制作包","制作","201101","","(制作)"),
DIRECT_DELIVERY_PACKAGE(4,"直发包","(直发)","201101","F"), DIRECT_DELIVERY_PACKAGE(4,"直发包","直发","201101","F","(直发)"),
PRE_ASSEMBLY_PACKAGE(8,"发货前装配包","(发货前装配)","200601","Z"); PRE_ASSEMBLY_PACKAGE(8,"发货前装配包","发货前装配","200601","Z","(发货前装配)");
private final Integer value; private final Integer value;
private final String description; private final String description;
private final String conMaterialName; private final String conMaterialName;
private final String materialCategoryCode; private final String materialCategoryCode;
private final String productTypeKey; private final String productTypeKey;
private final String findConMaterialName;
public static Integer getAll(){ public static Integer getAll(){

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

@ -44,7 +44,7 @@ public class EBomToPBomFor31 extends EBomToPbomBase {
this.facCodes=new ArrayList<>(); this.facCodes=new ArrayList<>();
//1020数据 //1020数据
List<BomNewEbomParentVO> data1020=new ArrayList<>(); List<BomNewEbomParentVO> data1020=new ArrayList<>();
List<BomNewEbomParentVO> deliveryPackage1020 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && u.getMaterialName().contains("仙桃") && u.getMaterialName().contains("发货")).collect(Collectors.toList()); List<BomNewEbomParentVO> deliveryPackage1020 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && u.getMaterialName().contains("仙桃") && u.getMaterialName().contains("(发货)")).collect(Collectors.toList());
if(CollUtil.isNotEmpty(deliveryPackage1020)){ if(CollUtil.isNotEmpty(deliveryPackage1020)){
facCodes.add(EBomConstant.XIAN_TAO_FACTORY_CODE_1020); facCodes.add(EBomConstant.XIAN_TAO_FACTORY_CODE_1020);
data1020.add(parent); data1020.add(parent);
@ -58,7 +58,7 @@ public class EBomToPBomFor31 extends EBomToPbomBase {
//1010 数据 //1010 数据
List<BomNewEbomParentVO> data1010=new ArrayList<>(); List<BomNewEbomParentVO> data1010=new ArrayList<>();
List<BomNewEbomParentVO> deliveryPackage1010 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && !u.getMaterialName().contains("仙桃") && u.getMaterialName().contains("发货")).collect(Collectors.toList()); List<BomNewEbomParentVO> deliveryPackage1010 = result.stream().filter(u -> u.getParentRowId().equals(parent.getRowId()) && !u.getMaterialName().contains("仙桃") && u.getMaterialName().contains("(发货)")).collect(Collectors.toList());
if(CollUtil.isNotEmpty(deliveryPackage1010)){ if(CollUtil.isNotEmpty(deliveryPackage1010)){
facCodes.add(EBomConstant.MAIN_FACTORY_CODE_1010); facCodes.add(EBomConstant.MAIN_FACTORY_CODE_1010);
data1010.add(parent); data1010.add(parent);

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

@ -383,7 +383,7 @@ public abstract class EBomToPbomBase {
String preAssemblyPackageLevelNo = StrUtil.isNotBlank(parentDrawingNoRe) ? StrUtil.join("-", parentDrawingNoRe, "1") : "1"; String preAssemblyPackageLevelNo = StrUtil.isNotBlank(parentDrawingNoRe) ? StrUtil.join("-", parentDrawingNoRe, "1") : "1";
for (BomNewEbomParentVO firstLevelBom : firstLevelBoms) { for (BomNewEbomParentVO firstLevelBom : firstLevelBoms) {
if (firstLevelBom.getMaterialName().contains(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getConMaterialName()) || firstLevelBom.getMaterialName().contains(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getConMaterialName())) { if (firstLevelBom.getMaterialName().contains(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getFindConMaterialName()) || firstLevelBom.getMaterialName().contains(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getFindConMaterialName())) {
firstLevelBom.setLevelNumber(levelToNum(preAssemblyPackageLevelNo)); firstLevelBom.setLevelNumber(levelToNum(preAssemblyPackageLevelNo));
firstLevelBom.setLevelNo(preAssemblyPackageLevelNo); firstLevelBom.setLevelNo(preAssemblyPackageLevelNo);
continue; continue;