Bladeren bron

coi template update

tum 7 maanden geleden
bovenliggende
commit
e81f125d34
3 gewijzigde bestanden met toevoegingen van 7 en 4 verwijderingen
  1. 2 1
      app/core/utils.py
  2. BIN
      app/report/coi_templates.xlsx
  3. 5 3
      app/report/views.py

+ 2 - 1
app/core/utils.py

236
     'dimension_app': '5.1 Dimension Appearance',
236
     'dimension_app': '5.1 Dimension Appearance',
237
     'dimension_app_drawing': '5.2 Dimension Appearance + Drawing',
237
     'dimension_app_drawing': '5.2 Dimension Appearance + Drawing',
238
     'dimension_bal_weight': '6. Dimension Balance/Weight',
238
     'dimension_bal_weight': '6. Dimension Balance/Weight',
239
-    'dim_bal_app_hard': '7. Dimension Balance/Appearance/Hardness',
239
+    'dim_bal_app_hard': '7.1 Dimension Balance/Appearance/Hardness',
240
+    'dim_bal_app_hard_stamp': '7.2 Dimension Balance/Appearance/Hardness + Stamp',
240
     'dim_bal_app_rot_hard': '8. Dimension Balance/Appearance/Rotation/Hardness',
241
     'dim_bal_app_rot_hard': '8. Dimension Balance/Appearance/Rotation/Hardness',
241
     'thickness_8_point': '9. Thickness 8 Points',
242
     'thickness_8_point': '9. Thickness 8 Points',
242
     'centering': '10. Centering',
243
     'centering': '10. Centering',

BIN
app/report/coi_templates.xlsx


+ 5 - 3
app/report/views.py

694
             # placeholders[f'v{i}_{j}'] = 0
694
             # placeholders[f'v{i}_{j}'] = 0
695
     placeholders['v6_0'] = placeholders['v14_0'] = out_limit
695
     placeholders['v6_0'] = placeholders['v14_0'] = out_limit
696
     placeholders['v7_0'] = placeholders['v15_0'] = mid_limit
696
     placeholders['v7_0'] = placeholders['v15_0'] = mid_limit
697
-    placeholders['v18_0'] = placeholders['v16_0'] = in_limit
697
+    placeholders['v8_0'] = placeholders['v16_0'] = in_limit
698
 
698
 
699
     pprint(placeholders)
699
     pprint(placeholders)
700
     pprint(manual_size_records) 
700
     pprint(manual_size_records) 
766
             for index, v in enumerate(["p1", "p2", "p3", "avg", "rgrade"], start=1):
766
             for index, v in enumerate(["p1", "p2", "p3", "avg", "rgrade"], start=1):
767
                 idx = rmap.get(r.r_type, None)
767
                 idx = rmap.get(r.r_type, None)
768
                 if idx:
768
                 if idx:
769
-                    placeholders[f'v{idx}_{index}']  = getattr(r, v) 
769
+                    placeholders[f'v{idx}_{index}']  = getattr(r, v, "-") 
770
         if r.row_no == 2:
770
         if r.row_no == 2:
771
             rmap = {'OUT': 14, 'MID': 15, 'IN': 16}
771
             rmap = {'OUT': 14, 'MID': 15, 'IN': 16}
772
             for index, v in enumerate(["p1", "p2", "p3", "avg", "rgrade"], start=1):
772
             for index, v in enumerate(["p1", "p2", "p3", "avg", "rgrade"], start=1):
773
                 idx = rmap.get(r.r_type, None)
773
                 idx = rmap.get(r.r_type, None)
774
                 if idx:
774
                 if idx:
775
-                    placeholders[f'v{idx}_{index}']  = getattr(r, v)
775
+                    placeholders[f'v{idx}_{index}']  = getattr(r, v, "-")
776
 
776
 
777
     # hide_con(placeholders, "v5_1", "26:32")
777
     # hide_con(placeholders, "v5_1", "26:32")
778
     placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
778
     placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
1061
             sheet_data[sheet_name] = generate_t8_values(lot_no, code)
1061
             sheet_data[sheet_name] = generate_t8_values(lot_no, code)
1062
         elif sheet_name == 'dim_bal_app_hard':
1062
         elif sheet_name == 'dim_bal_app_hard':
1063
             sheet_data[sheet_name] = generate_dim_bal_app_hard_values(lot_no, first_result, code)
1063
             sheet_data[sheet_name] = generate_dim_bal_app_hard_values(lot_no, first_result, code)
1064
+        elif sheet_name == 'dim_bal_app_hard_stamp':
1065
+            sheet_data[sheet_name] = generate_dim_bal_app_hard_values(lot_no, first_result, code)
1064
         elif sheet_name == 'dim_bal_app_rot_hard':
1066
         elif sheet_name == 'dim_bal_app_rot_hard':
1065
             sheet_data[sheet_name] = generate_dim_bal_app_rot_hard_values(lot_no, first_result, code)
1067
             sheet_data[sheet_name] = generate_dim_bal_app_rot_hard_values(lot_no, first_result, code)
1066
     
1068