add inspect date

app/report/views.py

@@ -135,13 +135,17 @@ def generate_hardness_out_values(lot_no, code):
     placeholders = clear_values(2,5)
 
     # Iterate over the records to populate placeholder values
+    inspect_date = None
     for record_idx, record in enumerate(records, start=1):
+        if record_idx == 1:
+            inspect_date = record.created_at
         placeholders[f'v{record_idx}_1'] = record.p1  # Checkpoint 1 value
         placeholders[f'v{record_idx}_2'] = record.p2  # Checkpoint 2 value
         placeholders[f'v{record_idx}_3'] = record.p3  # Checkpoint 3 value
         placeholders[f'v{record_idx}_4'] = record.avg  # Average value
         placeholders[f'v{record_idx}_5'] = record.rgrade  # Judgment value
 
+    placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
     return placeholders
 
 def generate_hardness_out_in_values(lot_no, code):
@@ -165,7 +169,11 @@ def generate_hardness_out_in_values(lot_no, code):
     # Prepare placeholders
     # placeholders = {}
     placeholders = clear_values(4,5)
+    inspect_date = None
     for idx, record in enumerate(out_data, start=1):
+        if idx == 1:
+            inspect_date = record.created_at
+
         placeholders[f'v{idx}_1'] = record.p1
         placeholders[f'v{idx}_2'] = record.p2
         placeholders[f'v{idx}_3'] = record.p3
@@ -186,6 +194,7 @@ def generate_hardness_out_in_values(lot_no, code):
 
     hide_con(placeholders, "v3_1", "25:28")
     
+    placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
     return placeholders
 
 def generate_hardness_both_size_values(lot_no, ms,code):
@@ -201,7 +210,11 @@ def generate_hardness_both_size_values(lot_no, ms,code):
 
     placeholders = clear_values(20,5)
     # Separate OUT and IN data
+    inspect_date = None
     for idx, record in enumerate(records, start=0):
+        if idx == 1:
+            inspect_date = record.created_at
+
         if record.sub_order == 1:
             for i,v in enumerate(["p1", "p2", "p3", "avg", "rgrade"],start=1):
                 placeholders[f"v{idx*2+1}_{i}"] = getattr(record,v)
@@ -210,6 +223,7 @@ def generate_hardness_both_size_values(lot_no, ms,code):
                 placeholders[f"v{idx*2+2}_{i}"] = getattr(record,v)
     # Prepare placeholders
     # placeholders = {}
+    placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
     return placeholders
 
 
@@ -250,6 +264,7 @@ def generate_dimension_values(lot_no, code):
 
 
     # Ensure that we map each manualSize entry to a corresponding DataMs entry
+    inspect_date = None
     for r in data_ms_records:
         if r.row_no == 1:
             placeholders[f'v1_2'] = r.dsize
@@ -260,6 +275,7 @@ def generate_dimension_values(lot_no, code):
             
             placeholders[f'v3_2'] = r.hsize
             placeholders[f'v3_3'] = r.hsizeok
+            inspect_date = r.created_at
         
         if r.row_no == 2:
             placeholders[f'v4_2'] = r.dsize
@@ -272,6 +288,7 @@ def generate_dimension_values(lot_no, code):
             placeholders[f'v6_3'] = r.hsizeok
 
     hide_con(placeholders, "v4_1", "24:28")
+    placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
     return placeholders
 
 def is_ok(instance):
@@ -326,6 +343,7 @@ def generate_dimension_app_values(lot_no, code):
 
 
     # Ensure that we map each manualSize entry to a corresponding DataMs entry
+    inspect_date = None
     for r in data_ms_records:
         if r.row_no == 1:
             placeholders[f'v1_2'] = r.dsize
@@ -336,6 +354,7 @@ def generate_dimension_app_values(lot_no, code):
             
             placeholders[f'v3_2'] = r.hsize
             placeholders[f'v3_3'] = r.hsizeok
+            inspect_date = r.created_at
 
             # if is_ok(r):
                 # placeholders[f'v4_1'] = 'OK'
@@ -362,6 +381,7 @@ def generate_dimension_app_values(lot_no, code):
                 # placeholders[f'v8_2'] = 'NG'
 
     hide_con(placeholders, "v5_1", "26:32")
+    placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
     return placeholders
 
 def generate_dimension_bal_weight_values(lot_no, ms, code):
@@ -406,7 +426,7 @@ def generate_dimension_bal_weight_values(lot_no, ms, code):
         if m.Size_Name == "H":
             placeholders['v3_1'] = placeholders['v8_1'] = f'H{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
 
