|
|
@@ -236,11 +236,11 @@ def generate_dimension_values(lot_no, code):
|
|
236
|
236
|
pprint(manual_size_records)
|
|
237
|
237
|
for m in dimens:
|
|
238
|
238
|
if m.Size_Name == "D":
|
|
239
|
|
- placeholders['v1_1'] = placeholders['v4_1'] = f'D{m.Std} +{m.TolUp} {m.TolUn}'
|
|
|
239
|
+ placeholders['v1_1'] = placeholders['v4_1'] = f'D{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
240
|
240
|
if m.Size_Name == "T":
|
|
241
|
|
- placeholders['v2_1'] = placeholders['v5_1'] = f'T{m.Std} +{m.TolUp} {m.TolUn}'
|
|
|
241
|
+ placeholders['v2_1'] = placeholders['v5_1'] = f'T{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
242
|
242
|
if m.Size_Name == "H":
|
|
243
|
|
- placeholders['v3_1'] = placeholders['v6_1'] = f'H{m.Std} +{m.TolUp} {m.TolUn}'
|
|
|
243
|
+ placeholders['v3_1'] = placeholders['v6_1'] = f'H{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
244
|
244
|
|
|
245
|
245
|
|
|
246
|
246
|
|
|
|
@@ -305,18 +305,18 @@ def generate_dimension_app_values(lot_no, code):
|
|
305
|
305
|
|
|
306
|
306
|
# for m in manual_size_records:
|
|
307
|
307
|
# if m.size_name == "D":
|
|
308
|
|
- # placeholders['v1_1'] = placeholders['v5_1'] = f'{m.std} +{m.tolup} {m.tolun}'
|
|
|
308
|
+ # placeholders['v1_1'] = placeholders['v5_1'] = f'{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
309
|
309
|
# if m.size_name == "T":
|
|
310
|
|
- # placeholders['v2_1'] = placeholders['v6_1'] = f'{m.std} +{m.tolup} {m.tolun}'
|
|
|
310
|
+ # placeholders['v2_1'] = placeholders['v6_1'] = f'{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
311
|
311
|
# if m.size_name == "H":
|
|
312
|
|
- # placeholders['v3_1'] = placeholders['v7_1'] = f'{m.std} +{m.tolup} {m.tolun}'
|
|
|
312
|
+ # placeholders['v3_1'] = placeholders['v7_1'] = f'{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
313
|
313
|
for m in dimens: # Changed from manual_size_records to dimens
|
|
314
|
314
|
if m.Size_Name == "D":
|
|
315
|
|
- placeholders['v1_1'] = placeholders['v5_1'] = f'D{m.Std} +{m.TolUp} {m.TolUn}'
|
|
|
315
|
+ placeholders['v1_1'] = placeholders['v5_1'] = f'D{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
316
|
316
|
if m.Size_Name == "T":
|
|
317
|
|
- placeholders['v2_1'] = placeholders['v6_1'] = f'T{m.Std} +{m.TolUp} {m.TolUn}'
|
|
|
317
|
+ placeholders['v2_1'] = placeholders['v6_1'] = f'T{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
318
|
318
|
if m.Size_Name == "H":
|
|
319
|
|
- placeholders['v3_1'] = placeholders['v7_1'] = f'H{m.Std} +{m.TolUp} {m.TolUn}'
|
|
|
319
|
+ placeholders['v3_1'] = placeholders['v7_1'] = f'H{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
320
|
320
|
|
|
321
|
321
|
|
|
322
|
322
|
|
|
|
@@ -395,11 +395,11 @@ def generate_dimension_bal_weight_values(lot_no, ms, code):
|
|
395
|
395
|
dimens = AllProductDimensionForInsProcess.objects.filter(ProductCode=code)
|
|
396
|
396
|
for m in dimens: # Changed from manual_size_records to dimens
|
|
397
|
397
|
if m.Size_Name == "D":
|
|
398
|
|
- placeholders['v1_1'] = placeholders['v6_1'] = f'D{m.Std} +{m.TolUp} {m.TolUn}'
|
|
|
398
|
+ placeholders['v1_1'] = placeholders['v6_1'] = f'D{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
399
|
399
|
if m.Size_Name == "T":
|
|
400
|
|
- placeholders['v2_1'] = placeholders['v7_1'] = f'T{m.Std} +{m.TolUp} {m.TolUn}'
|
|
|
400
|
+ placeholders['v2_1'] = placeholders['v7_1'] = f'T{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
401
|
401
|
if m.Size_Name == "H":
|
|
402
|
|
- placeholders['v3_1'] = placeholders['v8_1'] = f'H{m.Std} +{m.TolUp} {m.TolUn}'
|
|
|
402
|
+ placeholders['v3_1'] = placeholders['v8_1'] = f'H{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
403
|
403
|
|
|
404
|
404
|
|
|
405
|
405
|
|
|
|
@@ -502,11 +502,11 @@ def generate_dim_bal_app_hard_values(lot_no, first_result, code):
|
|
502
|
502
|
dimens = AllProductDimensionForInsProcess.objects.filter(ProductCode=code)
|
|
503
|
503
|
for m in dimens: # Changed from manual_size_records to dimens
|
|
504
|
504
|
if m.Size_Name == "D":
|
|
505
|
|
- placeholders['v1_1'] = placeholders['v9_1'] = f'D{m.Std} +{m.TolUp} {m.TolUn}'
|
|
|
505
|
+ placeholders['v1_1'] = placeholders['v9_1'] = f'D{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
506
|
506
|
if m.Size_Name == "T":
|
|
507
|
|
- placeholders['v2_1'] = placeholders['v10_1'] = f'T{m.Std} +{m.TolUp} {m.TolUn}'
|
|
|
507
|
+ placeholders['v2_1'] = placeholders['v10_1'] = f'T{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
508
|
508
|
if m.Size_Name == "H":
|
|
509
|
|
- placeholders['v3_1'] = placeholders['v11_1'] = f'H{m.Std} +{m.TolUp} {m.TolUn}'
|
|
|
509
|
+ placeholders['v3_1'] = placeholders['v11_1'] = f'H{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
510
|
510
|
|
|
511
|
511
|
|
|
512
|
512
|
# Ensure that we map each manualSize entry to a corresponding DataMs entry
|
|
|
@@ -622,11 +622,11 @@ def generate_dim_bal_app_rot_hard_values(lot_no, first_result, code):
|
|
622
|
622
|
dimens = AllProductDimensionForInsProcess.objects.filter(ProductCode=code)
|
|
623
|
623
|
for m in dimens: # Changed from manual_size_records to dimens
|
|
624
|
624
|
if m.Size_Name == "D":
|
|
625
|
|
- placeholders['v1_1'] = placeholders['v10_1'] = f'D{m.Std} +{m.TolUp} {m.TolUn}'
|
|
|
625
|
+ placeholders['v1_1'] = placeholders['v10_1'] = f'D{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
626
|
626
|
if m.Size_Name == "T":
|
|
627
|
|
- placeholders['v2_1'] = placeholders['v11_1'] = f'T{m.Std} +{m.TolUp} {m.TolUn}'
|
|
|
627
|
+ placeholders['v2_1'] = placeholders['v11_1'] = f'T{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
628
|
628
|
if m.Size_Name == "H":
|
|
629
|
|
- placeholders['v3_1'] = placeholders['v12_1'] = f'H{m.Std} +{m.TolUp} {m.TolUn}'
|
|
|
629
|
+ placeholders['v3_1'] = placeholders['v12_1'] = f'H{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
630
|
630
|
|
|
631
|
631
|
|
|
632
|
632
|
|
|
|
@@ -747,7 +747,7 @@ def generate_t8_values(lot_no, code):
|
|
747
|
747
|
for m in dimens: # Changed from manual_size_records to dimens
|
|
748
|
748
|
if m.Size_Name == "Thickness":
|
|
749
|
749
|
for i in range(1, 9):
|
|
750
|
|
- placeholders[f'v{i}_1'] = f'{m.Std} +{m.TolUp} {m.TolUn}'
|
|
|
750
|
+ placeholders[f'v{i}_1'] = f'{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
|
|
751
|
751
|
# pprint("set std")
|
|
752
|
752
|
# Fetch actual and judgement values from DataMs ordered by row_no (limit to 2 rows)
|
|
753
|
753
|
data_ms_records = DataMs.objects.filter(lot_no=lot_no).order_by('row_no')
|