From 459fc3bbe8d9875d16910e9fedcced47369d676c Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 19 Mar 2025 14:27:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20mgroup=E5=A2=9E=E5=8A=A0=E8=87=AA?=
 =?UTF-8?q?=E4=BA=A7=E5=92=8C=E5=A4=96=E5=8D=8F=E5=AD=97=E6=AE=B5=E5=8F=8A?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/mtm/migrations/0053_mgroup_mtype.py | 18 ++++++++++++++++++
 apps/mtm/models.py                       |  4 +++-
 apps/wpm/serializers.py                  |  7 ++++---
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 apps/mtm/migrations/0053_mgroup_mtype.py

diff --git a/apps/mtm/migrations/0053_mgroup_mtype.py b/apps/mtm/migrations/0053_mgroup_mtype.py
new file mode 100644
index 00000000..9db021d4
--- /dev/null
+++ b/apps/mtm/migrations/0053_mgroup_mtype.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2025-03-19 06:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mtm', '0052_routepack_document'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='mgroup',
+            name='mtype',
+            field=models.PositiveSmallIntegerField(default=10, help_text='10:自产 20:外协', verbose_name='工段类型'),
+        ),
+    ]
diff --git a/apps/mtm/models.py b/apps/mtm/models.py
index 793ef03e..59f4217d 100644
--- a/apps/mtm/models.py
+++ b/apps/mtm/models.py
@@ -129,11 +129,13 @@ class Team(CommonBModel):
 class Mgroup(CommonBModel):
     """测点集
     """
-
+    M_SELF = 10
+    M_OTHER = 20
     name = models.CharField('名称', max_length=50)
     code = models.CharField('标识', max_length=50, null=True, blank=True)
     cate = models.CharField(
         '分类', max_length=50, default='section', help_text='section/other')  # section是工段
+    mtype = models.PositiveSmallIntegerField("工段类型", default=10, help_text='10:自产 20:外协')
     shift_rule = models.CharField('班次规则', max_length=10, default='默认')
     process = models.ForeignKey(
         Process, verbose_name='工序', on_delete=models.SET_NULL, null=True, blank=True)
diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py
index 6e18bf69..87025663 100644
--- a/apps/wpm/serializers.py
+++ b/apps/wpm/serializers.py
@@ -598,7 +598,8 @@ class MlogInitSerializer(CustomModelSerializer):
         model = Mlog
         fields = ['id', 
         'work_start_time', 'work_end_time', 'mgroup', 'reminder_interval_list', 
-        'route', 'equipment', 'handle_user', 'note', 'mtype', 'supplier', 'test_file', 'test_user', 'test_time', 'oinfo_json', 'is_fix']
+        'route', 'equipment', 'handle_user', 'note', 'supplier', 'test_file', 'test_user', 'test_time', 'oinfo_json', 'is_fix']
+        read_only_fields = ["mtype"]
         extra_kwargs = {
             'work_start_time': {'required': True},
             'route':{'required': False},
@@ -607,10 +608,10 @@ class MlogInitSerializer(CustomModelSerializer):
         }
     
     def validate(self, attrs):
-        mtype = attrs['mtype']
         route: Route = attrs.get('route', None)
         mgroup: Mgroup = attrs['mgroup']
         is_fix:bool = attrs.get('is_fix', False)
+        attrs['mtype'] = mgroup.mtype
         if is_fix:
             attrs["route"] = None
         elif route is None:
@@ -626,7 +627,7 @@ class MlogInitSerializer(CustomModelSerializer):
             attrs['material_in'] = route.material_in
             attrs['material_out'] = route.material_out
         attrs['fill_way'] = Mlog.MLOG_23
-        if mtype == Mlog.MTYPE_OUT:
+        if attrs['mtype']  == Mlog.MTYPE_OUT:
             supplier = attrs.get('supplier', None)
             if not supplier:
                 raise ParseError('外协必须选择外协单位')