diff --git a/AMESCoreStudio.Web/Controllers/WHSController.cs b/AMESCoreStudio.Web/Controllers/WHSController.cs
index f33a8c14..b0549f0b 100644
--- a/AMESCoreStudio.Web/Controllers/WHSController.cs
+++ b/AMESCoreStudio.Web/Controllers/WHSController.cs
@@ -2391,6 +2391,7 @@ namespace AMESCoreStudio.Web.Controllers
{
var user_id = Request.Cookies["UserID"];
ViewBag.UserID = user_id;
+ ViewBag.OpenTime = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//製程單位
await GetFactoryUnitsList2();
//廠別
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS019C.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS019C.cshtml
index 94491bea..118dacc0 100644
--- a/AMESCoreStudio.Web/Views/WHS/WHS019C.cshtml
+++ b/AMESCoreStudio.Web/Views/WHS/WHS019C.cshtml
@@ -66,7 +66,7 @@
-
+
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs
index 826e767f..1168c102 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs
@@ -138,7 +138,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
q = q.Where(p => p.ItemNo.Equals(itemno));
if (wipno != "*")
q = q.Where(p => p.WipNo.Equals(wipno));
- var user1 = _context.UserInfoes.Where(w => w.UserName == user).FirstOrDefault();
+ var user1 = _context.UserInfoes.Where(w => w.UserNo == user).FirstOrDefault();
if (user1 != null)
q = q.Where(p => p.CreateUserID.Equals(user1.UserID));
@@ -190,7 +190,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
foreach (var data in workingHoursCollectionDtos)
{
var p1 = _context.UserInfoes.Where(w => w.UserID == data.CreateUserID).FirstOrDefault();
- data.CreateUser = p1.UserName;
+ data.CreateUser = p1.UserNo;
var dd = _context.StandardWorkTimes.Where(w => w.ItemNo == data.ItemNo);
var d1 = dd.Where(w => w.UnitNo == data.UnitNo);
var d2 = d1.Where(w => w.LineID == data.LineID);
@@ -222,7 +222,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
if (data.UpdateUserID != null && data.UpdateUserID !=-1)
{
var p2 = _context.UserInfoes.Where(w => w.UserID == data.UpdateUserID).FirstOrDefault();
- data.UpdateUser = p2.UserName;
+ data.UpdateUser = p2.UserNo;
}
}