dimens

app/report/views.py

@@ -288,6 +288,7 @@ def generate_dimension_app_values(lot_no, code):
     # 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')
 
@@ -300,14 +301,22 @@ def generate_dimension_app_values(lot_no, code):
             # placeholders[f'v{i}_{j}'] = 0
     
     pprint(placeholders)
-    pprint(manual_size_records) 
-    for m in manual_size_records:
-        if m.size_name == "D":
-            placeholders['v1_1'] = placeholders['v5_1'] = f'{m.std} +{m.tolup} {m.tolun}'
-        if m.size_name == "T":
-            placeholders['v2_1'] = placeholders['v6_1'] = f'{m.std} +{m.tolup} {m.tolun}'
-        if m.size_name == "H":
-            placeholders['v3_1'] = placeholders['v7_1'] = f'{m.std} +{m.tolup} {m.tolun}'
+    pprint(manual_size_records)
+
+    # for m in manual_size_records:
+        # if m.size_name == "D":
+            # placeholders['v1_1'] = placeholders['v5_1'] = f'{m.std} +{m.tolup} {m.tolun}'
+        # if m.size_name == "T":
+            # placeholders['v2_1'] = placeholders['v6_1'] = f'{m.std} +{m.tolup} {m.tolun}'
+        # if m.size_name == "H":
+            # placeholders['v3_1'] = placeholders['v7_1'] = f'{m.std} +{m.tolup} {m.tolun}'
+    for m in dimens:  # Changed from manual_size_records to dimens
+        if m.Size_Name == "D":
+            placeholders['v1_1'] = placeholders['v5_1'] = f'D{m.Std} +{m.TolUp} {m.TolUn}'
+        if m.Size_Name == "T":
+            placeholders['v2_1'] = placeholders['v6_1'] = f'T{m.Std} +{m.TolUp} {m.TolUn}'
+        if m.Size_Name == "H":
+            placeholders['v3_1'] = placeholders['v7_1'] = f'H{m.Std} +{m.TolUp} {m.TolUn}'
 
 
 
@@ -383,13 +392,14 @@ def generate_dimension_bal_weight_values(lot_no, ms, code):
         w = ms.PRO6
         placeholders['v4_1'] = placeholders['v9_1'] = w
 
-    for m in manual_size_records:
-        if m.size_name == "D":
-            placeholders['v1_1'] = placeholders['v6_1'] = f'D{m.std} +{m.tolup} {m.tolun}'
-        if m.size_name == "T":
-            placeholders['v2_1'] = placeholders['v7_1'] = f'T{m.std} +{m.tolup} {m.tolun}'
-        if m.size_name == "H":
-            placeholders['v3_1'] = placeholders['v8_1'] = f'H{m.std} +{m.tolup} {m.tolun}'
+    dimens = AllProductDimensionForInsProcess.objects.filter(ProductCode=code)
+    for m in dimens:  # Changed from manual_size_records to dimens
+        if m.Size_Name == "D":
+            placeholders['v1_1'] = placeholders['v6_1'] = f'D{m.Std} +{m.TolUp} {m.TolUn}'
+        if m.Size_Name == "T":
+            placeholders['v2_1'] = placeholders['v7_1'] = f'T{m.Std} +{m.TolUp} {m.TolUn}'
+        if m.Size_Name == "H":
+            placeholders['v3_1'] = placeholders['v8_1'] = f'H{m.Std} +{m.TolUp} {m.TolUn}'
 
 
 
@@ -489,14 +499,14 @@ def generate_dim_bal_app_hard_values(lot_no, first_result, code):
         w = first_result.PRO6
         placeholders['v4_1'] = placeholders['v12_1'] = w
 
-    for m in manual_size_records:
-        if m.size_name == "D":
-            placeholders['v1_1'] = placeholders['v9_1'] = f'D{m.std} +{m.tolup} {m.tolun}'
-        if m.size_name == "T":
-            placeholders['v2_1'] = placeholders['v10_1'] = f'T{m.std} +{m.tolup} {m.tolun}'
-        if m.size_name == "H":
-            placeholders['v3_1'] = placeholders['v11_1'] = f'H{m.std} +{m.tolup} {m.tolun}'
-
+    dimens = AllProductDimensionForInsProcess.objects.filter(ProductCode=code)
+    for m in dimens:  # Changed from manual_size_records to dimens
+        if m.Size_Name == "D":
+            placeholders['v1_1'] = placeholders['v9_1'] = f'D{m.Std} +{m.TolUp} {m.TolUn}'
+        if m.Size_Name == "T":
+            placeholders['v2_1'] = placeholders['v10_1'] = f'T{m.Std} +{m.TolUp} {m.TolUn}'
+        if m.Size_Name == "H":
+            placeholders['v3_1'] = placeholders['v11_1'] = f'H{m.Std} +{m.TolUp} {m.TolUn}'
 
 
     # Ensure that we map each manualSize entry to a corresponding DataMs entry
@@ -609,13 +619,14 @@ def generate_dim_bal_app_rot_hard_values(lot_no, first_result, code):
         w = first_result.PRO6
         placeholders['v4_1'] = placeholders['v13_1'] = w
 
-    for m in manual_size_records:
-        if m.size_name == "D":
-            placeholders['v1_1'] = placeholders['v10_1'] = f'D{m.std} +{m.tolup} {m.tolun}'
-        if m.size_name == "T":
-            placeholders['v2_1'] = placeholders['v11_1'] = f'T{m.std} +{m.tolup} {m.tolun}'
-        if m.size_name == "H":
-            placeholders['v3_1'] = placeholders['v12_1'] = f'H{m.std} +{m.tolup} {m.tolun}'
+    dimens = AllProductDimensionForInsProcess.objects.filter(ProductCode=code)
+    for m in dimens:  # Changed from manual_size_records to dimens
+        if m.Size_Name == "D":
+            placeholders['v1_1'] = placeholders['v10_1'] = f'D{m.Std} +{m.TolUp} {m.TolUn}'
+        if m.Size_Name == "T":
+            placeholders['v2_1'] = placeholders['v11_1'] = f'T{m.Std} +{m.TolUp} {m.TolUn}'
+        if m.Size_Name == "H":
+            placeholders['v3_1'] = placeholders['v12_1'] = f'H{m.Std} +{m.TolUp} {m.TolUn}'
 
 
 
@@ -732,10 +743,11 @@ def generate_t8_values(lot_no, code):
     
     manual_size_records = Manualsize.objects.filter(lotno=lot_no)
     # pprint(f"manual_size = {manual_size_records}")
-    for m in manual_size_records:
-        if m.size_name == "Thickness":
-            for i in range(1,9):
-                placeholders[f'v{i}_1'] = f'{m.std} +{m.tolup} {m.tolun}'
+    dimens = AllProductDimensionForInsProcess.objects.filter(ProductCode=code)
+    for m in dimens:  # Changed from manual_size_records to dimens
+        if m.Size_Name == "Thickness":
+            for i in range(1, 9):
+                placeholders[f'v{i}_1'] = f'{m.Std} +{m.TolUp} {m.TolUn}'
                 # pprint("set std")
     # 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')