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 6e2bb72..bc43401 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
@@ -575,6 +575,11 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
             if (StringUtils.isNotBlank(sortCfg.getVehicleNo()) && !sortCfg.getVehicleNo().equals(vehicleNo)){
                 continue;
             }
+            orderAssembly.setDisplayRule(sortCfg.getDisplayRule());
+            orderAssembly.setMatchRule(sortCfg.getMatchRule());
+            orderAssembly.setMatchType(sortCfg.getMatchType());
+            orderAssembly.setPrintType(sortCfg.getPrintType());
+            orderAssembly.setProcessCode(sortCfg.getProcessCode());
             orderAssembly.setDisplaySeq(sortCfg.getDisplaySeq());
             orderAssembly.setDisplayValue(sortCfg.getDisplayValue());
             orderAssembly.setProcessSeq(sortCfg.getProcessSeq());
@@ -613,6 +618,11 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         List<MesProdRuleSortCfg> prodCfgList = mesProdRuleSortCfgRao.findByHqlWhere(reportRuleSortPackBean);
         for (MesProdRuleSortCfg ruleSortCfg : prodCfgList) {
             MesWorkOrderAssembly orderAssembly = new MesWorkOrderAssembly();
+            orderAssembly.setDisplayRule(ruleSortCfg.getDisplayRule());
+            orderAssembly.setMatchRule(ruleSortCfg.getMatchRule());
+            orderAssembly.setMatchType(ruleSortCfg.getMatchType());
+            orderAssembly.setPrintType(ruleSortCfg.getPrintType());
+            orderAssembly.setProcessCode(ruleSortCfg.getProcessCode());
             orderAssembly.setWorkCellCode(ruleSortCfg.getWorkCellCode());
             orderAssembly.setProcessCode(ruleSortCfg.getProcessCode());
             orderAssembly.setProcessName(ruleSortCfg.getProcessName());
@@ -642,6 +652,11 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         List<MesProdRuleSortCfg> ruleSortCfgs = mesProdRuleSortCfgRao.findByHqlWhere(prodRuleSortPublicPackBean);
         for (MesProdRuleSortCfg ruleSortCfg : ruleSortCfgs) {
             MesWorkOrderAssembly orderAssembly = new MesWorkOrderAssembly();
+            orderAssembly.setDisplayRule(ruleSortCfg.getDisplayRule());
+            orderAssembly.setMatchRule(ruleSortCfg.getMatchRule());
+            orderAssembly.setMatchType(ruleSortCfg.getMatchType());
+            orderAssembly.setPrintType(ruleSortCfg.getPrintType());
+            orderAssembly.setProcessCode(ruleSortCfg.getProcessCode());
             orderAssembly.setWorkCellCode(ruleSortCfg.getWorkCellCode());
             orderAssembly.setProcessCode(ruleSortCfg.getProcessCode());
             orderAssembly.setProcessName(ruleSortCfg.getProcessName());
@@ -689,7 +704,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
             MesPartSap partSap = partMap.get(bom.getItemPartNo());
             if (partSap == null) {
                 log.info("工厂:{},零件号:{}未查到零件信息", organizeCode, bom.getItemPartNo());
-                return null;
+                return new ArrayList<>();
             }
             List<MesWorkOrderPart> orderParts = orderPartList.stream().filter(item -> item.getPartNo().equals(partSap.getPartNo())).collect(Collectors.toList());
             if (!orderParts.isEmpty()) {
@@ -750,7 +765,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(productPartNo, "partNo", ddlPackBean);
         List<MesPartSap> parts = mesPartSapRao.findByHqlWhere(ddlPackBean);
-        return parts.isEmpty() ? new MesPartSap() : parts.get(0);
+        return parts.isEmpty() ? null : parts.get(0);
     }
 
     private MesProductVersion getProdVersion(String organizeCode, String partNo) {