diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/VirtualPackageTypeEnum.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/VirtualPackageTypeEnum.java
index b331bc83..c6b63192 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/VirtualPackageTypeEnum.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/VirtualPackageTypeEnum.java
@@ -13,7 +13,7 @@ public enum VirtualPackageTypeEnum  implements  ValueEnum<Integer>{
     DELIVERY_PACKAGE(1,"发货包","发货" ,"201101", ""),
     MAKING_PACKAGE(2,"制作包","制作","201101",""),
     DIRECT_DELIVERY_PACKAGE(4,"直发包","直发","201101","F"),
-    PRE_ASSEMBLY_PACKAGE(8,"发货前装配包","发货前装配","201201","Z");
+    PRE_ASSEMBLY_PACKAGE(8,"发货前装配包","发货前装配","200601","Z");
 
     private final Integer value;
     private final String description;
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java
index ac2c8408..f391116d 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java
@@ -80,11 +80,11 @@ public abstract class VirtualPackageBase {
      * @param virtualPackageTypeEnums
      * @return
      */
-    protected void generateVMNoF21(String materialDesc, List<BomNewEbomParentVO> child,VirtualPackageTypeEnum ... virtualPackageTypeEnums){
+    protected void generateVMNoF21(String parentDrawingNo, List<BomNewEbomParentVO> child,VirtualPackageTypeEnum ... virtualPackageTypeEnums){
         List<AddVirtrualMaterialDTO> params=new ArrayList<>();
         for ( BomNewEbomParentVO ch: child ) {
             for (VirtualPackageTypeEnum vpy : virtualPackageTypeEnums) {
-                String  vDrawingNo = String.join("","(",materialDesc,")","(",vpy.getConMaterialName(),")" );
+                String vDrawingNo = String.join("",parentDrawingNo,".FHQ","(",ch.getMaterialName(),")","(",vpy.getConMaterialName(),")");
                 params.add(buildAddMaterialParamDo(StrUtil.join("",ch.getRowId().toString(), vpy.getConMaterialName()), vDrawingNo, vDrawingNo, vpy));
             }
         }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageFor21.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageFor21.java
index 0cc1f7e6..6b15d062 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageFor21.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageFor21.java
@@ -1,16 +1,11 @@
 package com.nflg.product.bomnew.service.domain.EBom;
 
 import cn.hutool.core.convert.Convert;
-import cn.hutool.extra.spring.SpringUtil;
 import com.google.common.collect.ImmutableList;
-import com.nflg.product.base.core.exception.NflgBusinessException;
 import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum;
-import com.nflg.product.bomnew.pojo.dto.AddVirtrualMaterialDTO;
 import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
 import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
-import com.nflg.product.bomnew.service.BomNewEbomParentService;
-import nflg.product.common.constant.STATE;
 
 import java.io.IOException;
 import java.util.List;
@@ -45,10 +40,10 @@ public class VirtualPackageFor21 extends VirtualPackageBase {
         BomNewEbomParentVO vo= Convert.convert(BomNewEbomParentVO.class,parent );
 
         if(virtualPackageValue.contains(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getValue()) && (parent.getVirtrualPackageEnum()| VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getValue())!=VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getValue()){
-            generateVMNoF21(parent.getMaterialDesc(), ImmutableList.of(vo),VirtualPackageTypeEnum.MAKING_PACKAGE, VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE,VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE);
+            generateVMNoF21(parent.getDrawingNo(), ImmutableList.of(vo),VirtualPackageTypeEnum.MAKING_PACKAGE, VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE,VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE);
         }
         else {
-            generateVMNoF21(parent.getMaterialDesc(),ImmutableList.of(vo),VirtualPackageTypeEnum.MAKING_PACKAGE, VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE);
+            generateVMNoF21(parent.getDrawingNo(),ImmutableList.of(vo),VirtualPackageTypeEnum.MAKING_PACKAGE, VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE);
         }