customer import

app/core/management/commands/import_customer_templates.py

@@ -0,0 +1,53 @@
+import csv
+from django.core.management.base import BaseCommand
+from core.models import CustomerTemplateMapping
+from django.contrib.auth.models import User
+import json
+
+class Command(BaseCommand):
+    help = "Import CustomerTemplateMapping records from a CSV file"
+
+    def add_arguments(self, parser):
+        parser.add_argument('csv_path', type=str, help='Path to the CSV file')
+        parser.add_argument('--created_by', type=int, help='User ID to assign as created_by')
+
+    def handle(self, *args, **options):
+        csv_path = options['csv_path']
+        created_by = None
+
+        if options.get('created_by'):
+            try:
+                created_by = User.objects.get(id=options['created_by'])
+            except User.DoesNotExist:
+                self.stdout.write(self.style.ERROR(f"User with ID {options['created_by']} does not exist."))
+                return
+
+        with open(csv_path, newline='', encoding='utf-8') as csvfile:
+            reader = csv.DictReader(csvfile)
+            count = 0
+
+            for row in reader:
+                name = row.get("customer_name")
+                templates = row.get("template_names")
+
+                if not name or not templates:
+                    self.stderr.write(f"Skipping incomplete row: {row}")
+                    continue
+
+                try:
+                    template_list = json.loads(templates)
+                except json.JSONDecodeError:
+                    self.stderr.write(f"Skipping row with invalid JSON: {templates}")
+                    continue
+
+                CustomerTemplateMapping.objects.update_or_create(
+                    customer_name=name,
+                    defaults={
+                        "template_names": template_list,
+                        "created_by": created_by,
+                    }
+                )
+
+                count += 1
+
+        self.stdout.write(self.style.SUCCESS(f"Imported {count} customer template mappings."))

app/core/utils.py

