fix(stock): allow partial raw material picking/transfer from work order

This commit is contained in:
Sudharsanan11
2026-06-21 00:52:21 +05:30
parent e6e5591088
commit 8e3fbab94a
4 changed files with 106 additions and 12 deletions

View File

@@ -1152,17 +1152,24 @@ erpnext.work_order = {
},
create_pick_list: function (frm, purpose = "Material Transfer for Manufacture") {
this.show_prompt_for_qty_input(frm, purpose)
.then((data) => {
return frappe.xcall("erpnext.manufacturing.doctype.work_order.work_order.create_pick_list", {
const max = this.get_max_transferable_qty(frm, purpose);
const get_pick_list = (for_qty) =>
frappe
.xcall("erpnext.manufacturing.doctype.work_order.work_order.create_pick_list", {
source_name: frm.doc.name,
for_qty: data.qty,
for_qty: for_qty,
})
.then((pick_list) => {
frappe.model.sync(pick_list);
frappe.set_route("Form", pick_list.doctype, pick_list.name);
});
})
.then((pick_list) => {
frappe.model.sync(pick_list);
frappe.set_route("Form", pick_list.doctype, pick_list.name);
});
if (max <= 0) {
get_pick_list(frm.doc.qty);
} else {
this.show_prompt_for_qty_input(frm, purpose).then((data) => get_pick_list(data.qty));
}
},
make_consumption_se: function (frm, backflush_raw_materials_based_on) {

View File

@@ -1706,6 +1706,38 @@ class WorkOrder(Document):
if self.reserve_stock:
self.update_qty_in_stock_reservation(row, transferred_qty, row_wise_serial_batch)
self.recompute_material_transferred_for_manufacturing(transferred_items)
def recompute_material_transferred_for_manufacturing(self, transferred_items):
"""Set material_transferred_for_manufacturing based on actual item-level transfers, not fg_completed_qty."""
# When fg_completed_qty > 0 (direct stock entries, excess transfer), preserve the
# SUM(fg_completed_qty) approach so excess-transfer tracking works correctly.
sum_fg_completed_qty = self.get_transferred_or_manufactured_qty(
"Material Transfer for Manufacture", "material_transferred_for_manufacturing"
)
if sum_fg_completed_qty:
self.db_set("material_transferred_for_manufacturing", sum_fg_completed_qty)
return
# Pick list flow sets fg_completed_qty=0; use min-fraction of actual item transfers
# so partial availability does not prematurely mark the work order as fully transferred.
required_by_item = {}
for row in self.required_items:
if not row.include_item_in_manufacturing or flt(row.required_qty) <= 0:
continue
required_by_item[row.item_code] = required_by_item.get(row.item_code, 0.0) + flt(row.required_qty)
if not required_by_item:
return
min_fraction = min(
flt(transferred_items.get(item_code) or 0) / required_qty
for item_code, required_qty in required_by_item.items()
)
min_fraction = min(min_fraction, 1.0)
material_transferred = min_fraction * flt(self.qty)
self.db_set("material_transferred_for_manufacturing", material_transferred)
def update_qty_in_stock_reservation(self, row, transferred_qty, row_wise_serial_batch):
if names := frappe.get_all(
"Stock Reservation Entry",

View File

@@ -1659,7 +1659,7 @@ def update_stock_entry_based_on_work_order(pick_list, stock_entry):
stock_entry.from_bom = 1
stock_entry.bom_no = work_order.bom_no
stock_entry.use_multi_level_bom = work_order.use_multi_level_bom
stock_entry.fg_completed_qty = pick_list.for_qty
stock_entry.fg_completed_qty = 0
if work_order.bom_no:
stock_entry.inspection_required = frappe.db.get_value("BOM", work_order.bom_no, "inspection_required")

View File

@@ -1236,10 +1236,12 @@ class StockEntry(StockController, SubcontractingInwardController):
if self.purpose not in ["Manufacture", "Material Transfer for Manufacture"]:
return
if not frappe.db.get_single_value("Manufacturing Settings", "validate_components_quantities_per_bom"):
if not self.fg_completed_qty:
if self.work_order and self.purpose == "Material Transfer for Manufacture":
self._validate_no_excess_transfer()
return
if not self.fg_completed_qty:
if not frappe.db.get_single_value("Manufacturing Settings", "validate_components_quantities_per_bom"):
return
raw_materials = self.get_bom_raw_materials(self.fg_completed_qty)
@@ -1267,6 +1269,59 @@ class StockEntry(StockController, SubcontractingInwardController):
title=_("Missing Item"),
)
def _validate_no_excess_transfer(self):
if self.is_return:
return
if (
frappe.db.get_single_value("Manufacturing Settings", "backflush_raw_materials_based_on")
== "Material Transferred for Manufacture"
):
return
wo = self.pro_doc
if not wo:
return
pending_by_item = {}
for r in wo.required_items:
pending_by_item[r.item_code] = (
pending_by_item.get(r.item_code, 0.0) + flt(r.required_qty) - flt(r.transferred_qty)
)
transfer_by_item = {}
first_row_by_item = {}
for item in self.items:
if not item.s_warehouse:
continue
key = (
item.item_code if item.item_code in pending_by_item else getattr(item, "original_item", None)
)
if key not in pending_by_item:
continue
transfer_by_item[key] = transfer_by_item.get(key, 0.0) + flt(item.qty)
first_row_by_item.setdefault(key, item)
for key, transfer_qty in transfer_by_item.items():
pending_qty = max(0.0, pending_by_item[key])
if transfer_qty > pending_qty:
item = first_row_by_item[key]
frappe.throw(
_(
"Row #{0}: Cannot transfer {1} {2} of Item {3}. "
"Maximum transferable quantity is {4} {2}."
).format(
item.idx,
transfer_qty,
item.uom,
frappe.bold(item.item_code),
pending_qty,
),
title=_("Excess Material Transfer"),
)
def validate_same_source_target_warehouse_during_material_transfer(self):
"""
Validate Material Transfer entries where source and target warehouses are identical.