From e139399a9f6b0173bd51d539abd917f3e39a6284 Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 14 May 2022 16:53:29 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=9B=9E=E5=AE=B6=E5=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/FQCController.cs | 27 +++ AMESCoreStudio.Web/Views/FQC/FQC002.cshtml | 2 +- AMESCoreStudio.Web/Views/FQC/FQC009.cshtml | 91 ++++++++ AMESCoreStudio.Web/Views/FQC/FQC009C.cshtml | 212 ++++++++++++++++++ AMESCoreStudio.Web/Views/FQC/FQC009U.cshtml | 62 +++++ .../Controllers/AMES/QcItemController.cs | 4 +- AMESCoreStudio.WebApi/DTO/AMES/QcItemDto.cs | 14 +- 7 files changed, 408 insertions(+), 4 deletions(-) create mode 100644 AMESCoreStudio.Web/Views/FQC/FQC009.cshtml create mode 100644 AMESCoreStudio.Web/Views/FQC/FQC009C.cshtml create mode 100644 AMESCoreStudio.Web/Views/FQC/FQC009U.cshtml diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs index c189e3af..e541c6b9 100644 --- a/AMESCoreStudio.Web/Controllers/FQCController.cs +++ b/AMESCoreStudio.Web/Controllers/FQCController.cs @@ -935,6 +935,33 @@ namespace AMESCoreStudio.Web.Controllers } #endregion + #region FQC009 料號對應檢驗工項 + + public ActionResult FQC009C() + { + return View(); + } + + [HttpPost] + public ActionResult FQC009CAsync(string ids , string itemNo) + { + return View(); + } + + [HttpGet] + public async Task FQC009ItemQueryAsync(int groupID = 0, int page = 0, int limit = 10) + { + var result = await _fqcApi.GetQcItemQuery(groupID, page, limit); + + if (result.Data.Count() != 0) + { + return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal }); + } + + return Json(new Table() { count = 0, data = null }); + } + #endregion + /// /// 登入UserID /// diff --git a/AMESCoreStudio.Web/Views/FQC/FQC002.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC002.cshtml index dede20e5..1ef46412 100644 --- a/AMESCoreStudio.Web/Views/FQC/FQC002.cshtml +++ b/AMESCoreStudio.Web/Views/FQC/FQC002.cshtml @@ -51,7 +51,7 @@ }); var tableCols = [[ { - field: 'groupName', + field: 'groupNameCN', title: '抽驗項目類別', sort: true }, diff --git a/AMESCoreStudio.Web/Views/FQC/FQC009.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC009.cshtml new file mode 100644 index 00000000..795380ba --- /dev/null +++ b/AMESCoreStudio.Web/Views/FQC/FQC009.cshtml @@ -0,0 +1,91 @@ +@{ + ViewData["Title"] = "料號檢驗工項維護"; + Layout = "~/Views/Shared/_AMESLayout.cshtml"; +} + +
+
+
+
+
@ViewBag.Title
+
+
+
+
+
+
+
+ +@section Scripts{ + +} \ No newline at end of file diff --git a/AMESCoreStudio.Web/Views/FQC/FQC009C.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC009C.cshtml new file mode 100644 index 00000000..a020faff --- /dev/null +++ b/AMESCoreStudio.Web/Views/FQC/FQC009C.cshtml @@ -0,0 +1,212 @@ +@model AMESCoreStudio.WebApi.Models.AMES.QcGroup + + +@{ ViewData["Title"] = "FQC009C"; + Layout = "~/Views/Shared/_AMESLayout.cshtml"; } + + + +
+
+
+
+ +
+ +
+ +
+
+ +
+
+
+ + @Html.ValidationMessage("error") +
+
+ +
+
+
+
+
+ +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); + await Html.RenderPartialAsync("_FileinputScriptsPartial"); } + + + + +} diff --git a/AMESCoreStudio.Web/Views/FQC/FQC009U.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC009U.cshtml new file mode 100644 index 00000000..ba0c54d0 --- /dev/null +++ b/AMESCoreStudio.Web/Views/FQC/FQC009U.cshtml @@ -0,0 +1,62 @@ +@model AMESCoreStudio.WebApi.Models.AMES.QcGroup + + +@{ ViewData["Title"] = "FQC001U"; + Layout = "~/Views/Shared/_AMESLayout.cshtml"; } + + + +
+
+
+
+
+ + +
+ +
+ + +
+
+ +
+ +
+ +
+
+ @Html.ValidationMessage("error") +
+
+ +
+
+
+
+
+
+ +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); + await Html.RenderPartialAsync("_FileinputScriptsPartial"); } + + + + +} diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/QcItemController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/QcItemController.cs index 16a5d6b4..1c4008dc 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/QcItemController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/QcItemController.cs @@ -75,13 +75,15 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES result.Data = await q.Select(s => new QcItemDto { ItemID = s.ItemID, + GroupID = s.GroupID, ItemNameCN = s.ItemNameCN, ItemNameEN = s.ItemNameEN, CreateUserID = s.CreateUserID, CreateDate = s.CreateDate, UpdateUserID = s.UpdateUserID, UpdateDate = s.UpdateDate, - GroupName = s.GetQcGroup.GroupNameCN + GroupNameCN = s.GetQcGroup.GroupNameCN, + GroupNameEN = s.GetQcGroup.GroupNameEN }).ToListAsync(); return result; diff --git a/AMESCoreStudio.WebApi/DTO/AMES/QcItemDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/QcItemDto.cs index 6b1e4ad7..e2b88345 100644 --- a/AMESCoreStudio.WebApi/DTO/AMES/QcItemDto.cs +++ b/AMESCoreStudio.WebApi/DTO/AMES/QcItemDto.cs @@ -14,9 +14,19 @@ namespace AMESCoreStudio.WebApi.DTO.AMES public int ItemID { get; set; } /// - /// 檢驗類別名稱 + /// 檢驗類別ID /// - public string GroupName { get; set; } + public int GroupID { get; set; } + + /// + /// 檢驗類別名稱中文 + /// + public string GroupNameCN { get; set; } + + /// + /// 檢驗類別名稱英文 + /// + public string GroupNameEN { get; set; } /// /// 檢驗項目中文