tum vor 5 Monaten
Ursprung
Commit
e947a0596f
6 geänderte Dateien mit 147 neuen und 5 gelöschten Zeilen
  1. 20 0
      app/core/utils.py
  2. 27 2
      app/report/views.py
  3. 1 0
      app/static/flowbite.min.css
  4. 2 0
      app/static/flowbite.min.js
  5. 83 0
      app/static/tailwind.js
  6. 14 3
      app/templates/base.html

+ 20 - 0
app/core/utils.py

242
     'thickness_8_point': '9. Thickness 8 Points',
242
     'thickness_8_point': '9. Thickness 8 Points',
243
     'centering': '10. Centering',
243
     'centering': '10. Centering',
244
 }
244
 }
245
+
246
+def convert_mgt_to_mks(mgt_code: str) -> str:
247
+    if not mgt_code:
248
+        raise ValueError("MGT code cannot be empty")
249
+
250
+    last_char = mgt_code[-1]
251
+
252
+    if last_char.isdigit():
253
+        # If last char is digit, code = -01
254
+        base_part = mgt_code[:-1]
255
+        suffix = "-01"
256
+    elif last_char.isalpha():
257
+        # A=1, B=2, ..., Z=26
258
+        code = ord(last_char.upper()) - ord('A') + 1
259
+        base_part = mgt_code[:-1]
260
+        suffix = f"-{code:02d}"
261
+    else:
262
+        raise ValueError("Invalid last character in MGT code")
263
+
264
+    return f"68-{base_part}{suffix}"

+ 27 - 2
app/report/views.py

4
 from core.models import Report, AllProductDimensionForInsProcess, CustomerTemplateMapping, \
4
 from core.models import Report, AllProductDimensionForInsProcess, CustomerTemplateMapping, \
5
                 ProductDrawing, MksCodeMap
5
                 ProductDrawing, MksCodeMap
6
 from core.forms import ReportForm, CustomerTemplateMappingForm, ProductDrawingForm
6
 from core.forms import ReportForm, CustomerTemplateMappingForm, ProductDrawingForm
7
-from core.utils import ConfigurableCRUDView, queryFromMaster, SHEET_NAMES
7
+from core.utils import ConfigurableCRUDView, queryFromMaster, SHEET_NAMES, convert_mgt_to_mks
8
 from .filters import ReportFilter, CustomerTemplateFilter, ProductDrawingFilter, MksCodeMapFilter
8
 from .filters import ReportFilter, CustomerTemplateFilter, ProductDrawingFilter, MksCodeMapFilter
9
 from .forms import ExportOptionsForm
9
 from .forms import ExportOptionsForm
10
 from pprint import pprint
10
 from pprint import pprint
1114
         spec = ""
1114
         spec = ""
1115
 
1115
 
1116
     mgt_code = first_result.PRO1 if first_result else "-"
1116
     mgt_code = first_result.PRO1 if first_result else "-"
1117
+
1118
+    mks_code = convert_mgt_to_mks(mgt_code)
1119
+    code = f"{mks_code}(MKSコード)  {mgt_code}(参照)"
1120
+    '''
1117
     mks_map = MksCodeMap.objects.filter(mgt_code=mgt_code).first()
1121
     mks_map = MksCodeMap.objects.filter(mgt_code=mgt_code).first()
1118
     if mks_map:
1122
     if mks_map:
1119
         code = f"{mks_map.mks_code}(MKSコード)  {mgt_code}(参照)"
1123
         code = f"{mks_map.mks_code}(MKSコード)  {mgt_code}(参照)"
1120
     else:
1124
     else:
1121
         code = f"{mgt_code}(参照)" or "-"
1125
         code = f"{mgt_code}(参照)" or "-"
1126
+    '''
1122
     # first_result.PRO_TOOL = None
1127
     # first_result.PRO_TOOL = None
