CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-07 20:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: job card overlap unknown column jc.employee (#27403)

Browse Source 
* fix: incorrect query for job card overlap

* test: employee overlap in job cards

* test: simplify/refactor job card tests

(cherry picked from commit 678335f8ac)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.py
#	erpnext/manufacturing/doctype/job_card/test_job_card.py
This commit is contained in:
Ankush Menat
2021-09-09 12:24:23 +05:30
committed by Mergify
parent f5160dc83d
commit 9c8e1facd9
2 changed files with 90 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,7 +149,11 @@ class JobCard(Document):
if args.get("employee"):
# override capacity for employee
production_capacity = 1
<<<<<<< HEAD
query = query.where(jctl.employee == args.get("employee"))
=======
validate_overlap_for = " and jctl.employee = %(employee)s "
>>>>>>> 678335f8ac (fix: job card overlap unknown column `jc.employee` (#27403))
existing = query.run(as_dict=True)

86
erpnext/manufacturing/doctype/job_card/test_job_card.py
View File

@@ -6,6 +6,7 @@ from frappe.tests.utils import FrappeTestCase, change_settings
from frappe.utils import random_string
from frappe.utils.data import add_to_date, now
<<<<<<< HEAD
from erpnext.manufacturing.doctype.job_card.job_card import (
JobCardOverTransferError,
OperationMismatchError,
@@ -15,12 +16,16 @@ from erpnext.manufacturing.doctype.job_card.job_card import (
from erpnext.manufacturing.doctype.job_card.job_card import (
make_stock_entry as make_stock_entry_from_jc,
)
=======
from erpnext.manufacturing.doctype.job_card.job_card import OperationMismatchError, OverlapError
>>>>>>> 678335f8ac (fix: job card overlap unknown column `jc.employee` (#27403))
from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_order_test_record
from erpnext.manufacturing.doctype.work_order.work_order import WorkOrder
from erpnext.manufacturing.doctype.workstation.test_workstation import make_workstation
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
<<<<<<< HEAD
class TestJobCard(FrappeTestCase):
def setUp(self):
make_bom_for_jc_tests()
@@ -73,19 +78,55 @@ class TestJobCard(FrappeTestCase):
filters={"work_order": self.work_order.name},
fields=["operation_id", "workstation", "name", "for_quantity"],
)
=======
class TestJobCard(unittest.TestCase):
def setUp(self):
self.work_order = make_wo_order_test_record(item="_Test FG Item 2", qty=2)
def tearDown(self):
frappe.db.rollback()
def test_job_card(self):
job_cards = frappe.get_all('Job Card',
filters = {'work_order': self.work_order.name}, fields = ["operation_id", "name"])
if job_cards:
job_card = job_cards[0]
frappe.db.set_value("Job Card", job_card.name, "operation_row_number", job_card.operation_id)
doc = frappe.get_doc("Job Card", job_card.name)
doc.operation_id = "Test Data"
self.assertRaises(OperationMismatchError, doc.save)
for d in job_cards:
frappe.delete_doc("Job Card", d.name)
def test_job_card_with_different_work_station(self):
job_cards = frappe.get_all('Job Card',
filters = {'work_order': self.work_order.name},
fields = ["operation_id", "workstation", "name", "for_quantity"])
>>>>>>> 678335f8ac (fix: job card overlap unknown column `jc.employee` (#27403))
job_card = job_cards[0]
if job_card:
<<<<<<< HEAD
workstation = frappe.db.get_value(
"Workstation", {"name": ("not in", [job_card.workstation])}, "name"
)
=======
workstation = frappe.db.get_value("Workstation",
{"name": ("not in", [job_card.workstation])}, "name")
>>>>>>> 678335f8ac (fix: job card overlap unknown column `jc.employee` (#27403))
if not workstation or job_card.workstation == workstation:
workstation = make_workstation(workstation_name=random_string(5)).name
doc = frappe.get_doc("Job Card", job_card.name)
doc.workstation = workstation
<<<<<<< HEAD
doc.append(
"time_logs",
{
@@ -466,3 +507,48 @@ def make_bom_for_jc_tests():
bom.items[0].uom = "_Test UOM 1"
bom.items[0].conversion_factor = 5
bom.insert()
=======
doc.append("time_logs", {
"from_time": "2009-01-01 12:06:25",
"to_time": "2009-01-01 12:37:25",
"time_in_mins": "31.00002",
"completed_qty": job_card.for_quantity
})
doc.submit()
completed_qty = frappe.db.get_value("Work Order Operation", job_card.operation_id, "completed_qty")
self.assertEqual(completed_qty, job_card.for_quantity)
doc.cancel()
for d in job_cards:
frappe.delete_doc("Job Card", d.name)
def test_job_card_overlap(self):
wo2 = make_wo_order_test_record(item="_Test FG Item 2", qty=2)
jc1_name = frappe.db.get_value("Job Card", {'work_order': self.work_order.name})
jc2_name = frappe.db.get_value("Job Card", {'work_order': wo2.name})
jc1 = frappe.get_doc("Job Card", jc1_name)
jc2 = frappe.get_doc("Job Card", jc2_name)
employee = "_T-Employee-00001" # from test records
jc1.append("time_logs", {
"from_time": "2021-01-01 00:00:00",
"to_time": "2021-01-01 08:00:00",
"completed_qty": 1,
"employee": employee,
})
jc1.save()
# add a new entry in same time slice
jc2.append("time_logs", {
"from_time": "2021-01-01 00:01:00",
"to_time": "2021-01-01 06:00:00",
"completed_qty": 1,
"employee": employee,
})
self.assertRaises(OverlapError, jc2.save)
>>>>>>> 678335f8ac (fix: job card overlap unknown column `jc.employee` (#27403))