diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs index c4426d2a..3860b38e 100644 --- a/AMESCoreStudio.Web/Controllers/FQCController.cs +++ b/AMESCoreStudio.Web/Controllers/FQCController.cs @@ -862,9 +862,6 @@ namespace AMESCoreStudio.Web.Controllers model.h_InhouseNo = ""; model.h_SeqID = ""; } - - - return View(model); } @@ -1248,7 +1245,7 @@ namespace AMESCoreStudio.Web.Controllers #region FQC細項資料 [HttpGet] - public async Task FQC007V(string inhouseNo, int seqID, string boxNo) + public IActionResult FQC007V(string inhouseNo, int seqID, string boxNo) { ViewBag.inhouseNo = inhouseNo; ViewBag.seqID = seqID; @@ -1412,17 +1409,17 @@ namespace AMESCoreStudio.Web.Controllers InspectionDate = FqcQuery.EndTime, AC = FqcQuery.AcQty.ToString(), Approved = "王曉明", - //AQL = "2.5", + AQL = FqcQuery.AQL.ToString(), SpeciallyAdoption = FqcQuery.SpecialPo, BIOSVer = FqcQuery.BIOS, - //ECN = "22N0202", - //ECNMemo = "工單生產已是最新ECN", + ECN = FqcQuery.PLMECN, + ECNMemo = FqcQuery.ECN_Memo, Factory = FqcQuery.Werk.Split('-')[0], FactoryRemark = FqcQuery.Werk.Split('-')[1], InspectionInstrumentNumber = FqcQuery.OutfitNo, InspectionItems = $"OS:[{FqcQuery.OS}] CPU test:[{FqcQuery.CPU}] RAM test:[{FqcQuery.RAM}]", InspectionNumber = FqcQuery.InhouseNo, - InspectionStatus = "廠驗", + InspectionStatus = FqcQuery.InspectionStatus, InspectionType = FqcQuery.InspectionTypeName, Inspector = "蔡喬虎", Judgment = "Defect Quantity", @@ -1433,19 +1430,17 @@ namespace AMESCoreStudio.Web.Controllers Minor = FqcQuery.MinorQty.ToString(), Model = FqcQuery.ItemNo, ModelName = FqcQuery.ModelNo, - //NOTE = @"ACC-M2 - // E1589 - // ESW-075R - // ACC-BAT", + NOTE = FqcQuery.Note, OrderNumber = FqcQuery.WipNo, - //Product99 = "一般二級水準正常檢驗", + QuotDescription = FqcQuery.QuotDescription, ReMajor = FqcQuery.ReQty.ToString(), Sample = FqcQuery.QcQty.ToString(), - //SamplingInspectionPlan = "ANSI/ASQZ 1.4II", + SamplingInspectionPlan = FqcQuery.QuotName, //StorageLocation = "9000", Avalue = "AVALUE", VIP = FqcQuery.CustomerVIP, - WaiveRequisition = FqcQuery.StatusName + WaiveRequisition = FqcQuery.StatusName, + AQLType = FqcQuery.AQLType }; // 抓全部檢驗工項 @@ -1534,11 +1529,11 @@ namespace AMESCoreStudio.Web.Controllers InspectionDate = FqcQuery.EndTime, AC = FqcQuery.AcQty.ToString(), Approved = "王曉明", - AQL = "2.5", + AQL = FqcQuery.AQL.ToString(), SpeciallyAdoption = FqcQuery.SpecialPo, BIOSVer = FqcQuery.BIOS, - ECN = "22N0202", - ECNMemo = "工單生產已是最新ECN", + ECN = FqcQuery.PLMECN, + ECNMemo = FqcQuery.ECN_Memo, Factory = FqcQuery.Werk.Split('-')[0], FactoryRemark = FqcQuery.Werk.Split('-')[1], InspectionInstrumentNumber = FqcQuery.OutfitNo, @@ -1560,7 +1555,7 @@ namespace AMESCoreStudio.Web.Controllers ESW-075R ACC-BAT", OrderNumber = FqcQuery.WipNo, - Product99 = "一般二級水準正常檢驗", + QuotDescription = "一般二級水準正常檢驗", ReMajor = FqcQuery.ReQty.ToString(), Sample = FqcQuery.QcQty.ToString(), SamplingInspectionPlan = "ANSI/ASQZ 1.4II", diff --git a/AMESCoreStudio.Web/Views/FQC/FQC005.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC005.cshtml index 0233d622..64729626 100644 --- a/AMESCoreStudio.Web/Views/FQC/FQC005.cshtml +++ b/AMESCoreStudio.Web/Views/FQC/FQC005.cshtml @@ -122,7 +122,7 @@ //通过行tool删除，lay-event="del" function del(obj) { if (obj.data.critID) { - hg.confirm("抽樣代碼：" + obj.data.critNo + "，確定要刪除嗎？", function () { + hg.confirm(`係數名稱：${obj.data.quotName} ${obj.data.quotDescription} ${obj.data.aqlType} 抽樣代碼：${obj.data.critNo}，確定要刪除嗎？`, function () { $.ajax({ url: '/FQC/FQC005D', data: { id: obj.data.critID }, diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml index 57137e1e..4c633798 100644 --- a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml +++ b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml @@ -31,7 +31,7 @@ @**@ -
+
SMS異常紀錄 QAZone異常紀錄
@@ -126,26 +126,55 @@
-
- - - +
+ + @* + + *@ + +
+
+
- - +
- +
- +
- +
- +
@@ -575,8 +604,12 @@ yes: function (index, layero) { //var body = layer.getChildFrame('body', index); var obj = layero.find("iframe")[0].contentWindow; - //@Model.AQL = obj.$("#aql").val(); - console.log(obj.$("#critID").val()); + $('#CritID').val(obj.$("#critID").val()); + $('#QuotDescription').val(obj.$("#quotDescription").val()); + $('#AQL').text(obj.$("#aql").val()); + $('#QcQty').text(obj.$("#qcQty").val()); + $('#ReQty').text(obj.$("#reQty").val()); + $('#AcQty').text(obj.$("#acQty").val()); layer.close(index); } }); diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007E.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007E.cshtml index 1c2fa046..5d346510 100644 --- a/AMESCoreStudio.Web/Views/FQC/FQC007E.cshtml +++ b/AMESCoreStudio.Web/Views/FQC/FQC007E.cshtml @@ -39,14 +39,6 @@ await Html.RenderPartialAsync("_FileinputScriptsPartial"); }