diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/MaterialItemController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/MaterialItemController.cs index 86b288a4..734bc238 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/MaterialItemController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/MaterialItemController.cs @@ -65,10 +65,24 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// 料號 /// [HttpGet("ByItemNO/{id}")] - public async Task GetMaterialItemByItemNO(string id) + public async Task GetMaterialItemByItemNO(string id) { IQueryable q = _context.MaterialItems; - var result = await q.Where(p => p.ItemNo == id).FirstOrDefaultAsync(); + var result = q.Where(p => p.ItemNo == id).FirstOrDefault(); + + return result; + } + + /// + /// 料號基本資料檔 to ItemNO + /// + /// 料號 + /// + [HttpGet("ByItemNO2/{id}")] + public async Task>> GetMaterialItemByItemNO2(string id) + { + IQueryable q = _context.MaterialItems; + var result = await q.Where(p => p.ItemNo == id).ToListAsync(); return result; } diff --git a/AMESCoreStudio.WebApi/DTO/AMES/WorkingHoursCollectionDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/WorkingHoursCollectionDto.cs index ecfb6bb9..28fd8d0c 100644 --- a/AMESCoreStudio.WebApi/DTO/AMES/WorkingHoursCollectionDto.cs +++ b/AMESCoreStudio.WebApi/DTO/AMES/WorkingHoursCollectionDto.cs @@ -115,7 +115,7 @@ namespace AMESCoreStudio.WebApi.DTO.AMES /// 標準工時 /// - public int? RuleTime { get; set; } + public double? RuleTime { get; set; } /// /// 標準人數 diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipBoxDto.cs b/AMESCoreStudio.WebApi/Models/AMES/WipBoxDto.cs new file mode 100644 index 00000000..871470c7 --- /dev/null +++ b/AMESCoreStudio.WebApi/Models/AMES/WipBoxDto.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace AMESCoreStudio.WebApi.Models.AMES +{ + /// + /// 自動裝箱 + /// + public class WipBoxDto + { + public string WipNo { get; set; } + /// + /// 裝箱出貨序號 + /// + public string ExtraNo { get; set; } + + /// + /// 是否關箱 + /// + public string CloseBox { get; set; } = "N"; + } +}