Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix : efficient job card overlap finding algorithm #15

Closed
wants to merge 1 commit into from
Closed

fix : efficient job card overlap finding algorithm #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 15 additions & 25 deletions erpnext/manufacturing/doctype/job_card/job_card.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,31 +199,21 @@ def has_overlap(self, production_capacity, time_logs):
overlap = False

# Check overlap exists or not between the overlapping time logs with the current Job Card
for row in time_logs:
count = 1
for next_row in time_logs:
if row.name == next_row.name:
continue

if (
(
get_datetime(next_row.from_time) >= get_datetime(row.from_time)
and get_datetime(next_row.from_time) <= get_datetime(row.to_time)
)
or (
get_datetime(next_row.to_time) >= get_datetime(row.from_time)
and get_datetime(next_row.to_time) <= get_datetime(row.to_time)
)
or (
get_datetime(next_row.from_time) <= get_datetime(row.from_time)
and get_datetime(next_row.to_time) >= get_datetime(row.to_time)
)
):
count += 1

if count > production_capacity:
return True

time_logs = sorted(time_logs, key=lambda x: x.get("from_time"))
alloted_capacity ={1: time_logs[0]['to_time']}
sequential_job_card_found = False
for i in range(1,len(time_logs)):

for key in alloted_capacity.keys():
if alloted_capacity[key] <= time_logs[i]['from_time']:
alloted_capacity[key] = time_logs[i]['to_time']
sequential_job_card_found = True
break
if not sequential_job_card_found :
key = key + 1
alloted_capacity[key] = time_logs[i]['to_time']
if len(alloted_capacity) >= production_capacity :
return True
return overlap

def get_time_logs(self, args, doctype, check_next_available_slot=False):
Expand Down
Loading