1128
+    def get_tool_no(code_number: str) -> str:
1129
+        tool_map = {
1130
+            "547870587D": "A中 内径195",
1131
+            "547870585K": "仕上用",
1132
+            "547870586C": "粗",
1133
+            "547870586F": "A粗 内径195",
1134
+            "547870586H": "B粗",
1135
+            "547870587C": "チュウケンヨウ"
1136
+        }
1137
+        pprint(f"code_number {code_number}")        
1138
+        return tool_map.get(code_number, None)
1139
+    tn = get_tool_no(mgt_code)
1140
+    if tn is None:
1141
+        tn = first_result.PRO_TOOL if first_result and first_result.PRO_TOOL else "-"
1142
+
1123
     data = {
1143
     data = {
1124
         # "code": first_result.PRO1 if first_result else "-",
1144
         # "code": first_result.PRO1 if first_result else "-",
1125
         "code": code,
1145
         "code": code,
1133
         # "hardness_out.spe_acc": False,  # Hide rows 24 to 28 if the prefix is "0"
1153
         # "hardness_out.spe_acc": False,  # Hide rows 24 to 28 if the prefix is "0"
1134
         "acc": accept,  # Hide rows 24 to 28 if the prefix is "0"
1154
         "acc": accept,  # Hide rows 24 to 28 if the prefix is "0"
1135
         "spe_acc": specialAccept,  # Hide rows 24 to 28 if the prefix is "0"
1155
         "spe_acc": specialAccept,  # Hide rows 24 to 28 if the prefix is "0"
1136
-        "tool": first_result.PRO_TOOL if first_result and first_result.PRO_TOOL else "-",
1156
+        "tool": tn,
1137
         # "hardness_out.qa1": f"{qa1.first_name} {qa1.last_name}",
1157
         # "hardness_out.qa1": f"{qa1.first_name} {qa1.last_name}",
1138
         # "hardness_out.qa2": f"{qa2.first_name} {qa2.last_name}",
1158
         # "hardness_out.qa2": f"{qa2.first_name} {qa2.last_name}",
1139
         "qa1": f"{qa1.first_name} {qa1.last_name}",
1159
         "qa1": f"{qa1.first_name} {qa1.last_name}",
1266
                     selected_templates = mapping.template_names if mapping else []
1286
                     selected_templates = mapping.template_names if mapping else []
1267
 
1287
 
1268
                     mgt_code = first_result.PRO1 if first_result else "-"
1288
                     mgt_code = first_result.PRO1 if first_result else "-"
1289
+                    mks_code = convert_mgt_to_mks(mgt_code)
1290
+                    code = f"{mks_code}(MKSコード)  {mgt_code}(参照)"
1291
+                    
1292
+                    '''
1269
                     mks_map = MksCodeMap.objects.filter(mgt_code=mgt_code).first()
1293
                     mks_map = MksCodeMap.objects.filter(mgt_code=mgt_code).first()
1270
                     if mks_map:
1294
                     if mks_map:
1271
                         code = f"{mks_map.mks_code}(MKSコード)  {mgt_code}(参照)"
1295
                         code = f"{mks_map.mks_code}(MKSコード)  {mgt_code}(参照)"
1272
                     else:
1296
                     else:
1273
                         code = f"{mgt_code}(参照)" or "-"
1297
                         code = f"{mgt_code}(参照)" or "-"
1298
+                    '''
1274
                 else:
1299
                 else:
1275
                     size_str = ""
1300
                     size_str = ""
1276
                     spec = ""
1301
                     spec = ""

Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 0
app/static/flowbite.min.css


Datei-Diff unterdrückt, da er zu groß ist
+ 2 - 0
app/static/flowbite.min.js


Datei-Diff unterdrückt, da er zu groß ist
+ 83 - 0
app/static/tailwind.js


+ 14 - 3
app/templates/base.html

10
     <title>{% block title %}COI System{% endblock %}</title>
10
     <title>{% block title %}COI System{% endblock %}</title>
11
 
11
 
12
     <!-- TailwindCSS -->
12
     <!-- TailwindCSS -->
13
-    
13
+    <!--
14
     <script src="https://cdn.tailwindcss.com"></script> 
14
     <script src="https://cdn.tailwindcss.com"></script> 
15
+    -->
16
+    <script src="{% static "tailwind.js" %}"></script> 
17
+
15
   
18
   
16
     <link href="{% static "font-awesome/css/font-awesome.css" %}" rel="stylesheet" />
19
     <link href="{% static "font-awesome/css/font-awesome.css" %}" rel="stylesheet" />
17
     <script type="text/javascript" defer src="{% static "alpinejs/dist/cdn.min.js" %}"></script>
20
     <script type="text/javascript" defer src="{% static "alpinejs/dist/cdn.min.js" %}"></script>
21
+    <!--
18
     <link href="https://cdn.jsdelivr.net/npm/flowbite@2.5.2/dist/flowbite.min.css" rel="stylesheet" />
22
     <link href="https://cdn.jsdelivr.net/npm/flowbite@2.5.2/dist/flowbite.min.css" rel="stylesheet" />
23
+    -->
24
+    <link href="{% static "flowbite.min.css" %}" rel="stylesheet" />
19
     <script type="text/javascript"  src="{% static "axios/dist/axios.js" %}"></script>
25
     <script type="text/javascript"  src="{% static "axios/dist/axios.js" %}"></script>
20
     <script type="text/javascript"  src="{% static "js/main.js" %}"></script>
26
     <script type="text/javascript"  src="{% static "js/main.js" %}"></script>
21
 </head>
27
 </head>
32
                         </svg>
38
                         </svg>
33
                     </button>
39
                     </button>
34
                     <a href="/" class="flex items-center ml-2">
40
                     <a href="/" class="flex items-center ml-2">
35
-                        <img src="https://flowbite.com/docs/images/logo.svg" class="h-8 mr-3" alt="Logo" />
41
+                      <!--
42
+                        <img src="https://flowbite.com/docs/images/logo.svg" class="h-8 mr-3" alt="Logo" /> -->
36
                         <span class="self-center text-xl font-semibold text-black dark:text-white">MGT COI</span>
43
                         <span class="self-center text-xl font-semibold text-black dark:text-white">MGT COI</span>
37
                     </a>
44
                     </a>
38
                 </div>
45
                 </div>
50
                     <div class="ml-3">
57
                     <div class="ml-3">
51
                         <button type="button" class="flex text-sm bg-gray-800 rounded-full focus:ring-4 focus:ring-gray-300 dark:focus:ring-gray-600">
58
                         <button type="button" class="flex text-sm bg-gray-800 rounded-full focus:ring-4 focus:ring-gray-300 dark:focus:ring-gray-600">
52
                             <span class="sr-only">Open user menu</span>
59
                             <span class="sr-only">Open user menu</span>
53
-                            <img class="w-8 h-8 rounded-full" src="https://flowbite.com/docs/images/people/profile-picture-5.jpg" alt="User">
60
+                            <!--
61
+                            <img class="w-8 h-8 rounded-full" src="https://flowbite.com/docs/images/people/profile-picture-5.jpg" alt="User"> -->
54
                         </button>
62
                         </button>
55
                     </div>
63
                     </div>
56
                 </div>
64
                 </div>
219
         <p class="text-sm text-gray-600">&copy; 2024 Simplico Co., Ltd. All rights reserved.</p>
227
         <p class="text-sm text-gray-600">&copy; 2024 Simplico Co., Ltd. All rights reserved.</p>
220
     </footer>
228
     </footer>
221
     <script type="text/javascript" src="{% static "underscore/underscore-min.js" %}"></script>
229
     <script type="text/javascript" src="{% static "underscore/underscore-min.js" %}"></script>
230
+    <!--
222
     <script src="https://cdn.jsdelivr.net/npm/flowbite@2.5.2/dist/flowbite.min.js"></script>
231
     <script src="https://cdn.jsdelivr.net/npm/flowbite@2.5.2/dist/flowbite.min.js"></script>
232
+    -->
233
+    <script src="{% static "flowbite.min.js" %}"></script>
223
 
234
 
224
     {% django_browser_reload_script %}
235
     {% django_browser_reload_script %}
225
     <script>
236
     <script>