From f5f04b0f9c0cbf673cd2856923789c64e5e15d54 Mon Sep 17 00:00:00 2001
From: "BB.Wang" <BB.Wang@git.com>
Date: Thu, 22 Dec 2022 10:10:54 +0800
Subject: [PATCH] =?UTF-8?q?Yiru=20=E4=BF=AE=E6=AD=A3ipqc=E5=A0=B1=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E9=96=8B=E4=B9=8B=E8=B3=87=E6=96=99=E5=8F=8Aipqc=20?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E4=BA=BA=E5=93=A1=E5=8A=A0=E4=B8=8A=E5=B7=A5?=
 =?UTF-8?q?=E8=99=9F(=E7=99=BB=E5=85=A5=E5=B8=B3=E8=99=9F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/SPCController.cs              |  2 +-
 AMESCoreStudio.Web/Views/QRS/QRS015B.cshtml   | 22 ++---
 AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml   | 96 +++++++++----------
 .../AMES/InspectionResultMastersController.cs | 54 ++++++++---
 4 files changed, 95 insertions(+), 79 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/SPCController.cs b/AMESCoreStudio.Web/Controllers/SPCController.cs
index cdedadaa..8ba46f60 100644
--- a/AMESCoreStudio.Web/Controllers/SPCController.cs
+++ b/AMESCoreStudio.Web/Controllers/SPCController.cs
@@ -237,7 +237,7 @@ namespace AMESCoreStudio.Web.Controllers
             UserItems.Add(new SelectListItem("N/A", "-1"));
             foreach (var item in result.Data)
             {
-                UserItems.Add(new SelectListItem(item.UserName, item.UserID.ToString()));
+                UserItems.Add(new SelectListItem(item.LoginNo +"_" +item.UserName, item.UserID.ToString()));
             }
             ViewBag.UserList = UserItems;
         }
