From fcffc7e4bdd8e63abaef2577e6ba6e99e2331d2d Mon Sep 17 00:00:00 2001
From: "BB.Wang" <BB.Wang@git.com>
Date: Thu, 29 Feb 2024 15:58:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E7=94=A2=E5=A0=B1=E5=B7=A5=EF=BC=8C?=
 =?UTF-8?q?=E8=B3=87=E6=96=99=E6=9F=A5=E8=A9=A2=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/WHSController.cs              |  8 +++++--
 AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs      |  4 +++-
 AMESCoreStudio.Web/Views/WHS/WHS019.cshtml    | 22 +++++++++++++++----
 .../AMES/WorkingHoursCollectionsController.cs | 13 ++++++++++-
 4 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/WHSController.cs b/AMESCoreStudio.Web/Controllers/WHSController.cs
index dd59feab..f33a8c14 100644
--- a/AMESCoreStudio.Web/Controllers/WHSController.cs
+++ b/AMESCoreStudio.Web/Controllers/WHSController.cs
@@ -2630,7 +2630,9 @@ namespace AMESCoreStudio.Web.Controllers
             return Json(new Table() { count = 0, data = null });
         }
 
-        public async Task<IActionResult> GetWorkingHoursCollectionDtoByQuery4WHS019Async(string unitNo, string lineid, string stationid, string wipno, string itemno, string user, string sdate, string edate)
+        //2024-02-27 BB.Wang Modufy 增加查詢工時收集單狀態
+        //public async Task<IActionResult> GetWorkingHoursCollectionDtoByQuery4WHS019Async(string unitNo, string lineid, string stationid, string wipno, string itemno, string user, string sdate, string edate)
+        public async Task<IActionResult> GetWorkingHoursCollectionDtoByQuery4WHS019Async(string unitNo, string lineid, string stationid, string wipno, string itemno, string user, string sdate, string edate, string type)
         {
             if (unitNo == null)
             {
@@ -2663,7 +2665,9 @@ namespace AMESCoreStudio.Web.Controllers
                 edate = "*";
             }
 
-            var result = await _whsApi.GetWorkingHoursCollectionDtoByQuery(unitNo, lineid, stationid, wipno, itemno, user, sdate, edate);
+            //2024-02-27 BB.Wang Modify 增加查詢工時收集單狀態
+            //var result = await _whsApi.GetWorkingHoursCollectionDtoByQuery(unitNo, lineid, stationid, wipno, itemno, user, sdate, edate);
+            var result = await _whsApi.GetWorkingHoursCollectionDtoByQuery(unitNo, lineid, stationid, wipno, itemno, user, sdate, edate, type);
 
 
             if (result.Count > 0)
diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs
index ccac8d68..0b3e8001 100644
--- a/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs
+++ b/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs
@@ -599,8 +599,10 @@ namespace AMESCoreStudio.Web
         /// 查詢線上異常工時
         /// </summary>
         /// <returns></returns>
+        /// //2024-02-27 BB.Wang Modify 增加查詢工時收集單狀態
         [WebApiClient.Attributes.HttpGet("api/WorkingHoursCollections/DtoByQuery/{unitNo}/{lineid}/{stationid}/{wipno}/{itemno}/{user}/{sdate}/{edate}")]
-        ITask<List<WorkingHoursCollectionDto>> GetWorkingHoursCollectionDtoByQuery(string unitNo, string lineid, string stationid, string wipno, string itemno, string user, string sdate, string edate);
+        //ask<List<WorkingHoursCollectionDto>> GetWorkingHoursCollectionDtoByQuery(string unitNo, string lineid, string stationid, string wipno, string itemno, string user, string sdate, string edate);
+        ITask<List<WorkingHoursCollectionDto>> GetWorkingHoursCollectionDtoByQuery(string unitNo, string lineid, string stationid, string wipno, string itemno, string user, string sdate, string edate, string type = null );
 
 
         #endregion
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS019.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS019.cshtml
index 39658087..acb8937d 100644
--- a/AMESCoreStudio.Web/Views/WHS/WHS019.cshtml
+++ b/AMESCoreStudio.Web/Views/WHS/WHS019.cshtml
@@ -103,15 +103,27 @@
             </div>
             <div class="layui-row">
                 <div class="layui-form-item">
-                    <div class="layui-col-sm11">
+                    <div class="layui-col-sm8">
                         <div class="layui-inline">
                             <label class="layui-form-label">開工日期:</label>
                             <div class="layui-input-inline" style="width:150px">
-                                <input id="sdate" name="sdate" autocomplete="off" class="layui-input"   readonly="">
+                                <input id="sdate" name="sdate" autocomplete="off" class="layui-input" readonly="">
                             </div>
                             <div class="layui-form-mid">～</div>
                             <div class="layui-input-inline" style="width:150px">
-                                <input id="edate" name="edate" autocomplete="off" class="layui-input"    readonly="">
+                                <input id="edate" name="edate" autocomplete="off" class="layui-input" readonly="">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">關單狀態:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <select id="Type" name="Type" lay-filter="Type" lay-submit>
+                                    <option value="">全部</option>
+                                    <option value="N" selected>未關單</option>
+                                    <option value="E">已關單</option>
+                                </select>
                             </div>
                         </div>
                     </div>
@@ -384,9 +396,11 @@
             itemno = $("#itemNo").val();
             wipno = $("#wipNo").val();
 
+            //2024-02-27 BB.Wang Add
+            var type = $("#Type").val();
 
             table = hg.table.datatable('query', '生產工時報工', '/WHS/GetWorkingHoursCollectionDtoByQuery4WHS019?'
-                + 'unitNo=' + unitNo + '&lineid=' + lineid + '&stationid=' + stationid + '&wipno=' + wipno + '&itemno=' + itemno + '&user=' + user +  '&sdate=' + $("#sdate").val() + '&edate=' + $("#edate").val()
+                + 'unitNo=' + unitNo + '&lineid=' + lineid + '&stationid=' + stationid + '&wipno=' + wipno + '&itemno=' + itemno + '&user=' + user + '&sdate=' + $("#sdate").val() + '&edate=' + $("#edate").val() + '&type=' + type
                 , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
         };
     </script>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs
index b2ff6f82..4ab44b54 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs
@@ -119,9 +119,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <param name="edate"></param>
         /// <param name="itemno">料號</param>
         /// <param name="wipno">料號</param>
+        /// 2024-02-27 BB.Wang Modify 增加查詢工時收集單狀態
+        /// <param name="type">狀態</param>
         /// <returns></returns>
         [HttpGet("DtoByQuery/{unitNo}/{lineid}/{stationid}/{wipno}/{itemno}/{user}/{sdate}/{edate}")]
-        public async Task<ActionResult<IEnumerable<WorkingHoursCollectionDto>>> GetWorkingHoursCollectionDtoByQuery(string unitNo, string lineid, string stationid,string wipno, string itemno, string user, string sdate, string edate)
+        //public async Task<ActionResult<IEnumerable<WorkingHoursCollectionDto>>> GetWorkingHoursCollectionDtoByQuery(string unitNo, string lineid, string stationid,string wipno, string itemno, string user, string sdate, string edate)
+        public async Task<ActionResult<IEnumerable<WorkingHoursCollectionDto>>> GetWorkingHoursCollectionDtoByQuery(string unitNo, string lineid, string stationid, string wipno, string itemno, string user, string sdate, string edate, string type)
         {
             IQueryable<WorkingHoursCollection> q = _context.WorkingHoursCollections;
 
@@ -139,6 +142,14 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             if (user1 != null)
                 q = q.Where(p => p.CreateUserID.Equals(user1.UserID));
 
+            //2024-02-27 BB.Wang Modify 增加查詢工時收集單狀態
+            if (user1 != null)
+                q = q.Where(p => p.CreateUserID.Equals(user1.UserID));
+            if (type == "E")
+                q = q.Where(p => p.CloseTime != null);
+            else if (type == "N")
+                q = q.Where(p => p.CloseTime == null);
+
             DateTime dateValue;
             if (sdate != "*")
             {