report dimen

app/report/templates/report/coi.html

@@ -8,7 +8,6 @@
 <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">
@@ -78,7 +77,6 @@
             </a>
           </div>
         </div>
-  {{ result }}
   
   <div class="bg-white shadow-md rounded-md p-4">
 

app/report/views.py

@@ -1,7 +1,7 @@
 from django.shortcuts import render, redirect, get_object_or_404
 from django.core.paginator import Paginator
 from django.contrib import messages
-from core.models import Report
+from core.models import Report, AllProductDimensionForInsProcess
 from core.forms import ReportForm
 from core.utils import ConfigurableCRUDView, queryFromMaster
 from .filters import ReportFilter
@@ -111,7 +111,7 @@ def clear_values(n, m):
             placeholders[f'v{i}_{j}'] = " "
     return placeholders
 
-def generate_hardness_out_values(lot_no):
+def generate_hardness_out_values(lot_no, code):
     """
     Generate a dictionary of placeholder values for a given lot_no.
 
@@ -139,7 +139,7 @@ def generate_hardness_out_values(lot_no):
 
     return placeholders
 
-def generate_hardness_out_in_values(lot_no):
+def generate_hardness_out_in_values(lot_no, code):
     # Fetch records from the Data model
     # records = Data.objects.filter(lot_no=lot_no).order_by('row_no')
     data_h1 = list(Data.objects.filter(lot_no=lot_no).order_by('row_no'))
@@ -183,7 +183,7 @@ def generate_hardness_out_in_values(lot_no):
     
     return placeholders
 
-def generate_hardness_both_size_values(lot_no, ms):
+def generate_hardness_both_size_values(lot_no, ms,code):
     # Fetch records from the Data model
     # records = Data.objects.filter(lot_no=lot_no).order_by('row_no')
     data_h1 = list(Data.objects.filter(lot_no=lot_no).order_by('row_no', 'sub_order'))
@@ -211,7 +211,7 @@ def generate_hardness_both_size_values(lot_no, ms):
 # # Example usage:
 # placeholders_dict = clear_values(6, 3)
 # print(placeholders_dict)
-def generate_dimension_values(lot_no):
+def generate_dimension_values(lot_no, code):
     """
     Fetch dimension records from manualSize and DataMs models
     and generate placeholder values for Standard, Actual, and Judgement.
@@ -219,6 +219,7 @@ def generate_dimension_values(lot_no):
     """
     # Fetch standard values from manualSize (limit to 2 rows)
     manual_size_records = Manualsize.objects.filter(lotno=lot_no)
+    dimens = AllProductDimensionForInsProcess.objects.filter(ProductCode=code)
 
     # Fetch actual and judgement values from DataMs ordered by row_no (limit to 2 rows)
     data_ms_records = DataMs.objects.filter(lot_no=lot_no).order_by('row_no')
@@ -233,13 +234,13 @@ def generate_dimension_values(lot_no):
     
     pprint(placeholders)
     pprint(manual_size_records) 
-    for m in manual_size_records:
-        if m.size_name == "D":
-            placeholders['v1_1'] = placeholders['v4_1'] = f'{m.std} +{m.tolup} {m.tolun}'
-        if m.size_name == "T":
-            placeholders['v2_1'] = placeholders['v5_1'] = f'{m.std} +{m.tolup} {m.tolun}'
-        if m.size_name == "H":
-            placeholders['v3_1'] = placeholders['v6_1'] = f'{m.std} +{m.tolup} {m.tolun}'
+    for m in dimens:
+        if m.Size_Name == "D":
+            placeholders['v1_1'] = placeholders['v4_1'] = f'D{m.Std} +{m.TolUp} {m.TolUn}'
+        if m.Size_Name == "T":
+            placeholders['v2_1'] = placeholders['v5_1'] = f'T{m.Std} +{m.TolUp} {m.TolUn}'
+        if m.Size_Name == "H":
+            placeholders['v3_1'] = placeholders['v6_1'] = f'H{m.Std} +{m.TolUp} {m.TolUn}'
 
 
 
@@ -278,7 +279,7 @@ def is_ok(instance):
                 return False
     return True
 
-def generate_dimension_app_values(lot_no):
+def generate_dimension_app_values(lot_no, code):
     """
     Fetch dimension records from manualSize and DataMs models
     and generate placeholder values for Standard, Actual, and Judgement.
@@ -349,7 +350,7 @@ def generate_dimension_app_values(lot_no):
     hide_con(placeholders, "v5_1", "26:32")
     return placeholders
 
