Skip to content

Commit

Permalink
fix: better overlap logic for job card
Browse files Browse the repository at this point in the history
  • Loading branch information
rohitwaghchaure committed Nov 29, 2023
1 parent cf97e3c commit 45d4477
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions erpnext/manufacturing/doctype/job_card/job_card.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,7 @@ def get_overlap_for(self, args, check_next_available_slot=False):
# override capacity for employee
production_capacity = 1

overlap_count = self.get_overlap_count(time_logs)
if time_logs and production_capacity > overlap_count:
if not self.has_overlap(production_capacity, time_logs):
return {}

if self.workstation_type and time_logs:
Expand All @@ -196,16 +195,13 @@ def get_overlap_for(self, args, check_next_available_slot=False):

return time_logs[-1]

@staticmethod
def get_overlap_count(time_logs):
count = 1
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 idx, row in enumerate(time_logs):
next_idx = idx
if idx + 1 < len(time_logs):
next_idx = idx + 1
next_row = time_logs[next_idx]
for row in time_logs:
count = 1
for next_row in time_logs:
if row.name == next_row.name:
continue

Expand All @@ -225,7 +221,10 @@ def get_overlap_count(time_logs):
):
count += 1

return count
if count > production_capacity:
return True

return overlap

def get_time_logs(self, args, doctype, check_next_available_slot=False):
jc = frappe.qb.DocType("Job Card")
Expand Down

0 comments on commit 45d4477

Please sign in to comment.