diff --git a/apps/wpm/scripts/batch_gxerp.py b/apps/wpm/scripts/batch_gxerp.py
index ab578300..8bff0645 100644
--- a/apps/wpm/scripts/batch_gxerp.py
+++ b/apps/wpm/scripts/batch_gxerp.py
@@ -2,6 +2,7 @@ from apps.wpm.models import BatchSt
 import logging
 from apps.qm.models import Defect
 from apps.wpm.models import Mlogb, MlogbDefect
+from apps.mtm.models import Mgroup
 import decimal
 from django.db.models import Sum
 from datetime import datetime
@@ -17,9 +18,10 @@ def main(batch: str):
     
     data = {"批次号": batch}
 
-    mgroup_names = ["尺寸检验", "外观检验"]
-    for mgroup_name in mgroup_names:
-        mlogb1_qs = Mlogb.objects.filter(mlog__submit_time__isnull=False, material_out__isnull=False, mlog__mgroup__name=mgroup_name, mlog__is_fix=False, batch=batch)
+    mgroup_qs = Mgroup.objects.all().order_by("sort")
+    for mgroup in mgroup_qs:
+        mgroup_name = mgroup.name
+        mlogb1_qs = Mlogb.objects.filter(mlog__submit_time__isnull=False, material_out__isnull=False, mlog__mgroup=mgroup, mlog__is_fix=False, batch=batch)
         if mlogb1_qs.exists():
             data[f"{mgroup_name}_日期"] = []
             data[f"{mgroup_name}_操作人"] = []