From 77bdf82751cb33f88c2d772044741e09affc424f Mon Sep 17 00:00:00 2001
From: Marvin <marvinhong@163.com>
Date: Wed, 11 Oct 2023 22:37:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=B8=85=E7=B6=AB=E4=BD=9C?=
 =?UTF-8?q?=E6=A5=AD=201.1.=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=A9=A2=E6=A2=9D?=
 =?UTF-8?q?=E4=BB=B6=201.2.=E4=BF=AE=E6=94=B9=E6=A9=9F=E7=A8=AE=E7=94=A8it?=
 =?UTF-8?q?emNO=201.3.=E4=BF=AE=E6=94=B9=E7=A2=BA=E8=AA=8D=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9=201.4.=E6=98=8E?=
 =?UTF-8?q?=E7=B4=B0=E9=A0=81=E9=9D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=A1=AF?=
 =?UTF-8?q?=E7=A4=BA=E5=B7=A5=E5=96=AE=E8=B3=87=E8=A8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PCSController.cs              | 12 ++-
 AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs      |  2 +-
 AMESCoreStudio.Web/Views/PCS/PCS037.cshtml    | 79 ++++++++++++++++++-
 AMESCoreStudio.Web/Views/PCS/PCS037L.cshtml   |  9 ++-
 .../Controllers/AMES/WipClearsController.cs   | 26 +++++-
 5 files changed, 117 insertions(+), 11 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index 23cfcaf1..3bd8b7ba 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -8814,9 +8814,15 @@ namespace AMESCoreStudio.Web.Controllers
 
         //维护明细页面
         [HttpGet]
-        public ActionResult PCS037L(string wipNO, int clearID)
+        public ActionResult PCS037L(string wipNO, int clearID, string itemNO, int planQty, string checkFlag)
         {
+            ViewData["Tips"] = "工單號碼 : " + wipNO + ", 工單數量 : " + planQty + ", 機種 : " + itemNO + ", ISO編號 : QO4-038";
+
             ViewBag.ClearID = clearID;
+            ViewBag.wipNO = wipNO;
+            ViewBag.itemNO = itemNO;
+            ViewBag.planQty = planQty;
+            ViewBag.checkFlag = checkFlag;
             return View();
         }
 
@@ -8914,9 +8920,9 @@ namespace AMESCoreStudio.Web.Controllers
 
         [ResponseCache(Duration = 0)]
         [HttpGet]