@@ -232,6 +232,7 @@ SHEET_NAMES = {
     'hardness_out_in': 'Hardness Out/In', 
     'hardness_both_size': 'Hardness Both Size',
     'dimension': 'Dimension',
+    'dimension_weight_warp': 'Dimension/Weight/Warp',
     'dimension_app': 'Dimension Appearance',
     'dimension_app_drawing': 'Dimension Appearance + Drawing',
     'dimension_bal_weight': 'Dimension Balance/Weight',

app/customer_templates.csv

@@ -0,0 +1,37 @@
+customer_name,template_names
+AIZEN,"[""dim_bal_app_hard""]"
+DYNAX,"[""dim_bal_app_hard""]"
+FSK,"[""dim_bal_app_hard""]"
+FUJI MACHINERY,"[""dimension""]"
+FUTABA KENNMA,"[""hardness_out""]"
+ITOU SEIKOU,"[""dim_bal_app_hard""]"
+JTEKT MACHINSYSTEMS,"[""dimension_app"", ""dimension_app_drawing""]"
+KARINO,"[""dimension"", ""dimension_weight_warp""]"
+KAWASAKI JUKOUGYOU,"[""dimension"", ""dimension_weight_warp""]"
+KOKI HOLDINGS,"[""dim_bal_app_hard""]"
+KUBOTA,"[""dim_bal_app_hard""]"
+KOMATSU SEISAKUSHO,"[""dim_bal_app_hard""]"
+MASAKI HAMONO,"[""hardness_out""]"
+MASTUDA KOUGYOU,"[""dim_bal_app_hard""]"
+MEIKOU HATSUJYO,"[""dim_bal_app_hard""]"
+MITSUBISHI JIDOUSHA,"[""dim_bal_app_hard""]"
+MIZUHO,"[""dim_bal_app_hard""]"
+MIZUNO TEKKOUSHO,"[""hardness_out_in""]"
+MUSASHINOSEIKI,"[""dim_bal_app_hard""]"
+NIPPON PISTON RING,"[""dim_bal_app_hard""]"
+NIWA TEKKOUSHO,"[""dimension"", ""dimension_weight_warp""]"
+NOBE SEISAKUSHO,"[""dim_bal_app_hard""]"
+NSK HARUNA,"[""hardness_out_in""]"
+NTN TADO,"[""dim_bal_app_hard""]"
+OKUMA,"[""dimension_app"", ""dimension_app_drawing""]"
+OSAKA SEIMITSU KOUGYO,"[""hardness_out""]"
+RIKEN,"[""dim_bal_app_hard""]"
+SANJO MCHINEWORKS,"[""dim_bal_app_hard""]"
+SANSIN,"[""hardness_out""]"
+SANYO,"[""dim_bal_app_hard""]"
+SHINNICHI KOGYO,"[""dim_bal_app_hard""]"
+SOUKA CENTERLESS,"[""dim_bal_app_hard""]"
+SUBARU,"[""dimension"", ""dimension_weight_warp""]"
+TOKYU,"[""dim_bal_app_hard""]"
+TOHSHIN SEIKI,"[""dim_bal_app_hard""]"
+NIPPISU IWATE,"[""hardness_out_in""]"

app/report/gen_report.py

@@ -137,6 +137,7 @@ def center_image_in_cell(sheet, img, cell_coordinate):
 
 
 def gen_xlsx(template_file, selected_sheets, prefix_filename, data):
+    pprint(f"5.0 = {template_file}, {selected_sheets}, {prefix_filename}, {data}")
     """
     Generate an Excel file from a template, fill placeholders, and include only selected sheets.
 
@@ -179,6 +180,8 @@ def gen_xlsx(template_file, selected_sheets, prefix_filename, data):
                     # Determine value priority: `sheet_name.key` > `key`
                     value = None
                     sheet_specific_key = f"{sheet_name}.{placeholder}"
+                    pprint(f"5.01 = {sheet_specific_key}")
+                    pprint(sheet_specific_key in data)
                     if sheet_specific_key in data:
                         value = data[sheet_specific_key]
                     elif placeholder in data:
@@ -259,6 +262,8 @@ def gen_xlsx(template_file, selected_sheets, prefix_filename, data):
                             cell.value = value
 
         for key, value in data.items():
+            pprint(f"7 = {key} => {value}")
+            
             # if isinstance(value, str) and re.match(r"^\d+\[\d+:\d+\]$", value):
             if isinstance(value, str) and re.match(r"^[0-9\s]+\[\d+:\d+\]$", value):
                 # Parse the prefix and row range
@@ -267,8 +272,12 @@ def gen_xlsx(template_file, selected_sheets, prefix_filename, data):
                 
                 # Hide rows if the prefix matches the condition
                 # if prefix == "0":  # Adjust the condition as needed
+                pprint(f"5.1 = {sheet} {value} => {prefix} ({row_start}, {row_end})")
+                
                 if " " in prefix or prefix.strip() == "0":
-                    sheet.row_dimensions.group(row_start, row_end, hidden=True)
+                    if key.split('.')[0] == sheet.title:
+                        pprint(f"HIDE !!! {key.split('.')[0]} {sheet.title} = {row_start}, {row_end}")
+                        sheet.row_dimensions.group(row_start, row_end, hidden=True)
         
 
     # Generate the output filename with a timestamp

app/report/templates/report/_tbl.html

@@ -1,6 +1,6 @@
 {% load legacy_filters %}
 <div class="clear-both bg-white shadow rounded-lg overflow-x-auto my-6">
-<h2 class="text-2xl md:text-2xl font-semibold text-gray-700 dark:text-gray-200  m-3 tracking-wide leading-snug">
+<h2 class="text-2xl md:text-2xl font-semibold text-gray-700   m-3 tracking-wide leading-snug">
   {{ header }}</h2>
 <table class="w-full border-collapse border border-gray-200">
     <thead>

app/report/views.py

@@ -194,7 +194,7 @@ def generate_hardness_out_in_values(lot_no, code):
     # else:
         # placeholders[f"v3_1"] = "0[25:28]"
 
-    hide_con(placeholders, "v3_1", "25:28")
+    hide_con(placeholders, "v3_1", "26:29")
     
     placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
     return placeholders
@@ -289,7 +289,77 @@ def generate_dimension_values(lot_no, code):
             placeholders[f'v6_2'] = r.hsize
             placeholders[f'v6_3'] = r.hsizeok
 
-    hide_con(placeholders, "v4_1", "24:28")
+    hide_con(placeholders, "v4_2", "25:29")
+    placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
+    return placeholders
+
+def generate_dimension_weight_warp_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')
+    data_wb = DataWb.objects.filter(lot_no=lot_no).order_by('row_no')
+    # Prepare placeholders
+
+    # placeholders = {}
+    placeholders = clear_values(7,4)
+    # 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 dimens:
+        if m.Size_Name == "D":
+            placeholders['v1_1'] = placeholders['v4_1'] = f'D{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
+        if m.Size_Name == "T":
+            placeholders['v2_1'] = placeholders['v5_1'] = f'T{m.Std:.2f} +{m.TolUp:.2f} {m.TolUn:.2f}'
+        if m.Size_Name == "H":
+            placeholders['v3_1'] = placeholders['v6_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 r.row_no == 2:
+            placeholders[f'v4_2'] = r.dsize
+            placeholders[f'v4_3'] = r.dsizeok
+            
+            placeholders[f'v5_2'] = r.tsize
+            placeholders[f'v5_3'] = r.tsizeok
+            
+            placeholders[f'v6_2'] = r.hsize
+            placeholders[f'v6_3'] = r.hsizeok
+
+
+    for r in data_wb:
+        if r.row_no == 1:
+            placeholders["v7_1"] = r.weight
+            placeholders["v7_2"] = r.judgement
+        if r.row_no == 2:
+            placeholders["v8_1"] = r.weight
+            placeholders["v8_2"] = r.judgement
+    
+    hide_con(placeholders, "v4_2", "29:37")
     placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
     return placeholders
 
@@ -382,7 +452,7 @@ def generate_dimension_app_values(lot_no, code):
                 # placeholders[f'v8_1'] = 'NG'
                 # placeholders[f'v8_2'] = 'NG'
 
-    hide_con(placeholders, "v5_1", "26:32")
+    hide_con(placeholders, "v5_1", "29:37")
     placeholders['inspect_date'] = inspect_date.strftime('%Y/%m/%d') if inspect_date else "-"
     return placeholders
 
@@ -465,7 +535,7 @@ def generate_dimension_app_drawing_values(lot_no, code):
                 # placeholders[f'v8_1'] = 'NG'
                 # placeholders[f'v8_2'] = 'NG'
 
-    hide_con(placeholders, "v5_1", "26:32")
+    hide_con(placeholders, "v5_1", "27:33")
     
     drawing_data = ProductDrawing.objects.filter(
         Q(lot_no=lot_no) | Q(code_no=code)).first()
@@ -955,6 +1025,9 @@ def create_coi_file(lot_no, sheets, user, md):
             sheet_data[sheet_name] = generate_hardness_both_size_values(lot_no, first_result, code)
         elif sheet_name == 'dimension':
             sheet_data[sheet_name] = generate_dimension_values(lot_no, code)
+
+        elif sheet_name == 'dimension_weight_warp':
+            sheet_data[sheet_name] = generate_dimension_weight_warp_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':

app/result3.csv

@@ -0,0 +1,8 @@
+customer_name,template_names
+ABC,"[""hardness_out"", ""dimension_app"", ""dimension_bal_weight""]"
+CDEF,"[""hardness_out_in"", ""hardness_both_size"", ""dimension_app""]"
+FFF,"[""hardness_both_size"", ""dimension""]"
+CCC,"[""dimension"", ""dimension_app""]"
+TypeB,"[""hardness_out"", ""hardness_out_in"", ""dimension_bal_weight"", ""dim_bal_app_hard"", ""dim_bal_app_rot_hard""]"
+AIZEN,"[""dim_bal_app_hard""]"
+DYNAX,"[""dim_bal_app_hard""]"