9320d81aefa458a26R1001">1001
"customer": first_result.PRO1C if first_result else "-",
|
|
890
|
1002
|
# "inspect_date": inspect_date.strftime('%Y/%m/%d') if inspect_date else "-",
|
|
891
|
1003
|
"lot_no": lot_no,
|
|
|
@@ -896,7 +1008,7 @@ def create_coi_file(lot_no, sheets, user, md):
|
|
896
|
1008
|
# "hardness_out.spe_acc": False, # Hide rows 24 to 28 if the prefix is "0"
|
|
897
|
1009
|
"acc": accept, # Hide rows 24 to 28 if the prefix is "0"
|
|
898
|
1010
|
"spe_acc": specialAccept, # Hide rows 24 to 28 if the prefix is "0"
|
|
899
|
|
- "tool": first_result.PRO_TOOL,
|
|
|
1011
|
+ "tool": first_result.PRO_TOOL if first_result else "-",
|
|
900
|
1012
|
# "hardness_out.qa1": f"{qa1.first_name} {qa1.last_name}",
|
|
901
|
1013
|
# "hardness_out.qa2": f"{qa2.first_name} {qa2.last_name}",
|
|
902
|
1014
|
"qa1": f"{qa1.first_name} {qa1.last_name}",
|
|
|
@@ -1017,11 +1129,19 @@ def coi_view(request):
|
|
1017
|
1129
|
pcs = int(first_result.PRO5) - int(first_result.PRO27)
|
|
1018
|
1130
|
except:
|
|
1019
|
1131
|
pcs = 0
|
|
|
1132
|
+ code = "-"
|
|
1020
|
1133
|
if first_result:
|
|
1021
|
1134
|
size_str = f"{first_result.PRO10}x{first_result.PRO11}x{first_result.PRO12}";
|
|
1022
|
1135
|
spec = f"{first_result.PRO13} {first_result.PRO14} {first_result.PRO15} {first_result.PRO16} {first_result.PRO17} {first_result.PRO18}"
|
|
1023
|
1136
|
#first_result.PRO1C = "TUM"
|
|
1024
|
1137
|
selected_templates = CustomerTemplateMapping.objects.filter(customer_name=first_result.PRO1C).first().template_names
|
|
|
1138
|
+
|
|
|
1139
|
+ mgt_code = first_result.PRO1 if first_result else "-"
|
|
|
1140
|
+ mks_map = MksCodeMap.objects.filter(mgt_code=mgt_code).first()
|
|
|
1141
|
+ if mks_map:
|
|
|
1142
|
+ code = f"{mks_map.mks_code}（MKSコード） {mgt_code}（参照）"
|
|
|
1143
|
+ else:
|
|
|
1144
|
+ code = f"{mgt_code}（参照）" or "-"
|
|
1025
|
1145
|
else:
|
|
1026
|
1146
|
size_str = ""
|
|
1027
|
1147
|
spec = ""
|
|
|
@@ -1040,7 +1160,7 @@ def coi_view(request):
|
|
1040
|
1160
|
'size_str': size_str,
|
|
1041
|
1161
|
'lot_no': lot_no,
|
|
1042
|
1162
|
'spec': spec, 'users': users, 'SHEET_NAMES': SHEET_NAMES,
|
|
1043
|
|
- 'results': results, 'fields': fields, 'selected_templates': selected_templates})
|
|
|
1163
|
+ 'results': results, 'fields': fields, 'selected_templates': selected_templates, 'code': code})
|
|
1044
|
1164
|
|
|
1045
|
1165
|
messages.success(request, "Request Sent")
|
|
1046
|
1166
|
return redirect(request.path_info)
|