diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs index 23cfcaf1..74019177 100644 --- a/AMESCoreStudio.Web/Controllers/PCSController.cs +++ b/AMESCoreStudio.Web/Controllers/PCSController.cs @@ -2635,6 +2635,7 @@ namespace AMESCoreStudio.Web.Controllers } } + model.wipMACs = await _pcsApi.GetWipMAC(model.wipInfo.WipNO); model.wipLabel = await _pcsApi.GetWipLabel(model.wipInfo.WipNO); @@ -8814,9 +8815,15 @@ namespace AMESCoreStudio.Web.Controllers //维护明细页面 [HttpGet] - public ActionResult PCS037L(string wipNO, int clearID) + public ActionResult PCS037L(string wipNO, int clearID, string itemNO, int planQty, string checkFlag) { + ViewData["Tips"] = "工單號碼 : " + wipNO + ", 工單數量 : " + planQty + ", 機種 : " + itemNO + ", ISO編號 : QO4-038"; + ViewBag.ClearID = clearID; + ViewBag.wipNO = wipNO; + ViewBag.itemNO = itemNO; + ViewBag.planQty = planQty; + ViewBag.checkFlag = checkFlag; return View(); } @@ -8914,9 +8921,9 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetWipClearsAsync(int page = 0, int limit = 10) + public async Task GetWipClearsAsync(string wipNo, string itemNo, string dateStart, string dateEnd, int page = 0, int limit = 10) { - var result = await _pcsApi.GetWipClears(page, limit); + var result = await _pcsApi.GetWipClears(wipNo, itemNo, dateStart, dateEnd, page, limit); if (result.DataTotal > 0) { diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs index 25bd15fe..b7c3fdfd 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs @@ -1525,7 +1525,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/WipClears")] - ITask> GetWipClears(int page, int limit); + ITask> GetWipClears(string wipNo,string itemNo,string dateStart,string dateEnd,int page, int limit); /// /// 新增清線資料 diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml index a5f3a05d..49633912 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml @@ -519,9 +519,18 @@
- - - + + +
@@ -537,7 +546,10 @@
- +
@@ -558,7 +570,10 @@
- +
@@ -571,7 +586,10 @@
- +
@@ -587,7 +605,10 @@
- +
@@ -875,8 +896,11 @@
- +
@@ -897,7 +921,10 @@
- +
@@ -1013,8 +1040,8 @@ SOP文件敘述 @* - 檔案路徑 - *@ + 檔案路徑 + *@ SOP類型 @@ -1038,8 +1065,8 @@ @* - - *@ + + *@ @@ -1269,27 +1296,27 @@ } - $.ajax({ - url: '@Url.Action("GetBarcodeOther", "PCS")', - dataType: 'json', - data: { "itemNo": itemNo, "lotNo": lotNo, "num": planQTY, "wipNo": '@Model.wipInfo.WipNO', "wipShcDate": wipShcDate }, - cache: false, - type: "POST", - success: function (result) { - // 錯誤訊息 - if (!result.success) { - parent.hg.msg(result.msg); - } - else { - var contactdiv = `${result.data.startNO}${result.data.endNO}`; - $('#wipBarcodeOtherTable').append(contactdiv); - $("#barcodeOtherDiv").hide(); - } - }, - error: function (jqXHR, textStatus, errorThrown) { - alert("Found error when using Ajax!!"); + $.ajax({ + url: '@Url.Action("GetBarcodeOther", "PCS")', + dataType: 'json', + data: { "itemNo": itemNo, "lotNo": lotNo, "num": planQTY, "wipNo": '@Model.wipInfo.WipNO', "wipShcDate": wipShcDate }, + cache: false, + type: "POST", + success: function (result) { + // 錯誤訊息 + if (!result.success) { + parent.hg.msg(result.msg); } - }); + else { + var contactdiv = `${result.data.startNO}${result.data.endNO}`; + $('#wipBarcodeOtherTable').append(contactdiv); + $("#barcodeOtherDiv").hide(); + } + }, + error: function (jqXHR, textStatus, errorThrown) { + alert("Found error when using Ajax!!"); + } + }); }); // 產生MAC @@ -1416,6 +1443,18 @@ form.on('select(lind)', function (data) { $("#lindId").val(data.value); }); + + $("#wipSystem_OsVer").on("input", function () { + var value = $(this).val().trim().toUpperCase(); + if (value.startsWith("E1582") || value.startsWith("E1583") || value.startsWith("E1584") || + value.startsWith("E1585") || value.startsWith("E1586") || value.startsWith("E1587") || + value.startsWith("E1588") || value.startsWith("E1589") || value.startsWith("E158C")) { + $("#wipSystem_Antivirus").prop("checked", true); + } else { + $("#wipSystem_Antivirus").prop("checked", false); + } + form.render(); + }); }); //通过行tool编辑，lay-event="show" @@ -2049,5 +2088,7 @@ } }); } + + } diff --git a/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml index 8bec0871..08036d14 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml @@ -501,9 +501,18 @@
- - - + + +
@@ -519,7 +528,10 @@
- +
@@ -540,7 +552,10 @@
- +
@@ -553,7 +568,10 @@
- +
@@ -569,7 +587,10 @@
- +
@@ -857,8 +878,11 @@
- +
@@ -879,7 +903,10 @@
- +
@@ -995,8 +1022,8 @@ SOP文件敘述 @* - 檔案路徑 - *@ + 檔案路徑 + *@ SOP類型 @@ -1020,8 +1047,8 @@ @* - - *@ + + *@ @@ -1213,7 +1240,7 @@ }); - // 產生出貨序號 + // 產生出貨序號 $("#GetBarcodeOther").click(function (event) { var itemNo = $('#wipAtt_ItemNO').val(); var planQTY = $('#wipInfo_PlanQTY').val(); @@ -1240,31 +1267,31 @@ } - $.ajax({ - url: '@Url.Action("GetBarcodeOther", "PCS")', - dataType: 'json', - data: { "itemNo": itemNo, "lotNo": lotNo, "num": planQTY, "wipNo": '@Model.wipInfo.WipNO', "wipShcDate": wipShcDate }, - cache: false, - type: "POST", - success: function (result) { - // 錯誤訊息 - if (!result.success) { - parent.hg.msg(result.msg); - } - else { - var contactdiv = `${result.data.startNO}${result.data.endNO}`; - $('#wipBarcodeOtherTable').append(contactdiv); - $("#barcodeOtherDiv").hide(); - } - }, - error: function (jqXHR, textStatus, errorThrown) { - alert("Found error when using Ajax!!"); + $.ajax({ + url: '@Url.Action("GetBarcodeOther", "PCS")', + dataType: 'json', + data: { "itemNo": itemNo, "lotNo": lotNo, "num": planQTY, "wipNo": '@Model.wipInfo.WipNO', "wipShcDate": wipShcDate }, + cache: false, + type: "POST", + success: function (result) { + // 錯誤訊息 + if (!result.success) { + parent.hg.msg(result.msg); } - }); + else { + var contactdiv = `${result.data.startNO}${result.data.endNO}`; + $('#wipBarcodeOtherTable').append(contactdiv); + $("#barcodeOtherDiv").hide(); + } + }, + error: function (jqXHR, textStatus, errorThrown) { + alert("Found error when using Ajax!!"); + } + }); }); // 產生MAC - $("#GetMAC").click(function (event) { + $("#GetMAC").click(function (event) { var wipNO = $('#wipAtt_ItemNO').val(); var planQTY = $('#wipInfo_PlanQTY').val(); if (wipNO == '' || !wipNO) { @@ -1373,7 +1400,17 @@ RuleStation(data.value); }); - + $("#wipSystem_OsVer").on("input", function () { + var value = $(this).val().trim().toUpperCase(); + if (value.startsWith("E1582") || value.startsWith("E1583") || value.startsWith("E1584") || + value.startsWith("E1585") || value.startsWith("E1586") || value.startsWith("E1587") || + value.startsWith("E1588") || value.startsWith("E1589") || value.startsWith("E158C")) { + $("#wipSystem_Antivirus").prop("checked", true); + } else { + $("#wipSystem_Antivirus").prop("checked", false); + } + form.render(); + }); }); //通过行tool编辑，lay-event="show" @@ -1791,7 +1828,7 @@ return b; } - // 更新ECN or ECR + // 更新ECN or ECR function GetPLM_ECN() { $.ajax({ url: "@Url.Action("GetItApiEcnByWipNo", "PCS")", @@ -1799,7 +1836,7 @@ async: true, data: { "wipNo": '@Model.wipInfo.WipNO' }, success: function (result) { - if (result.success) { + if (result.success) { if (result.data.changE_NO == null) { hg.msghide("查無資料，不需要更新！"); } @@ -1858,58 +1895,58 @@ layer.confirm('確定要同步料號SOP資料嗎？', { btn: ['確定', '取消'] }, function () { - $.ajax({ - type: "POST", - url: "@Url.Action("GetMaterialSop", "PCS")", - type: "Post", - async: true, - data: { "ItemNo": '@Model.wipAtt.ItemNO' }, - success: function (result) { - if (result.success) { - let No = 0; - var Unit = getFactoryUnitByWipNoList(); - var SopType = getSOPType(); - $("#SopTable").find("tr:not(:first)").remove(); - $.each(result.data, function (index, item) { - var FactoryUnit = Unit; - var Select = "'; - var SoptypeItem = SopType; - var SelectSoptype = ""; + $.each(FactoryUnit, function (index, item1) { + if (item1.value == item.unitNo) { + Select += ''; + } + }); + Select += ''; + var SoptypeItem = SopType; + var SelectSoptype = "'; + var contactdiv = '' + + '' + + '' + + '' + SelectSoptype + '' + + '' + Select + '' + + ' ' + + '刪除' + + ''; + $('#SopTable').append(contactdiv); + No += 1; }); - - SelectSoptype += ''; - var contactdiv = '' + - '' + - '' + - '' + SelectSoptype + '' + - '' + Select + '' + - ' ' + - '刪除' + - ''; - $('#SopTable').append(contactdiv); - No += 1; - }); - $('#WipSopCount').val(No); - layui.form.render("select");//重新渲染 固定写法 - } - else { - hg.msg("同步SOP失敗：" + result.data); + $('#WipSopCount').val(No); + layui.form.render("select");//重新渲染 固定写法 + } + else { + hg.msg("同步SOP失敗：" + result.data); + } + }, + error: function () { + hg.msg("同步SOP失敗"); } - }, - error: function () { - hg.msg("同步SOP失敗"); - } - }); + }); layer.closeAll('dialog'); }) } diff --git a/AMESCoreStudio.Web/Views/PCS/PCS037.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS037.cshtml index 32cc3dfa..9d7651e1 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS037.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS037.cshtml @@ -21,12 +21,68 @@
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
～
+
+ +
+ +
+
+
+
+
@section Scripts{