From 0a4477d2f636af33a7a8d98a2c81aff54a3dc8c7 Mon Sep 17 00:00:00 2001 From: Marvin Date: Tue, 21 Mar 2023 20:53:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=B6=AD=E4=BF=AE=E8=B3=87?= =?UTF-8?q?=E6=96=99=E7=B5=B1=E8=A8=88,=E5=A2=9E=E5=8A=A0=E7=B6=AD?= =?UTF-8?q?=E4=BF=AE=E7=B5=84=E4=BB=B6=E6=96=99=E8=99=9F=E6=9F=A5=E8=A9=A2?= =?UTF-8?q?=E6=A2=9D=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/REPController.cs | 20 +++---- AMESCoreStudio.Web/HttpApis/AMES/IREP.cs | 10 ++-- AMESCoreStudio.Web/Views/REP/REP012.cshtml | 25 +++++--- .../Controllers/AMES/NgRepairsController.cs | 59 +++++++++++++++++-- 4 files changed, 85 insertions(+), 29 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/REPController.cs b/AMESCoreStudio.Web/Controllers/REPController.cs index fe096510..34abf986 100644 --- a/AMESCoreStudio.Web/Controllers/REPController.cs +++ b/AMESCoreStudio.Web/Controllers/REPController.cs @@ -1679,10 +1679,10 @@ namespace AMESCoreStudio.Web.Controllers } - public async Task REP012QueryAsync(string productTypeNo, string testTypeNo, string unitNo, string lineID, string stationID, string wipNO, string itemNO, string dateStart, string dateEnd,string modelNO, int page = 0, int limit = 10) + public async Task REP012QueryAsync(string productTypeNo, string testTypeNo, string unitNo, string lineID, string stationID, string wipNO, string itemNO, string dateStart, string dateEnd, string modelNO, string itemPN, int page = 0, int limit = 10) { - var result = await _repApi.GetRepairData4REP012(productTypeNo, testTypeNo, unitNo, lineID, stationID, wipNO, itemNO, dateStart, dateEnd, modelNO, page, limit); + var result = await _repApi.GetRepairData4REP012(productTypeNo, testTypeNo, unitNo, lineID, stationID, wipNO, itemNO, dateStart, dateEnd, modelNO, itemPN, page, limit); if (result.DataTotal > 0) { @@ -1702,7 +1702,7 @@ namespace AMESCoreStudio.Web.Controllers { string[] param = id.Split('_'); - var result = await _repApi.GetErrorCode4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]); + var result = await _repApi.GetErrorCode4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9], param[10]); return Json(result.Data); //return Json(new { data = result.Data }); @@ -1712,7 +1712,7 @@ namespace AMESCoreStudio.Web.Controllers { string[] param = id.Split('_'); - var result = await _repApi.GetErrorCode4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]); + var result = await _repApi.GetErrorCode4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9], param[10]); if (result.DataTotal > 0) { @@ -1732,7 +1732,7 @@ namespace AMESCoreStudio.Web.Controllers { string[] param = id.Split('_'); - var result = await _repApi.GetRMACode4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]); + var result = await _repApi.GetRMACode4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9], param[10]); return Json(result.Data); //return Json(new { data = result.Data }); @@ -1742,7 +1742,7 @@ namespace AMESCoreStudio.Web.Controllers { string[] param = id.Split('_'); - var result = await _repApi.GetRMACode4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]); + var result = await _repApi.GetRMACode4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9], param[10]); if (result.DataTotal > 0) { @@ -1762,7 +1762,7 @@ namespace AMESCoreStudio.Web.Controllers { string[] param = id.Split('_'); - var result = await _repApi.GetLocation4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]); + var result = await _repApi.GetLocation4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9], param[10]); return Json(result.Data); //return Json(new { data = result.Data }); @@ -1772,7 +1772,7 @@ namespace AMESCoreStudio.Web.Controllers { string[] param = id.Split('_'); - var result = await _repApi.GetLocation4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]); + var result = await _repApi.GetLocation4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9], param[10]); if (result.DataTotal > 0) { @@ -1792,7 +1792,7 @@ namespace AMESCoreStudio.Web.Controllers { string[] param = id.Split('_'); - var result = await _repApi.GetRepairResponsibleUnit4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]); + var result = await _repApi.GetRepairResponsibleUnit4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9], param[10]); return Json(result.Data); //return Json(new { data = result.Data }); @@ -1803,7 +1803,7 @@ namespace AMESCoreStudio.Web.Controllers string[] param = id.Split('_'); - var result = await _repApi.GetRepairResponsibleUnit4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]); + var result = await _repApi.GetRepairResponsibleUnit4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9], param[10]); if (result.DataTotal > 0) { diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IREP.cs b/AMESCoreStudio.Web/HttpApis/AMES/IREP.cs index 0934c38f..260519fc 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/IREP.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/IREP.cs @@ -119,35 +119,35 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/NgRepairs/GetRepairData4REP012")] - ITask> GetRepairData4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo, int page, int limit); + ITask> GetRepairData4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo, string itemPN, int page, int limit); /// /// 查詢維修資料by不良代碼 /// /// [WebApiClient.Attributes.HttpGet("api/NgRepairs/GetErrorCode4REP012")] - ITask> GetErrorCode4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo); + ITask> GetErrorCode4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo, string itemPN); /// /// 查詢維修資料by维修代碼 /// /// [WebApiClient.Attributes.HttpGet("api/NgRepairs/GetRMACode4REP012")] - ITask> GetRMACode4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo); + ITask> GetRMACode4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo, string itemPN); /// /// 查詢維修資料by维修代碼 /// /// [WebApiClient.Attributes.HttpGet("api/NgRepairs/GetLocation4REP012")] - ITask> GetLocation4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo); + ITask> GetLocation4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo, string itemPN); /// /// 查詢維修資料by维修代碼 /// /// [WebApiClient.Attributes.HttpGet("api/NgRepairs/GetRepairResponsibleUnit4REP012")] - ITask> GetRepairResponsibleUnit4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo); + ITask> GetRepairResponsibleUnit4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo, string itemPN); /// /// 查詢統計不良代碼by工單號碼 diff --git a/AMESCoreStudio.Web/Views/REP/REP012.cshtml b/AMESCoreStudio.Web/Views/REP/REP012.cshtml index c8e8fd87..7c25b351 100644 --- a/AMESCoreStudio.Web/Views/REP/REP012.cshtml +++ b/AMESCoreStudio.Web/Views/REP/REP012.cshtml @@ -105,11 +105,6 @@ - - - -
-
@@ -118,6 +113,10 @@
+
+ +
+
@@ -126,6 +125,14 @@
+
+
+ +
+ +
+
+
@@ -368,22 +375,22 @@ $('#btnChart1').click(function () { - var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value + '_' + modelNO.value; + var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value + '_' + modelNO.value + '_' + itemPN.value; hg.open('不良代碼統計', '/REP/REP012A/' + param, 800, 600); }); $('#btnChart2').click(function () { - var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value + '_' + modelNO.value; + var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value + '_' + modelNO.value + '_' + itemPN.value; hg.open('維修代碼統計', '/REP/REP012B/' + param, 800, 600); }); $('#btnChart3').click(function () { - var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value + '_' + modelNO.value; + var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value + '_' + modelNO.value + '_' + itemPN.value; hg.open('維修位置統計', '/REP/REP012C/' + param, 800, 600); }); $('#btnChart4').click(function () { - var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value + '_' + modelNO.value; + var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value + '_' + modelNO.value + '_' + itemPN.value; hg.open('責任單位統計', '/REP/REP012D/' + param, 800, 600); }); diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs index 2b9631b4..e13dbb6d 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs @@ -198,12 +198,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// /// /// + /// /// /// /// [Route("[action]")] [HttpGet] - public async Task> GetRepairData4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo, int page = 0, int limit = 10) + public async Task> GetRepairData4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo, string itemPN, int page = 0, int limit = 10) { ResultModel result = new ResultModel(); var q = from q1 in _context.NgRepairs @@ -332,6 +333,14 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES } } + if (itemPN != null) + { + if (itemPN != "") + { + q = q.Where(w => w.PartNo == itemPN); + } + } + if (dateStart != null && dateEnd != null) { if (dateStart != "" && dateEnd != "") @@ -1029,10 +1038,11 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID /// /// /// + /// /// [Route("[action]")] [HttpGet] - public async Task> GetErrorCode4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo) + public async Task> GetErrorCode4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo,string itemPN) { ResultModel result = new ResultModel(); var q = from q1 in _context.NgRepairs @@ -1061,6 +1071,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID q1.RepairNo, q1.RepairTypeNo, q1.RepairDesc, + q1.PartNo, q8.LocationNo, q9.RRDesc }; @@ -1116,6 +1127,14 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID } } + if (itemPN != null) + { + if (itemPN != "") + { + q = q.Where(w => w.PartNo == itemPN); + } + } + if (dateStart != null && dateEnd != null) { if (dateStart != "" && dateEnd != "") @@ -1170,10 +1189,11 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID /// /// /// + /// /// [Route("[action]")] [HttpGet] - public async Task> GetRMACode4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo) + public async Task> GetRMACode4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo,string itemPN) { ResultModel result = new ResultModel(); var q = from q1 in _context.NgRepairs @@ -1202,6 +1222,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID q1.RepairNo, q1.RepairTypeNo, q1.RepairDesc, + q1.PartNo, q8.LocationNo, q9.RRDesc }; @@ -1257,6 +1278,14 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID } } + if (itemPN != null) + { + if (itemPN != "") + { + q = q.Where(w => w.PartNo == itemPN); + } + } + if (dateStart != null && dateEnd != null) { if (dateStart != "" && dateEnd != "") @@ -1312,10 +1341,11 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID /// /// /// + /// /// [Route("[action]")] [HttpGet] - public async Task> GetLocation4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo) + public async Task> GetLocation4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo,string itemPN) { ResultModel result = new ResultModel(); var q = from q1 in _context.NgRepairs @@ -1344,6 +1374,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID q1.RepairNo, q1.RepairTypeNo, q1.RepairDesc, + q1.PartNo, q8.LocationNo, q9.RRDesc }; @@ -1399,6 +1430,14 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID } } + if (itemPN != null) + { + if (itemPN != "") + { + q = q.Where(w => w.PartNo == itemPN); + } + } + if (dateStart != null && dateEnd != null) { if (dateStart != "" && dateEnd != "") @@ -1454,10 +1493,11 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID /// /// /// + /// /// [Route("[action]")] [HttpGet] - public async Task> GetRepairResponsibleUnit4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo) + public async Task> GetRepairResponsibleUnit4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo,string itemPN) { ResultModel result = new ResultModel(); var q = from q1 in _context.NgRepairs @@ -1486,6 +1526,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID q1.RepairNo, q1.RepairTypeNo, q1.RepairDesc, + q1.PartNo, q8.LocationNo, q9.RRDesc }; @@ -1541,6 +1582,14 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID } } + if (itemPN != null) + { + if (itemPN != "") + { + q = q.Where(w => w.PartNo == itemPN); + } + } + if (dateStart != null && dateEnd != null) { if (dateStart != "" && dateEnd != "")