update

app/core/utils.py

@@ -242,3 +242,23 @@ SHEET_NAMES = {
     'thickness_8_point': '9. Thickness 8 Points',
     'centering': '10. Centering',
 }
+
+def convert_mgt_to_mks(mgt_code: str) -> str:
+    if not mgt_code:
+        raise ValueError("MGT code cannot be empty")
+
+    last_char = mgt_code[-1]
+
+    if last_char.isdigit():
+        # If last char is digit, code = -01
+        base_part = mgt_code[:-1]
+        suffix = "-01"
+    elif last_char.isalpha():
+        # A=1, B=2, ..., Z=26
+        code = ord(last_char.upper()) - ord('A') + 1
+        base_part = mgt_code[:-1]
+        suffix = f"-{code:02d}"
+    else:
+        raise ValueError("Invalid last character in MGT code")
+
+    return f"68-{base_part}{suffix}"

app/report/views.py

@@ -4,7 +4,7 @@ from django.contrib import messages
 from core.models import Report, AllProductDimensionForInsProcess, CustomerTemplateMapping, \
                 ProductDrawing, MksCodeMap
 from core.forms import ReportForm, CustomerTemplateMappingForm, ProductDrawingForm
-from core.utils import ConfigurableCRUDView, queryFromMaster, SHEET_NAMES
+from core.utils import ConfigurableCRUDView, queryFromMaster, SHEET_NAMES, convert_mgt_to_mks
 from .filters import ReportFilter, CustomerTemplateFilter, ProductDrawingFilter, MksCodeMapFilter
 from .forms import ExportOptionsForm
 from pprint import pprint
@@ -1114,12 +1114,32 @@ def create_coi_file(lot_no, sheets, user, md):
         spec = ""
 
     mgt_code = first_result.PRO1 if first_result else "-"
+
+    mks_code = convert_mgt_to_mks(mgt_code)
+    code = f"{mks_code}（MKSコード）　　{mgt_code}（参照）"
+    '''
     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 "-"
+    '''
     # first_result.PRO_TOOL = None
+    def get_tool_no(code_number: str) -> str:
+        tool_map = {
+            "547870587D": "A中 内径195",
+            "547870585K": "仕上用",
+            "547870586C": "粗",
+            "547870586F": "A粗 内径195",
+            "547870586H": "B粗",
+            "547870587C": "チュウケンヨウ"
+        }
+        pprint(f"code_number {code_number}")        
+        return tool_map.get(code_number, None)
+    tn = get_tool_no(mgt_code)
+    if tn is None:
+        tn = first_result.PRO_TOOL if first_result and first_result.PRO_TOOL else "-"
+
     data = {
         # "code": first_result.PRO1 if first_result else "-",
         "code": code,
@@ -1133,7 +1153,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 if first_result and first_result.PRO_TOOL else "-",
+        "tool": tn,
         # "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}",
@@ -1266,11 +1286,16 @@ def coi_view(request):
                     selected_templates = mapping.template_names if mapping else []
 
                     mgt_code = first_result.PRO1 if first_result else "-"
+                    mks_code = convert_mgt_to_mks(mgt_code)
+                    code = f"{mks_code}（MKSコード）　　{mgt_code}（参照）"
+                    
+                    '''
                     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 = ""

app/templates/base.html

@@ -10,12 +10,18 @@
     <title>{% block title %}COI System{% endblock %}</title>
 
     <!-- TailwindCSS -->
-    
+    <!--
     <script src="https://cdn.tailwindcss.com"></script> 
+    -->
+    <script src="{% static "tailwind.js" %}"></script> 
+
   
     <link href="{% static "font-awesome/css/font-awesome.css" %}" rel="stylesheet" />
     <script type="text/javascript" defer src="{% static "alpinejs/dist/cdn.min.js" %}"></script>
+    <!--
     <link href="https://cdn.jsdelivr.net/npm/flowbite@2.5.2/dist/flowbite.min.css" rel="stylesheet" />
+    -->
+    <link href="{% static "flowbite.min.css" %}" rel="stylesheet" />
     <script type="text/javascript"  src="{% static "axios/dist/axios.js" %}"></script>
     <script type="text/javascript"  src="{% static "js/main.js" %}"></script>
 </head>
@@ -32,7 +38,8 @@
                         </svg>
                     </button>
                     <a href="/" class="flex items-center ml-2">
-                        <img src="https://flowbite.com/docs/images/logo.svg" class="h-8 mr-3" alt="Logo" />
+                      <!--
+                        <img src="https://flowbite.com/docs/images/logo.svg" class="h-8 mr-3" alt="Logo" /> -->
                         <span class="self-center text-xl font-semibold text-black dark:text-white">MGT COI</span>
                     </a>
                 </div>
@@ -50,7 +57,8 @@
                     <div class="ml-3">
                         <button type="button" class="flex text-sm bg-gray-800 rounded-full focus:ring-4 focus:ring-gray-300 dark:focus:ring-gray-600">
                             <span class="sr-only">Open user menu</span>
-                            <img class="w-8 h-8 rounded-full" src="https://flowbite.com/docs/images/people/profile-picture-5.jpg" alt="User">
+                            <!--
+                            <img class="w-8 h-8 rounded-full" src="https://flowbite.com/docs/images/people/profile-picture-5.jpg" alt="User"> -->
                         </button>
                     </div>
                 </div>
@@ -219,7 +227,10 @@
         <p class="text-sm text-gray-600">&copy; 2024 Simplico Co., Ltd. All rights reserved.</p>
     </footer>
     <script type="text/javascript" src="{% static "underscore/underscore-min.js" %}"></script>
+    <!--
     <script src="https://cdn.jsdelivr.net/npm/flowbite@2.5.2/dist/flowbite.min.js"></script>
+    -->
+    <script src="{% static "flowbite.min.js" %}"></script>
 
     {% django_browser_reload_script %}
     <script>