nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 16:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: job card overlap validation (backport #38345) (#38347)

Browse Source 
* fix: job card overlap validation (#38345)

(cherry picked from commit d8245cef72)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot]
2023-11-26 17:44:02 +05:30
committed by GitHub
parent f7c820ffad
commit 9cf8955d24
1 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
erpnext/manufacturing/doctype/job_card/job_card.py
View File

@@ -181,7 +181,14 @@ class JobCard(Document):
query = (
frappe.qb.from_(jctl)
.from_(jc)
.select(jc.name.as_("name"), jctl.to_time, jc.workstation, jc.workstation_type)
.select(
jc.name.as_("name"),
jctl.name.as_("row_name"),
jctl.from_time,
jctl.to_time,
jc.workstation,
jc.workstation_type,
)
.where(
(jctl.parent == jc.name)
& (Criterion.any(time_conditions))
@@ -208,7 +215,8 @@ class JobCard(Document):
existing = query.run(as_dict=True)
if existing and production_capacity > len(existing):
overlap_count = self.get_overlap_count(existing)
if existing and production_capacity > overlap_count:
return
if self.workstation_type:
@@ -218,6 +226,37 @@ class JobCard(Document):
return existing[0] if existing else None
@staticmethod
def get_overlap_count(time_logs):
count = 1
# 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]
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
return count
def get_workstation_based_on_available_slot(self, existing) -> Optional[str]:
workstations = get_workstations(self.workstation_type)
if workstations: