From 9fd2d6b22180fac4900e10b17fe22314216f0a2a Mon Sep 17 00:00:00 2001 From: Yiru Date: Sun, 28 Jan 2024 22:32:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E9=81=B8=E6=A8=99=E7=B1=A4=20?= =?UTF-8?q?=E5=90=88=E4=BD=B5YUI=E7=9A=84=E5=85=B1=E7=94=A8=E5=8F=83?= =?UTF-8?q?=E6=95=B8=E5=90=8D=E7=A8=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/LABController.cs | 262 +++++++++++++++++- AMESCoreStudio.Web/HttpApis/AMES/ILAB.cs | 106 +++++++ AMESCoreStudio.Web/Views/LAB/LAB001.cshtml | 41 +-- AMESCoreStudio.Web/Views/LAB/LAB001C.cshtml | 24 +- AMESCoreStudio.Web/Views/LAB/LAB001U.cshtml | 24 +- .../Controllers/AMES/LabelParamController.cs | 51 +++- .../AMES/LabelTemplateDetailController.cs | 56 ++-- .../AMES/LabelTemplateMasterController.cs | 81 +++++- .../DTO/AMES/LabelTemplateDto.cs | 116 ++++++++ .../Models/AMES/LabelParam.cs | 4 +- 10 files changed, 654 insertions(+), 111 deletions(-) create mode 100644 AMESCoreStudio.WebApi/DTO/AMES/LabelTemplateDto.cs diff --git a/AMESCoreStudio.Web/Controllers/LABController.cs b/AMESCoreStudio.Web/Controllers/LABController.cs index ebbb5f87..8e5a6170 100644 --- a/AMESCoreStudio.Web/Controllers/LABController.cs +++ b/AMESCoreStudio.Web/Controllers/LABController.cs @@ -13,6 +13,8 @@ using static AMESCoreStudio.Web.ViewModels.LAB.LAB003ViewModel; using AMESCoreStudio.WebApi.Models.AMES; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using Microsoft.AspNetCore.Mvc.Rendering; +using AMESCoreStudio.WebApi.DTO.AMES; namespace AMESCoreStudio.Web.Controllers { @@ -30,7 +32,265 @@ namespace AMESCoreStudio.Web.Controllers } + private void GetFlagList() + { + + var FlagList = new List(); + + + FlagList.Add(new SelectListItem("Y", "Y")); + FlagList.Add(new SelectListItem("N", "N")); + + ViewBag.FlagList = FlagList; + } + public void GetUserID() + { + var userID = ""; + HttpContext.Request.Cookies.TryGetValue("UserID", out userID); + int user_id = 0; + if (userID != null) + { + if (int.Parse(userID.ToString()) >= 0) + { + user_id = int.Parse(userID.ToString()); + } + } + ViewBag.UserID = user_id; + } + + #region LAB001工作群組維護相關 + + public IActionResult LAB001() + { + return View(); + } + + //新增頁面 + public IActionResult LAB001C() + { + GetUserID(); + GetFlagList(); + return View(); + } + + + + //修改页面 + [HttpGet] + public async Task LAB001U(int id) + { + GetUserID(); + GetFlagList(); + var result = await _labApi.GetLabelParam(id); + + if (result.LABEL_FIELD_ID == 0) + { + return View(); + } + return View(result); + } + + + //頁面提交，id=0 添加，id>0 修改 + [HttpPost] + public async Task LAB001CSaveAsync(LabelParam model) + { + if (ModelState.IsValid) + { + IResultModel result; + + result = await _labApi.PostLabelParam(JsonConvert.SerializeObject(model)); + + + if (result.Success) //yiru modify 2022-09-27 + { + var _msg = "添加成功！"; + return RedirectToAction("Refresh", "Home", new { msg = _msg }); + } + else + { + + ModelState.AddModelError("error", result.Msg); + + } + } + return View("LAB001C", model); + } + + public async Task LAB001USaveAsync(LabelParam model) + { + if (ModelState.IsValid) + { + IResultModel result; + + result = await _labApi.PutLabelParam(model.LABEL_FIELD_ID, 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("LAB001U", model); + } + + + [ResponseCache(Duration = 0)] + [HttpGet] + public async Task GetLabParamsAsync(int page = 0, int limit = 10) + { + var result = await _labApi.GetLabParamsByLabelID(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 + + + + #region LAB002 標籤樣板維護 + + public IActionResult LAB002() + { + return View(); + } + + //新增頁面 + public IActionResult LAB002C() + { + GetUserID(); + return View(); + } + + //修改页面 + [HttpGet] + public async Task LAB002UAsync(int id) + { + // var resultMaster = await _labApi.GetLabelTemplateMaster(id); + // var resultDetail = await _labApi.GetLabelTemplateDetail(id); + + // var result = new LabelTemplateDto(); + + // result.labelTemplateMaster = resultMaster; + // result.labelTemplateDetails = resultDetail; + // var result + + GetUserID(); + + + return View(); + } + + //頁面提交，id=0 添加，id>0 修改 + [HttpPost] + public async Task LAB002CSaveAsync(LabelTemplateDto model) + { + GetUserID(); + if (ModelState.IsValid) + { + IResultModel result; + + result = await _labApi.PostLabelTemplateMaster(JsonConvert.SerializeObject(model)); + + + if (result.Success) + { + var _msg = "添加成功！"; + return RedirectToAction("Refresh", "Home", new { msg = _msg }); + } + else + { + ModelState.AddModelError("error", result.Msg); + return View("LAB002C", model); + + } + } + else + { + + ModelState.AddModelError("error", "缺少必填資料"); + return View("LAB002C", model); + } + } + + public async Task LAB002USaveAsync(LabelTemplateDto model) + { + if (ModelState.IsValid) + { + IResultModel result; + + //result = await _labApi.PutLabeTemplateMaster(model.labelTemplateMaster.TemplateID, JsonConvert.SerializeObject(model.labelTemplateMaster)); + //foreach (var item in model.labelTemplateDetails) + //{ + // result = await _labApi.PutLabeTemplateDetail(item.TemplateDetailID, JsonConvert.SerializeObject(item)); + //} + + //if (result.Success) + //{ + // var _msg = "修改成功！"; + // return RedirectToAction("Refresh", "Home", new { msg = _msg }); + //} + //else + //{ + // GetUserID(); + // ModelState.AddModelError("error", result.Msg); + // return View("LAB002C", model); + + //} + return View("LAB002U", model); + } + else + { + GetUserID(); + ModelState.AddModelError("error", "缺少必填資料"); + return View("LAB002U", model); + } + } + + [ResponseCache(Duration = 0)] + [HttpGet] + public async Task GetLabelTemplateDtoAsync(string LabelMatnr, string Status, int page = 0, int limit = 10) + { + var result = await _labApi.GetLabelTemplateDto(LabelMatnr, Status, page, limit); + + if (result.Count > 0) + { + return Json(new Table() { code = 0, msg = "", data = result, count = result.Count }); + } + + return Json(new Table() { count = 0, data = null }); + } + + public async Task GetLabelTemplatebyMatnrAsync(int id) + { + var result = await _labApi.GetLabelTemplatebyMatnr(id); + + if (result.Count > 0) + { + return Json(new Table() { code = 0, msg = "", data = result, count = result.Count }); + } + + return Json(new Table() { count = 0, data = null }); + } + + #endregion + #region Lab003 public async Task LAB003(string mat) { @@ -157,7 +417,7 @@ namespace AMESCoreStudio.Web.Controllers return user_id; } - + #endregion diff --git a/AMESCoreStudio.Web/HttpApis/AMES/ILAB.cs b/AMESCoreStudio.Web/HttpApis/AMES/ILAB.cs index 75ea29e3..4ff8c458 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/ILAB.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/ILAB.cs @@ -42,6 +42,112 @@ namespace AMESCoreStudio.Web [WebApiClient.Attributes.HttpGet("api/LabelItem/GetLabelReq")] ITask> GetLabelReq(string OrderNo); + #endregion + + + #region LAB001 LAB002 + + /// + /// Label 參數查詢by ID + /// + /// + [WebApiClient.Attributes.HttpGet("api/LabelParam/{id}")] + ITask GetLabelParam(int id); + + + /// + /// Label 參數儲存 + /// + /// + [WebApiClient.Attributes.HttpPost("api/LabelParam")] + ITask> PostLabelParam([FromBody, RawJsonContent] string model); + + /// + /// Label 參數修改 + /// + /// + [WebApiClient.Attributes.HttpPut("api/LabelParam")] + ITask> PutLabelParam(int id, [FromBody, RawJsonContent] string model); + + /// + /// 獲取Label 全部參數資料 + /// + /// + [WebApiClient.Attributes.HttpGet("api/LabelParam")] + ITask> GetLabParams(); + + /// + /// 獲取Label 全部參數資料 + /// + /// + [WebApiClient.Attributes.HttpGet("api/LabelParam/byLabelID/{id}")] + ITask> GetLabParamsByLabelID(int page = 0, int limit = 10); + + /// + /// Label 參數儲存 + /// + /// + [WebApiClient.Attributes.HttpPost("api/LabelTemplateMaster")] + ITask> PostLabelTemplateMaster([FromBody, RawJsonContent] string model); + + /// + /// Label 參數修改 + /// + /// + [WebApiClient.Attributes.HttpPut("api/LabelTemplateMaster")] + ITask> PutLabeTemplateMaster(int id, [FromBody, RawJsonContent] string model); + + + /// + /// Label 參數儲存 + /// + /// + [WebApiClient.Attributes.HttpPost("api/LabelTemplatDetail")] + ITask> PostLabelTemplateDetail([FromBody, RawJsonContent] string model); + + /// + /// Label 參數修改 + /// + /// + [WebApiClient.Attributes.HttpPut("api/LabelTemplateDetail")] + ITask> PutLabeTemplateDetail(int id, [FromBody, RawJsonContent] string model); + + + + + + /// + /// Label 參數查詢by ID + /// + /// + [WebApiClient.Attributes.HttpGet("api/LabelTemplateMaster/{id}")] + ITask GetLabelTemplateMaster(int id); + + /// + /// Label 參數查詢by ID + /// + /// + [WebApiClient.Attributes.HttpGet("api/LabelTemplateDetail/{id}")] + ITask> GetLabelTemplateDetail(int id); + + /// + /// 獲取Label 全部參數資料 + /// + /// + [WebApiClient.Attributes.HttpGet("api/LabelTemplateMaster/LabelTemplatebyMatnr/{LabelMatnr}/{Status}")] + ITask> GetLabelTemplateDto(string LabelMatnr, string Status, int page, int limit); + + + /// + /// 獲取Label 全部參數資料 + /// + /// + [WebApiClient.Attributes.HttpGet("api/LabelTemplateDetail/byTemplateIDMulti/{id}")] + ITask> GetLabelTemplatebyMatnr(int id); + + + + #endregion } } diff --git a/AMESCoreStudio.Web/Views/LAB/LAB001.cshtml b/AMESCoreStudio.Web/Views/LAB/LAB001.cshtml index e198b326..2ad9a170 100644 --- a/AMESCoreStudio.Web/Views/LAB/LAB001.cshtml +++ b/AMESCoreStudio.Web/Views/LAB/LAB001.cshtml @@ -24,23 +24,23 @@ }); var tableCols = [[ { - field: 'labelFieldID', + field: 'labeL_FIELD_ID', width: 200, title: '#' }, { - field: 'labelFieldName', + field: 'labeL_FIELD_NAME', title: '標籤欄位名稱' }, { - field: 'paramName', + field: 'paraM_NAME', title: '標籤變數名稱' }, { - field: 'statusNo', + field: 'statuS_No', title: '狀態', templet: function (d) { - return d.statusNo === 'Y' ? '啟用' : '停用'; + return d.statuS_NO === 'Y' ? '啟用' : '停用'; } }, { @@ -56,41 +56,18 @@ //通过行tool编辑，lay-event="edit" function edit(obj) { - if (obj.data.labelFieldID) { - hg.open('修改參數名稱', '/LAB/LAB001U/' + obj.data.labelFieldID, 640,320); + if (obj.data.labeL_FIELD_ID) { + hg.open('修改參數名稱', '/LAB/LAB001U/' + obj.data.labeL_FIELD_ID, 640,320); } } - //通过行tool删除，lay-event="del" - function del(obj) { - if (obj.data.groupID) { - hg.confirm("工作群組：" + obj.data.groupName + "，确定要删除吗？", function () { - $.ajax({ - url: '/WHS/WHS001D', - data: { id: obj.data.groupID }, - type: 'POST', - success: function (data) { - if (data.success) { - obj.del(); //只删本地数据 - hg.msghide("删除成功！"); - } - else { - hg.msg(data.msg); - } - }, - error: function () { - hg.msg("网络请求失败！"); - } - }); - }); - } - } + var toolbar = [{ text: '新增', layuiicon: '', class: 'layui-btn-normal', handler: function () { - hg.open('新增工作群組', '/LAB/LAB001C', 640, 320); + hg.open('新增參數', '/LAB/LAB001C', 640, 320); } } diff --git a/AMESCoreStudio.Web/Views/LAB/LAB001C.cshtml b/AMESCoreStudio.Web/Views/LAB/LAB001C.cshtml index 98381718..ae0bb14d 100644 --- a/AMESCoreStudio.Web/Views/LAB/LAB001C.cshtml +++ b/AMESCoreStudio.Web/Views/LAB/LAB001C.cshtml @@ -1,7 +1,7 @@ @model AMESCoreStudio.WebApi.Models.AMES.LabelParam -@{ ViewData["Title"] = "WHS001C"; +@{ ViewData["Title"] = "新增Label參數"; Layout = "~/Views/Shared/_FormLayout.cshtml"; } @@ -15,25 +15,29 @@
+ + + +
- - - + + +
- - - + + +
- +
diff --git a/AMESCoreStudio.Web/Views/LAB/LAB001U.cshtml b/AMESCoreStudio.Web/Views/LAB/LAB001U.cshtml index 098fcf7a..55731f0b 100644 --- a/AMESCoreStudio.Web/Views/LAB/LAB001U.cshtml +++ b/AMESCoreStudio.Web/Views/LAB/LAB001U.cshtml @@ -15,26 +15,30 @@
- + + + + +
- - - + + +
- - - + + +
- +
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/LabelParamController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/LabelParamController.cs index aa8c7b52..a3371c6c 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/LabelParamController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/LabelParamController.cs @@ -29,7 +29,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES [HttpGet] public async Task>> GetLabelParams() { - return await _context.LabelParams.ToListAsync(); + return await _context.LabelParam.ToListAsync(); } @@ -37,7 +37,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES [HttpGet("{id}")] public async Task> GetLabelParam(int id) { - var LabelParam = await _context.LabelParams.FindAsync(id); + var LabelParam = await _context.LabelParam.FindAsync(id); if (LabelParam == null) { @@ -48,21 +48,46 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES } + // GET: api/LabelParam/5 + [HttpGet("byLabelID/{id}")] + public async Task> GetLabelParambyLabelID(int id, int page = 0, int limit = 10) + { + ResultModel result = new ResultModel(); + IQueryable q = _context.LabelParam; + if (id > 0) + { + q = q.Where(p => p.LABEL_FIELD_ID.Equals(id)); + } + + result.DataTotal = q.Count(); + + // Table 頁數 + if (page > 0) + { + q = q.Skip((page - 1) * limit).Take(limit); + } + + result.Data = await q.ToListAsync(); + + return result; + } + + /// /// 更新Label參數檔 /// /// /// [HttpPut] - public async Task> PutBarcodeOutfit(LabelParam labelParam) + public async Task> PutLabelParam(int id,LabelParam labelParam) { ResultModel result = new ResultModel(); _context.Entry(labelParam).State = EntityState.Modified; //設置容器空間某一個模型的某一個欄位 不提交到資料庫 - _context.Entry(labelParam).Property("CreateDate").IsModified = false; - _context.Entry(labelParam).Property("CreateUserID").IsModified = false; - labelParam.UpdateDate = DateTime.Now; - labelParam.UpdateUserID = 0; + _context.Entry(labelParam).Property("CREATE_DATE").IsModified = false; + _context.Entry(labelParam).Property("CREATE_USERID").IsModified = false; + labelParam.UPDATE_DATE = DateTime.Now; + labelParam.UPDATE_USERID = 0; try { @@ -84,15 +109,15 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// /// [HttpPost] - public async Task> PostBarcodeOutfit(LabelParam labelParam) + public async Task> PostLabelParam(LabelParam labelParam) { ResultModel result = new ResultModel(); try { Helper helper = new Helper(_context); - labelParam.LabelFieldID = helper.GetIDKey("LABEL_FIELD_ID").Result; - _context.LabelParams.Add(labelParam); + labelParam.LABEL_FIELD_ID = helper.GetIDKey("LABEL_FIELD_ID").Result; + _context.LabelParam.Add(labelParam); await _context.SaveChangesAsync(); result.Success = true; result.Msg = "OK"; @@ -109,13 +134,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES [HttpDelete("{id}")] public async Task> DeleteLabelParam(int id) { - var LabelParam = await _context.LabelParams.FindAsync(id); + var LabelParam = await _context.LabelParam.FindAsync(id); if (LabelParam == null) { return NotFound(); } - _context.LabelParams.Remove(LabelParam); + _context.LabelParam.Remove(LabelParam); await _context.SaveChangesAsync(); return LabelParam; @@ -123,7 +148,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES private bool LabelParamExists(int id) { - return _context.LabelParams.Any(e => e.LabelFieldID == id); + return _context.LabelParam.Any(e => e.LABEL_FIELD_ID == id); } } } diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateDetailController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateDetailController.cs index 73fd8a4d..55015abf 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateDetailController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateDetailController.cs @@ -29,41 +29,41 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES [HttpGet] public async Task>> GetLabelTemplateDetails() { - return await _context.LabelTemplateDetails.ToListAsync(); + return await _context.LabelTemplateDetail.ToListAsync(); } // GET: api/LabelTemplateDetail/5 [HttpGet("{id}")] public async Task>> GetLabelTemplateDetail(int id) { - var labelTemplateDetail = await _context.LabelTemplateDetails.Where(w=>w.TemplateID == id).ToListAsync(); + var labelTemplateDetail = await _context.LabelTemplateDetail.Where(w=>w.TEMPLATE_ID == id).ToListAsync(); return labelTemplateDetail; } - // GET: api/LabelTemplateDetail/5 - [HttpGet("byTemplateIDMulti/{id}")] - public async Task>> GetLabelTemplateDetailbyTemplateIDMulti(int id) - { - var q = from p in _context.LabelParams - join d in _context.LabelTemplateDetails - on new { p.LabelFieldID, TemplateID = id } equals new { d.LabelFieldID, d.TemplateID } into d1 - from subd in d1.DefaultIfEmpty() - where p.StatusNo == "Y" - select new - { - LabelFieldID = p.LabelFieldID, - LabelFieldName = p.LabelFieldName, - ParamName = p.ParamName, - TemplateID = subd != null ? 1 : 0 //有此欄位則顯示為1 沒有就為0 - }; + //// GET: api/LabelTemplateDetail/5 + //[HttpGet("byTemplateIDMulti/{id}")] + //public async Task>> GetLabelTemplateDetailbyTemplateIDMulti(int id) + //{ + // var q = from p in _context.LabelParam + // join d in _context.LabelTemplateDetail + // on new { p.LABEL_FIELD_ID, TemplateID = id } equals new { d.LABEL_FIELD_ID, d.TEMPLATE_ID } into d1 + // from subd in d1.DefaultIfEmpty() + // where p.StatusNo == "Y" + // select new + // { + // LabelFieldID = p.LabelFieldID, + // LabelFieldName = p.LabelFieldName, + // ParamName = p.ParamName, + // TemplateID = subd != null ? 1 : 0 //有此欄位則顯示為1 沒有就為0 + // }; - var query = await q.ToListAsync(); + // var query = await q.ToListAsync(); - return query; - } + // return query; + //} /// @@ -79,8 +79,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES //設置容器空間某一個模型的某一個欄位 不提交到資料庫 _context.Entry(LabelTemplateDetail).Property("CreateDate").IsModified = false; _context.Entry(LabelTemplateDetail).Property("CreateUserID").IsModified = false; - LabelTemplateDetail.UpdateDate = DateTime.Now; - LabelTemplateDetail.UpdateUserID = 0; + LabelTemplateDetail.UPDATE_DATE = DateTime.Now; + LabelTemplateDetail.UPDATE_USERID = 0; try { @@ -109,8 +109,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES try { Helper helper = new Helper(_context); - LabelTemplateDetail.TemplateID = helper.GetIDKey("TEMPLATE_ID").Result; - _context.LabelTemplateDetails.Add(LabelTemplateDetail); + LabelTemplateDetail.TEMPLATE_ID = helper.GetIDKey("TEMPLATE_ID").Result; + _context.LabelTemplateDetail.Add(LabelTemplateDetail); await _context.SaveChangesAsync(); result.Success = true; result.Msg = "OK"; @@ -127,13 +127,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES [HttpDelete("{id}")] public async Task> DeleteLabelTemplateDetail(int id) { - var LabelTemplateDetail = await _context.LabelTemplateDetails.FindAsync(id); + var LabelTemplateDetail = await _context.LabelTemplateDetail.FindAsync(id); if (LabelTemplateDetail == null) { return NotFound(); } - _context.LabelTemplateDetails.Remove(LabelTemplateDetail); + _context.LabelTemplateDetail.Remove(LabelTemplateDetail); await _context.SaveChangesAsync(); return LabelTemplateDetail; @@ -141,7 +141,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES private bool LabelTemplateDetailExists(int id) { - return _context.LabelTemplateDetails.Any(e => e.TemplateID == id); + return _context.LabelTemplateDetail.Any(e => e.TEMPLATE_ID == id); } } } diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateMasterController.cs index ac49ccd2..cb60fe2a 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateMasterController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateMasterController.cs @@ -30,14 +30,14 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES [HttpGet] public async Task>> GetLabelTemplateMasters() { - return await _context.LabelTemplateMasters.ToListAsync(); + return await _context.LabelTemplateMaster.ToListAsync(); } // GET: api/LabelTemplateMaster/5 [HttpGet("{id}")] public async Task> GetLabelTemplateMaster(int id) { - var LabelTemplateMaster = await _context.LabelTemplateMasters.FindAsync(id); + var LabelTemplateMaster = await _context.LabelTemplateMaster.FindAsync(id); if (LabelTemplateMaster == null) { @@ -61,8 +61,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES //設置容器空間某一個模型的某一個欄位 不提交到資料庫 _context.Entry(LabelTemplateMaster).Property("CreateDate").IsModified = false; _context.Entry(LabelTemplateMaster).Property("CreateUserID").IsModified = false; - LabelTemplateMaster.UpdateDate = DateTime.Now; - LabelTemplateMaster.UpdateUserID = 0; + LabelTemplateMaster.UPDATE_DATE = DateTime.Now; + LabelTemplateMaster.UPDATE_USERID = 0; try { @@ -91,8 +91,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES try { Helper helper = new Helper(_context); - LabelTemplateMaster.TemplateID = helper.GetIDKey("TEMPLATE_ID").Result; - _context.LabelTemplateMasters.Add(LabelTemplateMaster); + LabelTemplateMaster.TEMPLATE_ID = helper.GetIDKey("TEMPLATE_ID").Result; + _context.LabelTemplateMaster.Add(LabelTemplateMaster); await _context.SaveChangesAsync(); result.Success = true; result.Msg = "OK"; @@ -109,13 +109,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES [HttpDelete("{id}")] public async Task> DeleteLabelTemplateMaster(int id) { - var LabelTemplateMaster = await _context.LabelTemplateMasters.FindAsync(id); + var LabelTemplateMaster = await _context.LabelTemplateMaster.FindAsync(id); if (LabelTemplateMaster == null) { return NotFound(); } - _context.LabelTemplateMasters.Remove(LabelTemplateMaster); + _context.LabelTemplateMaster.Remove(LabelTemplateMaster); await _context.SaveChangesAsync(); return LabelTemplateMaster; @@ -126,26 +126,26 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES public async Task>> GetLabelTemplatebyMatnr(string LabelMatnr, string Status, int page = 0, int limit = 10) { - IQueryable q = _context.LabelTemplateMasters; + IQueryable q = _context.LabelTemplateMaster; if (!string.IsNullOrEmpty(LabelMatnr) && LabelMatnr != "*") { - q.Where(w => w.LabelMatnr.Equals(LabelMatnr)); + q.Where(w => w.LABEL_MATNR.Equals(LabelMatnr)); } if (!string.IsNullOrEmpty(Status) && Status != "*") { - q.Where(w => w.StatusNo.Equals(Status) ); + q.Where(w => w.STATUS_NO.Equals(Status) ); } if (page > 0) { - q = q.OrderBy(p => p.LabelMatnr).Skip((page - 1) * limit).Take(limit); + q = q.OrderBy(p => p.LABEL_MATNR).Skip((page - 1) * limit).Take(limit); } else { - q = q.OrderBy(p => p.LabelMatnr); + q = q.OrderBy(p => p.LABEL_MATNR); } var labelTemplateMasters = await q.ToListAsync(); @@ -156,10 +156,61 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES } - + //// GET: api/LabelTemplateMaster/5 + //[HttpGet("LabelTemplateMulti/{LabelMatnr}/{Status}")] + //public async Task>> GetLabelTemplateDto(string LabelMatnr, string Status, int page = 0, int limit = 10) + //{ + // List TemplateDtoList = new List(); + // var LabelTemplateMaster = await _context.LabelTemplateMaster.Where(w => w.LabelMatnr == LabelMatnr).ToListAsync(); + // foreach (var item in LabelTemplateMaster) + // { + // var LabelTemplateDetail = await _context.LabelTemplateDetails.Where(w => w.TemplateID == item.TemplateID).ToListAsync(); + + // var TemplateDto= new LabelTemplateDto + // { + // TemplateID = item.TemplateID, + // LabelMatnr = item.LabelMatnr, + // LabelFile = item.LabelFile, + // ImageName = item.ImageName, + // Remark = item.Remark, + // CreateDate = item.CreateDate, + // CreateUserID = item.CreateUserID, + // UpdateDate = item.UpdateDate, + // UpdateUserID = item.UpdateUserID + + // }; + + // foreach (var item1 in LabelTemplateDetail) + // { + // TemplateDto.labelTemplateDetails.Add(new Models.AMES.LabelTemplateDetail + // { + // TemplateID = item1.TemplateID, + // LabelFieldID = item1.LabelFieldID, + // CreateDate = item1.CreateDate, + // CreateUserID = item1.CreateUserID, + // UpdateDate = item1.UpdateDate, + // UpdateUserID = item1.UpdateUserID + // }); + + // } + + // TemplateDtoList.Add(TemplateDto); + + + // } + + // if (LabelTemplateMaster == null) + // { + // return NotFound(); + // } + + // return TemplateDtoList; + + //} + private bool LabelTemplateMasterExists(int id) { - return _context.LabelTemplateMasters.Any(e => e.TemplateID == id); + return _context.LabelTemplateMaster.Any(e => e.TEMPLATE_ID == id); } } } diff --git a/AMESCoreStudio.WebApi/DTO/AMES/LabelTemplateDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/LabelTemplateDto.cs new file mode 100644 index 00000000..8c685f25 --- /dev/null +++ b/AMESCoreStudio.WebApi/DTO/AMES/LabelTemplateDto.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; +using System.Runtime.Serialization; +using AMESCoreStudio.WebApi.Models.AMES; + +#nullable disable + +namespace AMESCoreStudio.WebApi.DTO.AMES +{ + /// + /// 入庫單資料檔 Dto + /// + public partial class LabelTemplateDto + { + public LabelTemplateDto() + { + labelTemplateDetails = new List(); + + } + + /// + /// 標籤欄位ID + /// + [DataMember] + [Display(Name = "標籤欄位ID")] + public int TemplateID { get; set; } + + /// + /// 標籤料號 + /// + [DataMember] + [Display(Name = "Label料號")] + public string LabelMatnr { get; set; } + + /// + /// 標籤檔案 + /// + [DataMember] + [Display(Name = "標籤檔名")] + public string LabelFile { get; set; } + + /// + /// 狀態 Y:啟用 N:停用 + /// + [DataMember] + [Display(Name = "狀態")] + public string StatusNo { get; set; } + + /// + /// 圖檔 + /// + [DataMember] + [Display(Name = "檢視圖檔")] + public string ImageName { get; set; } + + + /// + /// 建立UserID + /// + [DataMember] + [Display(Name = "建立UserID")] + public int CreateUserID { get; set; } = 0; + + /// + /// 建立日期 + /// + [DataMember] + [Display(Name = "建立日期")] + public DateTime CreateDate { get; set; } = DateTime.Now; + + /// + /// 更新UserID + /// + [DataMember] + [Display(Name = "更新UserID")] + public int UpdateUserID { get; set; } = 0; + + /// + /// 更新日期 + /// + [DataMember] + [Display(Name = "更新日期")] + public DateTime? UpdateDate { get; set; } = DateTime.Now; + + /// + /// 備註 + /// + [DataMember] + [Display(Name = "備註說明")] + public string Remark { get; set; } + ///// + ///// 標籤樣版detail ID + ///// + //[DataMember] + //[Display(Name = "標籤樣版detail ID")] + //public int TemplateDetailID { get; set; } + + ///// + ///// 標籤欄位名稱 + ///// + //[DataMember] + //[Display(Name = "標籤欄位名稱")] + //public int LabelFieldID { get; set; } + + + /// + /// Detail + /// + public List labelTemplateDetails { get; set; } + + + } +} diff --git a/AMESCoreStudio.WebApi/Models/AMES/LabelParam.cs b/AMESCoreStudio.WebApi/Models/AMES/LabelParam.cs index 242e8d9e..1c8eee06 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/LabelParam.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/LabelParam.cs @@ -55,14 +55,14 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// [Column("CREATE_DATE")] [DataMember] - public string CREATE_DATE { get; set; } + public DateTime CREATE_DATE { get; set; } /// /// 建立人 /// [Column("CREATE_USERID")] [DataMember] - public string CREATE_USERID { get; set; } + public int CREATE_USERID { get; set; } /// /// 更新日