From 40f2ef073e4eaa18e2143e8db9485f849a770ba4 Mon Sep 17 00:00:00 2001
From: Ray <raylin@aten.com>
Date: Wed, 9 Feb 2022 10:17:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=AD=A3=E5=B7=A5=E5=96=AE?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E8=B3=87=E6=96=99=E6=9F=A5=E8=A9=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PCSController.cs              | 11 ++++--
 AMESCoreStudio.Web/Views/PCS/PCS005.cshtml    | 39 +++++++++++++++++++
 AMESCoreStudio.Web/Views/PCS/PCS030.cshtml    |  2 +-
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index 2a6228b7..dcb546e8 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -1425,8 +1425,9 @@ namespace AMESCoreStudio.Web.Controllers
         }
 
         #region PCS005 工單資料查詢
-        public IActionResult PCS005()
+        public async Task<IActionResult> PCS005()
         {
+            await GetFactoryUnit();
             return View();
         }
 
@@ -1435,11 +1436,13 @@ namespace AMESCoreStudio.Web.Controllers
         /// </summary>
         /// <param name="unitno">生產單位</param>
         /// <param name="wipno">工單號碼</param>
+        /// <param name="itemNo">料號</param>
         /// <returns></returns>
-        public async Task<IActionResult> PCS005QueryAsync(string unitno, string wipno, int page = 1, int limit = 10)
+        public async Task<IActionResult> PCS005QueryAsync(string unitno, string wipNo, string itemNo, int page = 0, int limit = 10)
         {
             IResultModel<dynamic> result = await _pcsApi.GetWipInfoSelectParameter(unitno: unitno
-                , wipno: wipno
+                , wipno: wipNo
+                , itemno: itemNo
                 , page: page
                 , limit: limit);
 
@@ -1510,7 +1513,7 @@ namespace AMESCoreStudio.Web.Controllers
 
             if (result_dy.Count > 0)
             {
-                return Json(new Table() { code = 0, msg = "", data = result_dy, count = result_dy.Count });
+                return Json(new Table() { code = 0, msg = "", data = result_dy, count = result.DataTotal });
             }
             return Json(new Table() { count = 0, data = null });
         }
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS005.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS005.cshtml
index c04050c2..77695c82 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS005.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS005.cshtml
@@ -12,6 +12,45 @@
         </div>
     </div>
     <div class="layui-card-body">
+        <div class="layui-form">
+            <div class="layui-row">
+                <div class="layui-form-item">
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">工單:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="wipNo" name="wipNo" autocomplete="off" class="layui-input" placeholder="請輸入工單號碼">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">料號:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="itemNo" name="itemNo" autocomplete="off" class="layui-input" placeholder="請輸入料號">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">生產單位:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <select id="unitNo" lay-filter="unitNo" name="unitNo" lay-submit asp-items="@ViewBag.FactoryUnitList">
+                                    <option value="">全部</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline layui-show-xs-block">
+                            <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
+                                <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
         <table class="layui-hide" id="test" lay-filter="test"></table>
     </div>
 </div>
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS030.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS030.cshtml
index f0644c6d..f5efcce1 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS030.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS030.cshtml
@@ -50,7 +50,7 @@
                         <div class="layui-inline">
                             <label class="layui-form-label">生產單位:</label>
                             <div class="layui-input-inline" style="width:150px">
-                                <select id="unitNo" lay-filter="stations" name="unitNo" lay-submit asp-items="@ViewBag.FactoryUnitList">
+                                <select id="unitNo" lay-filter="unitNo" name="unitNo" lay-submit asp-items="@ViewBag.FactoryUnitList">
                                     <option value="">全部</option>
                                 </select>
                             </div>