diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardVO.java
index ee0acbbd..b50a9dbf 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardVO.java
@@ -55,6 +55,11 @@ public class QmsInspectionStandardVO {
      */
     private Long packagingMethodId;
 
+    /**
+     * 包装类型名称
+     */
+    private String packagingMethodName;
+
     /**
      * 启用状态
      */
diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml
index 84931ba6..4f0a15d1 100644
--- a/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml
@@ -18,6 +18,7 @@
             STRING_AGG(DISTINCT iqe_user.user_name, ',') AS iqeName,
             s.inspection_cycle AS inspectionCycle,
             s.packaging_method_id AS packagingMethodId,
+            di.name AS packagingMethodName,
             s.is_enabled AS isEnabled,
             s.publish_status AS publishStatus,
             s.publish_user_name AS publishUserName,
@@ -31,6 +32,7 @@
         LEFT JOIN qms_inspector_material_item imi ON imi.material_id = m.id
         LEFT JOIN qms_quality_inspector iqe ON imi.inspector_id = iqe.id AND iqe.inspection_type = 1 AND iqe.enable = true
         LEFT JOIN "user" iqe_user ON iqe.user_id = iqe_user.id
+        LEFT JOIN dictionary_item di ON s.packaging_method_id=di.id
         <where>
             <if test="request.materialNo != null and request.materialNo != ''">
                 AND m.material_no ilike concat('%', #{request.materialNo}, '%')
@@ -43,9 +45,9 @@
             </if>
         </where>
         GROUP BY s.id, m.material_no, m.material_category_code_path_name, m.material_desc, m.drawing_no_ver,
-                 s.version, s.inspection_cycle, s.packaging_method_id, s.is_enabled, s.publish_status,
+                 s.version, s.inspection_cycle, s.packaging_method_id, s.is_enabled, s.publish_status,di.name,
                  s.publish_user_name, s.publish_time, s.create_user_name, s.create_time, s.update_user_name, s.update_time
-        ORDER BY s.id DESC
+        ORDER BY s.is_enabled DESC,s.id DESC
     </select>
 
     <!--