report new format

app/core/utils.py

@@ -233,6 +233,7 @@ SHEET_NAMES = {
     'hardness_both_size': 'Hardness Both Size',
     'dimension': 'Dimension',
     'dimension_app': 'Dimension Appearance',
+    'dimension_app_drawing': 'Dimension Appearance + Drawing',
     'dimension_bal_weight': 'Dimension Balance/Weight',
     'dim_bal_app_hard': 'Dimension Balance/Appearance/Hardness',
     'dim_bal_app_rot_hard': 'Dimension Balance/Appearance/Rotation/Hardness',

app/report/gen_report.py

@@ -193,20 +193,37 @@ def gen_xlsx(template_file, selected_sheets, prefix_filename, data):
                                 # img.height = 40  # Adjust size as needed
                                 pil_img = PILImage.open(image_path)
                                 original_width, original_height = pil_img.size
+                                pprint(f"1.0 = f{image_path}")
+                                pprint(f"1.1 = {original_width}x{original_height}")
 
                                 # Desired height (e.g., 40), calculate the new width to maintain aspect ratio
-                                desired_height = 30
-                                aspect_ratio = original_width / original_height
-                                new_width = int(desired_height * aspect_ratio)
+                                row_height = sheet.row_dimensions[cell.row].height
+                                desired_height = int(row_height)
 
-                                # Resize the image using Pillow (optional, for saving memory during export)
-                                resized_img = pil_img.resize((new_width, desired_height), PILImage.Resampling.LANCZOS)
-                                resized_img.save(image_path)  # Save the resized image back to the same path
+                                fixed_pixel_height = int(desired_height * 1.33)  # Convert point → pixel
 
+                                aspect_ratio = original_width / original_height
+                                new_width = int(fixed_pixel_height * aspect_ratio)
+
+                                resized_img = pil_img.resize((new_width, fixed_pixel_height), PILImage.Resampling.LANCZOS)
+
+# Generate new filename by adding '_resized' before extension
+                                base, ext = os.path.splitext(image_path)
+                                resized_path = f"{base}_resized{ext}"
+
+                                resized_img.save(resized_path)
+                                # aspect_ratio = original_width / original_height
+                                # new_width = int(desired_height * aspect_ratio)
+                                #
+                                # # Resize the image using Pillow (optional, for saving memory during export)
+                                # resized_img = pil_img.resize((new_width, desired_height), PILImage.Resampling.LANCZOS)
+                                # resized_img.save(image_path)  # Save the resized image back to the same path
+                                pprint(f"1.2 = {new_width}, {desired_height}")
                                 # Insert the resized image into the Excel sheet
-                                img = Image(image_path)
+                                img = Image(resized_path)
                                 img.width, img.height = new_width, desired_height  # Set the dimensions
                                 # sheet.add_image(img, cell.coordinate)
+                                print(f"1.3 = {row_height}")
                                 center_image_in_cell(sheet, img, cell.coordinate, )
                                 cell.value = None  # Clear placeholder
 

app/report/templates/report/coi.html

@@ -7,6 +7,7 @@
 {% block content %}
 <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">
@@ -84,7 +85,7 @@
                     <tbody>
                         <tr class="bg-blue-100">
                             <td class="border border-gray-300 px-4 py-2 font-medium text-gray-700">Product Code :</td>
-                            <td class="border border-gray-300 px-4 py-2 text-gray-700">{{ result.PRO1 }}</td>
+                            <td class="border border-gray-300 px-4 py-2 text-gray-700">{{ code }}</td>
                         </tr>
                         <tr>
                             <td class="border border-gray-300 px-4 py-2 font-medium text-gray-700">Lot No. :</td>
@@ -152,7 +153,7 @@ th, td {
   function COIReport() {
     return {
       lot_no: '{{ lot_no }}', // Bind this to the input value
-      exports: {{ selected_templates|safe }},
+      exports: {{ selected_templates|default:"[]"|safe }},
       qa1: null,
       qa2: null,
       gen_report_url: '{% url "report:gen_report" %}', 

app/report/views.py

@@ -26,6 +26,8 @@ from django.conf import settings
 from itertools import chain
 
 from django_filters.views import FilterView
+from django.db.models import Q
+
 
 from django.views.generic import (
     ListView,)
@@ -384,6 +386,97 @@ def generate_dimension_app_values(lot_no, code):
     placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
     return placeholders
 
+def generate_dimension_app_drawing_values(lot_no, code):
+    """
+    Fetch dimension records from manualSize and DataMs models
+    and generate placeholder values for Standard, Actual, and Judgement.
+    Supports two row_no entries per lot.
+    """
+    # 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')
+
+    # Prepare placeholders
+
+    # placeholders = {}
+    placeholders = clear_values(8,3)
+    # for i in range(1,7):
+        # for j in range(1,4):
+            # 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:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
+        # if m.size_name == "T":
+            # placeholders['v2_1'] = placeholders['v6_1'] = f'{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
+        # if m.size_name == "H":
+            # placeholders['v3_1'] = placeholders['v7_1'] = f'{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
+    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:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
+        if m.Size_Name == "T":
+            placeholders['v2_1'] = placeholders['v6_1'] = f'T{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
+        if m.Size_Name == "H":
+            placeholders['v3_1'] = placeholders['v7_1'] = f'H{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
+
+
+
+    # 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
+            placeholders[f'v1_3'] = r.dsizeok
+            
+            placeholders[f'v2_2'] = r.tsize
+            placeholders[f'v2_3'] = r.tsizeok
+            
+            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'
+                # placeholders[f'v4_2'] = 'OK'
+            # else:
+                # placeholders[f'v4_1'] = 'NG'
+                # placeholders[f'v4_2'] = 'OK'
+        
+        if r.row_no == 2:
+            placeholders[f'v5_2'] = r.dsize
+            placeholders[f'v5_3'] = r.dsizeok
+            
+            placeholders[f'v6_2'] = r.tsize
+            placeholders[f'v6_3'] = r.tsizeok
+            
+            placeholders[f'v7_2'] = r.hsize
+            placeholders[f'v7_3'] = r.hsizeok
+
+            # if is_ok(r):
+                # placeholders[f'v8_1'] = 'OK'
+                # placeholders[f'v8_2'] = 'OK'
+            # else:
+                # placeholders[f'v8_1'] = 'NG'
+                # placeholders[f'v8_2'] = 'NG'
+
+    hide_con(placeholders, "v5_1", "26:32")
+    
+    drawing_data = ProductDrawing.objects.filter(
+        Q(lot_no=lot_no) | Q(code_no=code)).first()
+    pprint(f"1.1 = {drawing_data}") 
+    pprint(f"1.2 = {lot_no} {code}")
+    if drawing_data:
+        placeholders["drawing"] = drawing_data.drawing if drawing_data.drawing else "-"
+
+    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):
     """
     Fetch dimension records from manualSize and DataMs models
@@ -414,8 +507,11 @@ def generate_dimension_bal_weight_values(lot_no, ms, code):
     pprint(manual_size_records) 
     
     if ms:
-        w = ms.PRO6
-        placeholders['v4_1'] = placeholders['v9_1'] = w
+        try:
+            w = ms.PRO6
+            placeholders['v4_1'] = placeholders['v9_1'] = w
+        except:
+            print("no PRO6")
 
     dimens = AllProductDimensionForInsProcess.objects.filter(ProductCode=code)
     for m in dimens:  # Changed from manual_size_records to dimens
@@ -523,8 +619,11 @@ def generate_dim_bal_app_hard_values(lot_no, first_result, code):
     pprint(placeholders)
     pprint(manual_size_records) 
     if first_result:
-        w = first_result.PRO6
-        placeholders['v4_1'] = placeholders['v12_1'] = w
+        try:
+            w = first_result.PRO6
+            placeholders['v4_1'] = placeholders['v12_1'] = w
+        except:
+            print("No PRO6")
 
     dimens = AllProductDimensionForInsProcess.objects.filter(ProductCode=code)
     for m in dimens:  # Changed from manual_size_records to dimens
@@ -645,8 +744,11 @@ def generate_dim_bal_app_rot_hard_values(lot_no, first_result, code):
     pprint(placeholders)
     pprint(manual_size_records) 
     if first_result:
-        w = first_result.PRO6
-        placeholders['v4_1'] = placeholders['v13_1'] = w
+        try:
+            w = first_result.PRO6
+            placeholders['v4_1'] = placeholders['v13_1'] = w
+        except:
+            print("no PRO6")
 
     dimens = AllProductDimensionForInsProcess.objects.filter(ProductCode=code)
     for m in dimens:  # Changed from manual_size_records to dimens
@@ -855,6 +957,8 @@ def create_coi_file(lot_no, sheets, user, md):
             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, code)
+        elif sheet_name == 'dimension_app_drawing':
+            sheet_data[sheet_name] = generate_dimension_app_drawing_values(lot_no, code)
         elif sheet_name == 'dimension_bal_weight':
             sheet_data[sheet_name] = generate_dimension_bal_weight_values(lot_no, first_result, code)
         elif sheet_name == 'centering':
@@ -884,8 +988,16 @@ def create_coi_file(lot_no, sheets, user, md):
         size_str = ""
         spec = ""
 
+    mgt_code = first_result.PRO1 if first_result else "-"
+    mks_map = MksCodeMap.objects.filter(mgt_code=mgt_code).first()
+    if mks_map:
+        code = f"{mks_map.mks_code}（MKSコード）　　{mgt_code}（参照）"
+    else:
+        code = f"{mgt_code}（参照）" or "-"
+
     data = {
-        "code": first_result.PRO1 if first_result else "-",
+        # "code": first_result.PRO1 if first_result else "-",
+        "code": code,
         "customer": first_result.PRO1C if first_result else "-",
         # "inspect_date": inspect_date.strftime('%Y/%m/%d') if inspect_date else "-",
         "lot_no": lot_no,
@@ -896,7 +1008,7 @@ def create_coi_file(lot_no, sheets, user, md):
         # "hardness_out.spe_acc": False,  # Hide rows 24 to 28 if the prefix is "0"
         "acc": accept,  # Hide rows 24 to 28 if the prefix is "0"
         "spe_acc": specialAccept,  # Hide rows 24 to 28 if the prefix is "0"
-        "tool": first_result.PRO_TOOL,
+        "tool": first_result.PRO_TOOL if first_result else "-",
         # "hardness_out.qa1": f"{qa1.first_name} {qa1.last_name}",
         # "hardness_out.qa2": f"{qa2.first_name} {qa2.last_name}",
         "qa1": f"{qa1.first_name} {qa1.last_name}",
@@ -1017,11 +1129,19 @@ def coi_view(request):
                     pcs = int(first_result.PRO5) - int(first_result.PRO27)
                 except:
                     pcs = 0
+                code = "-"
                 if first_result:
                     size_str = f"{first_result.PRO10}x{first_result.PRO11}x{first_result.PRO12}";
                     spec = f"{first_result.PRO13} {first_result.PRO14} {first_result.PRO15} {first_result.PRO16} {first_result.PRO17} {first_result.PRO18}"
                     #first_result.PRO1C = "TUM"
                     selected_templates  = CustomerTemplateMapping.objects.filter(customer_name=first_result.PRO1C).first().template_names
+
+                    mgt_code = first_result.PRO1 if first_result else "-"
+                    mks_map = MksCodeMap.objects.filter(mgt_code=mgt_code).first()
+                    if mks_map:
+                        code = f"{mks_map.mks_code}（MKSコード）　　{mgt_code}（参照）"
+                    else:
+                        code = f"{mgt_code}（参照）" or "-"
                 else:
                     size_str = ""
                     spec = ""
@@ -1040,7 +1160,7 @@ def coi_view(request):
                                                            'size_str': size_str,
                                                            'lot_no': lot_no,
                                                            'spec': spec, 'users': users, 'SHEET_NAMES': SHEET_NAMES, 
-                                                           'results': results, 'fields': fields, 'selected_templates': selected_templates})
+                                                           'results': results, 'fields': fields, 'selected_templates': selected_templates, 'code': code})
 
         messages.success(request, "Request Sent")
         return redirect(request.path_info)