From 136fe03e072115561c4c16039a001b3a912c86b6 Mon Sep 17 00:00:00 2001
From: Javier <javier@local>
Date: Sun, 25 Jan 2026 20:40:51 -0600
Subject: [PATCH] v0.11.1 - Fixed weight Discrepancy bug

---
 app.py                                        |   2 +-
 .../__pycache__/counting.cpython-313.pyc      | Bin 23716 -> 24204 bytes
 .../__pycache__/data_imports.cpython-313.pyc  | Bin 7432 -> 7548 bytes
 blueprints/counting.py                        |  28 ++++++++++++++++--
 blueprints/data_imports.py                    |   1 +
 templates/count_location.html                 |  27 +++++++++++++----
 6 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/app.py b/app.py
index 8d70fcb..90fcde6 100644
--- a/app.py
+++ b/app.py
@@ -36,7 +36,7 @@ app.config['PERMANENT_SESSION_LIFETIME'] = timedelta(hours=1)
 
 
 # 1. Define the version
-APP_VERSION = '0.11.0'
+APP_VERSION = '0.11.1'
 
 # 2. Inject it into all templates automatically
 @app.context_processor
diff --git a/blueprints/__pycache__/counting.cpython-313.pyc b/blueprints/__pycache__/counting.cpython-313.pyc
index 07feb82f9470cfb5d92aadacea97d15a9af82d74..4f563455b5d172e68b87010091e3852ba8531242 100644
GIT binary patch
delta 595
zcmZ3old)$nBj0CUUM>b8n0B!&b64(0z6L$LL?cE91}+6C2zK>xbq-O0^FhMJmBl5g
zx$#Mvc{*H^Q)E@5p#p`aiFqZNC6ziTs(l?JG%|teH5C$z6+jG3>6Fys<f6=ilFa-(
zuqq_}<hP+7lY8{}CcoE{5C>WA9^@Yypx_jV<ci5m`s!SXi($^5{6I!!@&iK_E`&QL
zFZ36iTp%mKkLFUaxPq+E<VF6XlNDrHRFG^&cM056li!8vP0rT03C7_ZxI&OT2>1uN
zxCWs*8AFYar>|#-g5l;_`r#aMoZ=iGgc!I*7ig@ozo=w=fz#%I%12>NJ`ctQw+|AN
z`7M&gxK#x{h%pGuUJ%q=QSwooTgJ4*=bO~z4hthOZh2HGG1Cs9uFV%Lni-kA*(Qft
z88BtAY;Ly_WntX0d9Gaq6XS!;-y9@Z7~gN^cU9$Jbf0YMJD)LN^HtwpOiUt7n=b~;
mVrQ)0oD&hiERoL4$o`p`fk^;Fq%nSA0SSBvVV`^@`T_uhsIsE~

delta 274
zcmeC#%eZ7GBj0CUUM>b8;5=KFIXi13UxS`-RXLXe6a>5axH^X@XiZ)qt3EkP-+uB@
zeI=%<n#phUB^W`1+LPA?a7|t%C_MRyuJq=9LoW_FW^s-WYz*9@3p7^PUsSTbz-e<p
z<s&;Yp9f=u+XtS>-z}5Hm{kRUN`z%E2x_h<0m{jkcKCebnp|LIB*rX{DkWyx;r4-J
z^A4+KMy7by$+k8IOf}4#^KC>~7#D4Bb%<bMJhl0rlLQOn&CTE4R5=(8C(HWJXSCY9
z*Z&t2(?7<|JA-DiGp241i3(tr2xMkt|IEz5Bmg4P7(cLp1U_W2O_q(5o_sxaD*y%C
BR^b2u

diff --git a/blueprints/__pycache__/data_imports.cpython-313.pyc b/blueprints/__pycache__/data_imports.cpython-313.pyc
index 65758144bb9f3dfae6387cd23a40e5105f5f8c59..c549d2e9959e924d4d964719feaed4bff9bbd9a6 100644
GIT binary patch
delta 650
zcmZWmJ8aWX6n!7NDRvzves-MZ>xxPt&<Idcp;R&m1@lppG_`BBQa~`2!AlUe#J~mv
zuvT|uVlGRSosXa_&5%kRU}a%K0(D{NP`kAOsc(4ae$Kh~zWZJ+94<%)k|dzueB68D
z{o0oHllb}Yd(y+4OKk>kQfk3P7x6p^IS3i3g!<}<jgXyzy_80=orT9KhV!tk<cM7i
zRIDh>;}e>L9I;6TT)*^JW(2Z2>~QNeVOK&nyh~4ktuXjN&+vj9MMcR;#EoHDQNyez
zu5C5QV5(n@tHo@ZbYw^?XUi#*n1m0~u2ho{@~KZMf!EmzB4OoCr5yE|<YKX?oND!7
zlATUYxS}gLD#&aaHk3THnAW=xkMs{+<O;6rXvgEoP9{P<!fb@85F3ejWd`b8Mo5Ga
zE6B-s0|ttIgy9_gV9j9NGpf!P>eMNMslLV~_@;We3@xoCJ#F5w+SZC?+_aZEFq6rt
ztG6xNGW>_W?>!pa_tp*5xHf#DohSGbywz{PAN>nHg!kD^_LUP}cAs^}tUF%rk9&9b
zxqHLj^aEmkN?flk*3johaj`PFleX%Cvs;-6@0!rA(%mcP+Ou?2=G${<G|LB(QI&@F
doYKBJ{F&#leh1?vd_WOd!N19|vmpmhKLU{-h-d%+

delta 469
zcmY*VO-lk%6n%Hb$xvtP&4*v3sZ5q6rD0MC2_jLT5oiN}Epj;!K`r_XEove6KeT8k
zuG)qxwIJvRM4M<SZi9NGW6@i@bMJZgo^$W}Dqa`Gu_$^7JNHjlR=Xp<N^sJBmn^_O
ze}_S;KoVOtf^RMz3>IY}g>9;c-iEut*?ol64eZePgpaeD5jDh>=?fvIyPm=qs)2-C
zvH^Z<$}vY_;h#c_>bzacwDCsvO}ze?{*1w#;?k9M;rPt9*n<O^5HCrPEIF6Vx%zZg
zOVO|_C~1?J9@F1Y1y;&Xb1>jw&_O>wC^}?pYfs3OoVD;-iK3)#FGrdizuQO!n8p%m
z=y|>oo&7-qOIi|d)eDH>w`##6T3V(1p{;Tl2vs15W~dLJm<YGKz3?fw^SD`Ft42sK
z8LO)Ez0z);B?EQNz9XJmfFCTSYm^`Qgj$#kslb?FfVbnYT+4J@Q5OXF0S;lz6YdB`
L+$6d5v*CUKwj*MK

