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 bc43401..db2442a 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
@@ -476,6 +476,8 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         mesWorkOrderService.doSaveWorkOrderPrintQueue(mesWorkOrder);
         if (!assemblyList.isEmpty()) {
             for (MesWorkOrderAssembly orderAssembly : assemblyList) {
+                orderAssembly.setPartNo(mesWorkOrder.getPartNo());
+                orderAssembly.setPartName(mesWorkOrder.getPartName());
                 orderAssembly.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
                 orderAssembly.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue());
                 orderAssembly.setOrganizeCode(organizeCode);
@@ -558,8 +560,6 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         Map<String, List<MesWorkOrderPart>> orderPartMap = workOrderPartList.stream().collect(Collectors.groupingBy(MesWorkOrderPart::getPartNo));
         //遍历排序生产规则
         for (MesProdRuleSortCfg sortCfg : sortCfgListFilter) {
-            String t = sortCfg.getAssemblyPartNo();
-            System.out.println(sortCfg.getAssemblyPartNo());
             List<MesWorkOrderPart> orderPartList = orderPartMap.get(sortCfg.getAssemblyPartNo());
             MesWorkOrderAssembly orderAssembly = new MesWorkOrderAssembly();
             MesWorkOrderPart orderPart = orderPartList.get(0);
@@ -575,6 +575,10 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
             if (StringUtils.isNotBlank(sortCfg.getVehicleNo()) && !sortCfg.getVehicleNo().equals(vehicleNo)){
                 continue;
             }
+            orderAssembly.setAssemblyPartNo(sortCfg.getAssemblyPartNo());
+            orderAssembly.setAssemblyPartName(sortCfg.getAssemblyPartName());
+            orderAssembly.setProcessName(sortCfg.getProcessName());
+            orderAssembly.setWorkCenterCode(sortCfg.getWorkCenterCode());
             orderAssembly.setDisplayRule(sortCfg.getDisplayRule());
             orderAssembly.setMatchRule(sortCfg.getMatchRule());
             orderAssembly.setMatchType(sortCfg.getMatchType());
@@ -586,8 +590,8 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
             orderAssembly.setCraftName(sortCfg.getCraftName());
             orderAssembly.setCraftCode(sortCfg.getCraftCode());
             orderAssembly.setRouteSeq(sortCfg.getRouteSeq());
-            orderAssembly.setPartNo(orderPart.getPartNo());
-            orderAssembly.setPartName(orderPart.getPartName());
+//            orderAssembly.setPartNo(orderPart.getPartNo());
+//            orderAssembly.setPartName(orderPart.getPartName());
             orderAssembly.setWorkCellCode(sortCfg.getWorkCellCode());
             orderAssembly.setOrderPartId(orderPart.getId().toString());
             orderAssembly.setEquipmentCode(sortCfg.getEquipmentCode());
@@ -618,6 +622,11 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         List<MesProdRuleSortCfg> prodCfgList = mesProdRuleSortCfgRao.findByHqlWhere(reportRuleSortPackBean);
         for (MesProdRuleSortCfg ruleSortCfg : prodCfgList) {
             MesWorkOrderAssembly orderAssembly = new MesWorkOrderAssembly();
+            orderAssembly.setAssemblyPartNo(ruleSortCfg.getAssemblyPartNo());
+            orderAssembly.setAssemblyPartName(ruleSortCfg.getAssemblyPartName());
+            orderAssembly.setProcessName(ruleSortCfg.getProcessName());
+            orderAssembly.setWorkCenterCode(ruleSortCfg.getWorkCenterCode());
+
             orderAssembly.setDisplayRule(ruleSortCfg.getDisplayRule());
             orderAssembly.setMatchRule(ruleSortCfg.getMatchRule());
             orderAssembly.setMatchType(ruleSortCfg.getMatchType());
@@ -652,6 +661,10 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         List<MesProdRuleSortCfg> ruleSortCfgs = mesProdRuleSortCfgRao.findByHqlWhere(prodRuleSortPublicPackBean);
         for (MesProdRuleSortCfg ruleSortCfg : ruleSortCfgs) {
             MesWorkOrderAssembly orderAssembly = new MesWorkOrderAssembly();
+            orderAssembly.setAssemblyPartNo(ruleSortCfg.getAssemblyPartNo());
+            orderAssembly.setAssemblyPartName(ruleSortCfg.getAssemblyPartName());
+            orderAssembly.setProcessName(ruleSortCfg.getProcessName());
+            orderAssembly.setWorkCenterCode(ruleSortCfg.getWorkCenterCode());
             orderAssembly.setDisplayRule(ruleSortCfg.getDisplayRule());
             orderAssembly.setMatchRule(ruleSortCfg.getMatchRule());
             orderAssembly.setMatchType(ruleSortCfg.getMatchType());