Merge branch 'main' of http://git2.simplico.net/tum/coi

app/report/views.py

@@ -26,7 +26,7 @@ from django.conf import settings
 from itertools import chain
 
 from django_filters.views import FilterView
-from django.db.models import Q
+from django.db.models import Q, Func, Value, F
 
 
 from django.views.generic import (
@@ -456,6 +456,10 @@ def generate_dimension_app_values(lot_no, code):
     placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
     return placeholders
 
+def safe_strip(val):
+    """Remove '-' or return '' if None."""
+    return val.replace('-', '') if val else ''
+
 def generate_dimension_app_drawing_values(lot_no, code):
     """
     Fetch dimension records from manualSize and DataMs models
@@ -537,8 +541,23 @@ def generate_dimension_app_drawing_values(lot_no, code):
 
     hide_con(placeholders, "v5_1", "27:33")
     
-    drawing_data = ProductDrawing.objects.filter(
-        Q(lot_no=lot_no) | Q(code_no=code)).first()
+
+    norm_lot_no = safe_strip(lot_no)
+    norm_code = safe_strip(code)
+    
+    drawing_qs = ProductDrawing.objects.annotate(
+        norm_lot_no=Func(F('lot_no'), Value('-'), Value(''), function='replace'),
+        norm_code_no=Func(F('code_no'), Value('-'), Value(''), function='replace')
+    )
+
+    query = Q()
+    if norm_lot_no:
+        query |= Q(norm_lot_no=norm_lot_no)
+    if norm_code:
+        query |= Q(norm_code_no=norm_code)
+
+    drawing_data = drawing_qs.filter(query).first()
+    
     pprint(f"1.1 = {drawing_data}") 
     pprint(f"1.2 = {lot_no} {code}")
     if drawing_data: