report no

app/core/utils.py

@@ -203,7 +203,7 @@ class ConfigurableCRUDView:
         class DeleteViewClass(DeleteView):
             model = self.model
             template_name = self.confirm_delete_template_name
-            success_url = reverse_lazy(self.delete_url_name)
+            success_url = reverse_lazy(self.list_url_name)
 
             def get_context_data(inner_self, **kwargs):
                 context = super().get_context_data(**kwargs)
@@ -228,16 +228,16 @@ def queryFromMaster(lot_no):
     return results
 
 SHEET_NAMES = {
-    'hardness_out': 'Hardness Out',
-    'hardness_out_in': 'Hardness Out/In', 
-    'hardness_both_size': 'Hardness Both Size',
-    'dimension': 'Dimension',
-    'dimension_weight_warp': 'Dimension/Weight/Warp',
-    'dimension_app': 'Dimension Appearance',
-    'dimension_app_drawing': 'Dimension Appearance + Drawing',
-    'dimension_bal_weight': 'Dimension Balance/Weight',
-    'dim_bal_app_hard': 'Dimension Balance/Appearance/Hardness',
-    'dim_bal_app_rot_hard': 'Dimension Balance/Appearance/Rotation/Hardness',
-    'thickness_8_point': 'Thickness 8 Points',
-    'centering': 'Centering',
+    'hardness_out': '1. Hardness Out',
+    'hardness_out_in': '2. Hardness Out/In', 
+    'hardness_both_size': '3. Hardness Both Size',
+    'dimension': '4.1 Dimension',
+    'dimension_weight_warp': '4.2 Dimension/Weight/Warp',
+    'dimension_app': '5.1 Dimension Appearance',
+    'dimension_app_drawing': '5.2 Dimension Appearance + Drawing',
+    'dimension_bal_weight': '6. Dimension Balance/Weight',
+    'dim_bal_app_hard': '7. Dimension Balance/Appearance/Hardness',
+    'dim_bal_app_rot_hard': '8. Dimension Balance/Appearance/Rotation/Hardness',
+    'thickness_8_point': '9. Thickness 8 Points',
+    'centering': '10. Centering',
 }

app/report/templates/report/coi.html

@@ -7,7 +7,6 @@
 {% block content %}
 <div class="container mx-auto px-4 py-8" x-data="COIReport">
   <h1 class="text-2xl font-bold text-gray-800">Export Center</h1>
-  {{ lot_no }}
   <form method='post'>
     {% csrf_token %}
     <div class="flex items-center gap-2 mb-4">

app/report/views.py

@@ -665,8 +665,18 @@ def generate_dim_bal_app_hard_values(lot_no, first_result, code):
     data_ho = list(chain(data_h1, data_h2))
 
     if first_result:
-        out_limit = f"Out 外  ({first_result.MI18} - {first_result.MI19})"
-        in_limit = f"In 内 ({first_result.MI22} - {first_result.MI23})"
+        # out_limit = f"Out 外  ({first_result.MI18} - {first_result.MI19})"
+        # in_limit = f"In 内 ({first_result.MI22} - {first_result.MI23})"
+        try:
+            out_limit = f"Out 外 ({float(first_result.MI18):.2f} - {float(first_result.MI19):.2f})"
+        except (TypeError, ValueError):
+            out_limit = "Out 外"
+
+        try:
+            in_limit = f"In 内 ({float(first_result.MI22):.2f} - {float(first_result.MI23):.2f})"
+        except (TypeError, ValueError):
+            in_limit = "In 内"
+
         mid_limit = f"Middle   中  -"
     else:
         out_limit = f"Out 外"
@@ -790,8 +800,19 @@ def generate_dim_bal_app_rot_hard_values(lot_no, first_result, code):
     rotates = RotateData.objects.filter(lot_no=lot_no).order_by('row_no')
 
     if first_result:
