diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java
index dde46b3..9d086dc 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java
@@ -421,7 +421,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
 
         //  生成装配件清单
         if (isModifyPOrder){
-            mesWorkOrder.setOrderFlag(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P_SORT.getValue());
+            mesWorkOrder.setOrderFlag(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.PTR.getValue());
         }else {
             mesWorkOrder.setOrderFlag(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.N.getValue());
         }
@@ -512,7 +512,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
     }
 
 
-    private List<MesWorkOrderAssembly> getAssemblyList(String workCenterCode, String VehicleNo, List<MesWorkOrderPart> workOrderPartList, MesPartProdGroup mesPartProdGroup) {
+    private List<MesWorkOrderAssembly> getAssemblyList(String workCenterCode, String vehicleNo, List<MesWorkOrderPart> workOrderPartList, MesPartProdGroup mesPartProdGroup) {
         //TM_BAS_WORK_ORDER_ASSEMBLY_SETTING 对应  mes_prod_rule_sort_cfg 排序生产规则
 
         List<MesWorkOrderAssembly> workOrderAssemblyList = new ArrayList<>();
@@ -541,7 +541,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
                 }
             }
             //2.当排序规则的车型不为空时，则需要与参数匹配，如果不符合 则不加这个装配项
-            if (StringUtils.isNotBlank(sortCfg.getVehicleNo()) && !sortCfg.getVehicleNo().equals(VehicleNo)){
+            if (StringUtils.isNotBlank(sortCfg.getVehicleNo()) && !sortCfg.getVehicleNo().equals(vehicleNo)){
                 continue;
             }
             orderAssembly.setDisplaySeq(sortCfg.getDisplaySeq());
@@ -568,7 +568,32 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
             workOrderAssemblyList.add(orderAssembly);
         }
 
-
+        //车型不为空的逻辑--用于报工
+        DdlPackBean reportRuleSortPackBean = DdlPackBean.getDdlPackBean(mesPartProdGroup.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(workCenterCode, "workCenterCode", reportRuleSortPackBean);
+        DdlPreparedPack.getStringEqualPack(vehicleNo, "vehicleNo", reportRuleSortPackBean);
+        DdlPreparedPack.getNotInPack(partNoList, "assemblyPartNo", reportRuleSortPackBean);
+        //查询当前产线的所有排序生产规则--分为当前工单清单的装配件
+        List<MesProdRuleSortCfg> prodCfgList = mesProdRuleSortCfgRao.findByHqlWhere(reportRuleSortPackBean);
+        for (MesProdRuleSortCfg ruleSortCfg : prodCfgList) {
+            MesWorkOrderAssembly orderAssembly = new MesWorkOrderAssembly();
+            orderAssembly.setWorkCellCode(ruleSortCfg.getWorkCellCode());
+            orderAssembly.setProcessCode(ruleSortCfg.getProcessCode());
+            orderAssembly.setProcessName(ruleSortCfg.getProcessName());
+            orderAssembly.setCraftCode(ruleSortCfg.getCraftCode());
+            orderAssembly.setRouteSeq(ruleSortCfg.getRouteSeq());
+            orderAssembly.setEquipmentCode(ruleSortCfg.getEquipmentCode());
+            orderAssembly.setReportType(ruleSortCfg.getReportType());
+            orderAssembly.setReportPartNo(ruleSortCfg.getReportPartNo());
+            orderAssembly.setProcessSeq(ruleSortCfg.getProcessSeq());
+            orderAssembly.setPid(ruleSortCfg.getId());
+            orderAssembly.setImageFileId(ruleSortCfg.getImageFileId());
+            orderAssembly.setPartTypeCode(ruleSortCfg.getPartTypeCode());
+            orderAssembly.setMaxValue(ruleSortCfg.getMaxValue());
+            orderAssembly.setMinValue(ruleSortCfg.getMinValue());
+            orderAssembly.setProductPartNo(ruleSortCfg.getProductPartNo());
+            workOrderAssemblyList.add(orderAssembly);
+        }
         //查询所有共用的零件 且没有零件号，多用于螺钉---查询排序加工规则
         DdlPackBean prodRuleSortPublicPackBean = DdlPackBean.getDdlPackBean(mesPartProdGroup.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(workCenterCode, "workCenterCode", prodRuleSortPublicPackBean);