From cd428eb2dc7586d337c843ddf20be0548839c3d0 Mon Sep 17 00:00:00 2001
From: "BB.Wang" <BB.Wang@git.com>
Date: Tue, 29 Nov 2022 16:15:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=9C=E4=B8=8A=E5=82=B3=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AMES/MaterialItemController.cs            | 18 ++++++++++++--
 .../DTO/AMES/WorkingHoursCollectionDto.cs     |  2 +-
 .../Models/AMES/WipBoxDto.cs                  | 24 +++++++++++++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 AMESCoreStudio.WebApi/Models/AMES/WipBoxDto.cs

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
         /// <param name="id">料號</param>
         /// <returns></returns>
         [HttpGet("ByItemNO/{id}")]
-        public async Task<MaterialItem> GetMaterialItemByItemNO(string id)
+        public async Task <MaterialItem> GetMaterialItemByItemNO(string id)
         {
             IQueryable<MaterialItem> q = _context.MaterialItems;
-            var result = await q.Where(p => p.ItemNo == id).FirstOrDefaultAsync();
+            var result =  q.Where(p => p.ItemNo == id).FirstOrDefault();
+
+            return result;
+        }
+
+        /// <summary>
+        /// 料號基本資料檔 to ItemNO
+        /// </summary>
+        /// <param name="id">料號</param>
+        /// <returns></returns>
+        [HttpGet("ByItemNO2/{id}")]
+        public async Task<ActionResult<IEnumerable<MaterialItem>>> GetMaterialItemByItemNO2(string id)
+        {
+            IQueryable<MaterialItem> 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
         /// 標準工時
         /// </summary>
 
-        public int? RuleTime { get; set; }
+        public double? RuleTime { get; set; }
 
         /// <summary>
         /// 標準人數
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
+{
+    /// <summary>
+    /// 自動裝箱
+    /// </summary>
+    public class WipBoxDto
+    {
+        public string WipNo { get; set; }
+        /// <summary>
+        /// 裝箱出貨序號
+        /// </summary>
+        public string ExtraNo { get; set; }
+
+        /// <summary>
+        /// 是否關箱
+        /// </summary>
+        public string CloseBox { get; set; } = "N";
+    }
+}