nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-28 22:28:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(manufacturing): account for pending job card qty (#58466)

Browse Source
This commit is contained in:
Pandiyan P
2026-08-27 12:12:46 +05:30
committed by GitHub
parent dd033cbc10
commit 0d90608bc1
2 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,15 +259,16 @@ class JobCard(Document):
return wo_qty + (wo_qty * over_production_percentage / 100) return wo_qty + (wo_qty * over_production_percentage / 100)
def get_total_job_card_qty(self): def get_total_job_card_qty(self):
job_card_qty = frappe.get_all( job_card = frappe.qb.DocType("Job Card")
"Job Card", job_card_qty = (
fields=[{"SUM": "for_quantity"}], frappe.qb.from_(job_card)
filters={ .select(Sum(job_card.for_quantity - IfNull(job_card.pending_qty, 0)))
"work_order": self.work_order, .where(
"operation_id": self.operation_id, (job_card.work_order == self.work_order)
"docstatus": ["!=", 2], & (job_card.operation_id == self.operation_id)
}, & (job_card.docstatus != 2)
as_list=1, )
.run()
) )
return flt(job_card_qty[0][0]) if job_card_qty else 0 return flt(job_card_qty[0][0]) if job_card_qty else 0

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

@@ -21,7 +21,7 @@ from erpnext.manufacturing.doctype.job_card.mapper import (
make_stock_entry as make_stock_entry_from_jc, make_stock_entry as make_stock_entry_from_jc,
) )
from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_order_test_record 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, make_work_order from erpnext.manufacturing.doctype.work_order.work_order import WorkOrder, make_job_card, make_work_order
from erpnext.manufacturing.doctype.workstation.test_workstation import make_workstation from erpnext.manufacturing.doctype.workstation.test_workstation import make_workstation
from erpnext.stock.doctype.item.test_item import create_item from erpnext.stock.doctype.item.test_item import create_item
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
@@ -1815,16 +1815,16 @@ class TestJobCard(ERPNextTestSuite):
job_card.save() job_card.save()
job_card.complete_job_card( job_card.complete_job_card(
qty=3, qty=2,
for_quantity=5, for_quantity=5,
pending_qty=2, pending_qty=3,
process_loss_qty=0, process_loss_qty=0,
end_time="2024-04-01 09:00:00", end_time="2024-04-01 09:00:00",
) )
job_card.reload() job_card.reload()
self.assertEqual(flt(job_card.for_quantity), 5) self.assertEqual(flt(job_card.for_quantity), 5)
self.assertEqual(flt(job_card.pending_qty), 2) self.assertEqual(flt(job_card.pending_qty), 3)
self.assertEqual(flt(job_card.process_loss_qty), 0) self.assertEqual(flt(job_card.process_loss_qty), 0)
job_card.submit() job_card.submit()
@@ -1832,13 +1832,29 @@ class TestJobCard(ERPNextTestSuite):
manufacturing_entry = frappe.get_doc(job_card.make_stock_entry_for_semi_fg_item()) manufacturing_entry = frappe.get_doc(job_card.make_stock_entry_for_semi_fg_item())
finished_item = next(row for row in manufacturing_entry.items if row.is_finished_item) finished_item = next(row for row in manufacturing_entry.items if row.is_finished_item)
self.assertEqual(flt(finished_item.qty), 3) self.assertEqual(flt(finished_item.qty), 2)
manufacturing_entry.submit() manufacturing_entry.submit()
job_card.reload() job_card.reload()
self.assertEqual(flt(job_card.manufactured_qty), 3) self.assertEqual(flt(job_card.manufactured_qty), 2)
self.assertEqual(job_card.status, "Completed") self.assertEqual(job_card.status, "Completed")
make_job_card(
work_order.name,
[
{
"name": work_order.operations[0].name,
"operation": "Pending Qty Op A",
"qty": 3,
"pending_qty": 3,
}
],
)
follow_up_job_card = frappe.get_last_doc(
"Job Card", {"work_order": work_order.name, "operation_id": work_order.operations[0].name}
)
self.assertEqual(flt(follow_up_job_card.for_quantity), 3)
def test_semi_fg_process_loss_rolls_up_to_work_order(self): def test_semi_fg_process_loss_rolls_up_to_work_order(self):
from erpnext.manufacturing.doctype.operation.test_operation import make_operation from erpnext.manufacturing.doctype.operation.test_operation import make_operation
from erpnext.stock.doctype.item.test_item import make_item from erpnext.stock.doctype.item.test_item import make_item