diff --git a/apps/pm/services.py b/apps/pm/services.py index d54315a6..7e3213df 100644 --- a/apps/pm/services.py +++ b/apps/pm/services.py @@ -25,7 +25,8 @@ class PmService: while indx < rate_len: if indx + 1 == rate_len: # 循环到最后一步 break - xcount = xcount/(rate_list[indx+1]/100) + rate, div_number = rate_list[indx+1] + xcount = xcount/(rate/100)/div_number indx = indx + 1 r_list.append(math.ceil(xcount)) return r_list @@ -130,7 +131,7 @@ class PmService: if not rqs.exists(): raise ParseError('未配置工艺路线') # 通过出材率校正任务数, out_rate 默认为 100 - out_rate_list = [rq.out_rate for rq in rqs] + out_rate_list = [(rq.out_rate, rq.div_number) for rq in rqs] count_task_list = cls.cal_real_task_count(count,out_rate_list) # 创建小任务 for ind, val in enumerate(rqs):