-def generate_dimension_bal_weight_values(lot_no, ms):
+def generate_dimension_bal_weight_values(lot_no, ms, code):
     """
     Fetch dimension records from manualSize and DataMs models
     and generate placeholder values for Standard, Actual, and Judgement.
@@ -442,7 +443,7 @@ def generate_dimension_bal_weight_values(lot_no, ms):
     # hide_con(placeholders, "v5_1", "26:32")
     return placeholders
 
-def generate_dim_bal_app_hard_values(lot_no, first_result):
+def generate_dim_bal_app_hard_values(lot_no, first_result, code):
     """
     Fetch dimension records from manualSize and DataMs models
     and generate placeholder values for Standard, Actual, and Judgement.
@@ -559,7 +560,7 @@ def generate_dim_bal_app_hard_values(lot_no, first_result):
     # hide_con(placeholders, "v5_1", "26:32")
     return placeholders
 
-def generate_dim_bal_app_rot_hard_values(lot_no, first_result):
+def generate_dim_bal_app_rot_hard_values(lot_no, first_result, code):
     """
     Fetch dimension records from manualSize and DataMs models
     and generate placeholder values for Standard, Actual, and Judgement.
@@ -689,7 +690,7 @@ def generate_dim_bal_app_rot_hard_values(lot_no, first_result):
     # hide_con(placeholders, "v5_1", "26:32")
     return placeholders
 
-def generate_centering_values(lot_no):
+def generate_centering_values(lot_no, code):
     """
     Fetch dimension records from manualSize and DataMs models
     and generate placeholder values for Standard, Actual, and Judgement.
@@ -720,7 +721,7 @@ def generate_centering_values(lot_no):
 
     return placeholders
 
-def generate_t8_values(lot_no):
+def generate_t8_values(lot_no, code):
     """
     Fetch dimension records from manualSize and DataMs models
     and generate placeholder values for Standard, Actual, and Judgement.
@@ -788,29 +789,29 @@ def create_coi_file(lot_no, sheets, user, md):
     
     results = queryFromMaster(lot_no)
     first_result = results[0] if results else None
-    
+    code  = first_result.PRO1 if first_result else None 
     sheet_data = {}
     for sheet_name in sheets:
         if sheet_name == 'hardness_out':
-            sheet_data[sheet_name] = generate_hardness_out_values(lot_no)
+            sheet_data[sheet_name] = generate_hardness_out_values(lot_no, code)
         elif sheet_name == 'hardness_out_in':
-            sheet_data[sheet_name] = generate_hardness_out_in_values(lot_no)
+            sheet_data[sheet_name] = generate_hardness_out_in_values(lot_no, code)
         elif sheet_name == 'hardness_both_size':
-            sheet_data[sheet_name] = generate_hardness_both_size_values(lot_no, first_result)
+            sheet_data[sheet_name] = generate_hardness_both_size_values(lot_no, first_result, code)
         elif sheet_name == 'dimension':
-            sheet_data[sheet_name] = generate_dimension_values(lot_no)
+            sheet_data[sheet_name] = generate_dimension_values(lot_no, code)
         elif sheet_name == 'dimension_app':
-            sheet_data[sheet_name] = generate_dimension_app_values(lot_no)
+            sheet_data[sheet_name] = generate_dimension_app_values(lot_no, code)
         elif sheet_name == 'dimension_bal_weight':
-            sheet_data[sheet_name] = generate_dimension_bal_weight_values(lot_no, first_result)
+            sheet_data[sheet_name] = generate_dimension_bal_weight_values(lot_no, first_result, code)
         elif sheet_name == 'centering':
-            sheet_data[sheet_name] = generate_centering_values(lot_no)
+            sheet_data[sheet_name] = generate_centering_values(lot_no, code)
         elif sheet_name == 'thickness_8_point':
-            sheet_data[sheet_name] = generate_t8_values(lot_no)
+            sheet_data[sheet_name] = generate_t8_values(lot_no, code)
         elif sheet_name == 'dim_bal_app_hard':
-            sheet_data[sheet_name] = generate_dim_bal_app_hard_values(lot_no, first_result)
+            sheet_data[sheet_name] = generate_dim_bal_app_hard_values(lot_no, first_result, code)
         elif sheet_name == 'dim_bal_app_rot_hard':
-            sheet_data[sheet_name] = generate_dim_bal_app_rot_hard_values(lot_no, first_result)
+            sheet_data[sheet_name] = generate_dim_bal_app_rot_hard_values(lot_no, first_result, code)
     
     converted_data = convert_sheet_data(sheet_data)