diff --git a/AMESCoreStudio.Web/Controllers/SPCController.cs b/AMESCoreStudio.Web/Controllers/SPCController.cs index eb8dae10..6afa040a 100644 --- a/AMESCoreStudio.Web/Controllers/SPCController.cs +++ b/AMESCoreStudio.Web/Controllers/SPCController.cs @@ -233,7 +233,7 @@ namespace AMESCoreStudio.Web.Controllers var result = await _sysApi.GetUserInfoes(); var UserItems = new List(); - UserItems.Add(new SelectListItem("N/A", "0")); + UserItems.Add(new SelectListItem("N/A", "-1")); for (int i = 0; i < result.Count; i++) { UserItems.Add(new SelectListItem(result[i].UserName, result[i].UserID.ToString())); @@ -253,6 +253,7 @@ namespace AMESCoreStudio.Web.Controllers ViewBag.FactoryUnit = UnitItems; } + #endregion #region SPC001 巡檢類別維護相關 @@ -612,48 +613,29 @@ namespace AMESCoreStudio.Web.Controllers #region SPC004巡檢結果維護相關 - public async Task SPC004() - { - await GetFactoryUnitsList2(); - await GetFactoryList(); - return View(); - } - //新增頁面 - public async Task SPC004C() + public IActionResult SPC004() { - //製程單位 - await GetFactoryUnitsList2(); - //廠別 - await GetFactoryList(); - //線別 - await GetLineList(); - //站別 - await GetStationList(); - //班別 - GetClassList(); - //其他部門 - await GetDeptList(); return View(); } //修改页面 [HttpGet] - public async Task SPC004UAsync(int id,string type) + public async Task SPC004UAsync(int id, int Iid) { - //製程單位 - await GetFactoryUnitsList2(); - //廠別 - await GetFactoryList(); - //線別 - await GetLineList(); - //站別 - await GetStationList(); - //班別 - GetClassList(); - //其他部門 - await GetDeptList(); - ViewBag.type = type; + var result = await _spcApi.GetInspectionResultDetailByQuery(id,Iid); + var userID = ""; + int user_id = 0; + HttpContext.Request.Cookies.TryGetValue("UserID", out userID); + if (userID != null) + { + if (int.Parse(userID.ToString()) >= 0) + { + user_id = int.Parse(userID.ToString()); + } + } + var userName = await _sysApi.GetUserInfo(user_id); - var result = await _whsApi.GetSupportUser(id); + ViewBag.UuserID = user_id; + ViewBag.UuserName = userName[0].UserName; if (result.Count == 0) { @@ -661,47 +643,13 @@ namespace AMESCoreStudio.Web.Controllers } return View(result[0]); } - public async Task SPC008DAsync(int id) - { - var result = await _whsApi.DeleteSupportUser(id); - return Json(new Result() { success = true, msg = "" }); - } - [HttpPost] - public async Task SPC008CSaveAsync(SupportUser model) + public async Task SPC004USaveAsync(InspectionResultDetail model) { if (ModelState.IsValid) { IResultModel result; - result = await _whsApi.PostSupportUser(JsonConvert.SerializeObject(model)); - - - if (result.Success) - { - var _msg = "添加成功！"; - return RedirectToAction("Refresh", "Home", new { msg = _msg }); - } - else - { - if (result.Errors.Count > 0) - { - ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg); - } - else - { - ModelState.AddModelError("error", result.Msg); - } - } - } - return View("SPC008C", model); - } - public async Task SPC008USaveAsync(SupportUser model) - { - if (ModelState.IsValid) - { - IResultModel result; - - result = await _whsApi.PutSupportUser(model.SupportID, JsonConvert.SerializeObject(model)); + result = await _spcApi.PutInspectionResultDetail(model.InspectionID, JsonConvert.SerializeObject(model)); if (result.Success) { @@ -720,13 +668,23 @@ namespace AMESCoreStudio.Web.Controllers } } } - return View("SPC008U", model); + return View("SPC004U", model); } + [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetSupportUsersAsync() + public async Task GetInspectionResultMastersByQueryAsync(string WipNo, string ItemNo, string BarcodeNo) { - var result = await _whsApi.GetSupportUsers(); + + + if (string.IsNullOrWhiteSpace(WipNo)) + WipNo=" "; + if (string.IsNullOrWhiteSpace(ItemNo)) + ItemNo = " "; + if (string.IsNullOrWhiteSpace(BarcodeNo)) + BarcodeNo = " "; + + var result = await _spcApi.GetInspectionResultMastersByQuery(WipNo, ItemNo, BarcodeNo, "C"); if (result.Count > 0) { @@ -735,10 +693,10 @@ namespace AMESCoreStudio.Web.Controllers return Json(new Table() { count = 0, data = null }); } - public async Task GetSupportUser2Async(string f, string type, string unit, string sd, string ed) + public async Task GetInspectionResultDetailQueryAsync(int id) { - var result = await _whsApi.GetSupportUserByQuery( f,type, unit, sd, ed); + var result = await _spcApi.GetInspectionResultDetailQuery(id); if (result.Count > 0) { @@ -784,6 +742,13 @@ namespace AMESCoreStudio.Web.Controllers return View(); } + public IActionResult SPC005VR(int id, int itemID) + { + ViewBag.ItemID = itemID; + ViewBag.MasterID = id; + + return View(); + } //修改页面 [HttpGet] public async Task SPC005UAsync(int id) @@ -822,34 +787,6 @@ namespace AMESCoreStudio.Web.Controllers //頁面提交，id=0 添加，id>0 修改 [HttpPost] - public async Task SPC005CSaveAsync(InspectionResultMaster model) - { - if (ModelState.IsValid) - { - IResultModel result; - - result = await _whsApi.PostWorkManPower(JsonConvert.SerializeObject(model)); - - - if (result.Success) - { - var _msg = "添加成功！"; - return RedirectToAction("Refresh", "Home", new { msg = _msg }); - } - else - { - if (result.Errors.Count > 0) - { - ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg); - } - else - { - ModelState.AddModelError("error", result.Msg); - } - } - } - return View("SPC005C", model); - } public async Task SPC005TSaveAsync(InspectionResultMaster model) { @@ -978,8 +915,6 @@ namespace AMESCoreStudio.Web.Controllers return View("SPC005R"); } - - [HttpPatch] public async Task SPC005USaveAsync(InspectionResultMaster model) { var userID = ""; @@ -1102,7 +1037,6 @@ namespace AMESCoreStudio.Web.Controllers return Json(new Table() { count = 0, data = null }); } - public async Task GetWipAttAsync(string id) { diff --git a/AMESCoreStudio.Web/HttpApis/AMES/ISPC.cs b/AMESCoreStudio.Web/HttpApis/AMES/ISPC.cs index e381e05f..9c3f4360 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/ISPC.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/ISPC.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc; using AMESCoreStudio.WebApi.Models.AMES; using AMESCoreStudio.WebApi.Models.BAS; using AMESCoreStudio.CommonTools.Result; +using AMESCoreStudio.WebApi.DTO.AMES; namespace AMESCoreStudio.Web { @@ -146,46 +147,18 @@ namespace AMESCoreStudio.Web #region SPC004 每日工時資料維護 /// - /// 新增每日工時 + /// InspectionResultDetail By Id and ItemID /// /// - [WebApiClient.Attributes.HttpPost("api/WorkManPowers")] - ITask> PostWorkManPower([FromBody, RawJsonContent] string model); + [WebApiClient.Attributes.HttpGet("api/InspectionResultDetails/Query/{id}/{Iid}")] + ITask> GetInspectionResultDetailByQuery(int id, int Iid); /// - /// 更新每日工時 + /// InspectionResultDetailDto /// /// - [WebApiClient.Attributes.HttpPut("api/WorkManPowers/{id}")] - ITask> PutWorkManPower(int id, [FromBody, RawJsonContent] string model); - - /// - /// 刪除每日工時 - /// - /// - [WebApiClient.Attributes.HttpDelete("api/WorkManPowers/{id}")] - ITask> DeleteWorkManPower(int id); - - /// - /// 根據ID獲取指定每日工時資料 - /// - /// - [WebApiClient.Attributes.HttpGet("api/WorkManPowers/{id}")] - ITask> GetWorkManPower(int id); - - /// - /// 獲取每日工時資料 - /// - /// - [WebApiClient.Attributes.HttpGet("api/WorkManPowers")] - ITask> GetWorkManPowers(); - - /// - /// 查詢每日工時 - /// - /// - [WebApiClient.Attributes.HttpGet("api/WorkManPowers/Query/{factoryid}/{unitid}/{lineid}/{classID}/{stationID}/{userNo}/{deptID}/{sdate}/{edate}")] - ITask> GetWorkManPowersByQuery(string factoryid, string unitid, string lineid, string classID, string stationID, string userNo, string deptID, string sdate, string edate); + [WebApiClient.Attributes.HttpGet("api/InspectionResultDetails/Query/{id}")] + ITask> GetInspectionResultDetailQuery(int id); #endregion @@ -241,6 +214,13 @@ namespace AMESCoreStudio.Web [WebApiClient.Attributes.HttpGet("api/InspectionResultMasters/Form/{id}")] ITask> GetInspectionResultMastersByFormId(int id); + /// + /// 根据巡檢結果MASTER + /// + /// + [WebApiClient.Attributes.HttpGet("api/InspectionResultMasters/Query/{WipNo}/{ItemNo}/{BarcodeNo}/{StatusNo}")] + ITask> GetInspectionResultMastersByQuery(string WipNo, string ItemNo, string BarcodeNo, string StatusNo); + /// /// 獲取MASTER ID /// diff --git a/AMESCoreStudio.Web/Views/SPC/SPC002.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC002.cshtml index f64c66cf..fa2ea5c3 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC002.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC002.cshtml @@ -20,7 +20,7 @@
diff --git a/AMESCoreStudio.Web/Views/SPC/SPC004.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC004.cshtml index 1a7d60bb..dc1de143 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC004.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC004.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "巡檢表單細項資料維護"; + ViewData["Title"] = "巡檢結果回覆"; Layout = "~/Views/Shared/_AMESLayout.cshtml"; } @@ -13,400 +13,150 @@
-
-
-
-
- -
- -
-
+
+
+
+ +
-
-
- -
- -
-
-
-
-
- -
+
+
+
+ +
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
+
+
+
+ +
-
-
- -
+
+
+
+
-
@section Scripts{ - - - - - -} - - - - +} \ No newline at end of file diff --git a/AMESCoreStudio.Web/Views/SPC/SPC004U.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC004U.cshtml index 3084bb0c..f134eebe 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC004U.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC004U.cshtml @@ -1,7 +1,7 @@ -@model AMESCoreStudio.WebApi.Models.AMES.InspectionItem +@model AMESCoreStudio.WebApi.Models.AMES.InspectionResultDetail -@{ ViewData["Title"] = "SPC003U"; +@{ ViewData["Title"] = "SPC004U"; Layout = "~/Views/Shared/_FormLayout.cshtml"; } @@ -13,25 +13,47 @@
-
+
- - - - - + + + + + + + + + + + + + + -
- - - + + +
- - - + + + +
+
+ + + +
+
+ + + +
@Html.ValidationMessage("error")
@@ -47,6 +69,22 @@ await Html.RenderPartialAsync("_FileinputScriptsPartial"); } @*備註*@ @*線別*@ @*插件位置*@ @*缺失單位*@ + + +} + diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll index 21ce828c..b5420498 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb index e162c967..40a0bf6e 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll index 6a86a317..49ece3a0 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb index 7cb2ad87..54b3cd00 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll index 5900c551..8bff3325 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb index e06e30c8..00e1def0 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll index b9c3d871..dad0b638 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb index 3bc7f4a7..3d965842 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml index 9b8e719e..3093081e 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -1273,6 +1273,21 @@ + + + 巡檢資料 + + InspectionID + + + + + 用ID获取该巡檢類別資料 + + + + + 更新巡檢類別資料 @@ -1326,6 +1341,15 @@ + + + 用FormID获取该巡檢結果资料 + + + + + + @@ -2083,6 +2107,23 @@ + + + 維修資料統計 + + + + + + + + + + + + + + @@ -3707,13 +3748,13 @@ 料號 0:找不到 - + 取得上一個作業站RuleStationID 工單ID + BarCodeID 目前作業站ID - 該工單號碼過站資料 true:false @@ -5376,6 +5417,113 @@ 不良備註 + + + 檢驗項目維護資料檔 DTO + + + + + 巡檢ID + + + + + 巡檢項目ID + + + + + 巡檢項目ID + + + + + 線別 + + + + + 站別ID + + + + + 稽核結果 + P-PASS(允收) ; F-FAIL(批退) ; NA-無 ; A初始狀態 ； + + + + + 區域 + + + + + 位置 + + + + + 缺失單位 + + + + + 缺失站別 + + + + + 缺失人員ID + + + + + 缺失類型 + + + + + 缺失備註 + + + + + 是否需要對策 METHOD : Y-YES : N-NO + + + + + 回覆原因 + + + + + 回覆對策 + + + + + + 創建者ID + + + + + 創建日期 + + + + + 更新者ID + + + + + 更新日期 + + MaterialKpDtp Select Dto @@ -8479,17 +8627,17 @@ 是否需要對策 METHOD : Y-YES : N-NO - + 回覆原因 - + 回覆對策 - + 回覆人員ID diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultDetailsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultDetailsController.cs index 3c9d762f..6298a1d1 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultDetailsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultDetailsController.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using AMESCoreStudio.WebApi; using AMESCoreStudio.WebApi.Models.AMES; +using AMESCoreStudio.WebApi.DTO.AMES; using AMESCoreStudio.CommonTools.Result; @@ -70,6 +71,81 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES return InspectionResultDetail; } + + /// + /// 巡檢資料 + /// + /// InspectionID + /// + [HttpGet("Query/{id}")] + //Task> + public async Task>> GetInspectionResultDetailQuery(int id) + { + + IQueryable q = from q1 in _context.InspectionResultDetails + //join q2 in _context.InspectionItems on q1.InspectionItemID equals q2.InspectionItemID + join q3 in _context.UserInfoes on q1.CreateUserID equals q3.UserID + into subGrp3 from s3 in subGrp3.DefaultIfEmpty() + join q4 in _context.UserInfoes on q1.MissingUserID equals q4.UserID + into subGrp4 from s4 in subGrp4.DefaultIfEmpty() + join q5 in _context.LineInfoes on q1.LineID equals q5.LineID + into subGrp5 from s5 in subGrp5.DefaultIfEmpty() + join q6 in _context.Stationses on q1.RuleStationID equals q6.StationID + into subGrp6 from s6 in subGrp6.DefaultIfEmpty() + join q7 in _context.FactoryUnits on q1.MissingUnitNo equals q7.UnitNo + into subGrp7 from s7 in subGrp7.DefaultIfEmpty() + where q1.InspectionID == id + //orderby q1.InspectionItemID descending + select new InspectionResultDetailDto + { + InspectionID = q1.InspectionID, + InspectionItemID = q1.InspectionItemID, + InspectionItemName = q1.InspectionItem.InspectionItemName, + Line = s5.LineDesc, + RuleStation = s6.StationName, + Location = q1.Location, + MissingUnitNo = s7.UnitName, + CreateUserID = s3.UserName, + MissingUserID = s4.UserName, + MissingRemark = q1.MissingRemark, + Result = q1.Result == "F" ? "FAIL" : q1.Result == "P" ? "PASS" : "N/A", + CreateDate = q1.CreateDate, + UpdateDate = q1.UpdateDate, + + + }; + var query = await q.ToListAsync(); + + //ResultModel result = new ResultModel(); + //result.Data = query; + + return query; + } + + /// + /// 用ID获取该巡檢類別資料 + /// + /// + /// + /// + // GET: api/InspectionResultDetails/5 + [HttpGet("Query/{id}/{Iid}")] + public async Task>> GetInspectionResultDetailByQuery(int id,int Iid) + { + + IQueryable q = _context.InspectionResultDetails; + q = q.Where(p => p.InspectionID.Equals(id)); + q = q.Where(p => p.InspectionItemID.Equals(Iid)); + var InspectionResultDetail = await q.ToListAsync(); + + if (InspectionResultDetail == null) + { + return InspectionResultDetail; + } + + return InspectionResultDetail; + } + /// /// 更新巡檢類別資料 /// diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs index a5728b04..3adcdd07 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs @@ -91,6 +91,42 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES return InspectionResultMaster; } + /// + /// 用FormID获取该巡檢結果资料 + /// + /// + /// + /// + /// + // GET: api/InspectionItems/5 + [HttpGet("Query/{WipNo}/{ItemNo}/{BarcodeNo}/{StatusNo}")] + public async Task>> GetInspectionResultMastersByQuery(string WipNo, string ItemNo, string BarcodeNo, string StatusNo) + { + + IQueryable q = _context.InspectionResultMasters; + + if (!string.IsNullOrWhiteSpace(WipNo)) + q = q.Where(w => w.WipNo == WipNo); + + if (!string.IsNullOrWhiteSpace(ItemNo)) + q = q.Where(w => w.ItemNo == ItemNo); + + if (!string.IsNullOrWhiteSpace(BarcodeNo)) + q = q.Where(w => w.BarcodeNo == BarcodeNo); + + if (!string.IsNullOrWhiteSpace(StatusNo)) + q = q.Where(w => w.StatusNo == StatusNo); + + var InspectionResultMaster = await q.ToListAsync(); + + if (InspectionResultMaster == null) + { + return InspectionResultMaster; + } + + return InspectionResultMaster; + } + /// /// 用FormID获取该巡檢結果资料 /// @@ -150,7 +186,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES } result.Success = true; - result.Msg = "OK"; + result.Msg = InspectionResultMaster.InspectionID.ToString(); return result; } diff --git a/AMESCoreStudio.WebApi/DTO/AMES/InspectionResultDetailDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/InspectionResultDetailDto.cs new file mode 100644 index 00000000..721e2764 --- /dev/null +++ b/AMESCoreStudio.WebApi/DTO/AMES/InspectionResultDetailDto.cs @@ -0,0 +1,124 @@ +using System; + + +namespace AMESCoreStudio.WebApi.DTO.AMES +{ + /// + /// 檢驗項目維護資料檔 DTO + /// + public partial class InspectionResultDetailDto + { + + /// + /// 巡檢ID + /// + public int InspectionID { get; set; } + + /// + /// 巡檢項目ID + /// + public int InspectionItemID { get; set; } + + /// + /// 巡檢項目ID + /// + public string InspectionItemName { get; set; } + + /// + /// 線別 + /// + public string Line { get; set; } + + /// + /// 站別ID + /// + public string RuleStation { get; set; } + + /// + /// 稽核結果 + /// P-PASS(允收) ; F-FAIL(批退) ; NA-無 ; A初始狀態 ； + /// + public string Result { get; set; } + + /// + /// 區域 + /// + public string Area { get; set; } = ""; + + /// + /// 位置 + /// + public string Location { get; set; } + + /// + /// 缺失單位 + /// + public string MissingUnitNo { get; set; } + + /// + /// 缺失站別 + /// + public string MissingStationID { get; set; } = ""; + + /// + /// 缺失人員ID + /// + public string MissingUserID { get; set; } + + /// + /// 缺失類型 + /// + public string MissingType { get; set; } = ""; + + /// + /// 缺失備註 + /// + public string MissingRemark { get; set; } + + /// + /// 是否需要對策 METHOD : Y-YES : N-NO + /// + public string Method { get; set; } + + + /// + /// 回覆原因 + /// + public string PeplyReason { get; set; } + + /// + /// 回覆對策 + /// + public string PeplyMethod { get; set; } + + + /// + /// 回覆人員ID + public int PeplyUserID { get; set; } + + + /// + /// 創建者ID + /// + public string CreateUserID { get; set; } + + /// + /// 創建日期 + /// + public DateTime CreateDate { get; set; } + + /// + /// 更新者ID + /// + public string UpdateUserID { get; set; } + + /// + /// 更新日期 + /// + public DateTime? UpdateDate { get; set; } + + + + + } +} diff --git a/AMESCoreStudio.WebApi/Models/AMES/InspectionResultDetail.cs b/AMESCoreStudio.WebApi/Models/AMES/InspectionResultDetail.cs index 2da727f5..d020b651 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/InspectionResultDetail.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/InspectionResultDetail.cs @@ -141,7 +141,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES [StringLength(100)] [Display(Name = "回覆原因")] [DataMember] - public string PeplyReason { get; set; } + public string ReplyReason { get; set; } /// /// 回覆對策 @@ -150,7 +150,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES [StringLength(100)] [Display(Name = "回覆對策")] [DataMember] - public string PeplyMethod { get; set; } + public string ReplyMethod { get; set; } /// @@ -159,7 +159,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Column("REPLY_USERID")] [Display(Name = "回覆人員")] [DataMember] - public int PeplyUserID { get; set; } + public int ReplyUserID { get; set; } /// diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll index 5900c551..8bff3325 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb index e06e30c8..00e1def0 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll index b9c3d871..dad0b638 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb index 3bc7f4a7..3d965842 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml index 9b8e719e..3093081e 100644 --- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -1273,6 +1273,21 @@ + + + 巡檢資料 + + InspectionID + + + + + 用ID获取该巡檢類別資料 + + + + + 更新巡檢類別資料 @@ -1326,6 +1341,15 @@ + + + 用FormID获取该巡檢結果资料 + + + + + + @@ -2083,6 +2107,23 @@ + + + 維修資料統計 + + + + + + + + + + + + + + @@ -3707,13 +3748,13 @@ 料號 0:找不到 - + 取得上一個作業站RuleStationID 工單ID + BarCodeID 目前作業站ID - 該工單號碼過站資料 true:false @@ -5376,6 +5417,113 @@ 不良備註 + + + 檢驗項目維護資料檔 DTO + + + + + 巡檢ID + + + + + 巡檢項目ID + + + + + 巡檢項目ID + + + + + 線別 + + + + + 站別ID + + + + + 稽核結果 + P-PASS(允收) ; F-FAIL(批退) ; NA-無 ; A初始狀態 ； + + + + + 區域 + + + + + 位置 + + + + + 缺失單位 + + + + + 缺失站別 + + + + + 缺失人員ID + + + + + 缺失類型 + + + + + 缺失備註 + + + + + 是否需要對策 METHOD : Y-YES : N-NO + + + + + 回覆原因 + + + + + 回覆對策 + + + + + + 創建者ID + + + + + 創建日期 + + + + + 更新者ID + + + + + 更新日期 + + MaterialKpDtp Select Dto @@ -8479,17 +8627,17 @@ 是否需要對策 METHOD : Y-YES : N-NO - + 回覆原因 - + 回覆對策 - + 回覆人員ID