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 4476cff8..1c7cf273 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", "",1),
     MAKING_PACKAGE(2,"制作包","制作","201101","",2),
     DIRECT_DELIVERY_PACKAGE(4,"直发包","直发","201101","F",4),
-    PRE_ASSEMBLY_PACKAGE(8,"发货前装配包","发货前装配","200601","Z",8),
+    PRE_ASSEMBLY_PACKAGE(8,"发货前装配包","发货前装配","201101","Z",8),
     PAINT_PACKAGE(16, "油漆包", "油漆包", "201101", "", 16);
 
     private final Integer value;
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 ceda3d48..ddcae3a5 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
@@ -134,11 +134,12 @@ public abstract class VirtualPackageBase {
         for (BomNewEbomParentVO ch : child) {
             for (VirtualPackageTypeEnum vpy : virtualPackageTypeEnums) {
                 String vDrawingNo;
-                if (vpy == VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE) {
+                // 20240711 发货前装配包，命名规则也一样
+                /*if (vpy == VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE) {
                     vDrawingNo = String.join("", parentDrawingNo, ".FHQ", "(", ch.getMaterialName(), ")", "(", vpy.getConMaterialName(), ")");
-                } else {
+                } else {*/
                     vDrawingNo = String.join("", "(", parentDrawingNo, ch.getMaterialName(), ")", "(", vpy.getConMaterialName(), ")");
-                }
+                //}
                 vDrawingNoSet.add(vDrawingNo);
             }
         }
@@ -151,11 +152,12 @@ public abstract class VirtualPackageBase {
             for (BomNewEbomParentVO ch : child) {
                 for (VirtualPackageTypeEnum vpy : virtualPackageTypeEnums) {
                     String vDrawingNo;
-                    if (vpy == VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE) {
+                    // 20240711 发货前装配包，命名规则也一样
+                    /*if (vpy == VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE) {
                         vDrawingNo = String.join("", parentDrawingNo, ".FHQ", "(", ch.getMaterialName(), ")", "(", vpy.getConMaterialName(), ")");
-                    } else {
+                    } else {*/
                         vDrawingNo = String.join("", "(", parentDrawingNo, ch.getMaterialName(), ")", "(", vpy.getConMaterialName(), ")");
-                    }
+                    //}
                     params.add(buildAddMaterialParamDo(StrUtil.join("", ch.getRowId().toString(), vpy.getConMaterialName()), vDrawingNo, vDrawingNo, vpy, oldMaterialMap));
                 }
             }