diff --git a/AMESCoreStudio.Web/Controllers/KCSController.cs b/AMESCoreStudio.Web/Controllers/KCSController.cs
index 8f9448b8..83b17659 100644
--- a/AMESCoreStudio.Web/Controllers/KCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/KCSController.cs
@@ -192,12 +192,21 @@ namespace AMESCoreStudio.Web.Controllers
             return View("KCS001U", model);
         }
 
+        [HttpPost]
+        public async Task<JsonResult> GetClassGroupDataAsync(string group_no)
+        {
+            var result = await _kcsApi.GetMACInfoes4KCS001(null, group_no, 0, 10);
+
+            //将数据Json化并传到前台视图
+            return Json(new { data = result });
+        }
+
         [ResponseCache(Duration = 0)]
         [HttpGet]
-        public async Task<IActionResult> GetMACInfoesAsync(int page = 0, int limit = 10)
+        public async Task<IActionResult> GetMACInfoesAsync(string itemNO,string classGroupNo,int page = 0, int limit = 10)
         {
-            var result_total = await _kcsApi.GetMACInfoes(0, limit);
-            var result = await _kcsApi.GetMACInfoes(page, limit);
+            var result_total = await _kcsApi.GetMACInfoes4KCS001(itemNO,classGroupNo,0, limit);
+            var result = await _kcsApi.GetMACInfoes4KCS001(itemNO, classGroupNo, page, limit);
 
             if (result.Count > 0)
             {
diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IKCS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IKCS.cs
index 9fe3f517..1abcc256 100644
--- a/AMESCoreStudio.Web/HttpApis/AMES/IKCS.cs
+++ b/AMESCoreStudio.Web/HttpApis/AMES/IKCS.cs
@@ -49,6 +49,13 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/MACInfoes")]
         ITask<List<MACInfo>> GetMACInfoes(int page = 0, int limit = 10);
 
+        /// <summary>
+        /// 獲取MAC資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/MACInfoes/GetMACInfoes4KCS001")]
+        ITask<List<MACInfo>> GetMACInfoes4KCS001(string itemNO, string classGroupNo, int page = 0, int limit = 10);
+
         #endregion
 
         #region KCS002 序號料號維護
diff --git a/AMESCoreStudio.Web/Views/KCS/KCS001.cshtml b/AMESCoreStudio.Web/Views/KCS/KCS001.cshtml
index 2d5c2f3f..5dd3fff5 100644
--- a/AMESCoreStudio.Web/Views/KCS/KCS001.cshtml
+++ b/AMESCoreStudio.Web/Views/KCS/KCS001.cshtml
@@ -12,6 +12,35 @@
         </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="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">
+                                <input id="classGroupNo" name="classGroupNo" autocomplete="off" class="layui-input" placeholder="請輸入組代碼">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm1">
+                        <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/KCS/KCS001C.cshtml b/AMESCoreStudio.Web/Views/KCS/KCS001C.cshtml
index 3420e02d..72af2ec3 100644
--- a/AMESCoreStudio.Web/Views/KCS/KCS001C.cshtml
+++ b/AMESCoreStudio.Web/Views/KCS/KCS001C.cshtml
@@ -18,18 +18,19 @@
 
             <div class="form-group form-inline my-sm-1">
                 <label class="control-label col-sm-3">最大組代碼</label>
-                <input class="form-control col-sm-9"  readonly="readonly" value="@ViewBag.MaxClassGroup" />
+                <input class="form-control col-sm-9" readonly="readonly" value="@ViewBag.MaxClassGroup" />
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="ClassGroup" class="control-label col-sm-3"></label>
+                <input id="classGroupNo" asp-for="ClassGroup" class="form-control col-sm-3" type="number" placeholder="請輸入組代碼" />
+                <input id="btnQuery" type="button" value="查詢" class="btn btn-primary offset-sm-3" />
+                <span asp-validation-for="ClassGroup" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="Class" class="control-label col-sm-3"></label>
                 <input asp-for="Class" class="form-control col-sm-9" placeholder="請輸入機種" />
                 <span asp-validation-for="Class" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
-            <div class="form-group form-inline my-sm-1">
-                <label asp-for="ClassGroup" class="control-label col-sm-3"></label>
-                <input asp-for="ClassGroup" class="form-control col-sm-9" placeholder="請輸入組代碼" />
-                <span asp-validation-for="ClassGroup" class="text-danger offset-sm-3 my-sm-1"></span>
-            </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="Qty" class="control-label col-sm-3"></label>
                 <input asp-for="Qty" class="form-control col-sm-9" placeholder="請輸入單板MAC數" />
@@ -37,22 +38,22 @@
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="Max" class="control-label col-sm-3"></label>
-                <input asp-for="Max" class="form-control col-sm-9" placeholder="請輸入最大值" />
+                <input id="macMax" asp-for="Max" class="form-control col-sm-9" placeholder="請輸入最大值" />
                 <span asp-validation-for="Max" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="Min" class="control-label col-sm-3"></label>
-                <input asp-for="Min" class="form-control col-sm-9" placeholder="請輸入最小值" />
+                <input id="macMin" asp-for="Min" class="form-control col-sm-9" placeholder="請輸入最小值" />
                 <span asp-validation-for="Min" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="Value" class="control-label col-sm-3"></label>
-                <input asp-for="Value" class="form-control col-sm-9" placeholder="請輸入當前值" />
+                <input id="macValue" asp-for="Value" class="form-control col-sm-9" placeholder="請輸入當前值" />
                 <span asp-validation-for="Value" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="Title" class="control-label col-sm-3"></label>
-                <input asp-for="Title" class="form-control col-sm-9" placeholder="請輸入首碼" />
+                <input id="macTitle" asp-for="Title" class="form-control col-sm-9" placeholder="請輸入首碼" />
                 <span asp-validation-for="Title" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
@@ -71,7 +72,7 @@
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="SafeQty" class="control-label col-sm-3"></label>
-                <input asp-for="SafeQty" class="form-control col-sm-9" placeholder="請輸入安全量" />
+                <input id="macSafeQty" asp-for="SafeQty" class="form-control col-sm-9" placeholder="請輸入安全量" />
                 <span asp-validation-for="SafeQty" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
@@ -113,6 +114,42 @@
         if ($(error).text() != '') {
             parent.hg.msg(error);
         }
+
+        function setClassGroupData(data)
+        {
+            var idx = 0;
+            $.ajax({
+                type: "post",
+                url: '/KCS/GetClassGroupData?group_no=' + data,
+                contentType: "application/json; charset=utf-8",
+                dataType: 'json',
+                success: function (response) {             
+                    $.each(response, function (i, item) {
+                        idx = idx + 1;
+                        $('#macMax').val(item[0]["max"]);
+                        $('#macMin').val(item[0]["min"]);
+                        $('#macValue').val(item[0]["value"]);
+                        $('#macTitle').val(item[0]["title"]);
+                        $('#macSafeQty').val(item[0]["safeQty"]);
+                    });
+                },
+                error: function () {
+                    alert("查無組代碼資料!");
+                }
+            });
+
+            if (idx == 0) {
+                $('#macMax').val('');
+                $('#macMin').val('');
+                $('#macValue').val('');
+                $('#macTitle').val('');
+                $('#macSafeQty').val('');
+            }
+        }
+
+        $('#btnQuery').click(function () {
+            setClassGroupData(classGroupNo.value);
+        });
     });
 </script>
 
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/MACInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/MACInfoesController.cs
index 65602d01..ea2cc8ae 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/MACInfoesController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/MACInfoesController.cs
@@ -51,6 +51,48 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return macInfo;
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="itemNO"></param>
+        /// <param name="classGroupNo"></param>
+        /// <param name="page"></param>
+        /// <param name="limit"></param>
+        /// <returns></returns>
+        [Route("[action]")]
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<MACInfo>>> GetMACInfoes4KCS001(string itemNO,string classGroupNo,int page = 1, int limit = 10)
+        {
+            IQueryable<MACInfo> q = _context.MACInfoes;
+            if (itemNO != null)
+            {
+                if (itemNO != "")
+                {
+                    q = q.Where(m => m.Class == itemNO);
+                }
+            }
+
+            if (classGroupNo != null)
+            {
+                if (classGroupNo != "")
+                {
+                    q = q.Where(m => m.ClassGroup == classGroupNo);
+                }
+            }
+
+            if (page > 0)
+            {
+                q = q.OrderBy(p => p.Class + p.ClassGroup).Skip((page - 1) * limit).Take(limit);
+            }
+            else
+            {
+                q = q.OrderBy(p => p.Class + p.ClassGroup);
+            }
+
+            var macInfo = await q.ToListAsync();
+            return macInfo;
+        }
+
         /// <summary>
         /// 
         /// </summary>