From 73aab537e94cac706ff05d0a73decca1fc93277e Mon Sep 17 00:00:00 2001 From: Jadowyne Ulve Date: Wed, 6 Aug 2025 15:22:25 -0500 Subject: [PATCH] Introduced exchange into transaction scanner --- .../poe/__pycache__/poe_api.cpython-313.pyc | Bin 4649 -> 4649 bytes .../poe/sql/scanner/selectItemByBarcode.sql | 12 ------------ .../poe/static/js/transactionHandler.js | 10 ++++++++-- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/application/poe/__pycache__/poe_api.cpython-313.pyc b/application/poe/__pycache__/poe_api.cpython-313.pyc index c221478b56404c00c016e75447061011a5471c39..18a2a52157b79a70ed89500874e2b33debdd2860 100644 GIT binary patch delta 19 ZcmZ3fvQmZXGcPX}0}xE#v5`w&2mm&Q1or>{ delta 19 ZcmZ3fvQmZXGcPX}0}y=MvXM((2mm;&1yTS2 diff --git a/application/poe/sql/scanner/selectItemByBarcode.sql b/application/poe/sql/scanner/selectItemByBarcode.sql index 3e53268..cf22e74 100644 --- a/application/poe/sql/scanner/selectItemByBarcode.sql +++ b/application/poe/sql/scanner/selectItemByBarcode.sql @@ -1,15 +1,3 @@ -/* -id -logistics_info_id -barcode -item_name -logistics_info.primary_location.id -logistics_info.auto_issue_location.id -item_info.uom_quantity -item_info.cost - - -*/ WITH passed_id AS (SELECT items.id AS passed_id, barcodes.barcode AS passed_barcode FROM %%site_name%%_barcodes barcodes LEFT JOIN %%site_name%%_items items ON items.item_uuid = barcodes.item_uuid WHERE barcodes.barcode=%s), diff --git a/application/poe/static/js/transactionHandler.js b/application/poe/static/js/transactionHandler.js index b1a98c8..e371010 100644 --- a/application/poe/static/js/transactionHandler.js +++ b/application/poe/static/js/transactionHandler.js @@ -67,11 +67,14 @@ async function submitScanTransaction(scannedItem) { let trans_type = document.getElementById('scan_trans_type').value let scan_transaction_item_location_id = 0 let comparator = 0 - + let conversion_factor = 1 + if (trans_type === "Adjust In"){ comparator = scannedItem.primary_location_id + conversion_factor = scannedItem.in_exchange } else if (trans_type === "Adjust Out"){ comparator = scannedItem.auto_issue_location_id + conversion_factor = scannedItem.out_exchange } for (let i = 0; i < scannedItem.item_locations.length; i++){ @@ -79,6 +82,9 @@ async function submitScanTransaction(scannedItem) { scan_transaction_item_location_id = scannedItem.item_locations[i].location_id } } + + let quantity = scannedItem.uom_quantity * conversion_factor + const response = await fetch(`/poe/postTransaction`, { method: 'POST', headers: { @@ -90,7 +96,7 @@ async function submitScanTransaction(scannedItem) { barcode: scannedItem.barcode, item_name: scannedItem.item_name, transaction_type: document.getElementById('scan_trans_type').value, - quantity: scannedItem.uom_quantity, + quantity: quantity, description: "", cost: parseFloat(scannedItem.cost), vendor: 0,