From 950418a1544add8ec521d8e0f5e1ab314d176fac Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 8 Nov 2021 09:35:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/qm/models.py                    |  2 +-
 ..._wproductrecorddetail_wproductrecorditem.py | 18 ++++++++++++++++++
 hb_server/apps/wpm/models.py                   |  2 +-
 hb_server/apps/wpm/serializers.py              |  8 ++++----
 hb_server/apps/wpm/views.py                    |  6 +++---
 5 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 hb_server/apps/wpm/migrations/0006_rename_wproductrecorddetail_wproductrecorditem.py

diff --git a/hb_server/apps/qm/models.py b/hb_server/apps/qm/models.py
index 5da4930..2d5a917 100644
--- a/hb_server/apps/qm/models.py
+++ b/hb_server/apps/qm/models.py
@@ -54,7 +54,7 @@ class TestRecord(CommonAModel):
     fifo_detail = models.ForeignKey('inm.fifodetail', verbose_name='关联的出入库批次', on_delete=models.CASCADE, null=True, blank=True)
 
 
-class TestRecordDetail(BaseModel):
+class TestRecordItem(BaseModel):
     """
     记录表格字段值
     """
diff --git a/hb_server/apps/wpm/migrations/0006_rename_wproductrecorddetail_wproductrecorditem.py b/hb_server/apps/wpm/migrations/0006_rename_wproductrecorddetail_wproductrecorditem.py
new file mode 100644
index 0000000..b1346c6
--- /dev/null
+++ b/hb_server/apps/wpm/migrations/0006_rename_wproductrecorddetail_wproductrecorditem.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.6 on 2021-11-08 01:35
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mtm', '0028_auto_20211102_1707'),
+        ('wpm', '0005_auto_20211108_0901'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='WProductRecordDetail',
+            new_name='WProductRecordItem',
+        ),
+    ]
diff --git a/hb_server/apps/wpm/models.py b/hb_server/apps/wpm/models.py
index 8566f93..a930c82 100644
--- a/hb_server/apps/wpm/models.py
+++ b/hb_server/apps/wpm/models.py
@@ -70,7 +70,7 @@ class WProductRecord(CommonAModel):
     wproduct_action = models.ForeignKey(WProductAction, verbose_name='关联的生产操作', on_delete=models.CASCADE)
 
 
-class WProductRecordDetail(BaseModel):
+class WProductRecordItem(BaseModel):
     """
     记录表格字段值
     """
diff --git a/hb_server/apps/wpm/serializers.py b/hb_server/apps/wpm/serializers.py
index 876d18e..035fa4a 100644
--- a/hb_server/apps/wpm/serializers.py
+++ b/hb_server/apps/wpm/serializers.py
@@ -8,7 +8,7 @@ from apps.mtm.serializers import MaterialSimpleSerializer
 from apps.pm.models import SubProductionPlan, SubProductionProgress
 from django.utils import timezone
 
-from apps.wpm.models import WMaterial, WProduct, WProductRecord, WProductRecordDetail
+from apps.wpm.models import WMaterial, WProduct, WProductRecord, WProductRecordItem
 
 class PickDetailSerializer(serializers.Serializer):
     material = serializers.PrimaryKeyRelatedField(queryset=Material.objects.all(), label="物料ID")
@@ -95,13 +95,13 @@ class DoOutputSerializer(serializers.Serializer):
     material = serializers.PrimaryKeyRelatedField(queryset=Material.objects.all(), label='物料ID')
     count_output = serializers.IntegerField(min_value=0, label='产出数量')
 
-class WProductRecordDetailSerializer(serializers.ModelSerializer):
+class WProductRecordItemSerializer(serializers.ModelSerializer):
     class Meta:
-        model = WProductRecordDetail
+        model = WProductRecordItem
         fields = ['form_field', 'field_value']
 
 class WProductRecordSerializer(serializers.ModelSerializer):
-    record_data = WProductRecordDetailSerializer(many=True)
+    record_data = WProductRecordItemSerializer(many=True)
     class Meta:
         model = WProductRecord
         fields = ['form', 'record_data']
diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py
index c5ff876..828ac89 100644
--- a/hb_server/apps/wpm/views.py
+++ b/hb_server/apps/wpm/views.py
@@ -12,7 +12,7 @@ from apps.pm.serializers import SubProductionPlanListSerializer, SubProductionPl
 
 from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin
 from rest_framework.decorators import action
-from apps.wpm.models import WMaterial, WProduct, WProductAction, WProductMaterial, WProductRecord, WProductRecordDetail
+from apps.wpm.models import WMaterial, WProduct, WProductAction, WProductMaterial, WProductRecord, WProductRecordItem
 
 from apps.wpm.serializers import PickSerializer, WActionInitSerializer, WActionSubmitSerializer, WMaterialListSerializer
 from rest_framework.response import Response
@@ -181,8 +181,8 @@ class DoFormSubmit(CreateAPIView, GenericAPIView):
                 m['field_value'] = form_field.field_value
                 m['sort'] = form_field.sort
                 m['wproduct_record'] = wr
-                wrds.append(WProductRecordDetail(**m))
-            WProductRecordDetail.objects.bulk_create(wrds)
+                wrds.append(WProductRecordItem(**m))
+            WProductRecordItem.objects.bulk_create(wrds)
         return Response()
 
         
\ No newline at end of file