omnissiah/westech-r2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify pallet-list API

Browse Source
This commit is contained in:
Westech Admin
2026-05-19 21:45:39 +00:00
parent 73e0cd6c79
commit ece68b80e9
2 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
westech_r2/page/pallet-list/__init__.py
+1
View File
@@ -0,0 +1 @@
# Pallet List page for Westech R2
westech_r2/page/pallet-list/pallet-list.py
+2 -20
View File
@@ -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"] 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 = ["", "0", "0000", "N/A", "TBD", "null", "999990", "999995"]
junk_list = "', '".join(junk) junk_list = "', '".join(junk)
conditions.append("pallet_number NOT IN ('" + junk_list + "')") conditions.append("pallet_number NOT IN ('" + junk_list + "')")
# Exclude test numbers
conditions.append("pallet_number NOT LIKE '999%'") conditions.append("pallet_number NOT LIKE '999%'")
# Must start with digit
conditions.append("pallet_number REGEXP '^[0-9]'") conditions.append("pallet_number REGEXP '^[0-9]'")
if status_filter: 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] total = frappe.db.sql("SELECT COUNT(*) FROM tabPallet WHERE " + where_clause)[0][0]
pallets = frappe.db.sql(""" 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)
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 { return {"pallets": pallets, "total": total, "page": page, "page_size": page_size}
"pallets": pallets,
"total": total,
"page": page,
"page_size": page_size
}