From 23f9595918d7c6c5e8f2df6624f8e340495aca49 Mon Sep 17 00:00:00 2001 From: Yiru Date: Thu, 22 Feb 2024 21:17:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Label=E7=9B=B8=E9=97=9CAPI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AMES/LabelPrintDetailController.cs | 16 +++++-- .../AMES/LabelPrintMasterController.cs | 45 ++++++++++++++----- .../AMES/LabelTemplateMasterController.cs | 12 ++++- 3 files changed, 58 insertions(+), 15 deletions(-) diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/LabelPrintDetailController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/LabelPrintDetailController.cs index a677fb74..f447d333 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/LabelPrintDetailController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/LabelPrintDetailController.cs @@ -77,23 +77,32 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES return result; } + /// /// 新增更新Label參數檔 /// /// /// [HttpPost] - public async Task> PostLabelPrintDetail(LabelPrintDetail LabelPrintDetail) + public async Task> PostLabelPrintDetail(List LabelPrintDetail) { ResultModel result = new ResultModel(); try { - - _context.LabelPrintDetail.Add(LabelPrintDetail); + IQueryable q = _context.LabelPrintDetail; + Helper helper = new Helper(_context); + foreach (var item in LabelPrintDetail) + { + item.LabelPrintDetailID = helper.GetIDKey("LABELPRINT_DETAIL_ID").Result; + item.CreateDate = DateTime.Now; + _context.LabelPrintDetail.Add(item); + + } await _context.SaveChangesAsync(); result.Success = true; result.Msg = "OK"; + } catch (Exception ex) { @@ -103,6 +112,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES return result; } + // DELETE: api/LabelPrintDetail/5 [HttpDelete("{id}")] public async Task> DeleteLabelPrintDetail(int id) diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/LabelPrintMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/LabelPrintMasterController.cs index 0418fa18..090246f5 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/LabelPrintMasterController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/LabelPrintMasterController.cs @@ -47,6 +47,22 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES return LabelPrintMaster; } + // GET: api/LabelPrintMaster/5 + [HttpGet("{WipNo}/{id}")] + public async Task>> GetLabelPrintMasterbyWipNO(string WipNo,int id) + { + + IQueryable q = _context.LabelPrintMaster; + var LabelPrintMaster = await q.Where(p => p.WipNo == WipNo && p.TemplateID == id).ToListAsync(); + if (LabelPrintMaster == null) + { + return NotFound(); + } + + return LabelPrintMaster; + } + + /// /// 更新Label參數檔 @@ -62,8 +78,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES _context.Entry(LabelPrintMaster).Property("CreateDate").IsModified = false; _context.Entry(LabelPrintMaster).Property("CreateUserID").IsModified = false; + LabelPrintMaster.UpdateDate = DateTime.Now; + try { + await _context.SaveChangesAsync(); result.Success = true; result.Msg = "OK"; @@ -76,28 +95,34 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES return result; } + + /// /// 新增更新Label參數檔 /// /// /// [HttpPost] - public async Task> PostLabelPrintMaster(LabelPrintMaster LabelPrintMaster) + public async Task> PostLabelPrintMaster(List LabelPrintMaster) { ResultModel result = new ResultModel(); try { IQueryable q = _context.LabelPrintMaster; - - - Helper helper = new Helper(_context); - LabelPrintMaster.LabelPrintID = helper.GetIDKey("LabelPrint_ID").Result; - _context.LabelPrintMaster.Add(LabelPrintMaster); - await _context.SaveChangesAsync(); - result.Success = true; - result.Msg = LabelPrintMaster.LabelPrintID.ToString(); - + Helper helper = new Helper(_context); + foreach (var item in LabelPrintMaster) + { + item.LabelPrintID = helper.GetIDKey("LabelPrint_ID").Result; + item.CreateDate = DateTime.Now; + item.UpdateDate = DateTime.Now; + _context.LabelPrintMaster.Add(item); + + } + await _context.SaveChangesAsync(); + result.Success = true; + result.Msg = LabelPrintMaster.Select(s => s.LabelPrintID).FirstOrDefault().ToString(); + } catch (Exception ex) { diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateMasterController.cs index 89b0177d..48537dd4 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateMasterController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateMasterController.cs @@ -160,9 +160,17 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES var labelTemplateMasters = await q.ToListAsync(); // 紀錄筆數 - + if (result.DataTotal > 0) + { + result.Success = true; + result.Data = labelTemplateMasters; + } + else + { + result.Success = false; + result.Data = null; + } - result.Data = labelTemplateMasters; return result; }