diff --git a/blueprints/counting.py b/blueprints/counting.py
index 94bb7be..6f4f078 100644
--- a/blueprints/counting.py
+++ b/blueprints/counting.py
@@ -310,8 +310,14 @@ def scan_lot(session_id, location_count_id):
     
     # Check against MASTER baseline
     master = query_db('''
-        SELECT * FROM BaselineInventory_Master
+        SELECT 
+            system_bin,
+            SUM(system_quantity) as system_quantity,
+            MAX(item) as item,
+            MAX(description) as description
+        FROM BaselineInventory_Master
         WHERE session_id = ? AND lot_number = ? AND system_bin = ?
+        GROUP BY system_bin
     ''', [session_id, lot_number, location['location_name']], one=True)
     
     # Determine master_status (only if not a duplicate issue)
@@ -328,8 +334,16 @@ def scan_lot(session_id, location_count_id):
         else:
             # Check if lot exists in different location
             master_other = query_db('''
-                SELECT * FROM BaselineInventory_Master
+                SELECT 
+                    system_bin,
+                    SUM(system_quantity) as system_quantity,
+                    MAX(item) as item,
+                    MAX(description) as description
+                FROM BaselineInventory_Master
                 WHERE session_id = ? AND lot_number = ?
+                GROUP BY system_bin
+                ORDER BY system_bin
+                LIMIT 1
             ''', [session_id, lot_number], one=True)
             
             if master_other:
@@ -346,8 +360,16 @@ def scan_lot(session_id, location_count_id):
         # For duplicates, still check baseline for item info
         if not master:
             master = query_db('''
-                SELECT * FROM BaselineInventory_Master
+                SELECT 
+                    system_bin,
+                    SUM(system_quantity) as system_quantity,
+                    MAX(item) as item,
+                    MAX(description) as description
+                FROM BaselineInventory_Master
                 WHERE session_id = ? AND lot_number = ?
+                GROUP BY system_bin
+                ORDER BY system_bin
+                LIMIT 1
             ''', [session_id, lot_number], one=True)
         master_status = 'match'  # Don't override with wrong_location for duplicates
         variance_lbs = None
diff --git a/blueprints/data_imports.py b/blueprints/data_imports.py
index 8ebd24b..2a109df 100644
--- a/blueprints/data_imports.py
+++ b/blueprints/data_imports.py
@@ -94,6 +94,7 @@ def upload_master(session_id):
     
     conn = get_db()
     cursor = conn.cursor()
+    cursor.execute('DELETE FROM BaselineInventory_Master WHERE session_id = ?', [session_id])
     try:
         stream = io.StringIO(file.stream.read().decode("UTF8"), newline=None)
         csv_reader = csv.DictReader(stream)
diff --git a/templates/count_location.html b/templates/count_location.html
index 1d7acc3..606f81c 100644
--- a/templates/count_location.html
+++ b/templates/count_location.html
@@ -102,7 +102,7 @@
                onclick="openScanDetail('{{ scan.entry_id }}')">
             <div class="scan-row-lot">{{ scan.lot_number }}</div>
                 <div class="scan-row-item">{{ scan.item or 'N/A' }}</div>
-                    <div class="scan-row-weight">{{ scan.actual_weight }} lbs</div>
+                    <div class="scan-row-weight">{{ '%.1f'|format(scan.actual_weight) if scan.actual_weight is not none else '-' }} lbs</div>
                         <div class="scan-row-status">
                             {% if scan.duplicate_status == '01' or scan.duplicate_status == '04' %}
                                 <span class="status-dot status-dot-blue"></span> Duplicate
@@ -185,6 +185,23 @@ let currentLotNumber = '';
 let isDuplicateConfirmed = false;
 let isProcessing = false;
 
+function parseWeight(value) {
+    const num = Number(value);
+    return Number.isFinite(num) ? num : null;
+}
+
+function formatWeight(value) {
+    const num = parseWeight(value);
+    return num === null ? '-' : num.toFixed(1);
+}
+
+function weightsDiffer(actual, expected) {
+    const actualNum = parseWeight(actual);
+    const expectedNum = parseWeight(expected);
+    if (actualNum === null || expectedNum === null) return false;
+    return Math.abs(actualNum - expectedNum) >= 0.01;
+}
+
 // Lot scan handler
 document.getElementById('lotScanForm').addEventListener('submit', function(e) {
     e.preventDefault();
@@ -388,7 +405,7 @@ function addScanToList(data, weight) {
             statusDot = 'orange';
         }
     } else if (data.master_status === 'match') {
-        if (data.master_expected_weight && Math.abs(weight - data.master_expected_weight) >= 0.01) {
+        if (data.master_expected_weight && weightsDiffer(weight, data.master_expected_weight)) {
             statusClass = 'weight_discrepancy';
             statusText = 'Weight Off';
             statusDot = 'orange';
@@ -414,7 +431,7 @@ function addScanToList(data, weight) {
     scanRow.innerHTML = `
         <div class="scan-row-lot">${currentLotNumber}</div>
         <div class="scan-row-item">${data.item || 'N/A'}</div>
-        <div class="scan-row-weight">${weight} lbs</div>
+        <div class="scan-row-weight">${formatWeight(weight)} lbs</div>
         <div class="scan-row-status">
             <span class="status-dot status-dot-${statusDot}"></span> ${statusText}
         </div>
@@ -451,7 +468,7 @@ function displayScanDetail(scan) {
     // Check for weight discrepancy (Tolerance 0.01)
     let isWeightOff = false;
     if (scan.master_status === 'match' && scan.master_expected_weight) {
-        if (Math.abs(scan.actual_weight - scan.master_expected_weight) >= 0.01) {
+        if (weightsDiffer(scan.actual_weight, scan.master_expected_weight)) {
             isWeightOff = true;
         }
     }
@@ -502,7 +519,7 @@ function displayScanDetail(scan) {
                 </div>
                 <div class="form-group">
                     <label class="form-label">Weight (lbs)</label>
-                    <input type="number" id="editWeight" class="form-input" value="${scan.actual_weight}" step="0.01" min="0" inputmode="decimal">
+                    <input type="number" id="editWeight" class="form-input" value="${formatWeight(scan.actual_weight)}" step="0.01" min="0" inputmode="decimal">
                 </div>
                 <div class="form-group">
                     <label class="form-label">Comment</label>