Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_server/apps/inm/serializers.py

@@ -121,6 +121,7 @@ class FIFOItemSerializer(serializers.ModelSerializer):
     warehouse_ = WareHouseSimpleSerializer(source='warehouse', read_only=True)
     material_ = MaterialSimpleSerializer(source='material', read_only=True)
     files_ = FileSimpleSerializer(source='files', many=True, read_only=True)
+    test = serializers.PrimaryKeyRelatedField(source='test_fifoitem', read_only=True, many=True) 
     class Meta:
         model = FIFOItem
         fields = '__all__'

hb_server/apps/qm/migrations/0028_alter_testrecord_fifo_item.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.9 on 2022-03-25 00:51
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inm', '0034_alter_fifo_sale'),
+        ('qm', '0027_alter_testrecord_subproduction_plan'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='testrecord',
+            name='fifo_item',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='test_fifoitem', to='inm.fifoitem', verbose_name='关联的出入库批次'),
+        ),
+    ]

hb_server/apps/qm/models.py

@@ -67,7 +67,7 @@ class TestRecord(CommonADModel):
     material = models.ForeignKey('mtm.material', verbose_name='关联的物料状态', on_delete=models.CASCADE, null=True, blank=True)
     step = models.ForeignKey('mtm.step', verbose_name='关联的工序步骤', on_delete=models.CASCADE, null=True, blank=True)
     subproduction_plan = models.ForeignKey('pm.subproductionplan', verbose_name='关联的生产子计划', on_delete=models.CASCADE, null=True, blank=True, related_name='test_subplan')
-    fifo_item = models.ForeignKey('inm.fifoitem', verbose_name='关联的出入库批次', on_delete=models.CASCADE, null=True, blank=True)
+    fifo_item = models.ForeignKey('inm.fifoitem', verbose_name='关联的出入库批次', on_delete=models.CASCADE, null=True, blank=True, related_name='test_fifoitem')
     origin_test = models.ForeignKey('self', verbose_name='原检验记录', on_delete=models.CASCADE, null=True, blank=True)
     is_submited = models.BooleanField('是否提交', default=False)
     is_midtesting = models.BooleanField('是否子工序检验中', default=False)