Merge branch 'erp1'

apps/qm/migrations/0015_ftestwork_count_ok.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2024-07-23 04:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('qm', '0014_alter_ftest_test_group'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ftestwork',
+            name='count_ok',
+            field=models.IntegerField(default=0, verbose_name='合格数量'),
+        ),
+    ]

apps/qm/models.py

@@ -83,6 +83,7 @@ class FtestWork(CommonBDModel):
     batch = models.CharField('生产批次', max_length=20)
     count = models.IntegerField('总数量')
     count_sampling = models.IntegerField('抽检数量', default=0)
+    count_ok = models.IntegerField('合格数量', default=0)
 
 
 class Ftest(CommonBDModel):