Label 需填寫欄位增加狀態篩選條件

Label 料號模糊查詢改為%201R%
LabeL002 加大備註欄位

AMESCoreStudio.Web/Controllers/LABController.cs

@@ -147,9 +147,9 @@ namespace AMESCoreStudio.Web.Controllers
 
         [ResponseCache(Duration = 0)]
         [HttpGet]
-        public async Task<IActionResult> GetLabParamsAsync(int page = 0, int limit = 10)
+        public async Task<IActionResult> GetLabParamsAsync(string status = "*" ,int page = 0, int limit = 10)
         {
-            var result = await _labApi.GetLabParamsByLabelID(page, limit);
+            var result = await _labApi.GetLabParamsByStatus(status,page, limit);
 
             if (result.Data.Count() > 0)
             {

AMESCoreStudio.Web/HttpApis/AMES/ILAB.cs

@@ -98,6 +98,13 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/LabelParam/byLabelID/{id}")]
         ITask<ResultModel<LabelParam>> GetLabParamsByLabelID(int page = 0, int limit = 10);
 
+        /// <summary>
+        /// 獲取Label 全部參數資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/LabelParam/byStatus/{status}")]
+        ITask<ResultModel<LabelParam>> GetLabParamsByStatus(string status,int page = 0, int limit = 10);
+
         /// <summary>
         /// Label 參數儲存
         /// </summary>

AMESCoreStudio.Web/Views/LAB/LAB001.cshtml

@@ -9,6 +9,23 @@
             <div class="layui-form-item ">
                 <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
             </div>
+            <div class="layui-form-item layui-layout-left">
+                <div class="layui-inline">
+                    <label class="layui-form-label">狀態</label>
+                    <div class="layui-input-inline" style="width:100px">
+                        <select id="status" name="status" lay-filter="status" lay-submit>
+                            <option value="*">全部</option>
+                            <option value="Y">啟用</option>
+                            <option value="N">停用</option>
+                        </select>
+                    </div>
+                </div>
+                <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 class="layui-card-body">

AMESCoreStudio.Web/Views/LAB/LAB002C.cshtml

@@ -63,9 +63,12 @@
                     <div class="layui-inline" style="margin-right: 5px; margin-left: 5px;">
                         <div class="layui-inline">
                             <label asp-for="REMARK" class="layui-form-label"></label>
-                            <input asp-for="REMARK" type="text" style="width: 250px;" class="layui-input" />
+                            <textarea asp-for="REMARK" style="width: 250px;" class="layui-textarea"></textarea>
                             <span asp-validation-for="REMARK" class="text-danger offset-sm-3 my-sm-1"></span>
                         </div>
+
+
+
                     </div>
                     <div class="layui-inline" style="margin-right: 5px; margin-left: 5px;">
                         <div class="layui-inline">

AMESCoreStudio.Web/Views/LAB/LAB002U.cshtml

@@ -59,13 +59,11 @@
                             <div id="errorContainer1" style="color: red;"></div>
                         </div>
                     </div>
-                    <div class="layui-inline" style="margin-right: 5px; margin-left: 5px;">
                     <div class="layui-inline">
                         <label asp-for="REMARK" class="layui-form-label"></label>
-                            <input asp-for="REMARK" type="text" style="width: 250px;" class="layui-input" />
+                        <textarea asp-for="REMARK" style="width: 250px;" class="layui-textarea"></textarea>
                         <span asp-validation-for="REMARK" class="text-danger offset-sm-3 my-sm-1"></span>
                     </div>
-                    </div>
                     <div class="layui-inline" style="margin-right: 5px; margin-left: 5px;">
                         <div class="layui-inline">
                             <label asp-for="IMAGE_NAME" class="layui-form-label"></label>

AMESCoreStudio.WebApi/Controllers/AMES/LabelParamController.cs

@@ -73,6 +73,31 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         }
 
 
+        // GET: api/LabelParam/5
+        [HttpGet("byStatus/{status}")]
+        public async Task<ResultModel<LabelParam>> GetLabelParambyStatus(string status, int page = 0, int limit = 10)
+        {
+            ResultModel<LabelParam> result = new ResultModel<LabelParam>();
+            IQueryable<LabelParam> q = _context.LabelParam;
+            if (status != "*")
+            {
+                q = q.Where(w => w.STATUS_NO == status);
+            
+            }
+            result.DataTotal = q.Count();
+
+            // Table 頁數
+            if (page > 0)
+            {
+                q = q.Skip((page - 1) * limit).Take(limit);
+            }
+
+            result.Data = await q.ToListAsync();
+
+            return result;
+        }
+
+
         /// <summary>
         /// 更新Label參數檔
         /// </summary>

AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateMasterController.cs

@@ -145,7 +145,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
           
             if (!string.IsNullOrEmpty(LabelMatnr) && LabelMatnr != "*")
             {
-              q =  q.Where(w => w.LABEL_MATNR.StartsWith(LabelMatnr));
+              q =  q.Where(w => w.LABEL_MATNR.Contains(LabelMatnr));
                
             }
             result.DataTotal = q.Count();