matt/inventory
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up more purchase order stuff

Browse Source
This commit is contained in:
Matt
2025-01-10 21:40:43 -05:00
parent 2fed979b1d
commit ec2309156f
2 changed files with 132 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
inventory-server/src/routes/purchase-orders.js
View File

@@ -11,8 +11,8 @@ router.get('/', async (req, res) => {
const params = [];
if (search) {
whereClause += ' AND (po.po_id LIKE ? OR po.vendor LIKE ?)';
params.push(`%${search}%`, `%${search}%`);
whereClause += ' AND (po.po_id LIKE ? OR po.vendor LIKE ? OR po.status LIKE ?)';
params.push(`%${search}%`, `%${search}%`, `%${search}%`);
}
if (status && status !== 'all') {
@@ -35,6 +35,30 @@ router.get('/', async (req, res) => {
params.push(endDate);
}
// Get filtered summary metrics
const [summary] = await pool.query(`
WITH po_totals AS (
SELECT
po_id,
SUM(ordered) as total_ordered,
SUM(received) as total_received,
SUM(ordered * cost_price) as total_cost
FROM purchase_orders po
WHERE ${whereClause}
GROUP BY po_id
)
SELECT
COUNT(DISTINCT po_id) as order_count,
SUM(total_ordered) as total_ordered,
SUM(total_received) as total_received,
ROUND(
SUM(total_received) / NULLIF(SUM(total_ordered), 0), 3
) as fulfillment_rate,
SUM(total_cost) as total_value,
ROUND(AVG(total_cost), 2) as avg_cost
FROM po_totals
`, params);
// Get total count for pagination
const [countResult] = await pool.query(`
SELECT COUNT(DISTINCT po_id) as total
@@ -48,32 +72,48 @@ router.get('/', async (req, res) => {
// Get recent purchase orders
const [orders] = await pool.query(`
WITH po_totals AS (
SELECT
po_id,
vendor,
date,
status,
COUNT(DISTINCT product_id) as total_items,
SUM(ordered) as total_quantity,
SUM(ordered * cost_price) as total_cost,
SUM(received) as total_received,
ROUND(
SUM(received) / NULLIF(SUM(ordered), 0), 3
) as fulfillment_rate
FROM purchase_orders po
WHERE ${whereClause}
GROUP BY po_id, vendor, date, status
)
SELECT
po_id as id,
vendor as vendor_name,
DATE_FORMAT(date, '%Y-%m-%d') as order_date,
status,
COUNT(DISTINCT product_id) as total_items,
SUM(ordered) as total_quantity,
SUM(ordered * cost_price) as total_cost,
SUM(received) as total_received,
ROUND(
SUM(received) / SUM(ordered), 3
) as fulfillment_rate
FROM purchase_orders po
WHERE ${whereClause}
GROUP BY po_id, vendor, date, status
total_items,
total_quantity,
total_cost,
total_received,
fulfillment_rate
FROM po_totals
ORDER BY
CASE
WHEN ? = 'order_date' THEN date
WHEN ? = 'vendor_name' THEN vendor
WHEN ? = 'total_cost' THEN SUM(ordered * cost_price)
WHEN ? = 'total_received' THEN SUM(received)
WHEN ? = 'fulfillment_rate' THEN SUM(received) / SUM(ordered)
WHEN ? = 'total_cost' THEN CAST(total_cost AS DECIMAL(15,2))
WHEN ? = 'total_received' THEN CAST(total_received AS DECIMAL(15,2))
WHEN ? = 'total_items' THEN CAST(total_items AS SIGNED)
WHEN ? = 'total_quantity' THEN CAST(total_quantity AS SIGNED)
WHEN ? = 'fulfillment_rate' THEN CAST(fulfillment_rate AS DECIMAL(5,3))
WHEN ? = 'status' THEN status
ELSE date
END ${sortDirection === 'desc' ? 'DESC' : 'ASC'}
LIMIT ? OFFSET ?
`, [...params, sortColumn, sortColumn, sortColumn, sortColumn, sortColumn, Number(limit), offset]);
`, [...params, sortColumn, sortColumn, sortColumn, sortColumn, sortColumn, sortColumn, sortColumn, sortColumn, Number(limit), offset]);
// Get unique vendors for filter options
const [vendors] = await pool.query(`
@@ -104,8 +144,19 @@ router.get('/', async (req, res) => {
fulfillment_rate: Number(order.fulfillment_rate) || 0
}));
// Parse summary metrics
const parsedSummary = {
order_count: Number(summary[0].order_count) || 0,
total_ordered: Number(summary[0].total_ordered) || 0,
total_received: Number(summary[0].total_received) || 0,
fulfillment_rate: Number(summary[0].fulfillment_rate) || 0,
total_value: Number(summary[0].total_value) || 0,
avg_cost: Number(summary[0].avg_cost) || 0
};
res.json({
orders: parsedOrders,
summary: parsedSummary,
pagination: {
total,
pages,
@@ -129,27 +180,37 @@ router.get('/vendor-metrics', async (req, res) => {
const pool = req.app.locals.pool;
const [metrics] = await pool.query(`
WITH delivery_metrics AS (
SELECT
vendor,
po_id,
ordered,
received,
cost_price,
CASE
WHEN status = 'received' AND received_date IS NOT NULL AND date IS NOT NULL
THEN DATEDIFF(received_date, date)
ELSE NULL
END as delivery_days
FROM purchase_orders
WHERE vendor IS NOT NULL AND vendor != ''
)
SELECT
vendor as vendor_name,
COUNT(DISTINCT po_id) as total_orders,
SUM(ordered) as total_ordered,
SUM(received) as total_received,
ROUND(
SUM(received) / SUM(ordered), 3
SUM(received) / NULLIF(SUM(ordered), 0), 3
) as fulfillment_rate,
ROUND(
SUM(ordered * cost_price) / SUM(ordered), 2
SUM(ordered * cost_price) / NULLIF(SUM(ordered), 0), 2
) as avg_unit_cost,
SUM(ordered * cost_price) as total_spend,
ROUND(AVG(
CASE
WHEN status = 'received' AND received_date IS NOT NULL AND date IS NOT NULL
THEN DATEDIFF(received_date, date)
ELSE NULL
END
), 1) as avg_delivery_days
FROM purchase_orders
WHERE vendor IS NOT NULL AND vendor != ''
ROUND(
AVG(NULLIF(delivery_days, 0)), 1
) as avg_delivery_days
FROM delivery_metrics
GROUP BY vendor
HAVING total_orders > 0
ORDER BY total_spend DESC
@@ -165,7 +226,7 @@ router.get('/vendor-metrics', async (req, res) => {
fulfillment_rate: Number(vendor.fulfillment_rate) || 0,
avg_unit_cost: Number(vendor.avg_unit_cost) || 0,
total_spend: Number(vendor.total_spend) || 0,
avg_delivery_days: Number(vendor.avg_delivery_days) || 0
avg_delivery_days: vendor.avg_delivery_days === null ? null : Number(vendor.avg_delivery_days)
}));
res.json(parsedMetrics);