From ccbe2b280f6aff559d2b1ca56ea1b1a44687b7f7 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 10 Dec 2021 13:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/mtm/serializers.py | 2 +-
 hb_server/apps/wpm/views.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py
index f00b95d..8e5eb53 100644
--- a/hb_server/apps/mtm/serializers.py
+++ b/hb_server/apps/mtm/serializers.py
@@ -208,7 +208,7 @@ class RecordFormDetailSerializer(serializers.ModelSerializer):
         return queryset
     
     def get_form_fields(self, obj):
-        serializer = RecordFormFieldSerializer(instance=RecordFormField.objects.filter(form=obj, is_deleted=False), many=True)
+        serializer = RecordFormFieldSerializer(instance=RecordFormField.objects.filter(form=obj, is_deleted=False).order_by('sort'), many=True)
         data = serializer.data
         if obj.type == RecordForm.RF_TYPE_TEST:
             for i in data:
diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py
index b34415f..b14872d 100644
--- a/hb_server/apps/wpm/views.py
+++ b/hb_server/apps/wpm/views.py
@@ -208,7 +208,7 @@ class WProductViewSet(ListModelMixin, GenericViewSet):
                 for i in origin_test['record_data_']:
                     o_dict[i['field_key']] = i['field_value']
                 for i in data['form_fields']:
-                    i['origin_value'] = o_dict[i['field_key']]
+                    i['origin_value'] = o_dict[i['field_key']] if i['field_key'] in o_dict else None
             else:
                 raise exceptions.APIException('原工序检验记录不存在')
         else: