nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-19 04:59:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: fetch batch qty difference in a single db query

Browse Source 
(cherry picked from commit 9cc77934a6)
This commit is contained in:
Pugazhendhi Velu
2025-10-08 14:16:26 +00:00
committed by Mergify
parent 57c356a1cd
commit e7fcacbe69
2 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js
View File

@@ -22,7 +22,7 @@ frappe.query_reports["Stock Qty vs Batch Qty"] = {
get_query: function () { get_query: function () {
const item_code = frappe.query_report.get_filter_value("item"); const item_code = frappe.query_report.get_filter_value("item");
return { return {
filters: { item: item_code }, filters: { item: item_code, disabled: 0 },
}; };
}, },
}, },

56
erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py
View File

@@ -5,9 +5,7 @@ import json
import frappe import frappe
from frappe import _ from frappe import _
from frappe.query_builder import DocType from frappe.query_builder.functions import Sum
from erpnext.stock.doctype.batch.batch import get_batch_qty
def execute(filters=None): def execute(filters=None):
@@ -43,43 +41,37 @@ def get_data(filters):
item_filter = filters.get("item") item_filter = filters.get("item")
batch_filter = filters.get("batch") batch_filter = filters.get("batch")
Batch = DocType("Batch") stock_ledger_entry = frappe.qb.DocType("Stock Ledger Entry")
batch_ledger = frappe.qb.DocType("Serial and Batch Entry")
batch_table = frappe.qb.DocType("Batch")
query = ( query = (
frappe.qb.from_(Batch) frappe.qb.from_(stock_ledger_entry)
.select(Batch.item.as_("item_code"), Batch.item_name, Batch.batch_qty, Batch.name.as_("batch_no")) .inner_join(batch_ledger)
.where(Batch.disabled == 0) .on(stock_ledger_entry.serial_and_batch_bundle == batch_ledger.parent)
.inner_join(batch_table)
.on(batch_ledger.batch_no == batch_table.name)
.select(
batch_table.item.as_("item_code"),
batch_table.item_name.as_("item_name"),
batch_table.name.as_("batch"),
batch_table.batch_qty.as_("batch_qty"),
Sum(batch_ledger.qty).as_("stock_qty"),
(Sum(batch_ledger.qty) - batch_table.batch_qty).as_("difference"),
)
.where(batch_table.disabled == 0)
.where(stock_ledger_entry.is_cancelled == 0)
.groupby(batch_table.name)
.having((Sum(batch_ledger.qty) - batch_table.batch_qty) != 0)
) )
if item_filter: if item_filter:
query = query.where(Batch.item == item_filter) query = query.where(batch_table.item == item_filter)
if batch_filter: if batch_filter:
query = query.where(Batch.name == batch_filter) query = query.where(batch_table.name == batch_filter)
batch_list = query.run(as_dict=True) data = query.run(as_dict=True)
data = []
for batch in batch_list:
batches = get_batch_qty(batch_no=batch.batch_no)
if not batches:
continue
batch_qty = batch.get("batch_qty", 0)
actual_qty = sum(b.get("qty", 0) for b in batches)
difference = batch_qty - actual_qty
row = {
"item_code": batch.item_code,
"item_name": batch.item_name,
"batch": batch.batch_no,
"batch_qty": batch_qty,
"stock_qty": actual_qty,
"difference": difference,
}
data.append(row)
return data return data