splan 增加first_test_ list

hb_server/apps/pm/migrations/0027_auto_20220221_1027.py

@@ -29,11 +29,6 @@ class Migration(migrations.Migration):
             name='first_test',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='qm.testrecord'),
         ),
-        migrations.AddField(
-            model_name='subproductionplan',
-            name='first_test_state',
-            field=models.IntegerField(default=10, verbose_name='首件状态'),
-        ),
         migrations.DeleteModel(
             name='FirstItem',
         ),

hb_server/apps/pm/models.py

@@ -91,8 +91,7 @@ class SubProductionPlan(CommonAModel):
     start_date_real = models.DateField('实际开工日期', null=True, blank=True)
     end_date_real = models.DateField('实际完工日期', null=True, blank=True)
     is_picked = models.BooleanField('是否已领料', default=False)
-
+    
-    first_test_state = models.IntegerField('首件状态', default=SUBPLAN_STATE_PLANING)
     first_test = models.ForeignKey('qm.testrecord', on_delete=models.CASCADE, null=True, blank=True)
     leader_1 = models.ForeignKey(User, on_delete=models.CASCADE,
         verbose_name="工序负责人", null=True, blank=True, related_name='first_leader_1')

hb_server/apps/pm/serializers.py

@@ -1,6 +1,7 @@
 from apps.mtm.models import RecordForm
 from apps.pm.models import ProductionPlan, SubProductionPlan, SubProductionProgress
 from rest_framework import serializers
+from apps.qm.serializers import TestRecordShortSerializer
 from apps.sam.serializers import OrderSerializer, OrderSimpleSerializer
 from apps.mtm.serializers import MaterialSimpleSerializer, ProcessSimpleSerializer, RecordFormSimpleSerializer, SubProductionSimpleSerializer
 from apps.system.serializers import OrganizationSimpleSerializer, UserSimpleSerializer
@@ -42,6 +43,7 @@ class SubProductionPlanListSerializer(DynamicFieldsSerializerMixin, serializers.
     leader_1_ = UserSimpleSerializer(source='leader_1', read_only=True)
     leader_2_ = UserSimpleSerializer(source='leader_2', read_only=True)
     leader_3_ = UserSimpleSerializer(source='leader_3', read_only=True)
+    first_test_ = TestRecordShortSerializer(source='first_test', read_only=True)
     class Meta:
         model=SubProductionPlan
         fields = '__all__'

hb_server/apps/qm/models.py

@@ -61,7 +61,7 @@ class TestRecord(CommonADModel):
     )
     form = models.ForeignKey('mtm.recordform', verbose_name='所用表格', on_delete=models.CASCADE)
     type = models.PositiveSmallIntegerField(choices=type_choice, default=TEST_PROCESS)
-    is_testok = models.BooleanField('是否合格', default=True)
+    is_testok = models.BooleanField('是否合格', null=True, blank=True)
     number = models.CharField('产品编号', null=True, blank=True, max_length=50)
     wproduct = models.ForeignKey('wpm.wproduct', verbose_name='关联的动态产品', on_delete=models.CASCADE, null=True, blank=True, related_name='test_wproduct')
     material = models.ForeignKey('mtm.material', verbose_name='关联的物料状态', on_delete=models.CASCADE, null=True, blank=True)

hb_server/apps/qm/serializers.py

@@ -63,7 +63,11 @@ class TestRecordItemSerializer(serializers.ModelSerializer):
     class Meta:
         model = TestRecordItem
         fields = '__all__'
-        
+
+class TestRecordShortSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = TestRecord
+        fields = ['id', 'form', 'is_testok', 'is_submited']
 class TestRecordCreateSerializer(serializers.ModelSerializer):
     record_data = TestRecordItemCreateSerializer(many=True)
     class Meta: