From 99ab4e195752a8607892bc90686a4fed8a317101 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 1 Aug 2024 09:20:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20mlogbin=20create=E6=97=B6=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=BC=96=E5=8F=B7=E5=8F=98=E6=9B=B42?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wpm/views.py | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/apps/wpm/views.py b/apps/wpm/views.py
index 97aeeda8..b36f11ab 100644
--- a/apps/wpm/views.py
+++ b/apps/wpm/views.py
@@ -470,7 +470,6 @@ class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, Cust
         # 创建输出
         if ins.mtask and ins.material_in:
             material_out = mlog.material_out
-            route = mlog.route
             if material_out is None:
                 raise ParseError('产物不可为空')
             m_dict = {
@@ -478,19 +477,16 @@ class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, Cust
                 "mlog": ins.mlog,
                 "material_out": ins.mlog.material_out
             }
-            if route.batch_bind:  # 批次绑定
-                m_dict['batch'] = ins.batch
-            else:
-                new_batch = ins.batch
-                if mlog.mtype == Mlog.MTYPE_OUT:
-                    supplier_number = supplier.number if supplier else ''
-                    if supplier_number:
-                        new_batch = f'{new_batch}{supplier_number}'
-                elif process.batch_append_equip:
-                    number = mlog.equipment.number if mlog.equipment else ''
-                    if number:
-                        new_batch = f'{new_batch}{number}'
-                m_dict['batch'] = new_batch
+            new_batch = ins.batch
+            if mlog.mtype == Mlog.MTYPE_OUT:
+                supplier_number = supplier.number if supplier else ''
+                if supplier_number:
+                    new_batch = f'{new_batch}{supplier_number}'
+            elif process.batch_append_equip:
+                number = mlog.equipment.number if mlog.equipment else ''
+                if number:
+                    new_batch = f'{new_batch}{number}'
+            m_dict['batch'] = new_batch
             Mlogb.objects.get_or_create(**m_dict, defaults=m_dict)