-
+    inspect_date = None
 
     # Ensure that we map each manualSize entry to a corresponding DataMs entry
     for r in data_ms_records:
@@ -419,6 +439,7 @@ def generate_dimension_bal_weight_values(lot_no, ms, code):
             
             placeholders[f'v3_2'] = r.hsize
             placeholders[f'v3_3'] = r.hsizeok
+            inspect_date = r.created_at
 
             # if is_ok(r):
                 # placeholders[f'v4_1'] = 'OK'
@@ -456,6 +477,7 @@ def generate_dimension_bal_weight_values(lot_no, ms, code):
             placeholders["v10_2"] = r.weight
             placeholders["v10_3"] = r.judgement
     # hide_con(placeholders, "v5_1", "26:32")
+    placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
     return placeholders
 
 def generate_dim_bal_app_hard_values(lot_no, first_result, code):
@@ -513,7 +535,7 @@ def generate_dim_bal_app_hard_values(lot_no, first_result, code):
         if m.Size_Name == "H":
             placeholders['v3_1'] = placeholders['v11_1'] = f'H{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
 
-
+    inspect_date = None
     # Ensure that we map each manualSize entry to a corresponding DataMs entry
     for r in data_ms_records:
         if r.row_no == 1:
@@ -525,6 +547,7 @@ def generate_dim_bal_app_hard_values(lot_no, first_result, code):
             
             placeholders[f'v3_2'] = r.hsize
             placeholders[f'v3_3'] = r.hsizeok
+            inspect_date = r.created_at
 
             # if is_ok(r):
                 # placeholders[f'v4_1'] = 'OK'
@@ -573,6 +596,7 @@ def generate_dim_bal_app_hard_values(lot_no, first_result, code):
                     placeholders[f'v{idx}_{index}']  = getattr(r, v)
 
     # hide_con(placeholders, "v5_1", "26:32")
+    placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
     return placeholders
 
 def generate_dim_bal_app_rot_hard_values(lot_no, first_result, code):
@@ -636,6 +660,7 @@ def generate_dim_bal_app_rot_hard_values(lot_no, first_result, code):
 
 
     # Ensure that we map each manualSize entry to a corresponding DataMs entry
+    inspect_date = None
     for r in data_ms_records:
         if r.row_no == 1:
             placeholders[f'v1_2'] = r.dsize
@@ -646,6 +671,7 @@ def generate_dim_bal_app_rot_hard_values(lot_no, first_result, code):
             
             placeholders[f'v3_2'] = r.hsize
             placeholders[f'v3_3'] = r.hsizeok
+            inspect_date = r.created_at
 
             # if is_ok(r):
                 # placeholders[f'v4_1'] = 'OK'
@@ -704,6 +730,7 @@ def generate_dim_bal_app_rot_hard_values(lot_no, first_result, code):
             placeholders["v15_3"] = r.speedok
 
     # hide_con(placeholders, "v5_1", "26:32")
+    placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
     return placeholders
 
 def generate_centering_values(lot_no, code):
@@ -731,10 +758,14 @@ def generate_centering_values(lot_no, code):
 
 
     # Ensure that we map each manualSize entry to a corresponding DataMs entry
+    inspect_date = None
     for i,r in enumerate(data_ms_records, start=1):
+        if i == 1:
+            inspect_date = r.created_at
         placeholders[f'v{i}_2'] = r.censize
         placeholders[f'v{i}_3'] = r.censizeok
 
+    placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
     return placeholders
 
 def generate_t8_values(lot_no, code):
@@ -766,13 +797,18 @@ def generate_t8_values(lot_no, code):
     
 
     # Ensure that we map each manualSize entry to a corresponding DataMs entry
+    inspect_date = None
     for i,r in enumerate(data_ms_records, start=1):
+        if i == 1:
+            inspect_date = r.created_at
+
         placeholders[f'v{i}_2'] = r.tpoint1
         placeholders[f'v{i}_3'] = r.tpoint2
         placeholders[f'v{i}_4'] = r.tpoint3
         placeholders[f'v{i}_5'] = r.tpoint4
         placeholders[f'v{i}_10'] = r.tdiff
 
+    placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
     return placeholders
 
 def merge_sheet_data_with_data(sheet_data, data):
@@ -851,7 +887,7 @@ def create_coi_file(lot_no, sheets, user, md):
     data = {
         "code": first_result.PRO1 if first_result else "-",
         "customer": first_result.PRO1C if first_result else "-",
-        "inspect_date": "2025-01-15",
+        # "inspect_date": inspect_date.strftime('%Y/%m/%d') if inspect_date else "-",
         "lot_no": lot_no,
         "size": size_str,
         "lot_size": pcs,