From ab03ad24df614c91b32503f9180b21b90c637132 Mon Sep 17 00:00:00 2001 From: Marvin Date: Tue, 20 Dec 2022 22:53:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=A4=96=E5=8C=85=E6=A8=A1?= =?UTF-8?q?=E7=B5=84=E7=9A=84=E6=A2=9D=E7=A2=BC=E7=94=9F=E7=94=A2=E5=B1=A5?= =?UTF-8?q?=E6=AD=B7=E6=9F=A5=E8=A9=A2OCM012=202.=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=A4=96=E5=8C=85=E6=A8=A1=E7=B5=84=E7=9A=84=E5=9C=A8=E8=A3=BD?= =?UTF-8?q?=E5=88=86=E5=B8=83=E5=9C=96OCM013=203.=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=A4=96=E5=8C=85=E6=A8=A1=E7=B5=84=E7=9A=84=E6=9C=AA=E7=B5=90?= =?UTF-8?q?=E5=B7=A5=E5=96=AE=E6=9F=A5=E8=A9=A2OCM014?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PCSController.cs | 52 ++++++++++++++++++- .../Controllers/QRSController.cs | 44 +++++++++++++++- AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs | 4 +- AMESCoreStudio.Web/Views/PCS/PCS008.cshtml | 2 + .../Controllers/AMES/WipInfosController.cs | 17 ++++-- 5 files changed, 110 insertions(+), 9 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs index cf2a1f3f..6b853f67 100644 --- a/AMESCoreStudio.Web/Controllers/PCSController.cs +++ b/AMESCoreStudio.Web/Controllers/PCSController.cs @@ -4235,6 +4235,53 @@ namespace AMESCoreStudio.Web.Controllers #region PCS008 未結工單查詢 public async Task PCS008(string id) { + if (id != null) + { + string[] param = id.Split('_'); + if (param[0] != null && param[0] != "") + { + await GetFactoryUnit(param[0]); + ViewBag.UnitNo = param[0]; + } + else + { + await GetFactoryUnit(); + } + + if (param[1] != null && param[1] == "OC") + { + if (Request.Cookies["_AMESCookie"] != null) + { + var userID = ""; + HttpContext.Request.Cookies.TryGetValue("UserID", out userID); + if (userID != null) + { + if (int.Parse(userID.ToString()) >= 0) + { + int user_id = int.Parse(userID.ToString()); + var user_info = await _sysApi.GetUserData(user_id); + + if (user_info.DataTotal > 0) + { + foreach (var item in user_info.Data) + { + JObject jo = JObject.Parse(item.ToString()); + string factoryNo = jo["factoryNo"].ToString(); + ViewBag.UserFactory = factoryNo; + } + } + } + } + + } + } + } + else + { + await GetFactoryUnit(); + } + + /* if (id != null) { await GetFactoryUnit(id); @@ -4244,16 +4291,17 @@ namespace AMESCoreStudio.Web.Controllers { await GetFactoryUnit(); } + */ //await GetFactoryUnit(); return View(); } [HttpGet] - public async Task PCS008V(string unitNo, string wipNo, string itemNo, string dateStr, string dateEnd) + public async Task PCS008V(string unitNo, string wipNo, string itemNo, string dateStr, string dateEnd,string factoryNo) { IResultModel result = await _pcsApi.GetWipInfoPCS008(unitno: unitNo, wipno: wipNo, itemno: itemNo, - date_str: dateStr, date_end: dateEnd); + date_str: dateStr, date_end: dateEnd, factoryno: factoryNo); string wipDataList = ""; if (result.DataTotal > 0) diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs index 13290fa7..7244cc95 100644 --- a/AMESCoreStudio.Web/Controllers/QRSController.cs +++ b/AMESCoreStudio.Web/Controllers/QRSController.cs @@ -19,21 +19,61 @@ namespace AMESCoreStudio.Web.Controllers public readonly IPPS _ppsApi; public readonly IBAS _basApi; public readonly IPCS _pcsApi; + public readonly ISYS _sysApi; private readonly IWebHostEnvironment _env; - public QRSController(ILogger logger, IREP repApi, IPPS ppsApi, IBAS basApi, IPCS pcsApi, IWebHostEnvironment env) + public QRSController(ILogger logger, IREP repApi, IPPS ppsApi, IBAS basApi, IPCS pcsApi, ISYS sysApi, IWebHostEnvironment env) { _logger = logger; _repApi = repApi; _ppsApi = ppsApi; _basApi = basApi; _pcsApi = pcsApi; + _sysApi = sysApi; _env = env; } public async Task QRS009(string id) { - IResultModel result = await _pcsApi.GetWipInfo4QRS009(id); + string unitNo = null, factoryNo = null; + if (id != null) + { + string[] param = id.Split('_'); + if (param[0] != null && param[0] != "") + { + unitNo = param[0]; + } + if (param.Length > 1) + { + if (param[1] != null && param[1] == "OC") + { + if (Request.Cookies["_AMESCookie"] != null) + { + var userID = ""; + HttpContext.Request.Cookies.TryGetValue("UserID", out userID); + if (userID != null) + { + if (int.Parse(userID.ToString()) >= 0) + { + int user_id = int.Parse(userID.ToString()); + var user_info = await _sysApi.GetUserData(user_id); + + if (user_info.DataTotal > 0) + { + foreach (var item in user_info.Data) + { + JObject jo = JObject.Parse(item.ToString()); + factoryNo = jo["factoryNo"].ToString(); + } + } + } + } + + } + } + } + } + IResultModel result = await _pcsApi.GetWipInfo4QRS009(unitNo, factoryNo); string wipDataList = ""; if (result.DataTotal > 0) diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs index 3ee5850a..dbf5c738 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs @@ -112,7 +112,7 @@ namespace AMESCoreStudio.Web [WebApiClient.Attributes.HttpGet("api/WipInfos/GetWipInfoPCS008")] //ITask> GetWipInfoSelectParameter(string unitno = null, string wipno = null); ITask> GetWipInfoPCS008(string unitno = null, string wipno = null, int lineid = 0 - , string itemno = null, string date_str = null, string date_end = null, int page = 0, int limit = 10); + , string itemno = null, string date_str = null, string date_end = null, string factoryno = null, int page = 0, int limit = 10); /// /// 查詢工單基本資料-WipID @@ -984,7 +984,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/WipInfos/GetWipInfo4QRS009")] - ITask> GetWipInfo4QRS009(string unitNo); + ITask> GetWipInfo4QRS009(string unitNo,string factoryNo); /// diff --git a/AMESCoreStudio.Web/Views/PCS/PCS008.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS008.cshtml index 79085d01..0a7bf1ed 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS008.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS008.cshtml @@ -45,6 +45,7 @@ +
@@ -96,6 +97,7 @@ form.on('submit(querysubmit)', function () { var data = $("#myForm").serialize(); + //alert(data); hg.open('未結工單分布圖', '/PCS/PCS008V?' + data, '', '', true); }); diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs index 79ac52cc..92b55c99 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs @@ -54,10 +54,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// 查詢工單資料QRS009 ///
/// + /// /// [Route("[action]")] [HttpGet] - public async Task> GetWipInfo4QRS009(string unitNo) + public async Task> GetWipInfo4QRS009(string unitNo,string factoryNo) { ResultModel result = new ResultModel(); var q = from q1 in _context.WipInfos @@ -77,7 +78,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES q1.CreateDate, q2.ItemNO, q3.LineDesc, - q4.UnitName + q4.UnitName, + q1.WerksNO }; q = q.Where(w => w.StatusNO == "A"); @@ -85,6 +87,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { q = q.Where(w => w.UnitNO.Equals(unitNo)); } + if (factoryNo != null) + { + q = q.Where(w => w.WerksNO.Equals(factoryNo)); + } //紀錄筆數 result.DataTotal = q.Count(); @@ -480,7 +486,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES q1.CreateDate, q2.ItemNO, q3.LineDesc, - q4.UnitName + q4.UnitName, + q1.WerksNO }; if (statusNo == null) @@ -502,6 +509,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { q = q.Where(w => w.UnitNO.Equals(value.unitno)); } + if (value.factoryno != null) + { + q = q.Where(w => w.WerksNO.Equals(value.factoryno)); + } DateTime dateTime = DateTime.Now; if (DateTime.TryParse(value.date_str, out dateTime))