From 5eb4eaaaec4cc68aa9a264a65dd6cdf06bcff8d1 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 26 Oct 2023 10:01:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20utask=E6=8C=87=E5=AE=9Amgroup=E4=B9=9F?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=9B=B4=E6=8E=A5=E5=88=86=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/pm/services.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/apps/pm/services.py b/apps/pm/services.py
index dfddfff5..bbf83381 100644
--- a/apps/pm/services.py
+++ b/apps/pm/services.py
@@ -64,22 +64,22 @@ class PmService:
         # 计算相差天数
         rela_days = (end_date - start_date).days + 1
         if utask.mgroup:  # 如果存在指定的mgroup则直接排产
-            pass
-            # if rela_days > 1:
-            #     for i in range(rela_days):
-            #         task_date = start_date + timedelta(days=i)
-            #         Mtask.objects.create(**{
-            #             'number': f'{number}_r{ind+1}_{i+1}',
-            #             'material_out': halfgood,
-            #             'material_in': material_in,
-            #             'mgroup': mgroup,
-            #             'count': task_count_day,
-            #             'start_date': task_date,
-            #             'end_date':  task_date,
-            #             'utask': utask,
-            #             'create_by': user,
-            #             'update_by': user
-            #         })
+            if rela_days >= 1:
+                task_count_day = math.ceil(count/rela_days)
+                for i in range(rela_days):
+                    task_date = start_date + timedelta(days=i)
+                    Mtask.objects.create(**{
+                        'number': f'{number}_{i+1}',
+                        'material_out': utask.material,
+                        'material_in': utask.material_in,
+                        'mgroup': utask.mgroup,
+                        'count': task_count_day,
+                        'start_date': task_date,
+                        'end_date':  task_date,
+                        'utask': utask,
+                        'create_by': user,
+                        'update_by': user
+                    })
         else:
             # 获取产品的加工路线
             rqs = Route.get_routes(product)
@@ -113,7 +113,7 @@ class PmService:
                         else:
                             task_count = math.ceil(count / val.out_rate)
                     task_count_day = math.ceil(task_count/rela_days)
-                    if rela_days > 1:
+                    if rela_days >= 1:
                         for i in range(rela_days):
                             task_date = start_date + timedelta(days=i)
                             Mtask.objects.create(**{