From 452b336babbc27aa280ebe10b2a7291f62b983bc Mon Sep 17 00:00:00 2001
From: ray <newkyonew@hotmail.com>
Date: Fri, 20 May 2022 01:24:10 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=AD=A3=E7=94=9F=E7=94=A2?=
 =?UTF-8?q?=E5=B1=A5=E6=AD=B7=E9=A1=AF=E7=A4=BA=E9=8C=AF=E8=AA=A4=202.=20?=
 =?UTF-8?q?=E5=B7=A5=E5=96=AE=E4=BF=AE=E6=94=B9=20KeyParts=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=87=AA=E5=8B=95=E7=B5=A6=E9=A0=86=E5=BA=8F=20?=
 =?UTF-8?q?=E7=87=92=E6=A9=9F=E6=99=82=E9=96=93=E9=A1=AF=E7=A4=BA'?=
 =?UTF-8?q?=E5=88=86'=203.=20=E4=BF=AE=E6=AD=A3=E7=99=BB=E5=85=A5=E5=BE=8C?=
 =?UTF-8?q?=E9=A6=96=E9=A0=81=E9=81=B8=E5=96=AE=E5=85=A8=E9=96=8B=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/HomeController.cs             |  6 +--
 AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml   | 19 ++++-----
 AMESCoreStudio.Web/Views/PCS/PCS003.cshtml    | 20 +++++-----
 AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml   | 40 +++++++++++--------
 .../Controllers/AMES/NgInfoController.cs      |  8 ++--
 5 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/HomeController.cs b/AMESCoreStudio.Web/Controllers/HomeController.cs
index 18413ea4..9d840595 100644
--- a/AMESCoreStudio.Web/Controllers/HomeController.cs
+++ b/AMESCoreStudio.Web/Controllers/HomeController.cs
@@ -81,10 +81,10 @@ namespace AMESCoreStudio.Web.Controllers
 
                             if (user_module.Module != null)
                             {
-                                menuData = menuData + "<a class='border active'>";
-                                menuData = menuData + "<i class='fa fa-star fa-fw' style='color:#77B272;'></i><cite style='color:#77B272;'> " + user_module.Module.ModuleName + " </cite><i class='fa fa-angle-up fa-fw nav_right'></i>";
+                                menuData = menuData + "<a class=''>";
+                                menuData = menuData + "<i class='fa fa-star fa-fw' style='color:#77B272;'></i><cite style='color:#77B272;'> " + user_module.Module.ModuleName + " </cite><i class='fa fa-angle-down fa-fw nav_right'></i>";
                                 menuData = menuData + "</a>";
-                                menuData = menuData + "<ul class='sub-menu' style='display: block;'>";
+                                menuData = menuData + "<ul class='sub-menu' style='display: none;'>";
                             }
 
                             foreach (var user_program in userProgram.Data)
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
index 84fbe6c0..3d2f09f8 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
@@ -666,7 +666,7 @@
                                 <div class="layui-input-inline" style="display: flex;align-items: center;height: 35px;">
                                     @if (!string.IsNullOrWhiteSpace(Model.itemNoCT1))
                                     {
-                                        <span style="color:red">標準工時:@Model.itemNoCT1 秒/個 </span>
+                                        <span style="color:red">標準工時:@Model.itemNoCT1 分/個 </span>
                                     }
                                     else
                                     {
@@ -698,18 +698,15 @@
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <div class="layui-input-inline">
-                                    <label asp-for="wipSystem.BiRatio" class="layui-form-label"></label>
-                                    <div class="layui-input-block">
-                                        <input asp-for="wipSystem.BiRatio" class="layui-input" />
-                                    </div>
+                                <label asp-for="wipSystem.BiRatio" class="layui-form-label"></label>
+                                <div class="layui-input-block">
+                                    <input asp-for="wipSystem.BiRatio" class="layui-input" />
                                 </div>
-                                <div class="layui-input-inline">
-                                    <label asp-for="wipSystem.BiTime" class="layui-form-label"></label>
-                                    <div class="layui-input-block">
-                                        <input asp-for="wipSystem.BiTime" class="layui-input" />
-                                    </div>
+                                <label asp-for="wipSystem.BiTime" class="layui-form-label"></label>
+                                <div class="layui-input-block">
+                                    <input asp-for="wipSystem.BiTime" class="layui-input" />
                                 </div>
+                                <div class="layui-form-mid layui-word-aux">分</div>
                                 <label asp-for="wipSystem.BiTemperature" class="layui-form-label"></label>
                                 <div class="layui-input-inline" style="width:150px;">
                                     <input asp-for="wipSystem.BiTemperature" class="layui-input" />
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
index b7d4bbc3..2443aaaf 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
@@ -697,7 +697,7 @@
                                 <div class="layui-input-inline" style="display: flex;align-items: center;height: 35px;">
                                     @if (!string.IsNullOrWhiteSpace(Model.itemNoCT1))
                                     {
-                                        <span style="color:red">標準工時:@Model.itemNoCT1 秒/個 </span>
+                                        <span style="color:red">標準工時:@Model.itemNoCT1 分/個 </span>
                                     }
                                     else
                                     {
@@ -729,18 +729,18 @@
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
+
+                                <label asp-for="wipSystem.BiRatio" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <label asp-for="wipSystem.BiRatio" class="layui-form-label"></label>
-                                    <div class="layui-input-block">
-                                        <input style="background-color: #acdbe36b" asp-for="wipSystem.BiRatio" class="layui-input" />
-                                    </div>
+                                    <input style="background-color: #acdbe36b" asp-for="wipSystem.BiRatio" class="layui-input" />
                                 </div>
+
+
+                                <label asp-for="wipSystem.BiTime" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <label asp-for="wipSystem.BiTime" class="layui-form-label"></label>
-                                    <div class="layui-input-block">
-                                        <input asp-for="wipSystem.BiTime" class="layui-input" />
-                                    </div>
+                                    <input asp-for="wipSystem.BiTime" class="layui-input" />
                                 </div>
+                                <div class="layui-form-mid layui-word-aux">分</div>
                                 <label asp-for="wipSystem.BiTemperature" class="layui-form-label"></label>
                                 <div class="layui-input-inline" style="width:150px;">
                                     <select asp-for="wipSystem.BiTemperature" asp-items="@ViewBag.GetWipBITemperatuerSelect" class=""></select>
@@ -1479,7 +1479,7 @@
                 '<td><input type="hidden" value="" name="WipKps[' + No + '].WipKpID" />' +
                 '<input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].KpName" /></td>' +
                 '<td>'+SelectKPNo+'</td>' +
-                '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].KpSeq" /></td>' +
+                '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].KpSeq" value=' + (No+1)+' /></td>' +
                 '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].Title" /></td>' +
                 '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].Length" /></td>' +
                 '<td>' + Select + '</td>' +
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml
index 32fb2365..fb5f85ba 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml
@@ -253,23 +253,26 @@
                     <tbody>
                         @foreach (var index in Model.BarCodeKPs)
                         {
-                            <tr>
-                                <td>
-                                    @index.StationName
-                                </td>
-                                <td>
-                                    @index.ItemNoName
-                                </td>
-                                <td>
-                                    @index.PartNo
-                                </td>
-                                <td>
-                                    @index.KpItemNo
-                                </td>
-                                <td>
-                                  @index.CreateDate.ToString("yyyy/MM/dd HH:mm:ss")
-                                </td>
-                            </tr>
+                        <tr>
+                            <td>
+                                @index.StationName
+                            </td>
+                            <td>
+                                @index.ItemNoName
+                            </td>
+                            <td>
+                                @index.PartNo
+                            </td>
+                            <td>
+                                @index.KpItemNo
+                            </td>
+                            <td>
+                                @index.CreateUser
+                            </td>
+                            <td>
+                                @index.CreateDate.ToString("yyyy/MM/dd HH:mm:ss")
+                            </td>
+                        </tr>
                         }
                     </tbody>
                 </table>
@@ -317,6 +320,9 @@
                             <td>
                                 @index.LocationNo
                             </td>
+                            <td>
+                                @index.RepairNo
+                            </td>
                             <td>
                                 @index.Status
                             </td>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs
index e930dce3..80f2955c 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs
@@ -147,9 +147,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     join q5 in _context.NgRepairs on q3.ComponentID equals q5.ComponentID
                     into s1
                     from q5 in s1.DefaultIfEmpty()
-                    join q6 in _context.RMAReasons on q5.RepairNo equals q6.RMAReasonNo
-                    into s2 
+                    join q6 in _context.RMAReasons on q5.RepairNo equals q6.RMAReasonNo into s2
                     from q6 in s2.DefaultIfEmpty()
+                    join q7 in _context.UserInfoes on q3.ReplyUserID equals q7.UserID 
                     select new NGInfoDto
                     {
                         StationName = q2.Station.StationName,
@@ -160,11 +160,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         RepairNo = q5.RepairNo,
                         RepairDesc = q5.RepairDesc,
                         RepairNoDesc = q6.RMAReasonDesc,
-                        ReplyUser = q3.ReplyUserID.ToString(),
+                        ReplyUser = q7.UserName,
                         ReplyDate = q3.ReplyDate.ToString("yyyy/MM/dd")
                     };
 
-            return await q.ToListAsync();
+            return await q.Distinct().ToListAsync();
         }
 
         /// <summary>