diff --git a/westech_r2/page/pallet-list/__init__.py b/westech_r2/page/pallet-list/__init__.py index e69de29..eb0d74d 100644 --- a/westech_r2/page/pallet-list/__init__.py +++ b/westech_r2/page/pallet-list/__init__.py @@ -0,0 +1 @@ +# Pallet List page for Westech R2 diff --git a/westech_r2/page/pallet-list/pallet-list.py b/westech_r2/page/pallet-list/pallet-list.py index 4c19e61..abac61c 100644 --- a/westech_r2/page/pallet-list/pallet-list.py +++ b/westech_r2/page/pallet-list/pallet-list.py @@ -8,15 +8,10 @@ def get_pallets(page=1, page_size=100, sort_field="pallet_number", sort_dir="des conditions = ["pallet_number IS NOT NULL", "pallet_number != ''", "date_reserved IS NOT NULL"] - # Junk filter (same as EIM) junk = ["", "0", "0000", "N/A", "TBD", "null", "999990", "999995"] junk_list = "', '".join(junk) conditions.append("pallet_number NOT IN ('" + junk_list + "')") - - # Exclude test numbers conditions.append("pallet_number NOT LIKE '999%'") - - # Must start with digit conditions.append("pallet_number REGEXP '^[0-9]'") if status_filter: @@ -28,19 +23,6 @@ def get_pallets(page=1, page_size=100, sort_field="pallet_number", sort_dir="des total = frappe.db.sql("SELECT COUNT(*) FROM tabPallet WHERE " + where_clause)[0][0] - pallets = frappe.db.sql(""" - SELECT - name, pallet_number, date_reserved, received_date, - customer_number, inbound_weight, tester, - description, qty_to_sales, weight_to_sales, finish_date, notes, status - FROM tabPallet - WHERE """ + where_clause + """ - ORDER BY CAST(pallet_number AS UNSIGNED) """ + sort_dir + """ - LIMIT """ + str(page_size) + """ OFFSET """ + str(offset), as_dict=True) + pallets = frappe.db.sql("SELECT name, pallet_number, date_reserved, received_date, customer_number, inbound_weight, tester, description, qty_to_sales, weight_to_sales, finish_date, notes, status FROM tabPallet WHERE " + where_clause + " ORDER BY CAST(pallet_number AS UNSIGNED) " + sort_dir + " LIMIT " + str(page_size) + " OFFSET " + str(offset), as_dict=True) - return { - "pallets": pallets, - "total": total, - "page": page, - "page_size": page_size - } + return {"pallets": pallets, "total": total, "page": page, "page_size": page_size}