From bd416f203685df58f63453b0a0f1d8b59ce61795 Mon Sep 17 00:00:00 2001
From: Marvin <marvinhong@163.com>
Date: Tue, 12 Mar 2024 22:26:11 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E6=8A=A5?=
 =?UTF-8?q?=E5=B7=A5=201.1.=E5=BC=80=E5=B7=A5=E6=97=B6=E9=97=B4=E5=B8=A6?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=97=B6=E9=97=B4=EF=BC=8C=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=201.2.=E5=BC=80=E5=B7=A5=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=94=B9=E7=94=A8=E5=B7=A5=E5=8F=B7=E6=98=BE=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E6=90=9C=E5=AF=BB=E7=9A=84=E5=BC=80=E5=B7=A5=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=EF=BC=8C=E4=B9=9F=E4=BD=BF=E7=94=A8=E5=B7=A5=E5=8F=B7=E6=90=9C?=
 =?UTF-8?q?=E5=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AMESCoreStudio.Web/Controllers/WHSController.cs             | 1 +
 AMESCoreStudio.Web/Views/WHS/WHS019C.cshtml                 | 2 +-
 .../Controllers/AMES/WorkingHoursCollectionsController.cs   | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

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 @@
 
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="OpenTime" class="control-label col-sm-3"></label>
-                <input asp-for="OpenTime" value="@System.DateTime.Now" class="form-control col-sm-9"  />
+                <input asp-for="OpenTime" value="@ViewBag.OpenTime" class="form-control col-sm-9"  readonly="readonly" />
                 <span asp-validation-for="OpenTime" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
 
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;
                 }
                
             }