Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server

apps/qm/models.py

@@ -9,6 +9,7 @@ from django.utils.translation import gettext_lazy as _
 class NotOkOption(models.TextChoices):
     # 不合格项
     zw = "zw", _("炸纹")
+    zt = "zt", _("炸头")
     tw = "tw", _("条纹")
     qp = "qp", _("气泡")
     wq = "wq", _("弯曲")

apps/wpm/migrations/0073_auto_20241128_0909.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.12 on 2024-11-28 01:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wpm', '0072_handover_note'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='mlog',
+            name='count_n_zt',
+            field=models.PositiveIntegerField(default=0, verbose_name='炸头'),
+        ),
+        migrations.AddField(
+            model_name='mlogb',
+            name='count_n_zt',
+            field=models.PositiveIntegerField(default=0, verbose_name='炸头'),
+        ),
+    ]

apps/wpm/migrations/0074_mlog_count_n_b.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2024-11-28 01:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wpm', '0073_auto_20241128_0909'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='mlog',
+            name='count_n_b',
+            field=models.PositiveIntegerField(default=0, verbose_name='扁'),
+        ),
+    ]

apps/wpm/models.py

@@ -233,6 +233,8 @@ class Mlog(CommonADModel):
     count_n_yd = models.PositiveIntegerField('圆度', default=0)
     count_n_txd = models.PositiveIntegerField('同心度', default=0)
     count_n_hd = models.PositiveIntegerField('厚度', default=0)
+    count_n_zt = models.PositiveIntegerField('炸头', default=0)
+    count_n_b = models.PositiveIntegerField('扁', default=0)   # 光芯七车间
     count_n_qt = models.PositiveIntegerField('其他', default=0)
 
     handle_date = models.DateField('操作日期', null=True, blank=True)
@@ -314,6 +316,7 @@ class Mlogb(BaseModel):
     count_n_yd = models.PositiveIntegerField('圆度', default=0)
     count_n_txd = models.PositiveIntegerField('同心度', default=0)
     count_n_hd = models.PositiveIntegerField('厚度', default=0)
+    count_n_zt = models.PositiveIntegerField('炸头', default=0)
     count_n_qt = models.PositiveIntegerField('其他', default=0)
     count_notok_json = models.JSONField('不合格情况', default=list, blank=True)
 

apps/wpm/services.py

@@ -30,6 +30,8 @@ def generate_new_batch(old_batch: str, mlog: Mlog):
         number = mlog.equipment.number if mlog.equipment else ''
         if number:
             new_batch = f'{new_batch}>{number}'
+        if mlog.index:
+            new_batch = f'{new_batch}>{mlog.index}'
     return new_batch
 
 def find_material_can_change(material: Material, mgroup_to: Mgroup):