diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java
index dc30cd96..d9c69824 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java
@@ -7,6 +7,7 @@ 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.VirtualPackageTypeEnum;
 import com.nflg.product.bomnew.pojo.entity.BomNewPbomChildEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity;
 import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
@@ -63,9 +64,11 @@ public class EBomToPBomForFormal31 extends EBomToPbomBase {
             for (BomNewEbomParentVO data: deliveryPackage1010){
                 List<BomNewEbomParentVO> subVos = new ArrayList<>();// result.stream().filter(u -> u.getLevelNumber().compareTo(data.getLevelNumber()) >= 0 && u.getLevelNumber().compareTo(NumberUtil.add(data.getLevelNumber(),   BigDecimal.valueOf(0.01))) < 0).collect(Collectors.toList());
                 if(data.getMaterialName().contains("仙桃")){
+                    if(!data.getMaterialName().contains(VirtualPackageTypeEnum.PAINT_PACKAGE.getDescription())) {
 //                    subVos = result.stream().filter(u ->  u.getMaterialName().contains("仙桃") &&  u.getLevelNumber().compareTo(data.getLevelNumber()) >= 0 && u.getLevelNumber().compareTo(NumberUtil.add(data.getLevelNumber(),   BigDecimal.valueOf(0.01))) < 0).collect(Collectors.toList());
-                    subVos.add(data);
-                    subVos.addAll(result.stream().filter(u->u.getParentRowId().equals(data.getBomRowId())).collect(Collectors.toList()));
+                        subVos.add(data);
+                        subVos.addAll(result.stream().filter(u -> u.getParentRowId().equals(data.getBomRowId())).collect(Collectors.toList()));
+                    }
                 }
                 else {
 //                    subVos = result.stream().filter(u -> u.getLevelNumber().compareTo(data.getLevelNumber()) >= 0 && u.getLevelNumber().compareTo(NumberUtil.add(data.getLevelNumber(),   BigDecimal.valueOf(0.01))) < 0).collect(Collectors.toList());