-        out_limit = f"Out 外  ({first_result.MI18} - {first_result.MI19})"
-        in_limit = f"In 内 ({first_result.MI22} - {first_result.MI23})"
+        # out_limit = f"Out 外  ({first_result.MI18} - {first_result.MI19})"
+        # in_limit = f"In 内 ({first_result.MI22} - {first_result.MI23})"
+
+        try:
+            out_limit = f"Out 外 ({float(first_result.MI18):.2f} - {float(first_result.MI19):.2f})"
+        except (TypeError, ValueError):
+            out_limit = "Out 外"
+
+        try:
+            in_limit = f"In 内 ({float(first_result.MI22):.2f} - {float(first_result.MI23):.2f})"
+        except (TypeError, ValueError):
+            in_limit = "In 内"
+
         mid_limit = f"Middle   中  -"
     else:
         out_limit = f"Out 外"
@@ -1054,8 +1075,18 @@ def create_coi_file(lot_no, sheets, user, md):
         pcs = int(first_result.PRO5) - int(first_result.PRO27)
     except:
         pcs = 0
+    
+    first_result.PRO10 = 12321.1232
+    first_result.PRO11 = 1.5
+    first_result.PRO12 = 3.5
+
     if first_result:
-        size_str = f"{first_result.PRO10}x{first_result.PRO11}x{first_result.PRO12}";
+        # size_str = f"{first_result.PRO10}x{first_result.PRO11}x{first_result.PRO12}";
+        try:
+            size_str = f"{float(first_result.PRO10):.2f}x{float(first_result.PRO11):.2f}x{float(first_result.PRO12):.2f}"
+        except (ValueError, TypeError):
+            size_str = "-"
+        
         spec = f"{first_result.PRO13} {first_result.PRO14} {first_result.PRO15} {first_result.PRO16} {first_result.PRO17} {first_result.PRO18}"
     else:
         size_str = ""
@@ -1067,7 +1098,7 @@ def create_coi_file(lot_no, sheets, user, md):
         code = f"{mks_map.mks_code}（MKSコード）　　{mgt_code}（参照）"
     else:
         code = f"{mgt_code}（参照）" or "-"
-
+    # first_result.PRO_TOOL = None
     data = {
         # "code": first_result.PRO1 if first_result else "-",
         "code": code,
@@ -1081,7 +1112,7 @@ def create_coi_file(lot_no, sheets, user, md):
         # "hardness_out.spe_acc": False,  # Hide rows 24 to 28 if the prefix is "0"
         "acc": accept,  # Hide rows 24 to 28 if the prefix is "0"
         "spe_acc": specialAccept,  # Hide rows 24 to 28 if the prefix is "0"
-        "tool": first_result.PRO_TOOL if first_result else "-",
+        "tool": first_result.PRO_TOOL if first_result and first_result.PRO_TOOL else "-",
         # "hardness_out.qa1": f"{qa1.first_name} {qa1.last_name}",
         # "hardness_out.qa2": f"{qa2.first_name} {qa2.last_name}",
         "qa1": f"{qa1.first_name} {qa1.last_name}",
@@ -1208,7 +1239,8 @@ def coi_view(request):
                     spec = f"{first_result.PRO13} {first_result.PRO14} {first_result.PRO15} {first_result.PRO16} {first_result.PRO17} {first_result.PRO18}"
                     #first_result.PRO1C = "TUM"
                     #selected_templates  = CustomerTemplateMapping.objects.filter(customer_name=first_result.PRO1C).first().template_names
-                    mapping = CustomerTemplateMapping.objects.filter(customer_name=first_result.PRO1C).first()
+                    # first_result.PRO1C = 'OSAKA SEIMITSU'
+                    mapping = CustomerTemplateMapping.objects.filter(customer_name__icontains=first_result.PRO1C).first()
                     selected_templates = mapping.template_names if mapping else []
 
                     mgt_code = first_result.PRO1 if first_result else "-"