diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeLockController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeLockController.cs
index 2b9ca2ec..11d9299b 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeLockController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeLockController.cs
@@ -74,8 +74,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <param name="wipNo">工單</param>
         /// <param name="lockStatus">條碼鎖定狀態</param>
         /// <param name="itemNo">料號</param>
-        /// <param name="date_str">鎖定日期起</param>
-        /// <param name="date_end">鎖定日期迄</param>
+        /// <param name="date_Str">鎖定日期起</param>
+        /// <param name="date_End">鎖定日期迄</param>
         /// <returns></returns>
         [HttpGet("GetBarcodeLockQuery")]
         public async Task<ResultModel<BarcodeLockDto>> GetBarcodeLockQuery(string barCodeNo, string wipNo, string lockStatus
@@ -120,12 +120,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
             if (DateTime.TryParse(date_Str, out _))
             {
-                q = q.Where(w => w.LockDate >= DateTime.Parse(date_Str));
+                q = q.Where(w => w.LockDate >= DateTime.Parse(date_Str + " 00:00:00"));
             }
 
             if (DateTime.TryParse(date_End, out _))
             {
-                q = q.Where(w => w.LockDate <= DateTime.Parse(date_End));
+                q = q.Where(w => w.LockDate <= DateTime.Parse(date_End + " 23:59:59"));
             }
 
             ResultModel<BarcodeLockDto> result = new ResultModel<BarcodeLockDto>();
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
index 1581fb20..81983882 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
@@ -181,12 +181,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
             if (DateTime.TryParse(date_str, out _))
             {
-                q = q.Where(w => w.CreateDate >= DateTime.Parse(date_str));
+                q = q.Where(w => w.CreateDate >= DateTime.Parse(date_str + " 00:00:00"));
             }
 
             if (DateTime.TryParse(date_end, out _))
             {
-                q = q.Where(w => w.CreateDate <= DateTime.Parse(date_end));
+                q = q.Where(w => w.CreateDate <= DateTime.Parse(date_end + " 23:59:59"));
             }
 
             ResultModel<FqcInhouseMasterDto> result = new ResultModel<FqcInhouseMasterDto>();
@@ -589,12 +589,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
             if (DateTime.TryParse(date_str, out _))
             {
-                q = q.Where(w => w.RecordDate >= DateTime.Parse(date_str));
+                q = q.Where(w => w.CreateDate >= DateTime.Parse(date_str + " 00:00:00"));
             }
 
             if (DateTime.TryParse(date_end, out _))
             {
-                q = q.Where(w => w.RecordDate <= DateTime.Parse(date_end));
+                q = q.Where(w => w.CreateDate <= DateTime.Parse(date_end + " 23:59:59"));
             }
             q = q.Where(w => w.StatusName == "P");
             ResultModel<FqcInhouseMaster_WareDto> result = new ResultModel<FqcInhouseMaster_WareDto>();
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultMasterController.cs
index 3103fa9f..9a6d185a 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultMasterController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultMasterController.cs
@@ -310,7 +310,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             }
             if (dateStart != null && dateStart != "" && dateEnd != null && dateEnd != "")
             {
-                q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd));
+                q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart + " 00:00:00") && w.CreateDate <= DateTime.Parse(dateEnd + " 23:59:59"));
             }
             if (weekCode != null && weekCode != "")
             {
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/MaterialSopController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/MaterialSopController.cs
index 98b72c97..fee211af 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/MaterialSopController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/MaterialSopController.cs
@@ -106,12 +106,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
             if (DateTime.TryParse(date_str, out _))
             {
-                q = q.Where(w => w.CreateDate >= DateTime.Parse(date_str));
+                q = q.Where(w => w.CreateDate >= DateTime.Parse(date_str + " 00:00:00"));
             }
 
             if (DateTime.TryParse(date_end, out _))
             {
-                q = q.Where(w => w.CreateDate <= DateTime.Parse(date_end));
+                q = q.Where(w => w.CreateDate <= DateTime.Parse(date_end + " 23:59:59"));
             }
             ResultModel<MaterialSopDto> result = new ResultModel<MaterialSopDto>();
             result.Data = await q.Select(s => new MaterialSopDto