修正Label相關API

AMESCoreStudio.WebApi/Controllers/AMES/LabelPrintDetailController.cs

@@ -77,23 +77,32 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return result;
         }
 
+        
         /// <summary>
         /// 新增更新Label參數檔
         /// </summary>
         /// <param name="LabelPrintDetail"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<ResultModel<LabelPrintDetail>> PostLabelPrintDetail(LabelPrintDetail LabelPrintDetail)
+        public async Task<ResultModel<LabelPrintDetail>> PostLabelPrintDetail(List<LabelPrintDetail> LabelPrintDetail)
         {
             ResultModel<LabelPrintDetail> result = new ResultModel<LabelPrintDetail>();
 
             try
             {
-               
+                IQueryable<LabelPrintDetail> q = _context.LabelPrintDetail;
-                _context.LabelPrintDetail.Add(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<ResultModel<LabelPrintDetail>> DeleteLabelPrintDetail(int id)

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<ActionResult<IEnumerable<LabelPrintMaster>>> GetLabelPrintMasterbyWipNO(string WipNo,int id)
+        {
+           
+            IQueryable<LabelPrintMaster> q = _context.LabelPrintMaster;
+            var LabelPrintMaster = await q.Where(p => p.WipNo == WipNo && p.TemplateID == id).ToListAsync();
+            if (LabelPrintMaster == null)
+            {
+                return NotFound();
+            }
+
+            return LabelPrintMaster;
+        }
+
+
 
         /// <summary>
         /// 更新Label參數檔
@@ -62,8 +78,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             _context.Entry<LabelPrintMaster>(LabelPrintMaster).Property("CreateDate").IsModified = false;
             _context.Entry<LabelPrintMaster>(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;
         }
 
+
+
         /// <summary>
         /// 新增更新Label參數檔
         /// </summary>
         /// <param name="LabelPrintMaster"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<ResultModel<LabelPrintMaster>> PostLabelPrintMaster(LabelPrintMaster LabelPrintMaster)
+        public async Task<ResultModel<LabelPrintMaster>> PostLabelPrintMaster(List<LabelPrintMaster> LabelPrintMaster)
         {
             ResultModel<LabelPrintMaster> result = new ResultModel<LabelPrintMaster>();
 
             try
             {
                 IQueryable<LabelPrintMaster> q = _context.LabelPrintMaster;
-             
+                Helper helper = new Helper(_context);
-                
+                foreach (var item in LabelPrintMaster)
-                    Helper helper = new Helper(_context);
+                {
-                    LabelPrintMaster.LabelPrintID = helper.GetIDKey("LabelPrint_ID").Result;
+                    item.LabelPrintID = helper.GetIDKey("LabelPrint_ID").Result;
-                    _context.LabelPrintMaster.Add(LabelPrintMaster);
+                    item.CreateDate = DateTime.Now;
-                    await _context.SaveChangesAsync();
+                    item.UpdateDate = DateTime.Now;
-                    result.Success = true;
+                    _context.LabelPrintMaster.Add(item);
-                    result.Msg = LabelPrintMaster.LabelPrintID.ToString();
+                   
-              
+                }
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = LabelPrintMaster.Select(s => s.LabelPrintID).FirstOrDefault().ToString();
+
             }
             catch (Exception ex)
             {

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;
 
         }