-        public async Task<IActionResult> GetWipClearsAsync(int page = 0, int limit = 10)
+        public async Task<IActionResult> GetWipClearsAsync(string wipNo, string itemNo, string dateStart, string dateEnd, int page = 0, int limit = 10)
         {
-            var result = await _pcsApi.GetWipClears(page, limit);
+            var result = await _pcsApi.GetWipClears(wipNo, itemNo, dateStart, dateEnd, page, limit);
 
             if (result.DataTotal > 0)
             {
diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
index 25bd15fe..b7c3fdfd 100644
--- a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
+++ b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
@@ -1525,7 +1525,7 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/WipClears")]
-        ITask<ResultModel<dynamic>> GetWipClears(int page, int limit);
+        ITask<ResultModel<dynamic>> GetWipClears(string wipNo,string itemNo,string dateStart,string dateEnd,int page, int limit);
 
         /// <summary>
         /// 新增清線資料
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS037.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS037.cshtml
index 32cc3dfa..9d7651e1 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS037.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS037.cshtml
@@ -21,12 +21,68 @@
         </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-sm4">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">建立日期:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="dateStart" name="dateStart" autocomplete="off" class="layui-input" readonly="">
+                            </div>
+                            <div class="layui-form-mid">～</div>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="dateEnd" name="dateEnd" autocomplete="off" class="layui-input" readonly="">
+                            </div>
+                            <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>
 
 @section Scripts{
     <script type="text/javascript">
+
+        layui.use(['form', 'layer', 'laydate'], function () {
+            form = layui.form;
+            laydate = layui.laydate;
+            laydate.render({
+                elem: '#dateStart'
+                , trigger: 'click'
+                , format: 'yyyy/MM/dd'
+                , theme: 'grid'
+            });
+
+            laydate.render({
+                elem: '#dateEnd'
+                , trigger: 'click'
+                , format: 'yyyy/MM/dd'
+                , theme: 'grid'
+            });
+        });
+
         //监听表单提交事件
         hg.form.onsubmit('querysubmit', function (data) {
             table && table.reload(data);
@@ -49,7 +105,7 @@
                 title: '工單號碼'
             },
             {
-                field: 'modelNO',
+                field: 'itemNO',
                 title: '機種'
             },
             {
@@ -88,7 +144,19 @@
                 width: 240,
                 title: '操作',
                 templet: function (d) {
-                    return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-form" lay-event="detail">明細</a> <a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="check">確認</a> <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">删除</a>'
+                    //return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-form" lay-event="detail">明細</a> <a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="check">確認</a> <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">删除</a>'
+                    if (d.headmanCheckFlag == 'Y' && d.directorCheckFlag != 'Y') {
+                        return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-form" lay-event="detail">明細</a> <a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="check">確認</a> '
+                    }
+                    else if (d.headmanCheckFlag == 'Y'&& d.directorCheckFlag == 'Y') 
+                    {
+                        return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-form" lay-event="detail">明細</a> '
+                    }
+                    else
+                    {
+                        return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-form" lay-event="detail">明細</a> <a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="check">確認</a> <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">删除</a>'
+                        //return "";
+                    }
                 }
             }]
         ];
@@ -96,7 +164,12 @@
         function detail(obj) {
             var clearID = obj.data.clearID;
             var wipNO = obj.data.wipNO;
-            var param = "?wipNO=" + wipNO + "&clearID=" + clearID;
+            var itemNO = obj.data.itemNO;
+            var planQty = obj.data.planQTY;
+            var checkFlag = obj.data.headmanCheckFlag;
+
+            var param = "?wipNO=" + wipNO + "&clearID=" + clearID+ "&itemNO=" + itemNO+ "&planQty=" + planQty+ "&checkFlag=" + checkFlag;
+
 
             if (obj.data.clearID) {
                 hg.open('維護清線明細', '/PCS/PCS037L' + param, 1280, 640);
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS037L.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS037L.cshtml
index a97e2a29..8e61082d 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS037L.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS037L.cshtml
@@ -9,10 +9,12 @@
             <div class="layui-form-item ">
                 <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
                 <input id="clearID" name="clearID" value="@ViewBag.ClearID" type="hidden" />
+                <input id="checkFlag" name="checkFlag" value="@ViewBag.checkFlag" type="hidden" />
             </div>
         </div>
     </div>
     <div class="layui-card-body">
+        @ViewData["Tips"]
         <table class="layui-hide" id="test" lay-filter="test"></table>
         
     </div>
@@ -65,7 +67,12 @@
                 width: 150,
                 title: '操作',
                 templet: function (d) {
-                    return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a> <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">删除</a>'
+                    if (checkFlag.value == 'Y') {
+                        return ''
+                    }
+                    else {
+                        return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a> <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">删除</a>'
+                    }
                 }
             }]
         ];
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipClearsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipClearsController.cs
index 7c84e54f..e7b4902d 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipClearsController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipClearsController.cs
@@ -32,12 +32,16 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <summary>
         /// 獲取全部清線資料
         /// </summary>
+        /// <param name="wipNo"></param>
+        /// <param name="itemNo"></param>
+        /// <param name="dateStart"></param>
+        /// <param name="dateEnd"></param>
         /// <param name="page"></param>
         /// <param name="limit"></param>
         /// <returns></returns>
         // GET: api/WipClears
         [HttpGet]
-        public async Task<ResultModel<dynamic>> GetWipClear(int page = 0, int limit = 10)
+        public async Task<ResultModel<dynamic>> GetWipClear(string wipNo,string itemNo,string dateStart,string dateEnd,int page = 0, int limit = 10)
         {
             ResultModel<dynamic> result = new ResultModel<dynamic>();
 
@@ -52,16 +56,32 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         b.WipNO,
                         b.WerksNO,
                         b.PlanQTY,
-                        c.ModelNO,
+                        c.ItemNO,
                         a.DetailQty,
                         a.HeadmanCheckFlag,
                         a.DirectorCheckFlag,
                         a.DirectorCheckDate,
-                        a.ClearDesc
+                        a.ClearDesc,
+                        a.CreateDate
                     };
 
             result.DataTotal = q.ToList().Count;
 
+            if (wipNo != null)
+            {
+                q = q.Where(w => w.WipNO.Equals(wipNo));
+            }
+
+            if (itemNo != null)
+            {
+                q = q.Where(w => w.ItemNO.Equals(itemNo));
+            }
+
+            if (dateStart != null&& dateEnd != null)
+            {
+                q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd).AddDays(1));
+            }
+
             if (page > 0)
             {
                 q = q.OrderBy(p => p.ClearNo).Skip((page - 1) * limit).Take(limit);