zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: utask指定mgroup也可以直接分解

This commit is contained in:
caoqianming 2023-10-26 10:01:53 +08:00
parent add92c8daa
commit 5eb4eaaaec
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
apps/pm/services.py
View File

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