Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] pull source warehouse from production order child table (#11718)

Browse Source
This commit is contained in:
Saurabh 2017-11-27 12:04:41 +05:30 committed by Nabin Hait
parent e3d6d21ec5
commit 9d0092f89a
1 changed files with 67 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
erpnext/manufacturing/report/production_order_stock_report/production_order_stock_report.py
View File

@ -15,62 +15,66 @@ def get_item_list(prod_list, filters):
out = [] out = []
#Add a row for each item/qty #Add a row for each item/qty
for prod_order in prod_list: for prod_details in prod_list:
prod_details = frappe.db.get_value("Production Order", prod_order.name,
["bom_no", "source_warehouse", "qty", "produced_qty"], as_dict=1)
desc = frappe.db.get_value("BOM", prod_details.bom_no, "description") desc = frappe.db.get_value("BOM", prod_details.bom_no, "description")
item_list = frappe.db.sql("""SELECT for prod_item_details in frappe.db.get_values("Production Order Item",
bom_item.item_code as item_code, {"parent": prod_details.name}, ["item_code", "source_warehouse"], as_dict=1):
ifnull(ledger.actual_qty*bom.quantity/bom_item.stock_qty,0) as build_qty
FROM item_list = frappe.db.sql("""SELECT
`tabBOM` as bom, `tabBOM Item` AS bom_item bom_item.item_code as item_code,
LEFT JOIN `tabBin` AS ledger ifnull(ledger.actual_qty*bom.quantity/bom_item.stock_qty,0) as build_qty
ON bom_item.item_code = ledger.item_code FROM
AND ledger.warehouse = ifnull(%(warehouse)s,%(filterhouse)s) `tabBOM` as bom, `tabBOM Item` AS bom_item
WHERE LEFT JOIN `tabBin` AS ledger
bom.name = bom_item.parent ON bom_item.item_code = ledger.item_code
and bom.name = %(bom)s AND ledger.warehouse = ifnull(%(warehouse)s,%(filterhouse)s)
GROUP BY WHERE
bom_item.item_code""", bom.name = bom_item.parent
{"bom": prod_details.bom_no, "warehouse": prod_details.source_warehouse, and bom_item.item_code = %(item_code)s
"filterhouse": filters.warehouse}, as_dict=1) and bom.name = %(bom)s
GROUP BY
stock_qty = 0 bom_item.item_code""",
count = 0 {"bom": prod_details.bom_no, "warehouse": prod_item_details.source_warehouse,
buildable_qty = prod_details.qty "filterhouse": filters.warehouse, "item_code": prod_item_details.item_code}, as_dict=1)
for item in item_list:
count = count + 1 stock_qty = 0
if item.build_qty >= (prod_details.qty - prod_details.produced_qty): count = 0
stock_qty = stock_qty + 1 buildable_qty = prod_details.qty
elif buildable_qty >= item.build_qty: for item in item_list:
buildable_qty = item.build_qty count = count + 1
if item.build_qty >= (prod_details.qty - prod_details.produced_qty):
if count == stock_qty: stock_qty = stock_qty + 1
build = "Y" elif buildable_qty >= item.build_qty:
else: buildable_qty = item.build_qty
build = "N"
if count == stock_qty:
row = frappe._dict({ build = "Y"
"production_order": prod_order.name, else:
"status": prod_order.status, build = "N"
"req_items": cint(count),
"instock": stock_qty, row = frappe._dict({
"description": desc, "production_order": prod_details.name,
"bom_no": prod_details.bom_no, "status": prod_details.status,
"qty": prod_details.qty, "req_items": cint(count),
"buildable_qty": buildable_qty, "instock": stock_qty,
"ready_to_build": build "description": desc,
}) "source_warehouse": prod_item_details.source_warehouse,
"item_code": prod_item_details.item_code,
out.append(row) "bom_no": prod_details.bom_no,
"qty": prod_details.qty,
"buildable_qty": buildable_qty,
"ready_to_build": build
})
out.append(row)
return out return out
def get_production_orders(): def get_production_orders():
out = frappe.get_all("Production Order", filters={"docstatus": 1, "status": ( "!=","Completed")},
out = frappe.get_all("Production Order", filters={"docstatus": 1, "status": ( "!=","Completed")}, fields=["name","status"], order_by='name') fields=["name","status", "bom_no", "qty", "produced_qty"], order_by='name')
return out return out
def get_columns(): def get_columns():
@ -93,6 +97,18 @@ def get_columns():
"options": "", "options": "",
"width": 230 "width": 230
}, { }, {
"fieldname": "item_code",
"label": "Item Code",
"fieldtype": "Link",
"options": "Item",
"width": 110
},{
"fieldname": "source_warehouse",
"label": "Source Warehouse",
"fieldtype": "Link",
"options": "Warehouse",
"width": 110
},{
"fieldname": "qty", "fieldname": "qty",
"label": "Qty to Build", "label": "Qty to Build",
"fieldtype": "Data", "fieldtype": "Data",