From ae048674f6c69be816428c4a4de511edb9a8a334 Mon Sep 17 00:00:00 2001 From: "Yui.Chen" Date: Tue, 12 Mar 2024 12:15:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=82=8F=E8=BC=AF&=E4=BF=AE?= =?UTF-8?q?=E6=94=B9LAB003&LAB004=201.=E6=A8=99=E7=B1=A4=E6=9C=89=E7=B6=AD?= =?UTF-8?q?=E8=AD=B7=E6=95=B8=E9=87=8F,=E5=89=87=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=A8=99=E7=B1=A4=E9=A0=90=E8=A8=AD=E8=A9=B2=E6=95=B8=E9=87=8F?= =?UTF-8?q?=202.=E6=9A=AB=E5=AD=98=E6=9C=89MESSAGE=E6=8F=90=E7=A4=BA=203.?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E9=9A=94=E7=B7=9A=204.=E6=94=B9?= =?UTF-8?q?=E6=88=90=E5=B8=B6=E5=87=BA=E6=AC=84=E4=BD=8D=E5=90=8D=E7=A8=B1?= =?UTF-8?q?=205.=E6=A8=A3=E5=93=81=E5=BA=8F=E8=99=9F=E5=8F=96=E5=BE=97,?= =?UTF-8?q?=E5=8F=96=E7=94=9F=E7=AE=A1=E4=BB=A5=E6=96=99=E8=99=9F=E5=8F=96?= =?UTF-8?q?=E9=81=8E=E7=9A=84=E6=9C=80=E5=A4=A7=E8=99=9F=E7=A2=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DesignTimeBuild/.dtbcache.v2 | Bin 228595 -> 228887 bytes .vs/AMESCoreStudio/v16/.suo | Bin 529920 -> 529920 bytes .../Controllers/LABController.cs | 25 ++- AMESCoreStudio.Web/HttpApis/AMES/ILAB.cs | 10 +- AMESCoreStudio.Web/Views/LAB/LAB003.cshtml | 193 ++++++++++-------- AMESCoreStudio.Web/Views/LAB/LAB003U.cshtml | 110 ++++++---- AMESCoreStudio.Web/Views/LAB/LAB004.cshtml | 31 ++- .../AMESCoreStudio.WebApi.xml | 8 +- .../Controllers/AMES/LabelItemController.cs | 96 ++++++++- 9 files changed, 328 insertions(+), 145 deletions(-) diff --git a/.vs/AMESCoreStudio/DesignTimeBuild/.dtbcache.v2 b/.vs/AMESCoreStudio/DesignTimeBuild/.dtbcache.v2 index 9fa74402101e8a21eb0fe8f35bfeaf7f5609195b..c4fcf4ed58bb491fbe411bd85f3f9289d2b1884e 100644 GIT binary patch delta 11521 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 Ynw~7$%YycrxQ+_u%Yp^6^}>aJ2RSM^0RR91 delta 11813 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 SqNHLC;NUcy&$xrl!v6ywbH%X$ delta 15886 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 diff --git a/AMESCoreStudio.Web/Controllers/LABController.cs b/AMESCoreStudio.Web/Controllers/LABController.cs index c245b773..1f060a88 100644 --- a/AMESCoreStudio.Web/Controllers/LABController.cs +++ b/AMESCoreStudio.Web/Controllers/LABController.cs @@ -569,13 +569,13 @@ namespace AMESCoreStudio.Web.Controllers } [HttpGet] - public async Task GetSampleSn(int Qty) + public async Task GetSn(string ItemNo) { - ResultModel result = new ResultModel(); - result = await _labApi.GetSampleSerialRulesNEW(Qty); + ResultModel result = new ResultModel(); + result = await _labApi.GetWipBarcodeOtherSN(ItemNo); - return result.Msg; + return Json(new Result() { success = result.Success, msg = result.Msg, data = result.Data.FirstOrDefault() }); } [HttpGet] @@ -587,6 +587,15 @@ namespace AMESCoreStudio.Web.Controllers return Json(new Result() { success = result.Success, msg = result.Msg, data = result.Data }); } + [HttpGet] + public async Task GetMetInfo(string Model) + { + ResultModel result = new ResultModel(); + result = await _labApi.GetMetInfo(Model); + + return Json(new Result() { success = result.Success, msg = result.Msg, data = result.Data }); + } + [HttpGet] public async Task GetReqData(int OrderId) { @@ -596,6 +605,14 @@ namespace AMESCoreStudio.Web.Controllers return Json(new Result() { success = result.Success, msg = result.Msg, data = result.Data }); } + [HttpGet] + public async Task FinishReqData(string OrderNo) + { + ResultModel result = new ResultModel(); + result = await _labApi.FinishReqData(OrderNo); + + return result.Success; + } [HttpGet] public async Task LabelApplyNotify(string OrderNo) diff --git a/AMESCoreStudio.Web/HttpApis/AMES/ILAB.cs b/AMESCoreStudio.Web/HttpApis/AMES/ILAB.cs index 6f357a04..a6865718 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/ILAB.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/ILAB.cs @@ -28,6 +28,9 @@ namespace AMESCoreStudio.Web [WebApiClient.Attributes.HttpGet("api/LabelItem/GetLabel")] ITask> GetLabel(string Model); + [WebApiClient.Attributes.HttpGet("api/LabelItem/GetMetInfo")] + ITask> GetMetInfo(string Model); + [WebApiClient.Attributes.HttpGet("api/LabelItem/GetLabelItemMaster")] ITask> GetLabelItemMaster(string OrderNo, string ModelNo, DateTime? strdate, DateTime? enddate, int UserId); @@ -37,8 +40,8 @@ namespace AMESCoreStudio.Web [WebApiClient.Attributes.HttpPost("api/LabelItem/UpdateLabelItem")] ITask> UpdateLabelItem([FromBody, RawJsonContent] string model); - [WebApiClient.Attributes.HttpGet("api/SerialRules/Sample/num_new/{num}")] - ITask> GetSampleSerialRulesNEW(int num); + [WebApiClient.Attributes.HttpGet("api/LabelItem/GetWipBarcodeOtherSN")] + ITask> GetWipBarcodeOtherSN(string ItemNo); [WebApiClient.Attributes.HttpGet("api/LabelItem/GetLabelPicture")] ITask> GetLabelPicture(string LabMat); @@ -49,6 +52,9 @@ namespace AMESCoreStudio.Web [WebApiClient.Attributes.HttpGet("api/LabelItem/GetLabelParamReq")] ITask> GetLabelParamReq(int OrderId); + [WebApiClient.Attributes.HttpPost("api/LabelItem/FinishReqData")] + ITask> FinishReqData(string OrderNo); + [WebApiClient.Attributes.HttpGet("api/LabelItem/LabelApplyNotify")] ITask> LabelApplyNotify(string OrderNo); #endregion diff --git a/AMESCoreStudio.Web/Views/LAB/LAB003.cshtml b/AMESCoreStudio.Web/Views/LAB/LAB003.cshtml index 77199faa..ce67341a 100644 --- a/AMESCoreStudio.Web/Views/LAB/LAB003.cshtml +++ b/AMESCoreStudio.Web/Views/LAB/LAB003.cshtml @@ -85,7 +85,7 @@
- +
@@ -116,7 +116,7 @@
- +
@@ -148,72 +148,72 @@ @*
*@ -
 
