apps/wpm/models.py

@@ -721,8 +721,7 @@ class Handover(CommonADModel):
 
     @property
     def handoverb(self):
-        # 用反向关联管理器, 以命中 list 接口的 Prefetch("b_handover") 缓存, 避免 N+1
-        return self.b_handover.all()
+        return Handoverb.objects.filter(handover=self)
 
 class Handoverb(BaseModel):
     """TN: 子级交接记录

apps/wpm/views.py

@@ -285,7 +285,6 @@ class MlogViewSet(CustomModelViewSet):
         "handle_user",
         "equipment",
         "mgroup",
-        "mgroup__belong_dept",
         "material_in",
         "material_out",
         "material_in__process",
@@ -299,22 +298,7 @@ class MlogViewSet(CustomModelViewSet):
     #                          'equipment_2', 'material_in', 'material_out', 'route__routepack', 'submit_user',
     #                          'supplier', 'ticket', 'mgroup__process', 'test_user', 'handle_leader', 'test_user', 'team',
     #                          'material_in__process', 'material_out__process', "shift", "route"]
-    prefetch_related_fields = [
-        "handle_users",
-        "material_outs",
-        "equipments",
-        # 以下为可选的一对一/外键, 用 prefetch(每个关系仅 1 条 IN 查询)避免 N+1
-        # 又不加宽主查询的 JOIN
-        "team",
-        "supplier",
-        "mtask",
-        "shift",
-        "test_user",
-        "handle_user_2",
-        "handle_leader",
-        "equipment_2",
-        "ticket__state",
-    ]
+    prefetch_related_fields = ["handle_users", "material_outs", "equipments"]
     filterset_class = MlogFilter
     search_fields = [
         "material_in__name",
@@ -358,7 +342,27 @@ class MlogViewSet(CustomModelViewSet):
         ]
     )
     def list(self, request, *args, **kwargs):
-        return super().list(request, *args, **kwargs)
+        from django.db import connection
+        from django.conf import settings
+
+        # 清空之前的查询记录
+        connection.queries_log.clear()
+
+        # 调用父类的 list 方法
+        response = super().list(request, *args, **kwargs)
+
+        # 获取执行的 SQL 查询
+        queries = connection.queries
+        sql_queries = []
+
+        for query in queries:
+            sql_queries.append({"sql": query["sql"], "time": query["time"], "params": query.get("params", [])})
+
+        # 将 SQL 信息添加到响应中（仅在调试模式）
+        if settings.DEBUG:
+            response.data["_debug"] = {"sql_queries": sql_queries, "total_queries": len(queries), "total_time": sum(float(q["time"]) for q in queries)}
+
+        return response
 
     def add_info_for_list(self, data):
         czx_dict = {}
@@ -586,10 +590,10 @@ class HandoverViewSet(CustomModelViewSet):
     queryset = Handover.objects.all()
     list_serializer_class = HandoverListSerializer
     serializer_class = HandoverSerializer
-    select_related_fields = ["send_user", "send_mgroup", "send_dept", "recive_user", "recive_mgroup", "recive_dept", "wm", "material_changed", "material", "material__process"]
+    select_related_fields = ["send_user", "send_mgroup", "send_dept", "recive_user", "recive_mgroup", "recive_dept", "wm", "material_changed", "material"]
     filterset_class = HandoverFilter
     search_fields = ["material__name", "material__number", "material__specification", "batch", "material__model", "b_handover__batch", "new_batch", "wm__batch"]
-    prefetch_related_fields = [Prefetch("b_handover", queryset=Handoverb.objects.select_related("wm__defect")), "ticket__state"]
+    prefetch_related_fields = [Prefetch("b_handover", queryset=Handoverb.objects.select_related("wm__defect"))]
 
     def perform_destroy(self, instance: Handover):
         user = self.request.user
@@ -778,7 +782,7 @@ class MlogbViewSet(CustomListModelMixin, CustomGenericViewSet):
     perms_map = {"get": "*"}
     queryset = Mlogb.objects.all()
     serializer_class = MlogbDetailSerializer
-    select_related_fields = ["material_out", "material_out__process", "material_in", "material_in__process", "test_user", "wm_in__defect"]
+    select_related_fields = ["material_out", "material_in", "test_user", "wm_in__defect"]
     prefetch_related_fields = [
         Prefetch("mlogbdefect_set", queryset=MlogbDefect.objects.select_related("defect")),
     ]

changelog.md

@@ -1,13 +1,3 @@
-## 3.1.2026071614
-
-- feat: 新增功能
-  - 合格B类字段前端文案改为"记为合格"更准确表达 [caoqianming]
-- fix: 问题修复
-  - 发货编号获取接口number_out_last兼容无横杠格式避免明细重复编号 [caoqianming]
-- other: 其他变更
-  - perf:mlog/handover/mlogb列表消除N+1,select_related精简改prefetch,修Handover.handoverb属性绕过prefetch的bug [caoqianming]
-  - 车间库存列表补齐关联字段select_related,消除剩余N+1 [caoqianming]
-  - perf:销售发货批次隐藏可发数量为0的批次,并用子查询消除在途量N+1 [caoqianming]
 ## 3.1.2026071608
 
 - feat: 新增功能

server/settings.py

@@ -35,7 +35,7 @@ sys.path.insert(0, os.path.join(BASE_DIR, 'apps'))
 ALLOWED_HOSTS = ['*']
 
 SYS_NAME = '星途工厂综合管理系统'
-SYS_VERSION = '3.1.2026071614'
+SYS_VERSION = '3.1.2026071608'
 X_FRAME_OPTIONS = 'SAMEORIGIN'
 
 # Application definition

update_changelog.sh

@@ -33,12 +33,9 @@ process_commits() {
   local type="$1"
   local header="$2"
   local pattern="$3"
-  local invert="$4"  # 传 "invert" 则取"不匹配 pattern 的提交"(用于 other 兜底)
-
+  
   # 查找匹配类型的提交
-  local grep_flag="-E"
-  [ "$invert" = "invert" ] && grep_flag="-vE"
-  git log $RANGE --no-merges --pretty=format:"%s | %an | %ad" --date=short | grep $grep_flag "$pattern" | while read -r line; do
+  git log $RANGE --no-merges --pretty=format:"%s | %an | %ad" --date=short | grep -E "$pattern" | while read -r line; do
     COMMIT_MSG=$(echo "$line" | cut -d'|' -f1 | sed 's/^ *//;s/ *$//')
     AUTHOR=$(echo "$line" | cut -d'|' -f2 | sed 's/^ *//;s/ *$//')
     DATE=$(echo "$line" | cut -d'|' -f3 | sed 's/^ *//;s/ *$//')
@@ -58,7 +55,7 @@ process_commits() {
 # 处理各类型提交（按优先级排序）
 printed_header=0; process_commits "feat" "feat: 新增功能" "^[fF]eat"
 printed_header=0; process_commits "fix" "fix: 问题修复" "^[fF]ix"
-printed_header=0; process_commits "" "other: 其他变更" "^([fF]eat|[fF]ix)" "invert"
+printed_header=0; process_commits "" "other: 其他变更" "^((?![fF]eat|[fF]ix).)*$"
 
 # 合并到原文件
 if [ -f changelog.md ]; then