diff --git a/AMESCoreStudio.Web/Views/QRS/QRS015B.cshtml b/AMESCoreStudio.Web/Views/QRS/QRS015B.cshtml
index cfe5e64e..5b865641 100644
--- a/AMESCoreStudio.Web/Views/QRS/QRS015B.cshtml
+++ b/AMESCoreStudio.Web/Views/QRS/QRS015B.cshtml
@@ -23,7 +23,7 @@
         });
     var tableCols = [[
         {
-            field: 'inspectionNo',
+            field: 'inspectionID',
             width: 160,
             title: 'IPQC單號',
             sort: true
@@ -34,9 +34,8 @@
             title: '工單'
         },
         {
-            field: 'modelNo',
-            width: 100,
-            title: '機種'
+            field: 'barcodeNo',
+            title: '檢驗序號'
         },
         {
             field: 'itemNo',
@@ -44,18 +43,9 @@
             title: '料號'
         },
         {
-            field: 'lineDesc',
-            width: 60,
-            title: '線別'
-        },
-        {
-            field: 'stationName',
-            width: 80,
-            title: '站別'
-        },
-        {
-            field: 'barcodeNo',
-            title: '序號'
+            field: 'createDate',
+            width: 150,
+            title: '建立日期'
         },
         {
             field: 'result',
diff --git a/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml
index 3ee0f4f0..6e307d4e 100644
--- a/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml
+++ b/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml
@@ -67,56 +67,56 @@
                             <div class="layui-inline">
                                 <div class="layui-input-inline">
                                     <label asp-for="WipNo" class="control-label col-sm-2">線別</label>
-                                        <select id="theLine" lay-event="theLine" lay-filter="theLine" lay-submit asp-items="@ViewBag.LineList">
-                                        </select>
+                                    <select id="theLine" lay-event="theLine" lay-filter="theLine" lay-submit asp-items="@ViewBag.LineList">
+                                    </select>
+                                </div>
+                                <div class="layui-inline">
+                                    <label asp-for="WipNo" class="control-label col-sm-2">站別：</label>
+                                    <select id="theStation" lay-event="theStation" lay-filter="theStation" lay-submit asp-items="@ViewBag.StationList">
+                                    </select>
+                                </div>
+                                <div class="layui-inline">
+                                    <div class="layui-input-inline" style="width:200px">
+                                        <input lay-filter="show" lay-skin="primary" type="checkbox" value="" title="勾選確認顯示線別/站別" />
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
+                                    <button id="querysubmitTmp" class="layui-btn tt">暫存</button>
+                                    <button id="querysubmit" class="layui-btn tt">保存</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    @*<div class="layui-form-item">
+                            <div class="layui-inline">
+                                <label class="layui-form-label">線別：</label>
+                                <div class="layui-input-inline" style="width:100px">
+                                    <select id="theLine" lay-event="theLine" lay-filter="theLine" lay-submit asp-items="@ViewBag.LineList">
+                                    </select>
                                 </div>
+                            </div>
                             <div class="layui-inline">
-                                <label asp-for="WipNo" class="control-label col-sm-2">站別：</label>
+                                <label class="layui-form-label">站別：</label>
+                                <div class="layui-input-inline" style="width:100px">
                                     <select id="theStation" lay-event="theStation" lay-filter="theStation" lay-submit asp-items="@ViewBag.StationList">
                                     </select>
+                                </div>
                             </div>
                             <div class="layui-inline">
                                 <div class="layui-input-inline" style="width:200px">
                                     <input lay-filter="show" lay-skin="primary" type="checkbox" value="" title="勾選確認顯示線別/站別" />
                                 </div>
                             </div>
-                            <div class="layui-inline">
-                                <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
-                                <button id="querysubmitTmp" class="layui-btn tt">暫存</button>
-                                <button id="querysubmit" class="layui-btn tt">保存</button>
-                            </div>
-                        </div>
-                    </div>
+                        </div>*@
                 </div>
-                @*<div class="layui-form-item">
-                    <div class="layui-inline">
-                        <label class="layui-form-label">線別：</label>
-                        <div class="layui-input-inline" style="width:100px">
-                            <select id="theLine" lay-event="theLine" lay-filter="theLine" lay-submit asp-items="@ViewBag.LineList">
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">站別：</label>
-                        <div class="layui-input-inline" style="width:100px">
-                            <select id="theStation" lay-event="theStation" lay-filter="theStation" lay-submit asp-items="@ViewBag.StationList">
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <div class="layui-input-inline" style="width:200px">
-                            <input lay-filter="show" lay-skin="primary" type="checkbox" value="" title="勾選確認顯示線別/站別" />
+                @*<div class="layui-inline">
+                        <div class="layui-form-item">
+                            <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
+                            <button id="querysubmitTmp" class="layui-btn tt">暫存</button>
+                            <button id="querysubmit" class="layui-btn tt">保存</button>
                         </div>
-                    </div>
-                </div>*@
-            </div>
-            @*<div class="layui-inline">
-                <div class="layui-form-item">
-                    <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
-                    <button id="querysubmitTmp" class="layui-btn tt">暫存</button>
-                    <button id="querysubmit" class="layui-btn tt">保存</button>
-                </div>
-            </div>*@
+                    </div>*@
         </form>
         <form id="modeltable">
             <table class="layui-hide" id="test" lay-filter="test" lay-data="{id:'test'}"></table>
@@ -162,18 +162,18 @@
         </select>
     </script>
     @*缺失人員*@
-    @* <script type="text/html" id="selectUser">
-            <select name="selectUser" lay-filter="selectUser" id="selectUser" data-value={{d.missingUserID}} lay-search='' asp-items="@ViewBag.UserList" class="layui-form">
-            </select>
-        </script>
-           <script type="text/html" id="selectUser">
-            <input type="text" name="selectUser" lay-filter="selectUser" id="selectUser" data-value={{d.missingUserID}} class="layui-input" style=" margin-top: -10px; margin-left: -10px; margin-right: -10px;">
-        </script>
-
-    *@
     <script type="text/html" id="selectUser">
-        <input type="text" name="selectUser" lay-filter="selectUser" id="selectUser" data-value={{d.missingUserID}} class="layui-input" style=" margin-top: -10px; margin-left: -10px; margin-right: -10px;">
+        <select name="selectUser" lay-filter="selectUser" id="selectUser" data-value={{d.missingUserID}} lay-search='' asp-items="@ViewBag.UserList" class="layui-form">
+        </select>
     </script>
+    @*         <script type="text/html" id="selectUser">
+                <input type="text" name="selectUser" lay-filter="selectUser" id="selectUser" data-value={{d.missingUserID}} class="layui-input" style=" margin-top: -10px; margin-left: -10px; margin-right: -10px;">
+            </script>
+
+
+        <script type="text/html" id="selectUser">
+            <input type="text" name="selectUser" lay-filter="selectUser" id="selectUser" data-value={{d.missingUserID}} class="layui-input" style=" margin-top: -10px; margin-left: -10px; margin-right: -10px;">
+        </script>*@
     <script type="text/javascript">
         ////保存
         $('#querysubmit').click(function () {
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs
index 4bc2a7c1..aa3a0e52 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs
@@ -218,27 +218,53 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         public async Task<ResultModel<dynamic>> GetIPQCDetailData(string wipNO, string itemNO, string modelNO, string dateStart, string dateEnd, string weekCode, int page = 0, int limit = 10)
         {
             ResultModel<dynamic> result = new ResultModel<dynamic>();
-            var q = from q1 in _context.InspectionForms
-                    join q2 in _context.InspectionItems on q1.InspectionFormID equals q2.InspectionFormID
-                    join q3 in _context.InspectionResultDetails on q2.InspectionItemID equals q3.InspectionItemID
-                    join q4 in _context.InspectionResultMasters on q1.InspectionFormID equals q4.InspectionFormID
-                    join q5 in _context.WipAtts on q4.WipNo equals q5.WipNO
-                    join q6 in _context.CalendarTables on q1.CreateDate.Date equals q6.TimeID
-                    join q7 in _context.LineInfoes on q3.LineID equals q7.LineID
+
+            var d = _context.InspectionResultDetails;
+
+            var q = from q0 in _context.InspectionTypes.Where(w => w.InspectionNo.Contains("IPQC"))
+                    join q1 in _context.InspectionForms on q0.InspectionTypeID equals q1.InspectionTypeID
+                    join q4 in _context.InspectionResultMasters.Where(w => w.StatusNo == "C") on q1.InspectionFormID equals q4.InspectionFormID
+                    join q5 in _context.WipAtts on q4.WipNo equals q5.WipNO into cp5
+                    from q5 in cp5.DefaultIfEmpty()
+                    join q6 in _context.CalendarTables on q4.CreateDate.Date equals q6.TimeID
+   
+
                     select new
                     {
                         q1.InspectionFormID,
-                        q1.InspectionNo,
-                        q1.CreateDate,
+                        q4.InspectionID,
+                        q4.CreateDate,
                         q4.WipNo,
                         q5.ItemNO,
                         q5.ModelNO,
-                        q7.LineDesc,
-                        StationName = q3.Stations.StationName,
                         q4.BarcodeNo,
-                        q3.Result,
-                        IPQCWeek = q6.WeekOfYear
-                    };
+                        IPQCWeek = q6.WeekOfYear,
+                        Result = d.Where(w => w.InspectionID == q4.InspectionID && w.Result == "F").Select(s => s.Result).Count() > 0 ? "F" : "P"                    };
+
+
+
+
+            //var q = from q1 in _context.InspectionForms
+            //        join q2 in _context.InspectionItems on q1.InspectionFormID equals q2.InspectionFormID
+            //        join q3 in _context.InspectionResultDetails on q2.InspectionItemID equals q3.InspectionItemID
+            //        join q4 in _context.InspectionResultMasters on q1.InspectionFormID equals q4.InspectionFormID
+            //        join q5 in _context.WipAtts on q4.WipNo equals q5.WipNO
+            //        join q6 in _context.CalendarTables on q1.CreateDate.Date equals q6.TimeID
+            //        join q7 in _context.LineInfoes on q3.LineID equals q7.LineID
+            //        select new
+            //        {
+            //            q1.InspectionFormID,
+            //            q1.InspectionNo,
+            //            q1.CreateDate,
+            //            q4.WipNo,
+            //            q5.ItemNO,
+            //            q5.ModelNO,
+            //            q7.LineDesc,
+            //            StationName = q3.Stations.StationName,
+            //            q4.BarcodeNo,
+            //            q3.Result,
+            //            IPQCWeek = q6.WeekOfYear
+            //        };
 
             if (wipNO != null && wipNO != "")
             {