- + @*
*@ @*
-
-
-
- -
- +
+
+
+ +
+ +
-
-
-
- -
- +
+
+ +
+ +
-
- -
-
- + +
+
+ +
-
-
-
-
- -
- +
+
+
+ +
+ +
-
-
-
-
-
- -
- +
+
+
+
+ +
+ +
-
-
-
- +
+
+ +
-
-
*@ +
*@ @Html.Hidden("TextBoxCount", 0)
+
@@ -260,7 +260,8 @@ var newColumnDiv = $(document.createElement('div')).attr("id", 'group_title'); - console.log(newColumnDiv); + newColumnDiv.after().html('
'); + var newTextBoxDiv = $(document.createElement('div')).attr( { @@ -292,6 +293,7 @@ newColumnDiv.appendTo("#group_title"); $('#TextBoxCount').val(newCount); + $('#Qty' + newCount).attr("value", $('#Qty' + currentCount).val()); $('#textbox' + newCount).focus(); }); @@ -385,7 +387,31 @@ console.log(response); alert("找不到標籤樣本"); } - }); + }); + + $.ajax({ + type: "GET", + url: '@Url.Action("GetMetInfo", "LAB")', + data: { + Model: model + }, + contentType: "application/json; charset=utf-8", + DataType: 'json', + success: function (response) { + if (response.data == "") { + hg.msg("查無品名描述"); + document.getElementById("Des1").value = null; + document.getElementById("Des2").value = null; + } + else { + document.getElementById("Des1").value = response.data[0].meterialDesc; + document.getElementById("Des2").value = response.data[0].longText; + } + }, + error: function (response) { + hg.msg("品名描述取得錯誤!"); + } + }); } }; @@ -400,7 +426,7 @@ function Applyfor(x) { var model = $('#Model').val(); - var oderno = $('#OrderNo').val(); + var orderno = $('#OrderNo').val(); var LabPar = GetLabPar(x); var currentCount = parseInt($('#TextBoxCount').val(), 10); var al = false; @@ -415,7 +441,7 @@ else { if (labmat == null) x++; - + if (x >= currentCount) al = true; else @@ -443,13 +469,13 @@ contentType: 'application/json; charset=utf-8', DataType: 'json', success: function (response) { + hg.msg("申請成功!"); if (response.success) { - $.ajax({ type: "GET", url: '@Url.Action("LabelApplyNotify", "LAB")', data: { - OrderNo: oderno + OrderNo: orderno }, contentType: 'application/json; charset=utf-8', DataType: 'json', @@ -502,7 +528,7 @@ for (i = 1; i <= currentCount-1;i++) { var old = $("#LabMat" + i).val(); if (old == labmat) { - hg.msg("標籤不可重複新增!"); + hg.msg("標籤不可重複新增!" + old + "&" + labmat); return; } } @@ -524,6 +550,7 @@ hg.msg("找不到標籤樣本!"); return; } + console.log(response.data); $.each(response.data, function (index, value) { var newListDiv = $(document.createElement('div')).attr("id", 'TextBoxListScope' + x); @@ -534,12 +561,12 @@ "class": "layui-form-item" }); newListBoxDiv.appendTo(newListDiv); - if (value.paraM_NAME != "出貨序號起訖") { + if (value.labeL_FIELD_NAME != "出貨序號起訖") { qty++; newListBoxDiv.after().html( '
' + '
' + - '' + + '' + '
' + '' + '
' + - '' + + '' + '
' + ' 0) { - $.ajax({ - type: "GET", - url: '@Url.Action("GetSampleSn", "LAB")', - data: { - Qty: qty - }, - contentType: "application/json; charset=utf-8", - DataType: 'json', - success: function (response) { - var xx = response.split('-'); - var z = x + 1; - var lab = $('#LabMat' + y).val(); - $('#' + lab + x).attr("value", xx[0]); - $('#' + lab + z).attr("value", xx[1]); - - + var itemno = $('#Model').val(); + $.ajax({ + type: "GET", + url: '@Url.Action("GetSn", "LAB")', + data: { + ItemNo: itemno + }, + contentType: "application/json; charset=utf-8", + DataType: 'json', + success: function (response) { + var z = x + 1; + var lab = $('#LabMat' + y).val(); + + if (response.data == null) { + hg.msg("查無特殊條碼起訖!"); + document.getElementById(lab + x).value = null; + document.getElementById(lab + z).value = null; + } + else { + document.getElementById(lab + x).value = response.data.startNo; + document.getElementById(lab + z).value = response.data.endNo; + } }, - error: function (response) { + error: function (response) { hg.msg("樣品序號取得錯誤!"); - - } - }); - } - else { - hg.msg("請維護數量!"); - - } - - + } + }); }; function GetLabPar(x) { diff --git a/AMESCoreStudio.Web/Views/LAB/LAB003U.cshtml b/AMESCoreStudio.Web/Views/LAB/LAB003U.cshtml index bc66bc86..93bae4f2 100644 --- a/AMESCoreStudio.Web/Views/LAB/LAB003U.cshtml +++ b/AMESCoreStudio.Web/Views/LAB/LAB003U.cshtml @@ -99,7 +99,7 @@ } else { - + } }
@@ -173,7 +173,7 @@ } else { - + } }
@@ -352,7 +352,8 @@ var newColumnDiv = $(document.createElement('div')).attr("id", 'group_title'); - console.log(newColumnDiv); + newColumnDiv.after().html('
'); + var newTextBoxDiv = $(document.createElement('div')).attr( { @@ -384,6 +385,7 @@ newColumnDiv.appendTo("#group_title"); $('#TextBoxCount').val(newCount); + $('#Qty' + newCount).attr("value", $('#Qty' + currentCount).val()); $('#textbox' + newCount).focus(); }); @@ -435,13 +437,13 @@ "class": "layui-form-item" }); newListBoxDiv.appendTo(newListDiv); - if (value.paraM_NAME != "出貨序號起訖") { + if (value.labeL_FIELD_NAME != "出貨序號起訖") { qty++; if (x == "d") { newListBoxDiv.after().html( '
' + '
' + - '' + + '' + '
' + '' + '
' + - '' + + '' + '
' + '' + '
' ); } - } + } else { if (con2 == 0) { qty = qty + 2; @@ -468,7 +470,7 @@ newListBoxDiv.after().html( '
' + '
' + - '' + + '' + '
' + '' + '
' + - '' + + '' + '
' + '' + '
' + - '' + + '' + '
' + '' + '
' + - '' + + '' + '
' + ' 0) { - $.ajax({ - type: "GET", - url: '@Url.Action("GetSampleSn", "LAB")', - data: { - Qty: qty - }, - contentType: "application/json; charset=utf-8", - DataType: 'json', - success: function (response) { - var xx = response.split('-'); - var z = x + 1; - var lab = $('#LabMat' + y).val(); - console.log(lab); - document.getElementById(lab + x).value = xx[0]; - document.getElementById(lab + z).value = xx[1]; - // $('#' + lab + x).attr("value", xx[0]); - //$('#' + lab + z).attr("value", xx[1]); + var itemno = $('#Model').val(); + $.ajax({ + type: "GET", + url: '@Url.Action("GetSn", "LAB")', + data: { + ItemNo: itemno + }, + contentType: "application/json; charset=utf-8", + DataType: 'json', + success: function (response) { + var z = x + 1; + var lab = $('#LabMat' + y).val(); + + if (response.data == null) { + hg.msg("查無特殊條碼起訖!"); + document.getElementById(lab + x).value = null; + document.getElementById(lab + z).value = null; + } + else { + document.getElementById(lab + x).value = response.data.startNo; + document.getElementById(lab + z).value = response.data.endNo; + } }, - error: function (response) { + error: function (response) { hg.msg("樣品序號取得錯誤!"); - } - }); - } - else { - hg.msg("請維護數量!"); - } - + } + }); }; function GetLabPar(x) { diff --git a/AMESCoreStudio.Web/Views/LAB/LAB004.cshtml b/AMESCoreStudio.Web/Views/LAB/LAB004.cshtml index 9e0bd8cd..92e81870 100644 --- a/AMESCoreStudio.Web/Views/LAB/LAB004.cshtml +++ b/AMESCoreStudio.Web/Views/LAB/LAB004.cshtml @@ -113,8 +113,12 @@ width: 200, title: '操作', templet: function (item) { - var btn = '修改'; - btn += ' 檢視'; + var btn = ' 檢視'; + if (item.status == "暫存") { + btn += '修改'; + btn += '完成'; + } + return btn } } @@ -132,7 +136,7 @@ if (res.data) result = res.data.slice(0, this.limit); } - + return { "code": res.code,//解析接口状态 "msg": res.msg,//解析提示文本 @@ -155,12 +159,31 @@ hg.msg("非本人不能修改"); } else - hg.msg("已送出不能修改"); + hg.msg("已送出不能修改"); } if (obj.event == 'detail') { var url = '/LAB/LAB003U?OrderNo=' + obj.data.ordeR_NO + '&Operate=d'; window.location.href = url; } + if (obj.event == 'finish') { + console.log(obj.data.ordeR_NO); + $.ajax({ + type: "GET", + url: '@Url.Action("FinishReqData", "LAB")', + data: { + OrderNo: obj.data.ordeR_NO + }, + contentType: "application/json; charset=utf-8", + DataType: 'json', + success: function (response) { + var url = '/LAB/LAB004'; + window.location.href = url; + }, + error: function (response) { + hg.msg("錯誤!"); + } + }); + } }); //搜索 $('#btnSearch').click(function () { diff --git a/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.xml b/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.xml index 82fff7ac..47de6309 100644 --- a/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.xml @@ -2590,7 +2590,7 @@ - + 新增更新Label參數檔 @@ -2609,7 +2609,7 @@ - + 新增更新Label參數檔 @@ -7375,7 +7375,7 @@ 料號 - + 生產工時Dto查詢 wipno @@ -7387,6 +7387,8 @@ 料號 料號 + 2024-02-27 BB.Wang Modify 增加查詢工時收集單狀態 + 狀態 diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/LabelItemController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/LabelItemController.cs index 847ac982..9bd49c2e 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/LabelItemController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/LabelItemController.cs @@ -49,7 +49,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES q1.TEMPLATE_ID, q1.LABEL_MATNR, q3.LABEL_FIELD_ID, - //q3.LABEL_FIELD_NAME, + q3.LABEL_FIELD_NAME, q3.PARAM_NAME }; @@ -114,6 +114,34 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES return result; } + [Route("[action]")] + [HttpGet] + public async Task> GetMetInfo(string Model) + { + ResultModel result = new ResultModel(); + IQueryable pmi = _context.PlmMeterialInfos; + + var q = pmi.Where(x => x.MeterialNo == Model).Select(x => new { + MeterialDesc = x.MeterialDesc, + LongText = x.LongText + + }); + + result.Data = await q.ToListAsync(); + + if (result == null) + { + result.Msg = "查無資料"; + result.Success = false; + return result; + } + + result.Success = true; + result.Msg = "OK"; + return result; + + } + [Route("[action]")] [HttpGet] public async Task> GetLabelItemMaster(string OrderNo,string ModelNo,DateTime strdate, DateTime enddate,int UserId) @@ -292,7 +320,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES dataP.LABEL_ITEM_ID = itemId; if (PN!="") { - LFId = lp.Where(x => x.PARAM_NAME == PN.Trim()).Select(x => x.LABEL_FIELD_ID).FirstOrDefault(); + LFId = lp.Where(x => x.LABEL_FIELD_NAME == PN.Trim()).Select(x => x.LABEL_FIELD_ID).FirstOrDefault(); } dataP.LABEL_FIELD_ID = LFId; dataP.VALUE = w.Value; @@ -388,7 +416,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES dataP.LABEL_ITEM_ID = itemId; if (PN != "") { - LFId = lp.Where(x => x.PARAM_NAME == PN.Trim()).Select(x => x.LABEL_FIELD_ID).FirstOrDefault(); + LFId = lp.Where(x => x.LABEL_FIELD_NAME == PN.Trim()).Select(x => x.LABEL_FIELD_ID).FirstOrDefault(); } dataP.LABEL_FIELD_ID = LFId; dataP.VALUE = w.Value; @@ -483,7 +511,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES LABEL_MATNR=q2.LABEL_MATNR, QTY =q1.QTY, LABEL_FIELD_ID=q3.LABEL_FIELD_ID, - PARAM_NAME=q4.PARAM_NAME, + LABEL_FIELD_NAME=q4.LABEL_FIELD_NAME, + PARAM_NAME =q4.PARAM_NAME, VALUE=q3.VALUE }; @@ -501,6 +530,65 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES return result; } + [Route("[action]")] + [HttpGet] + public async Task> GetWipBarcodeOtherSN(string ItemNo) + { + ResultModel result = new ResultModel(); + IQueryable wbo = _context.WipBarcodeOthers; + IQueryable wi = _context.WipInfos; + IQueryable wa = _context.WipAtts; + + var q = from q1 in wa.Where(x => x.ItemNO == ItemNo) + join q2 in wi on q1.WipNO equals q2.WipNO + join q3 in wbo on q2.WipNO equals q3.WipNO + orderby q3.OtherID descending + select new + { + StartNo = q3.StartNO, + EndNo = q3.EndNO + }; + + result.Data = await q.ToListAsync(); + + if (result == null) + { + result.Msg = "查無資料"; + result.Success = false; + return result; + } + + result.Success = true; + result.Msg = "OK"; + return result; + } + + [Route("[action]")] + [HttpPost] + public async Task> FinishReqData(string OrderNo) + { + IQueryable lim = _context.LabelItemMaster; + ResultModel result = new ResultModel(); + var q = lim.Where(x => x.ORDER_NO == OrderNo).FirstOrDefault(); + q.STATUS = "C"; + _context.Entry(q).State = EntityState.Modified; + + try + { + await _context.SaveChangesAsync(); + result.Success = true; + result.Msg = "OK"; + // await LabelApplyNotify(orderNo); + } + catch (Exception e) + { + result.Success = false; + result.Msg = e.Message; + return result; + } + return result; + } + [Route("[action]")] [HttpGet] public async Task> LabelApplyNotify(string OrderNo)