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(**{