diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs
index 0ac82978..c0ea02d1 100644
--- a/AMESCoreStudio.Web/Controllers/FQCController.cs
+++ b/AMESCoreStudio.Web/Controllers/FQCController.cs
@@ -1,28 +1,23 @@
-using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
+using AMESCoreStudio.CommonTools.Result;
 using AMESCoreStudio.Web.Models;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using AMESCoreStudio.WebApi;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Mvc.Rendering;
+using AMESCoreStudio.WebApi.DTO.AMES;
+using AMESCoreStudio.WebApi.Enum;
 using AMESCoreStudio.WebApi.Models.AMES;
 using AMESCoreStudio.WebApi.Models.BAS;
-using AMESCoreStudio.Web.ViewModels;
-using AMESCoreStudio.Web.ViewModels.PCS;
-using AMESCoreStudio.WebApi.DTO.AMES;
-using System.Linq;
-using AMESCoreStudio.CommonTools.Result;
-using System;
-using System.IO;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Hosting;
-using System.ComponentModel.DataAnnotations;
 using AspNetCore.Reporting;
-using System.Text.Encodings;
-using AMESCoreStudio.WebApi.Enum;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.StaticFiles;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace AMESCoreStudio.Web.Controllers
 {
@@ -843,11 +838,24 @@ namespace AMESCoreStudio.Web.Controllers
                     var result_WipFQC = await _fqcApi.GetWipFqcItemByWipNo(model.WipNo);
                     if (result_WipFQC.Count == 0)
                     {
-                        //工單無設定檢驗工項時 在抓料號綁定檢驗工項
-                        var result_MaterialFQC = await _fqcApi.GetMaterialFqcItemsByitemNo(model.ItemNo);
-                        if (result_MaterialFQC.Count != 0)
+                        // 2024/02/01 切換判斷
+                        if (model.CreateDate < new DateTime(2024, 2, 1))
                         {
-                            model.qcItemDtos = result_QcItem.Data.Where(w => result_MaterialFQC.Select(s => s.QcItemID).Contains(w.ItemID)).ToList();
+                            //工單無設定檢驗工項時 在抓料號綁定檢驗工項
+                            var result_MaterialFQC = await _fqcApi.GetMaterialFqcItemsByitemNo(model.ItemNo);
+                            if (result_MaterialFQC.Count != 0)
+                            {
+                                model.qcItemDtos = result_QcItem.Data.Where(w => result_MaterialFQC.Select(s => s.QcItemID).Contains(w.ItemID)).ToList();
+                            }
+                        }
+                        else
+                        {
+                            // 改抓FQC設定群組內綁定的料號取 FQC設定群組項目
+                            var result_FqcItem = await _fqcApi.GetFqcItemByItemNo(model.ItemNo);
+                            if (result_FqcItem.Count != 0)
+                            {
+                                model.qcItemDtos = result_QcItem.Data.Where(w => result_FqcItem.Select(s => s.QcItemId).Contains(w.ItemID)).ToList();
+                            }
                         }
                     }
                     else
@@ -960,11 +968,24 @@ namespace AMESCoreStudio.Web.Controllers
                 var result_WipFQC = await _fqcApi.GetWipFqcItemByWipNo(model.WipNo);
                 if (result_WipFQC.Count == 0)
                 {
-                    //工單無設定檢驗工項時 在抓料號綁定檢驗工項
-                    var result_MaterialFQC = await _fqcApi.GetMaterialFqcItemsByitemNo(model.ItemNo);
-                    if (result_MaterialFQC.Count != 0)
+                    // 2024/02/01 切換判斷
+                    if (model.CreateDate < new DateTime(2024, 2, 1))
+                    {
+                        //工單無設定檢驗工項時 在抓料號綁定檢驗工項
+                        var result_MaterialFQC = await _fqcApi.GetMaterialFqcItemsByitemNo(model.ItemNo);
+                        if (result_MaterialFQC.Count != 0)
+                        {
+                            model.qcItemDtos = result_QcItem.Data.Where(w => result_MaterialFQC.Select(s => s.QcItemID).Contains(w.ItemID)).ToList();
+                        }
+                    }
+                    else
                     {
-                        model.qcItemDtos = result_QcItem.Data.Where(w => result_MaterialFQC.Select(s => s.QcItemID).Contains(w.ItemID)).ToList();
+                        // 改抓FQC設定群組內綁定的料號取 FQC設定群組項目
+                        var result_FqcItem = await _fqcApi.GetFqcItemByItemNo(model.ItemNo);
+                        if (result_FqcItem.Count != 0)
+                        {
+                            model.qcItemDtos = result_QcItem.Data.Where(w => result_FqcItem.Select(s => s.QcItemId).Contains(w.ItemID)).ToList();
+                        }
                     }
                 }
                 else
@@ -981,6 +1002,20 @@ namespace AMESCoreStudio.Web.Controllers
             return View(model);
         }
 
+        /// <summary>
+        /// 確認是否可以開立FQC檢驗單
+        /// </summary>
+        /// <param name="inhouseNo">入庫單號碼</param>
+        /// <param name="wipNo">工單號碼</param>
+        /// <param name="seqID">序號</param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<JsonResult> CheckFqcIssue(string inhouseNo, string wipNo, int seqID = 0)
+        {
+            var result = await _fqcApi.CheckFqcIssue(inhouseNo, wipNo, seqID);
+            return Json(new Result() { success = result.Success, msg = result.Msg, data = null });
+        }
+
         [HttpPost]
         public async Task FQC007AjaxJson(FqcDto model)
         {
@@ -1302,11 +1337,24 @@ namespace AMESCoreStudio.Web.Controllers
             var qcItemDtos = new List<QcItemDto>();
             if (result_WipFQC.Count == 0)
             {
-                //工單無設定檢驗工項時 在抓料號綁定檢驗工項
-                var result_MaterialFQC = await _fqcApi.GetMaterialFqcItemsByitemNo(fqcItem.ItemNo);
-                if (result_MaterialFQC.Count != 0)
+                // 2024/02/01 切換判斷
+                if (model.CreateDate < new DateTime(2024, 2, 1))
+                {
+                    //工單無設定檢驗工項時 在抓料號綁定檢驗工項
+                    var result_MaterialFQC = await _fqcApi.GetMaterialFqcItemsByitemNo(fqcItem.ItemNo);
+                    if (result_MaterialFQC.Count != 0)
+                    {
+                        qcItemDtos = result_QcItem.Data.Where(w => result_MaterialFQC.Select(s => s.QcItemID).Contains(w.ItemID)).ToList();
+                    }
+                }
+                else
                 {
-                    qcItemDtos = result_QcItem.Data.Where(w => result_MaterialFQC.Select(s => s.QcItemID).Contains(w.ItemID)).ToList();
+                    // 改抓FQC設定群組內綁定的料號取 FQC設定群組項目
+                    var result_FqcItem = await _fqcApi.GetFqcItemByItemNo(fqcItem.ItemNo);
+                    if (result_FqcItem.Count != 0)
+                    {
+                        qcItemDtos = result_QcItem.Data.Where(w => result_FqcItem.Select(s => s.QcItemId).Contains(w.ItemID)).ToList();
+                    }
                 }
             }
             else
@@ -1336,8 +1384,6 @@ namespace AMESCoreStudio.Web.Controllers
                     if (model.QaResult == "P" && string.IsNullOrWhiteSpace(model.SpecialPo))
                     {
                         return Json(new { data = "請輸入特採單號", success = false });
-                        //ModelState.AddModelError("error", "請輸入特採單號");
-                        //return View("FQC007B", model);
                     }
                 }
 
@@ -1350,16 +1396,12 @@ namespace AMESCoreStudio.Web.Controllers
                         if (fqcItem.PassQty + fqcItem.FailQty != fqcItem.InhouseQty && model.QaResult == "P")
                         {
                             return Json(new { data = "抽樣數量不足，不可判定允收", success = false });
-                            //ModelState.AddModelError("error", "抽樣數量不足，不可判定允收");
-                            //return View("FQC007B", model);
                         }
                     }
                     //當抽驗數量 小於 抽樣數量就離開
                     else if (fqcItem.QcQty > fqcItem.PassQty + fqcItem.FailQty && model.QaResult == "P")
                     {
                         return Json(new { data = "抽樣數量不足，不可判定允收", success = false });
-                        //ModelState.AddModelError("error", "抽樣數量不足，不可判定允收");
-                        //return View("FQC007B", model);
                     }
                 }
             }
@@ -1385,6 +1427,9 @@ namespace AMESCoreStudio.Web.Controllers
             result = await _fqcApi.PutFqcResultMaster(JsonConvert.SerializeObject(fqcResultMaster));
             if (result.Success)
             {
+                // 抽驗時,判斷檢驗項目是否有建立
+                await _fqcApi.PostWipFqcItemByWipNo(fqcItem.WipNo);
+
                 // 允收且不是無序號供單需要FQC過站
                 if (model.QaResult == "P" && fqcItem.InspectionStatus != "D")
                     result = await _fqcApi.PassingByFQC(model.InhouseNo, model.SeqID, GetLogInUserID());
@@ -1393,6 +1438,11 @@ namespace AMESCoreStudio.Web.Controllers
                 {
                     await _fqcApi.PostSMS_CAR_FQC(JsonConvert.SerializeObject(fqcResultMaster));
                 }
+                // 執行判斷無序號工單檢驗完成
+                else if (model.QaResult == "P" && fqcItem.InspectionStatus == "D")
+                {
+                    await _fqcApi.GetFqcExecuteWithoutWipNoComplete(fqcItem.WipNo);
+                }
 
                 if (!result.Success)
                 {
@@ -1617,9 +1667,27 @@ namespace AMESCoreStudio.Web.Controllers
         }
 
         [HttpGet]
-        public async Task<IActionResult> FQC007AItemQuery(string wipNo, string itemNo)
+        public async Task<IActionResult> FQC007AItemQuery(string wipNo, string itemNo, DateTime createDate)
         {
-            var result = await _fqcApi.GetQcItemQuery(0, 0, 0, itemNo, wipNo);
+            // 2024/02/01 切換判斷
+            var result = new ResultModel<QcItemDto>();
+            if (createDate < new DateTime(2024, 2, 1))
+            {
+                result = await _fqcApi.GetQcItemQuery(0, 0, 0, itemNo, wipNo);
+            }
+            else
+            {
+                var item = await _pcsApi.GetMaterialItemByItemNO(itemNo);
+                if (item != null)
+                {
+                    var fqcGroupId = await _fqcApi.GetFqcItemGroupMaterialByItemId(item.ItemID);
+                    if (fqcGroupId.Any())
+                    {
+                        result = await _fqcApi.GetQcItemQuery(0, 0, 0, wipNo: wipNo,
+                            fqcItemGroupId: fqcGroupId.FirstOrDefault().GroupId);
+                    }
+                }
+            }
             return Json(new Table() { code = 0, data = result.Data, count = result.DataTotal });
         }
 
@@ -1898,7 +1966,7 @@ namespace AMESCoreStudio.Web.Controllers
         #endregion
 
         #region FQC010 報表
-        public async Task<IActionResult> FQC010_PDF(string inhouseNo, int seqID)
+        public IActionResult FQC010_PDF(string inhouseNo, int seqID)
         {
             string mimeType = "";
             int extension = 1;
@@ -1908,7 +1976,7 @@ namespace AMESCoreStudio.Web.Controllers
             return File(result.MainStream, "application/pdf");
         }
 
-        public async Task<IActionResult> FQC010_Excel(string inhouseNo, int seqID)
+        public IActionResult FQC010_Excel(string inhouseNo, int seqID)
         {
             string mimeType = "";
             int extension = 1;
@@ -1990,10 +2058,11 @@ namespace AMESCoreStudio.Web.Controllers
                 var result_WipFQC = await _fqcApi.GetWipFqcItemByWipNo(FqcQuery.WipNo);
                 if (result_WipFQC.Count == 0)
                 {
-                    //工單無設定檢驗工項時 在抓料號綁定檢驗工項
-                    var result_MaterialFQC = await _fqcApi.GetMaterialFqcItemsByitemNo(FqcQuery.ItemNo);
-                    if (result_MaterialFQC.Count != 0)
+                    // 2024/02/01 切換判斷
+                    if (FqcQuery.CreateDate < new DateTime(2024, 2, 1))
                     {
+                        //工單無設定檢驗工項時 在抓料號綁定檢驗工項
+                        var result_MaterialFQC = await _fqcApi.GetMaterialFqcItemsByitemNo(FqcQuery.ItemNo);
                         // 檢驗工項
                         foreach (var item in result_QcItem.Data.Where(w => result_MaterialFQC.Select(s => s.QcItemID).Contains(w.ItemID)).ToList())
                         {
@@ -2005,6 +2074,20 @@ namespace AMESCoreStudio.Web.Controllers
                             });
                         }
                     }
+                    else
+                    {
+                        // 改抓FQC設定群組內綁定的料號取 FQC設定群組項目
+                        var result_FqcItem = await _fqcApi.GetFqcItemByItemNo(FqcQuery.ItemNo);
+                        foreach (var item in result_QcItem.Data.Where(w => result_FqcItem.Select(s => s.QcItemId).Contains(w.ItemID)).ToList())
+                        {
+                            FQC010Master.Detail1.Add(new FQC010Detail1
+                            {
+                                ItemID = item.ItemID.ToString(),
+                                ItemName = item.ItemNameEN,
+                                ItemType = item.ItemTypeName
+                            });
+                        }
+                    }
                 }
                 else
                 {
@@ -2280,6 +2363,289 @@ namespace AMESCoreStudio.Web.Controllers
         }
         #endregion
 
+        #region FQC013 檢驗項目群組名稱維護
+        public IActionResult FQC013()
+        {
+            return View();
+        }
+
+        //新增頁面
+        public IActionResult FQC013C()
+        {
+            return View();
+        }
+
+        //修改页面
+        [HttpGet]
+        public async Task<IActionResult> FQC013U(int id)
+        {
+            var result = await _fqcApi.GetFqcItemGroups(id);
+            return View(result);
+        }
+
+        /// <summary>
+        /// 刪除
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<IActionResult> FQC013D(int id)
+        {
+            var result = await _fqcApi.DeleteFqcItemGroup(id);
+            return Json(new Result() { success = result.Success, msg = result.Msg });
+        }
+
+        //頁面提交，id=0 添加，id>0 修改
+        [HttpPost]
+        public async Task<IActionResult> FQC013Async(FqcItemGroup model)
+        {
+            IResultModel result;
+            // 判斷是否有重複的群組代號
+            var checkData = await _fqcApi.GetFqcItemGroupQuery(no: model.ItemGroupNo);
+            if (checkData.Data.Any(w => w.ItemGroupNo == model.ItemGroupNo))
+            {
+                // 新增 群組
+                if (model.FqcItemGroupId == 0)
+                {
+                    ModelState.AddModelError("error", "已有建立相同的群組代號，請在確認");
+                    return View("FQC013C", model);
+                }
+                // 修改 群組
+                else if (checkData.Data.Any(w => w.ItemGroupNo == model.ItemGroupNo && w.FqcItemGroupId != model.FqcItemGroupId))
+                {
+                    ModelState.AddModelError("error", "已有建立相同的群組代號，請在確認");
+                    return View("FQC013U", model);
+                }
+            }
+
+            if (ModelState.IsValid)
+            {
+                if (model.FqcItemGroupId == 0)
+                {
+                    model.CreateUserID = GetLogInUserID();
+                    result = await _fqcApi.PostFqcItemGroup(JsonConvert.SerializeObject(model));
+                }
+                else
+                {
+                    model.UpdateUserID = GetLogInUserID();
+                    result = await _fqcApi.PutFqcItemGroup(JsonConvert.SerializeObject(model));
+                }
+
+                if (result.Success)
+                {
+                    var _msg = model.FqcItemGroupId == 0 ? "新增成功！" : "修改成功！";
+                    return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                }
+                else
+                {
+                    ModelState.AddModelError("error", result.Msg);
+                }
+            }
+
+            if (model.FqcItemGroupId == 0)
+            {
+                return View("FQC013C", model);
+            }
+            return View("FQC013U", model);
+        }
+
+        /// <summary>
+        /// FQC檢驗項目群組名稱設定檔 By Query
+        /// </summary>
+        /// <param name="no">群組代號</param>
+        /// <param name="name">群組名稱</param>
+        /// <param name="desc">群組描述</param>
+        /// <param name="itemNo">料號</param>
+        /// <param name="page">頁數</param>
+        /// <param name="limit">筆數</param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<IActionResult> FQC013Query(string no,
+            string name,
+            string desc,
+            string itemNo,
+            int page = 0,
+            int limit = 10)
+        {
+            var result = await _fqcApi.GetFqcItemGroupQuery(no, name, desc, itemNo, page, limit);
+
+            if (result.Data.Count() != 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
+            }
+
+            return Json(new Table() { count = 0, data = null });
+        }
+
+        #region FQC013A FQC群組綁設定檢驗工項維護
+
+        public async Task<IActionResult> FQC013A(int fqcItemGroupId = 0)
+        {
+            var result = await _fqcApi.GetFqcItemGroups(fqcItemGroupId);
+            if (result != null)
+            {
+                ViewBag.GroupNo = result.ItemGroupNo;
+                ViewBag.GroupName = result.ItemGroupName;
+            }
+            ViewBag.GroupId = fqcItemGroupId;
+            return View();
+        }
+
+        /// <summary>
+        /// 查詢 FQC檢驗群組綁定工項
+        /// </summary>
+        /// <param name="fqcItemGroupId"></param>
+        /// <param name="page"></param>
+        /// <param name="limit"></param>
+        /// <returns></returns>
+        public async Task<ActionResult> FQC013A_Query(int fqcItemGroupId = 0, int page = 0, int limit = 1)
+        {
+            var result = await _fqcApi.GetQcItemQuery(0, 0, limit, fqcItemGroupId: fqcItemGroupId);
+            return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> FQC013A_Submit(string itemID, string groupID, int fqcItemGroupId)
+        {
+            // 取料號綁定檢驗工項
+            var result_FqcItem = await _fqcApi.GetFqcItemByFqcGroupId(fqcItemGroupId);
+            // 有勾選的ItemID
+            var checkItemID = itemID.Split(',').ToList();
+            // 有勾選的GroupID
+            var checkGroupID = groupID.Split(',').ToList();
+
+            // 取勾選有的 = 新增
+            var insertItemID = checkItemID.Except(result_FqcItem.Select(s => s.QcItemId.ToString()));
+            for (int i = 0; i < checkItemID.Count; i++)
+            {
+                if (insertItemID.Where(w => w == checkItemID[i]).Any())
+                {
+                    FqcItem FqcItem = new FqcItem
+                    {
+                        GroupId = fqcItemGroupId,
+                        QcItemId = Int32.Parse(checkItemID[i]),
+                        QcGroupId = Int32.Parse(checkGroupID[i]),
+                        CreateUserID = GetLogInUserID(),
+                        CreateDate = DateTime.Now,
+                        UpdateUserID = GetLogInUserID(),
+                        UpdateDate = DateTime.Now
+                    };
+                    await _fqcApi.PostFqcItem(JsonConvert.SerializeObject(FqcItem));
+                }
+            }
+
+            // 取有料號綁定 = 需要刪除
+            var deteleItemID = result_FqcItem.Select(s => s.QcItemId.ToString()).Except(checkItemID);
+            foreach (var item in deteleItemID)
+            {
+                var FqcItemId = result_FqcItem.Where(w => w.QcItemId == Int32.Parse(item)).FirstOrDefault().FqcItemId;
+                await _fqcApi.DeleteFqcItem(FqcItemId);
+            }
+
+            return Json(new { code = 0, msg = "", success = true });
+        }
+
+        #endregion
+
+        #region FQC013B FQC群組綁定料號
+
+        public async Task<IActionResult> FQC013B(int groupId = 0)
+        {
+            var result = await _fqcApi.GetFqcItemGroups(groupId);
+            if (result != null)
+            {
+                ViewBag.GroupNo = result.ItemGroupNo;
+                ViewBag.GroupName = result.ItemGroupName;
+            }
+            ViewBag.GroupId = groupId;
+            return View();
+        }
+
+        /// <summary>
+        /// 查詢 FQC檢驗群組綁定工項
+        /// </summary>
+        /// <param name="fqcItemGroupId"></param>
+        /// <param name="page"></param>
+        /// <param name="limit"></param>
+        /// <returns></returns>
+        public async Task<ActionResult> FQC013B_Query(int groupId)
+        {
+            var result = await _fqcApi.GetFqcItemGroupMaterialByGroupId(groupId);
+            return Json(new Table() { code = 0, msg = "", data = result, count = result.Count() });
+        }
+
+        /// <summary>
+        /// 新增料號
+        /// </summary>
+        /// <param name="groupId">群組ID</param>
+        /// <param name="materialNo">料號</param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IActionResult> FQC013B_addMaterial(int groupId, string materialNo)
+        {
+            var msg = string.Empty;
+            var result = await _fqcApi.GetMaterialItemByItemNO(materialNo);
+            if (result == null)
+            {
+                msg = $"在料號主檔找不到該筆料號【{materialNo}】";
+                return Json(new { code = 0, msg, success = false });
+            }
+            else
+            {
+                var check = await _fqcApi.GetFqcItemGroupMaterialByItemId(result.ItemID);
+                if (check.Any())
+                {
+                    msg = $"該筆料號【{materialNo}】已有在群組綁定了，請在確認";
+                    return Json(new { code = 0, msg, success = false });
+                }
+            }
+
+            var model = new FqcItemGroupMaterial
+            {
+                GroupId = groupId,
+                ItemId = result.ItemID,
+                CreateUserID = GetLogInUserID(),
+                CreateDate = DateTime.Now,
+                UpdateUserID = GetLogInUserID(),
+                UpdateDate = DateTime.Now
+            };
+
+            await _fqcApi.PostFqcItemGroupMaterial(JsonConvert.SerializeObject(model));
+            return Json(new { code = 0, msg = "綁定成功", success = true });
+        }
+
+        /// <summary>
+        /// FQC檢驗群組刪除綁定料號
+        /// </summary>
+        /// <param name="groupId">FQC檢驗群組ID</param>
+        /// <param name="itemId">料號ID</param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IActionResult> FQC013B_Delete(int groupId, int itemId)
+        {
+            // 取料號綁定檢驗工項
+            var result = await _fqcApi.DeleteFqcItemGroupMaterial(groupId, itemId);
+            if (result == 1)
+                return Json(new { code = 0, msg = "", success = true });
+            else
+                return Json(new { code = 0, msg = "", success = false });
+        }
+
+        /// <summary>
+        /// 回傳PLM料號品名_AutoComplete
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<JsonResult> GetMeterialItemAutoComplete(string search)
+        {
+            var result = await _fqcApi.GetMeterialAutoComplete(search);
+            return Json(new { data = result });
+        }
+
+        #endregion
+
+        #endregion
+
         /// <summary>
         /// 登入UserID
         /// </summary>
diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs b/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs
index 206ab056..6192f13b 100644
--- a/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs
+++ b/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs
@@ -81,9 +81,10 @@ namespace AMESCoreStudio.Web
         /// <param name="limit">比數</param>
         /// <param name="itemNo">料號</param>
         /// <param name="wipNo">工單號碼</param>
+        /// <param name="fqcItemGroupId">FQC檢驗設定群組</param>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/QcItem/QcItemQuery")]
-        ITask<ResultModel<QcItemDto>> GetQcItemQuery(int groupID, int page, int limit, string itemNo = null, string wipNo = null);
+        ITask<ResultModel<QcItemDto>> GetQcItemQuery(int groupID, int page, int limit, string itemNo = null, string wipNo = null ,int fqcItemGroupId = 0) ;
 
         /// <summary>
         /// 查詢檢驗項目維護 ID
@@ -411,7 +412,6 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/FqcResultDetail/{id}")]
         ITask<List<FqcResultDetail>> GetFqcResultDetail(int id);
 
-
         /// <summary>
         /// 用id取檢驗單結果
         /// </summary>
@@ -462,6 +462,13 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpDelete("api/WipFqcItem/{id}")]
         ITask<ResultModel<string>> DeleteWipFqcItem(int id);
 
+        /// <summary>
+        /// FqcItem 查詢料號對應設定群組綁定檢驗工項
+        /// </summary>
+        /// <param name="id">料號</param>
+        [WebApiClient.Attributes.HttpGet("api/FqcItem/ByItemNo/{id}")]
+        ITask<List<FqcItem>> GetFqcItemByItemNo(string id);
+
         /// <summary>
         /// FQC抽驗過站
         /// </summary>
@@ -526,6 +533,28 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpDelete("api/FqcResultMasterBlob/ByFileName")]
         ITask<ResultModel<FqcResultMasterBlob>> DeleteFqcResultMasterBlob(int fqcId, string fileName);
 
+        /// <summary>
+        /// 執行判斷無序號工單檢驗完成
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/FqcResultMaster/ExecuteWithoutWipNoComplete/{id}")]
+        ITask<string> GetFqcExecuteWithoutWipNoComplete(string id);
+
+        /// <summary>
+        /// 確認FQC抽驗時，箱號是否已經跑到FQC流程
+        /// </summary>
+        /// <param name="inhouseNo">入庫單號</param>
+        /// <param name="wipNo">工單號碼</param>
+        /// <param name="seqID">順序</param>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/FqcInhouseMaster/CheckFqcIssue")]
+        ITask<ResultModel<string>> CheckFqcIssue(string inhouseNo, string wipNo , int seqID);
+
+        /// <summary>
+        /// WipFqcItemByWipNo 新增工單綁定檢驗工項,抽驗時判斷沒有資料就新增預設
+        /// </summary>
+        [WebApiClient.Attributes.HttpPost("api/WipFqcItem/ByWipNo/{wipNo}")]
+        ITask<ResultModel<WipFqcItem>> PostWipFqcItemByWipNo(string wipNo);
         #endregion
 
         #region FQC008 FQC查詢
@@ -627,7 +656,7 @@ namespace AMESCoreStudio.Web
         /// <returns></returns>
         [WebApiClient.Attributes.HttpDelete("api/FqcInhouseMaster/{no}/{seq}")]
         ITask<ResultModel<string>> DeleteFqcInhouseMaster(string no, int seq);
-      
+
 
         /// <summary>
         /// 刪除FQC 表身
@@ -637,5 +666,124 @@ namespace AMESCoreStudio.Web
         ITask<ResultModel<string>> DeleteFqcInhouseDetail(string no, int seq);
 
         #endregion
+
+        #region FQC013 檢驗項目群組相關維護
+        /// <summary>
+        /// FqcItem 新增檢驗項目群組綁定設定檔
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPost("api/FqcItem")]
+        ITask<ResultModel<FqcItem>> PostFqcItem([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// FqcItem 更新檢驗項目群組綁定設定檔
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPut("api/FqcItem")]
+        ITask<ResultModel<FqcItem>> PutFqcItem([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// FqcItem 刪除檢驗項目群組綁定設定檔
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpDelete("api/FqcItem/{id}")]
+        ITask<ResultModel<string>> DeleteFqcItem(int id);
+
+        /// <summary>
+        /// FqcItem 查詢 ByFqcGroupId
+        /// </summary>
+        /// <param name="id">FqcGroupId</param>
+        [WebApiClient.Attributes.HttpGet("api/FqcItem/ByFqcGroupId/{id}")]
+        ITask<List<FqcItem>> GetFqcItemByFqcGroupId(int id);
+
+        /// <summary>
+        /// FqcItemGroup 查詢FQC檢驗項目群組名稱設定檔 By ID
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/FqcItemGroup/{id}")]
+        ITask<FqcItemGroup> GetFqcItemGroups(int id);
+
+        /// <summary>
+        /// FqcItemGroup 新增FQC檢驗項目群組名稱設定檔
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPost("api/FqcItemGroup")]
+        ITask<ResultModel<FqcItemGroup>> PostFqcItemGroup([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// FqcItemGroup 更新FQC檢驗項目群組名稱設定檔
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPut("api/FqcItemGroup")]
+        ITask<ResultModel<FqcItemGroup>> PutFqcItemGroup([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// FqcItemGroup 刪除FQC檢驗項目群組名稱設定檔
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpDelete("api/FqcItemGroup/{id}")]
+        ITask<ResultModel<string>> DeleteFqcItemGroup(int id);
+
+        /// <summary>
+        /// FQC檢驗項目群組名稱設定檔 By Query
+        /// </summary>
+        /// <param name="no">群組代號</param>
+        /// <param name="name">群組名稱</param>
+        /// <param name="desc">群組描述</param>
+        /// <param name="itemNo">料號</param>
+        /// <param name="page">頁數</param>
+        /// <param name="limit">筆數</param>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/FqcItemGroup/FqcItemGroupQuery")]
+        ITask<ResultModel<FqcItemGroup>> GetFqcItemGroupQuery(string no = null,
+            string name = null,
+            string desc = null,
+            string itemNo = null,
+            int page = 0,
+            int limit = 10);
+
+        /// <summary>
+        /// 新增 檢驗群組指定料號設定檔
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPost("api/FqcItemGroupMaterial")]
+        ITask<ResultModel<FqcItemGroupMaterial>> PostFqcItemGroupMaterial([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// 更新 檢驗群組指定料號設定檔
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPut("api/FqcItemGroupMaterial")]
+        ITask<ResultModel<FqcItemGroupMaterial>> PutFqcItemGroupMaterial([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// FqcItemGroupMaterial 查詢檢驗群組指定料號設定檔 By GroupId
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/FqcItemGroupMaterial/ByGroupId/{id}")]
+        ITask<List<FqcItemGroupMaterial>> GetFqcItemGroupMaterialByGroupId(int id);
+
+        /// <summary>
+        /// FqcItemGroupMaterial 查詢檢驗群組指定料號設定檔 By ItemId
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/FqcItemGroupMaterial/ByItemId/{id}")]
+        ITask<List<FqcItemGroupMaterial>> GetFqcItemGroupMaterialByItemId(int id);
+
+        /// <summary>
+        /// 刪除 檢驗群組指定料號設定檔
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpDelete("api/FqcItemGroupMaterial/{id}/{id1}")]
+        ITask<int> DeleteFqcItemGroupMaterial(int id, int id1);
+
+        /// <summary>
+        /// 查詢料號_AutoComplete
+        /// </summary>
+        /// <param name="id">料號</param>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/MaterialItem/AutoComplete/{id}")]
+        ITask<List<MaterialItem>> GetMeterialAutoComplete(string id);
+        #endregion
     }
 }
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
index 0c8c242d..36d07e6a 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
@@ -64,6 +64,7 @@
                 <input type="hidden" asp-for="InhouseQty" value="@Model.InhouseQty" />
                 <input type="hidden" asp-for="ItemNo" value="@Model.ItemNo" />
                 <input type="hidden" asp-for="ModelNo" value="@Model.ModelNo" />
+                <input type="hidden" id="CreateDate" value="@Model.CreateDate" />
                 <div class="layui-col-xs1">
                     <label class="layui-form-label-col" style="text-align:right;">入庫單號：</label>
                 </div>
@@ -691,7 +692,7 @@
                     area: ['700px', '500px'],
                     fixed: false, //不固定
                     maxmin: true,
-                    content: '/FQC/FQC007A?wipNo=@Model.WipNo&itemNo=@Model.ItemNo',
+                    content: '/FQC/FQC007A?wipNo=@Model.WipNo&itemNo=@Model.ItemNo&createDate=@Model.CreateDate.ToShortDateString()',
                     end: function () {
                         window.location.reload();
                     }
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007A.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007A.cshtml
index 84ba9017..183a2aa6 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC007A.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC007A.cshtml
@@ -14,6 +14,7 @@
     <div class="layui-card-body">
         <input type="hidden" asp-for="WipNo" value="@Model.WipNo" />
         <input type="hidden" asp-for="ItemNo" value="@Model.ItemNo" />
+        <input type="hidden" asp-for="CreateDate" value="@Model.CreateDate" />
         <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3" id="error"></span>
         <table class="layui-hide" id="tableQuery" name="tableQuery" lay-filter="tableQuery"></table>
     </div>
@@ -31,7 +32,7 @@
     }
 
     <script type="text/javascript">
-
+        console.log('@Model.CreateDate');
         layui.use(['form', 'table'], function () {
             table = layui.table;
             form = layui.form;
@@ -48,7 +49,7 @@
                 defaultToolbar: ['filter', 'print', 'exports'],
                 cols: tableCols,
                 response: { msgName: 'msg' },
-                where: { itemNo: '@Model.ItemNo', wipNo: '@Model.WipNo' },
+                where: { itemNo: '@Model.ItemNo', wipNo: '@Model.WipNo', createDate: '@Model.CreateDate.ToShortDateString()' },
                 done: function (res, curr, count) {
                     //迴圈所有資料，找出對應關係，設定checkbox選中狀態
                     for (var i = 0; i < res.data.length; i++) {
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007V.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007V.cshtml
index cb3bcae7..0877895e 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC007V.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC007V.cshtml
@@ -59,11 +59,11 @@
                 title: '',
                 fixed: 'right',
                 templet: function (d) {
-                    if (d.statusNo.length === 0) {
-                        return '<a></a>';
+                    if (d.statusNo !== null) {
+                        return '<a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">刪除</a>';
                     }
                     else {
-                        return '<a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">删除</a>';
+                        return '<a></a>'
                     }
                 }
             }]
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml
index 2367f947..e7c55bbf 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml
@@ -7,27 +7,27 @@
     /*.layui-table-main .layui-table-cell {*/
     /*height: auto !important;*/
     /*white-space: normal;
-                        }
+                            }
 
-                        .layui-table img {
-                            max-width: 60px;
-                            max-height: 28px;
-                        }
+                            .layui-table img {
+                                max-width: 60px;
+                                max-height: 28px;
+                            }
 
-                        .layui-tree-main {
-                            cursor: pointer;
-                            padding-right: 10px;
-                            float: left;
-                            border-width: 1px;
-                            border-style: solid;
-                            border-color: #e6e6e6;
-                            margin: 10px 0;
-                        }
+                            .layui-tree-main {
+                                cursor: pointer;
+                                padding-right: 10px;
+                                float: left;
+                                border-width: 1px;
+                                border-style: solid;
+                                border-color: #e6e6e6;
+                                margin: 10px 0;
+                            }
 
-                        .layui-table-cell {
-                            height: auto;
-                            white-space: normal;
-                        }*/
+                            .layui-table-cell {
+                                height: auto;
+                                white-space: normal;
+                            }*/
 </style>
 
 
@@ -253,8 +253,8 @@
                         aa = '<a class="layui-btn layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a>'
                     }
                     else {
-                        aa = '<a class="layui-btn layui-btn-warm layui-icon layui-icon-list layui-btn-xs" lay-event="edit">檢視</a>\
-                                                      <a class="layui-btn layui-btn-xs" lay-event="PDF">PDF</a> <a class="layui-btn layui-btn-xs" lay-event="Excel">Excel</a>'
+                        aa = '<a class="layui-btn layui-btn-warm layui-icon layui-icon-list layui-btn-xs" lay-event="view">檢視</a>\
+                              <a class="layui-btn layui-btn-xs" lay-event="PDF">PDF</a> <a class="layui-btn layui-btn-xs" lay-event="Excel">Excel</a>'
                     }
                     return aa;
                 }
@@ -273,14 +273,42 @@
 
         //通过行tool编辑，lay-event="edit"
         function edit(obj) {
-            if (obj.data.inhouseNo) {
-                hg.open('FQC抽驗作業', '/FQC/FQC007?inhouseNo=' + obj.data.inhouseNo + '&seqID=' + obj.data.seqID, '', '', true);
+            $.ajax({
+                url: "@Url.Action("CheckFqcIssue", "FQC")",
+                type: "POST",
+                data: { "inhouseNo": obj.data.inhouseNo, "wipNo": obj.data.wipNo , "seqID": obj.data.seqID },
+                success: function (result) {
+                    if (result.success) {
+                        if (obj.data.inhouseNo) {
+                            hg.open('FQC抽驗作業', '/FQC/FQC007?inhouseNo=' + obj.data.inhouseNo + '&seqID=' + obj.data.seqID, '', '', true);
 
-                var tempwindow = window.open('_blank'); // 先打開頁面
-                tempwindow.location = 'https://sms.avalue.com.tw/SMS/SUP/SFIS_SMS001.aspx?MODEL_NO=' + obj.data.modelNo;
-                var tempwindow1 = window.open('_blank'); // 先打開頁面
-                tempwindow1.location = 'http://qazone.avalue.com.tw/qazone/sfislinktocfqr.aspx?QF=2&QA_PRDID=' + obj.data.itemNo;
-            }
+                            var tempwindow = window.open('_blank'); // 先打開頁面
+                            tempwindow.location = 'https://sms.avalue.com.tw/SMS/SUP/SFIS_SMS001.aspx?MODEL_NO=' + obj.data.modelNo;
+                            var tempwindow1 = window.open('_blank'); // 先打開頁面
+                            tempwindow1.location = 'http://qazone.avalue.com.tw/qazone/sfislinktocfqr.aspx?QF=2&QA_PRDID=' + obj.data.itemNo;
+                        }
+                    }
+                    else {
+                        parent.hg.msg(result.msg);
+                    }
+                },
+                error: function (result) {
+                    alert(`開啟FQC失敗，請聯繫系統管理員`);
+                }
+            });
+
+
+        }
+
+        function view(obj) {
+               if (obj.data.inhouseNo) {
+                            hg.open('FQC抽驗作業', '/FQC/FQC007?inhouseNo=' + obj.data.inhouseNo + '&seqID=' + obj.data.seqID, '', '', true);
+
+                            var tempwindow = window.open('_blank'); // 先打開頁面
+                            tempwindow.location = 'https://sms.avalue.com.tw/SMS/SUP/SFIS_SMS001.aspx?MODEL_NO=' + obj.data.modelNo;
+                            var tempwindow1 = window.open('_blank'); // 先打開頁面
+                            tempwindow1.location = 'http://qazone.avalue.com.tw/qazone/sfislinktocfqr.aspx?QF=2&QA_PRDID=' + obj.data.itemNo;
+                        }
         }
 
         function PDF(obj) {
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs
index ce1b3305..f53eaf92 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs
@@ -1,16 +1,14 @@
-using System;
+using AMESCoreStudio.CommonTools.Result;
+using AMESCoreStudio.WebApi.DTO.AMES;
+using AMESCoreStudio.WebApi.Extensions;
+using AMESCoreStudio.WebApi.Models.AMES;
+using Dapper;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using AMESCoreStudio.WebApi;
-using AMESCoreStudio.WebApi.Models.AMES;
-using AMESCoreStudio.CommonTools.Result;
-using AMESCoreStudio.WebApi.DTO.AMES;
-using Dapper;
-using AMESCoreStudio.WebApi.Extensions;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
@@ -72,32 +70,33 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         {
             ResultModel<FqcResultDto> result = new ResultModel<FqcResultDto>();
             var fqcResultDto = new List<FqcResultDto>();
-            var FqcInhouseDetails = await _context.FqcInhouseDetails.Where(w => w.SerialNo == boxNo && w.InhouseNo == inhouseNo
-                                                                 && w.SeqID == seqID).FirstOrDefaultAsync();
+            var querySql = @"  SELECT DISTINCT SERIAL_NO AS BoxNo , BARCODE_NO AS BarcodeNo , EXTRA_BARCODE_NO AS ExtraBarcodeNo 
+                               FROM ( 
+                                SELECT A.BARCODE_NO , A.EXTRA_BARCODE_NO , B.SERIAL_NO ,B.INHOUSE_NO 
+                                FROM JHAMES.BARCODE_INFO A , JHAMES.FQC_INHOUSE_DETAIL B 
+                                WHERE B.SERIAL_NO = A.BOX_NO 
+                                AND B.INHOUSE_NO = :InhouseNo
+                                AND B.SEQ_ID = :SeqId
+                                AND B.BARCODE_NO = '0'
+                                UNION ALL
+                                SELECT BARCODE_NO , EXTRA_BARCODE_NO , SERIAL_NO ,INHOUSE_NO 
+                                FROM JHAMES.FQC_INHOUSE_DETAIL 
+                                WHERE INHOUSE_NO = :InhouseNo
+                                AND SEQ_ID  = :SeqId
+                                AND BARCODE_NO <> '0') 
+                                WHERE SERIAL_NO=:BoxNo ";
+
+            DynamicParameters p = new DynamicParameters();
+            p.Add("InhouseNo", inhouseNo);
+            p.Add("SeqId", seqID);
+            p.Add("BoxNo", boxNo);
+            fqcResultDto = _context.Database.DapperQuery<FqcResultDto>(querySql, p).ToList();
 
             // 取FQC_ID
-            if (FqcInhouseDetails != null)
+            if (fqcResultDto.Any())
             {
-                var BarcodeInfo = new List<BarcodeInfo>();
-                if (FqcInhouseDetails.SerialType == "B")
-                    BarcodeInfo = await _context.BarcodeInfoes.Where(w => w.BoxNo == FqcInhouseDetails.SerialNo).ToListAsync();
-                else
-                    BarcodeInfo = await _context.BarcodeInfoes.Where(w => w.BarcodeNo == FqcInhouseDetails.SerialNo).ToListAsync();
-
-                // 先塞入資料
-                foreach (var item in BarcodeInfo)
-                {
-                    fqcResultDto.Add(new FqcResultDto
-                    {
-                        BarcodeNo = item.BarcodeNo,
-                        ExtraBarcodeNo = item.ExtraBarcodeNo,
-                        BoxNo = item.BoxNo,
-                        StatusNo = ""
-                    });
-                }
-
-                var FqcResultMaster = await _context.FqcResultMasters.Where(w => w.InhouseNo == FqcInhouseDetails.InhouseNo
-                                                                            && w.SeqID == FqcInhouseDetails.SeqID)
+                var FqcResultMaster = await _context.FqcResultMasters.Where(w => w.InhouseNo == inhouseNo
+                                                                            && w.SeqID == seqID)
                                                                             .FirstOrDefaultAsync();
                 // 取抽驗結果
                 if (FqcResultMaster != null)
@@ -110,7 +109,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         {
                             if (item.BarcodeNo == item2.BarcodeNo)
                             {
-                                item2.StatusNo = item.StatusNo;
+                                item2.StatusNo = item.StatusNo == "P" ? "PASS" : "NG";
                                 item2.NgReasonNo = item.NgReasonNo;
                                 item2.NgReasonDesc = NgReasons.Where(w => w.NGReasonNo == item.NgReasonNo).FirstOrDefault() == null ? "" : NgReasons.Where(w => w.NGReasonNo == item.NgReasonNo).FirstOrDefault().NGReasonDesc;
                                 item2.NgMemo = item.NgMemo;
@@ -145,54 +144,51 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         {
             ResultModel<FqcResultDto> result = new ResultModel<FqcResultDto>();
             var fqcResultDto = new List<FqcResultDto>();
-            var FqcInhouseDetails = await _context.FqcInhouseDetails.Where(w => w.InhouseNo == inhouseNo
-                                                                 && w.SeqID == seqID).ToListAsync();
+            var querySql = @"  SELECT DISTINCT SERIAL_NO AS BoxNo , BARCODE_NO AS BarcodeNo , EXTRA_BARCODE_NO AS ExtraBarcodeNo 
+                               FROM ( 
+                                SELECT A.BARCODE_NO , A.EXTRA_BARCODE_NO , B.SERIAL_NO ,B.INHOUSE_NO 
+                                FROM JHAMES.BARCODE_INFO A , JHAMES.FQC_INHOUSE_DETAIL B 
+                                WHERE B.SERIAL_NO = A.BOX_NO 
+                                AND B.INHOUSE_NO = :InhouseNo
+                                AND B.SEQ_ID = :SeqId
+                                AND B.BARCODE_NO = '0'
+                                UNION ALL
+                                SELECT BARCODE_NO , EXTRA_BARCODE_NO , SERIAL_NO ,INHOUSE_NO 
+                                FROM JHAMES.FQC_INHOUSE_DETAIL 
+                                WHERE INHOUSE_NO = :InhouseNo
+                                AND SEQ_ID  = :SeqId
+                                AND BARCODE_NO <> '0') ";
+
+            DynamicParameters p = new DynamicParameters();
+            p.Add("InhouseNo", inhouseNo);
+            p.Add("SeqId", seqID);
+            fqcResultDto = _context.Database.DapperQuery<FqcResultDto>(querySql, p).ToList();
 
             // 取FQC_ID
-            if (FqcInhouseDetails.Count != 0)
+            if (fqcResultDto.Any())
             {
-                foreach (var item in FqcInhouseDetails)
+                var FqcResultMaster = await _context.FqcResultMasters.Where(w => w.InhouseNo == inhouseNo
+                                                             && w.SeqID == seqID)
+                                                             .FirstOrDefaultAsync();
+                if (FqcResultMaster != null)
                 {
-                    var BarcodeInfo = new List<BarcodeInfo>();
-                    if (item.SerialType == "B")
-                        BarcodeInfo = await _context.BarcodeInfoes.Where(w => w.BoxNo == item.SerialNo).ToListAsync();
-                    else
-                        BarcodeInfo = await _context.BarcodeInfoes.Where(w => w.BarcodeNo == item.SerialNo).ToListAsync();
-
-                    // 先塞入資料
-                    foreach (var item1 in BarcodeInfo)
-                    {
-                        fqcResultDto.Add(new FqcResultDto
-                        {
-                            BarcodeNo = item1.BarcodeNo,
-                            ExtraBarcodeNo = item1.ExtraBarcodeNo,
-                            BoxNo = item1.BoxNo,
-                            StatusNo = ""
-                        });
-                    }
-
-                    var FqcResultMaster = await _context.FqcResultMasters.Where(w => w.InhouseNo == item.InhouseNo
-                                                                                && w.SeqID == item.SeqID)
-                                                                                .FirstOrDefaultAsync();
-
                     var NgReasons = await _context.NGReasons.ToListAsync();
-
-                    // 取抽驗結果
-                    if (FqcResultMaster != null)
+                    var FqcResultDetail = await _context.FqcResultDetails.Where(w => w.FqcID == FqcResultMaster.FqcID).ToListAsync();
+                    foreach (var item in fqcResultDto)
                     {
-                        var FqcResultDetail = await _context.FqcResultDetails.Where(w => w.FqcID == FqcResultMaster.FqcID).ToListAsync();
-                        foreach (var item1 in FqcResultDetail)
+                        // 取抽驗結果
+                        if (FqcResultMaster != null)
                         {
-                            foreach (var item2 in fqcResultDto)
+                            foreach (var item1 in FqcResultDetail)
                             {
-                                if (item1.BarcodeNo == item2.BarcodeNo)
+                                if (item1.BarcodeNo == item.BarcodeNo)
                                 {
-                                    item2.StatusNo = item1.StatusNo == "P" ? "PASS" : "NG";
-                                    item2.NgReasonNo = item1.NgReasonNo;
-                                    item2.NgReasonDesc = NgReasons.Where(w => w.NGReasonNo == item1.NgReasonNo).FirstOrDefault() == null ? "" : NgReasons.Where(w => w.NGReasonNo == item1.NgReasonNo).FirstOrDefault().NGReasonDesc;
-                                    item2.NgMemo = item1.NgMemo;
-                                    item2.IsSample = "Y";
-                                    item2.CreateName = await new Helper(_context).GetUserName(item.CreateUserID);
+                                    item.StatusNo = item1.StatusNo == "P" ? "PASS" : "NG";
+                                    item.NgReasonNo = item1.NgReasonNo;
+                                    item.NgReasonDesc = NgReasons.Where(w => w.NGReasonNo == item1.NgReasonNo).FirstOrDefault() == null ? "" : NgReasons.Where(w => w.NGReasonNo == item1.NgReasonNo).FirstOrDefault().NGReasonDesc;
+                                    item.NgMemo = item1.NgMemo;
+                                    item.IsSample = "Y";
+                                    item.CreateName = await new Helper(_context).GetUserName(item1.CreateUserID);
                                     continue;
                                 }
                             }
@@ -222,7 +218,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <param name="wipId">WIPID</param>
         /// <returns></returns>
         [HttpGet("GetCheckFqcOnGoIng")]
-        public async Task<IEnumerable<dynamic>> GetCheckFqcOnGoIng(string boxNo , int wipId)
+        public async Task<IEnumerable<dynamic>> GetCheckFqcOnGoIng(string boxNo, int wipId)
         {
             var querySql = @"  SELECT * FROM JHAMES.FQC_INHOUSE_MASTER M 
                                INNER JOIN JHAMES.FQC_INHOUSE_DETAIL D ON M.INHOUSE_NO = D.INHOUSE_NO AND M.SEQ_ID = D.SEQ_ID
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
index e56034fa..b8239287 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
@@ -10,6 +10,8 @@ using AMESCoreStudio.WebApi.Models.AMES;
 using AMESCoreStudio.WebApi.DTO.AMES;
 using AMESCoreStudio.CommonTools.Result;
 using AMESCoreStudio.WebApi.Enum;
+using AMESCoreStudio.WebApi.Extensions;
+using Dapper;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
@@ -222,7 +224,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 resultQuery = resultQuery.Skip((page - 1) * limit).Take(limit).ToList();
             }
-
             result.Data = resultQuery;
 
             // 判斷結束時間
@@ -305,7 +306,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                        Note = q2.Note,
                                        InspectionStatus = q2.InspectionStatus,
                                        Description = q4.Description,
-                                       LocationNo = q1.LocationNo
+                                       LocationNo = q1.LocationNo,
+                                       CreateDate = q1.CreateDate
                                    };
 
             var query = await q.Distinct().ToListAsync();
@@ -320,15 +322,17 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 var Detail = _context.FqcInhouseDetails.Where(w => w.InhouseNo == inhouseNo && w.SeqID == seqid);
 
-                foreach (var item in Detail)
+                foreach (var serialNo in Detail.Select(s => s.SerialNo).Distinct())
                 {
                     // 取抽驗結果明細檔資料
                     var FqcResultDetail = _context.FqcResultDetails.Where(w => w.FqcID == query.FirstOrDefault().FqcID
-                                           && w.BoxNo == item.SerialNo).ToList();
+                                           && w.BoxNo == serialNo).ToList();
+                    var barInfoBoxCount = _context.BarcodeInfoes.Where(w => w.BoxNo == serialNo).Count();
+                    var FqcInhouseDetailBoxCount = Detail.Where(w => w.SerialNo == serialNo).Count();
                     FqcDetail.Add(new FqcDto.FqcDetailDto
                     {
-                        SerialNo = item.SerialNo,
-                        Qty = _context.BarcodeInfoes.Where(w => w.BoxNo == item.SerialNo).Count(),
+                        SerialNo = serialNo,
+                        Qty = barInfoBoxCount == 0 ? FqcInhouseDetailBoxCount : barInfoBoxCount,
                         HasQty = FqcResultDetail.Count(),
                         PassQty = FqcResultDetail.Where(w => w.StatusNo != "F").Count(),
                         FailQty = FqcResultDetail.Where(w => w.StatusNo == "F").Count()
@@ -369,6 +373,89 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return result;
         }
 
+        /// <summary>
+        /// 確認FQC開立抽驗時，是否資料與流程都完成
+        /// </summary>
+        /// <param name="inhouseNo">入庫單號碼</param>
+        /// <param name="wipNo">工單號碼</param>
+        /// <param name="seqid">序號</param>
+        /// <returns></returns>
+        [HttpGet("CheckFqcIssue")]
+        public async Task<ResultModel<string>> CheckFqcIssue(string inhouseNo, string wipNo, int seqid = 1)
+        {
+            ResultModel<string> result = new ResultModel<string> { Success = true };
+            var wip = await _context.WipInfos.Where(w => w.WipNO.Trim().ToUpper() == wipNo.Trim().ToUpper()).FirstOrDefaultAsync();
+
+            // 無序號工單不需要判斷
+            if (wip != null)
+            {
+                if (wip.WipType == "N")
+                    return result;
+            }
+
+            var CheckFqcNextProcess = await GetCheckFqcNextProcess(inhouseNo, seqid);
+
+            if (CheckFqcNextProcess.Any())
+            {
+                result.Success = false;
+                result.Msg = "該筆入庫單尚有序號未跑完流程，請確認";
+                return result;
+            }
+
+            var CheckFqcDetailExist = await GetCheckFqcDetailExist(inhouseNo, seqid);
+            if (!CheckFqcDetailExist.Any())
+            {
+                result.Success = false;
+                result.Msg = "該筆入庫單未有箱號紀錄，請確認";
+                return result;
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// 確認FQC抽驗時是否已經跑到FQC流程
+        /// </summary>
+        /// <param name="inhouseNo">入庫單號碼</param>
+        /// <param name="seqid">序號</param>
+        /// <returns>有資料:尚未跑完流程</returns>
+        private async Task<List<dynamic>> GetCheckFqcNextProcess(string inhouseNo, int seqid = 1)
+        {
+            var querySql = @"  SELECT A.STATION_ID , A.WIP_ID , A.FLOW_RULE_ID , A.NEXT_STATION_ID FROM
+                               (SELECT B.STATION_ID , B.WIP_ID , W.FLOW_RULE_ID , R.NEXT_STATION_ID FROM JHAMES.FQC_INHOUSE_DETAIL D 
+                               INNER JOIN JHAMES.BARCODE_INFO B ON D.SERIAL_NO = B.BOX_NO
+                               INNER JOIN JHAMES.WIP_INFO W ON B.WIP_ID = W.WIP_ID
+                               INNER JOIN JHAMES.RULES R ON R.FLOW_RULE_ID = W.FLOW_RULE_ID AND R.STATION_ID = B.STATION_ID
+                               WHERE D.INHOUSE_NO = :InhouseNo AND D.SEQ_ID=:Seqid
+                               GROUP BY B.STATION_ID , B.WIP_ID , W.FLOW_RULE_ID , R.NEXT_STATION_ID) A ,
+                               JHAMES.STATIONS S WHERE S.STATION_ID=A.NEXT_STATION_ID AND S.TYPE_NO != 'F' ";
+
+            DynamicParameters p = new DynamicParameters();
+            p.Add("InhouseNo", inhouseNo);
+            p.Add("SeqId", seqid);
+            var result = await _context.Database.DapperQueryAsync<dynamic>(querySql, p);
+            return result.ToList();
+        }
+
+        /// <summary>
+        /// 確認FQC開立抽驗時，InhouseDetail是否有資料
+        /// </summary>
+        /// <param name="inhouseNo">入庫單號碼</param>
+        /// <param name="seqid">序號</param>
+        /// <returns>沒資料:Detail沒有資料</returns>
+        private async Task<List<dynamic>> GetCheckFqcDetailExist(string inhouseNo, int seqid = 1)
+        {
+            var querySql = @"  SELECT * FROM JHAMES.FQC_INHOUSE_MASTER M 
+                               INNER JOIN JHAMES.FQC_INHOUSE_DETAIL D ON M.INHOUSE_NO = D.INHOUSE_NO AND M.SEQ_ID = D.SEQ_ID
+                               INNER JOIN JHAMES.WIP_INFO W ON W.WIP_NO = M.WIP_NO AND W.WIP_TYPE != 'N' 
+                               WHERE D.INHOUSE_NO = :InhouseNo AND D.SEQ_ID=:Seqid ";
+            DynamicParameters p = new DynamicParameters();
+            p.Add("InhouseNo", inhouseNo);
+            p.Add("SeqId", seqid);
+            var result = await _context.Database.DapperQueryAsync<dynamic>(querySql, p);
+            return result.ToList();
+        }
+
         /// <summary>
         /// 更新入庫單
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcItemController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcItemController.cs
index 1b0d01fb..26865ac9 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcItemController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcItemController.cs
@@ -7,11 +7,13 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using AMESCoreStudio.WebApi;
 using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.CommonTools.Result;
+using AMESCoreStudio.WebApi.DTO.AMES;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
     /// <summary>
-    /// FQC檢驗結果ID
+    /// FQC檢驗項目群組綁定設定檔
     /// </summary>
     [Route("api/[controller]")]
     [ApiController]
@@ -24,104 +26,134 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             _context = context;
         }
 
-        // GET: api/FqcItem
         [HttpGet]
         public async Task<ActionResult<IEnumerable<FqcItem>>> GetFqcItems()
         {
             return await _context.FqcItems.ToListAsync();
         }
 
-        // GET: api/FqcItem/5
         [HttpGet("{id}")]
         public async Task<ActionResult<FqcItem>> GetFqcItem(int id)
         {
             var fqcItem = await _context.FqcItems.FindAsync(id);
-
-            if (fqcItem == null)
-            {
-                return NotFound();
-            }
-
             return fqcItem;
         }
 
-        // PUT: api/FqcItem/5
-        // To protect from overposting attacks, enable the specific properties you want to bind to, for
-        // more details, see https://go.microsoft.com/fwlink/?linkid=2123754.
-        [HttpPut("{id}")]
-        public async Task<IActionResult> PutFqcItem(int id, FqcItem fqcItem)
+        /// <summary>
+        /// FQC檢驗項目群組綁定設定檔 to GroupID(FQC檢驗群組)
+        /// </summary>
+        /// <param name="id">料號</param>
+        /// <returns></returns>
+        [HttpGet("ByFqcGroupId/{id}")]
+        public async Task<IEnumerable<FqcItem>> GetFqcItemByFqcGroupId(int id)
         {
-            if (id != fqcItem.FqcID)
-            {
-                return BadRequest();
-            }
+            IQueryable<FqcItem> q = _context.FqcItems;
+            var result = await q.Where(p => p.GroupId == id).ToListAsync();
+            return result;
+        }
+
+        /// <summary>
+        /// 料號查詢FQC檢驗群組及綁定檢驗工項
+        /// </summary>
+        /// <param name="id">料號</param>
+        /// <returns></returns>
+        [HttpGet("ByItemNo/{id}")]
+        public async Task<ActionResult<IEnumerable<FqcItem>>> GetFqcItemByItemNo(string id)
+        {
+            var itemID = 0;
+            var result = await _context.MaterialItems.Where(w => w.ItemNo == id).ToListAsync();
+            if (result.Count() != 0)
+                itemID = result.FirstOrDefault().ItemID;
+
+            var q = from q1 in _context.FqcItems
+                    join q2 in _context.FqcItemGroupMaterials on q1.GroupId equals q2.GroupId where q2.ItemId == itemID
+                    select q1;
+                 
+            return await q.ToListAsync();
+        }
 
+        /// <summary>
+        /// 更新檢驗項目群組綁定設定檔
+        /// </summary>
+        /// <param name="fqcItem"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<ResultModel<FqcItem>> PutFqcItem(FqcItem fqcItem)
+        {
+            ResultModel<FqcItem> result = new ResultModel<FqcItem>();
             _context.Entry(fqcItem).State = EntityState.Modified;
+            _context.Entry<FqcItem>(fqcItem).Property("CreateDate").IsModified = false;
+            _context.Entry<FqcItem>(fqcItem).Property("CreateUserID").IsModified = false;
+            fqcItem.UpdateDate = DateTime.Now;
 
             try
             {
                 await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
             }
-            catch (DbUpdateConcurrencyException)
+            catch (Exception ex)
             {
-                if (!FqcItemExists(id))
-                {
-                    return NotFound();
-                }
-                else
-                {
-                    throw;
-                }
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
             }
-
-            return NoContent();
+            return result;
         }
 
-        // POST: api/FqcItem
-        // To protect from overposting attacks, enable the specific properties you want to bind to, for
-        // more details, see https://go.microsoft.com/fwlink/?linkid=2123754.
+        /// <summary>
+        /// 新增檢驗項目群組綁定設定檔
+        /// </summary>
+        /// <param name="fqcItem"></param>
+        /// <returns></returns>
         [HttpPost]
-        public async Task<ActionResult<FqcItem>> PostFqcItem(FqcItem fqcItem)
+        public async Task<ResultModel<FqcItem>> PostFqcItem(FqcItem fqcItem)
         {
+            ResultModel<FqcItem> result = new ResultModel<FqcItem>();
+            Helper helper = new Helper(_context);
+            fqcItem.FqcItemId = helper.GetIDKey("FQC_ITEM_ID").Result;
             _context.FqcItems.Add(fqcItem);
             try
             {
                 await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
             }
-            catch (DbUpdateException)
+            catch (Exception ex)
             {
-                if (FqcItemExists(fqcItem.FqcID))
-                {
-                    return Conflict();
-                }
-                else
-                {
-                    throw;
-                }
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
             }
-
-            return CreatedAtAction("GetFqcItem", new { id = fqcItem.FqcID }, fqcItem);
+            return result;
         }
 
         // DELETE: api/FqcItem/5
         [HttpDelete("{id}")]
-        public async Task<ActionResult<FqcItem>> DeleteFqcItem(int id)
+        public async Task<ResultModel<string>> DeleteFqcItem(int id)
         {
+            ResultModel<string> result = new ResultModel<string>();
             var fqcItem = await _context.FqcItems.FindAsync(id);
-            if (fqcItem == null)
+
+            try
             {
-                return NotFound();
+                if (fqcItem == null)
+                {
+                    result.Success = false;
+                    result.Msg = "找不到要刪除資料";
+                }
+                else
+                {
+                    _context.FqcItems.Remove(fqcItem);
+                    await _context.SaveChangesAsync();
+                    result.Success = true;
+                    result.Msg = "OK";
+                }
             }
-
-            _context.FqcItems.Remove(fqcItem);
-            await _context.SaveChangesAsync();
-
-            return fqcItem;
-        }
-
-        private bool FqcItemExists(int id)
-        {
-            return _context.FqcItems.Any(e => e.FqcID == id);
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
+            }
+            return result;
         }
     }
 }
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcItemGroupController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcItemGroupController.cs
new file mode 100644
index 00000000..3b4f284d
--- /dev/null
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcItemGroupController.cs
@@ -0,0 +1,196 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using AMESCoreStudio.WebApi;
+using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.CommonTools.Result;
+using System.Text.RegularExpressions;
+using Dapper;
+using AMESCoreStudio.WebApi.Extensions;
+using System.Data;
+
+namespace AMESCoreStudio.WebApi.Controllers.AMES
+{
+    /// <summary>
+    /// FQC檢驗項目群組名稱設定檔
+    /// </summary>
+    [Route("api/[controller]")]
+    [ApiController]
+    public class FqcItemGroupController : ControllerBase
+    {
+        private readonly AMESContext _context;
+
+        public FqcItemGroupController(AMESContext context)
+        {
+            _context = context;
+        }
+
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<FqcItemGroup>>> GetFqcItemGroups()
+        {
+            return await _context.FqcItemGroups.ToListAsync();
+        }
+
+        [HttpGet("{id}")]
+        public async Task<ActionResult<FqcItemGroup>> GetFqcItemGroup(int id)
+        {
+            var fqcItemGroup = await _context.FqcItemGroups.FindAsync(id);
+            return fqcItemGroup;
+        }
+
+        /// <summary>
+        /// FQC檢驗項目群組名稱設定檔 By Query
+        /// </summary>
+        /// <param name="no">群組代號</param>
+        /// <param name="name">群組名稱</param>
+        /// <param name="desc">群組描述</param>
+        /// <param name="itemNo">料號</param>
+        /// <param name="page">頁數</param>
+        /// <param name="limit">筆數</param>
+        /// <returns></returns>
+        [HttpGet("FqcItemGroupQuery")]
+        public async Task<ResultModel<FqcItemGroup>> GetFqcItemGroupQuery(string no, string name, string desc, string itemNo, int page = 0, int limit = 10)
+        {
+            ResultModel<FqcItemGroup> result = new ResultModel<FqcItemGroup>();
+
+            var query = @$" SELECT DISTINCT
+                            G.FQC_ITEM_GROUP_ID AS fqcItemGroupId , 
+                            G.ITEM_GROUP_NO AS itemGroupNo ,
+                            G.ITEM_GROUP_NAME AS itemGroupName ,
+                            G.ITEM_GROUP_DESC AS itemGroupDesc
+                            FROM JHAMES.FQC_ITEM_GROUP G 
+                            LEFT JOIN JHAMES.FQC_ITEM_GROUP_MATERIAL GM ON G.FQC_ITEM_GROUP_ID = GM.GROUP_ID
+                            LEFT JOIN JHAMES.MATERIAL_ITEM M ON GM.ITEM_ID = M.ITEM_ID 
+                            WHERE 1 = 1 ";
+
+            DynamicParameters p = new DynamicParameters();
+            if (!string.IsNullOrWhiteSpace(no))
+            {
+                query += " AND UPPER(G.ITEM_GROUP_NO) LIKE :No ";
+                p.Add("No", $"%{no.Trim().ToUpper()}%", DbType.String);
+            }
+
+            if (!string.IsNullOrWhiteSpace(name))
+            {
+                query += " AND G.ITEM_GROUP_NAME LIKE :Name ";
+                p.Add("Name", $"%{name.Trim().ToUpper()}%", DbType.String);
+            }
+
+            if (!string.IsNullOrWhiteSpace(desc))
+            {
+                query += " AND G.ITEM_GROUP_DESC LIKE :GroupDesc ";
+                p.Add("GroupDesc", $"%{desc.Trim().ToUpper()}%", DbType.String);
+            }
+
+            if (!string.IsNullOrWhiteSpace(itemNo))
+            {
+                query += " AND UPPER(M.ITEM_NO) LIKE :ItemNo ";
+                p.Add("ItemNo", $"%{itemNo.Trim().ToUpper()}%", DbType.String);
+            }
+
+            var q = await _context.Database.DapperQueryAsync<FqcItemGroup>(query, p);
+
+            // 紀錄筆數
+            result.DataTotal = q.Count();
+
+            // Table 頁數
+            if (page > 0)
+            {
+                q = q.Skip((page - 1) * limit).Take(limit);
+            }
+            result.Data = q;
+            return result;
+        }
+
+        /// <summary>
+        /// 更新FQC檢驗項目群組名稱設定檔
+        /// </summary>
+        /// <param name="fqcItemGroup"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<ResultModel<FqcItemGroup>> PutFqcItemGroup(FqcItemGroup fqcItemGroup)
+        {
+            ResultModel<FqcItemGroup> result = new ResultModel<FqcItemGroup>();
+            _context.Entry(fqcItemGroup).State = EntityState.Modified;
+            _context.Entry<FqcItemGroup>(fqcItemGroup).Property("CreateDate").IsModified = false;
+            _context.Entry<FqcItemGroup>(fqcItemGroup).Property("CreateUserID").IsModified = false;
+            fqcItemGroup.UpdateDate = DateTime.Now;
+
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 新增FQC檢驗項目群組名稱設定檔
+        /// </summary>
+        /// <param name="fqcItemGroup"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<ResultModel<FqcItemGroup>> PostFqcItemGroup(FqcItemGroup fqcItemGroup)
+        {
+            ResultModel<FqcItemGroup> result = new ResultModel<FqcItemGroup>();
+            Helper helper = new Helper(_context);
+            fqcItemGroup.FqcItemGroupId = helper.GetIDKey("FQC_ITEM_GROUP_ID").Result;
+            _context.FqcItemGroups.Add(fqcItemGroup);
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
+            }
+            return result;
+        }
+
+        [HttpDelete("{id}")]
+        public async Task<ResultModel<string>> DeleteFqcItemGroup(int id)
+        {
+            ResultModel<string> result = new ResultModel<string>();
+            var fqcItemGroup = await _context.FqcItemGroups.FindAsync(id);
+            var fqcItem = await _context.FqcItems.Where(w => w.GroupId == id).ToListAsync();
+            var fqcItemGroupMaterial = await _context.FqcItemGroupMaterials
+                                             .Where(w => w.GroupId == id).ToListAsync();
+            try
+            {
+                if (fqcItemGroup == null)
+                {
+                    result.Success = false;
+                    result.Msg = "找不到要刪除資料";
+                }
+                else
+                {
+                    _context.FqcItemGroups.Remove(fqcItemGroup);
+                    _context.FqcItems.RemoveRange(fqcItem);
+                    _context.FqcItemGroupMaterials.RemoveRange(fqcItemGroupMaterial);
+                    await _context.SaveChangesAsync();
+                    result.Success = true;
+                    result.Msg = "OK";
+                }
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
+            }
+            return result;
+        }
+    }
+}
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcItemGroupMaterialController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcItemGroupMaterialController.cs
new file mode 100644
index 00000000..5e1412f7
--- /dev/null
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcItemGroupMaterialController.cs
@@ -0,0 +1,159 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using AMESCoreStudio.WebApi;
+using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.CommonTools.Result;
+using System.Text.RegularExpressions;
+using Dapper;
+using AMESCoreStudio.WebApi.Extensions;
+
+namespace AMESCoreStudio.WebApi.Controllers.AMES
+{
+    /// <summary>
+    /// FQC檢驗項目群組指定料號設定檔
+    /// </summary>
+    [Route("api/[controller]")]
+    [ApiController]
+    public class FqcItemGroupMaterialController : ControllerBase
+    {
+        private readonly AMESContext _context;
+
+        public FqcItemGroupMaterialController(AMESContext context)
+        {
+            _context = context;
+        }
+
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<FqcItemGroupMaterial>>> GetFqcItemGroupMaterials()
+        {
+            return await _context.FqcItemGroupMaterials.ToListAsync();
+        }
+
+        /// <summary>
+        /// By GroupId 查詢
+        /// </summary>
+        /// <param name="id">GroupId</param>
+        /// <returns></returns>
+        [HttpGet("ByGroupId/{id}")]
+        public async Task<ActionResult<IEnumerable<FqcItemGroupMaterial>>> GetFqcItemGroupMaterialByGroupId(int id)
+        {
+            var query = @"  SELECT 
+                                F.GROUP_ID AS groupId , 
+                                M.ITEM_ID AS itemId , 
+                                M.ITEM_NO AS itemNo , 
+                                M.ITEM_DESC AS itemDesc ,
+                                F.CREATE_USERID AS createUserID ,
+                                F.CREATE_DATE AS createDate , 
+                                F.UPDATE_USERID AS updateUserID ,
+                                F.UPDATE_DATE AS updateDate 
+                                FROM JHAMES.FQC_ITEM_GROUP_MATERIAL F
+                                INNER JOIN JHAMES.MATERIAL_ITEM M ON F.ITEM_ID = M.ITEM_ID 
+                                WHERE F.GROUP_ID = :GroupId";
+            DynamicParameters p = new DynamicParameters();
+            p.Add("GroupId", id);
+            var result = await _context.Database.DapperQueryAsync<FqcItemGroupMaterial>(query, p);
+            return result.ToList();
+        }
+
+        /// <summary>
+        /// By ItemId 查詢
+        /// </summary>
+        /// <param name="id">ItemId</param>
+        /// <returns></returns>
+        [HttpGet("ByItemId/{id}")]
+        public async Task<ActionResult<IEnumerable<FqcItemGroupMaterial>>> GetFqcItemGroupMaterialByItemId(int id)
+        {
+            var query = @"  SELECT 
+                                F.GROUP_ID AS groupId , 
+                                M.ITEM_ID AS itemId , 
+                                M.ITEM_NO AS itemNo , 
+                                M.ITEM_DESC AS itemDesc ,
+                                F.CREATE_USERID AS createUserID ,
+                                F.CREATE_DATE AS createDate , 
+                                F.UPDATE_USERID AS updateUserID ,
+                                F.UPDATE_DATE AS updateDate 
+                                FROM JHAMES.FQC_ITEM_GROUP_MATERIAL F
+                                INNER JOIN JHAMES.MATERIAL_ITEM M ON F.ITEM_ID = M.ITEM_ID 
+                                WHERE F.ITEM_ID = :ItemId";
+            DynamicParameters p = new DynamicParameters();
+            p.Add("ItemId", id);
+            var result = await _context.Database.DapperQueryAsync<FqcItemGroupMaterial>(query, p);
+            return result.ToList();
+        }
+
+        /// <summary>
+        /// 更新檢驗群組指定料號設定檔
+        /// </summary>
+        /// <param name="fqcItemGroupMaterial"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<ResultModel<FqcItemGroupMaterial>> PutFqcItemGroupMaterial(FqcItemGroupMaterial fqcItemGroupMaterial)
+        {
+            ResultModel<FqcItemGroupMaterial> result = new ResultModel<FqcItemGroupMaterial>();
+            _context.Entry(fqcItemGroupMaterial).State = EntityState.Modified;
+            _context.Entry<FqcItemGroupMaterial>(fqcItemGroupMaterial).Property("CreateDate").IsModified = false;
+            _context.Entry<FqcItemGroupMaterial>(fqcItemGroupMaterial).Property("CreateUserID").IsModified = false;
+            fqcItemGroupMaterial.UpdateDate = DateTime.Now;
+
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 新增檢驗群組指定料號設定檔
+        /// </summary>
+        /// <param name="fqcItemGroupMaterial"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<ResultModel<FqcItemGroupMaterial>> PostFqcItemGroupMaterial(FqcItemGroupMaterial fqcItemGroupMaterial)
+        {
+            ResultModel<FqcItemGroupMaterial> result = new ResultModel<FqcItemGroupMaterial>();
+            _context.FqcItemGroupMaterials.Add(fqcItemGroupMaterial);
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 刪除 檢驗群組指定料號設定檔
+        /// </summary>
+        /// <param name="id">GroupId</param>
+        /// <param name="id1">itemId</param>
+        /// <returns></returns>
+        [HttpDelete("{id}/{id1}")]
+        public async Task<ActionResult<int>> DeleteFqcItemGroupMaterial(int id, int id1)
+        {
+            var query = @" DELETE JHAMES.FQC_ITEM_GROUP_MATERIAL WHERE GROUP_ID =:id 
+                           AND ITEM_ID = :id1";
+            DynamicParameters p = new DynamicParameters();
+            p.Add("id", id);
+            p.Add("id1", id1);
+            var result = await _context.Database.DapperExecuteAsync(query, p);
+            return result;
+        }
+    }
+}
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultMasterController.cs
index 361758cd..390b12be 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultMasterController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultMasterController.cs
@@ -345,6 +345,39 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return result;
         }
 
+        /// <summary>
+        /// 執行判斷無序號工單檢驗完成
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet("ExecuteWithoutWipNoComplete/{id}")]
+        public async Task<ActionResult<string>> ExecuteWithoutWipNoComplete(string id)
+        {
+            var query = @$" SELECT SUM(INHOUSE_QTY) , PLAN_QTY , WIP_NO FROM
+                            (SELECT DISTINCT I.INHOUSE_QTY , I.INHOUSE_NO , I.SEQ_ID , W.PLAN_QTY, W.WIP_NO
+                            FROM JHAMES.FQC_INHOUSE_MASTER I
+                            INNER JOIN JHAMES.FQC_RESULT_MASTER F ON I.INHOUSE_NO = F.INHOUSE_NO AND I.SEQ_ID = F.SEQ_ID
+                            INNER JOIN JHAMES.WIP_INFO W ON F.WIP_NO = W.WIP_NO
+                            WHERE F.INSPECTION_STATUS = 'D' 
+                            AND I.STATUS = 'P'
+                            AND I.WIP_NO=:WipNo) A
+                            GROUP BY WIP_NO, PLAN_QTY 
+                            HAVING SUM(INHOUSE_QTY) = PLAN_QTY ";
+
+            DynamicParameters p = new DynamicParameters();
+            p.Add("WipNo", id.Trim().ToUpper(), DbType.String);
+            var q = await _context.Database.DapperQueryAsync<dynamic>(query, p);
+
+            if (q.Any())
+            {
+                query = @" UPDATE JHAMES.WIP_INFO SET STATUS_NO='E' WHERE WIP_NO=:WipNo ";
+                await _context.Database.DapperExecuteAsync(query, p);
+                return "該筆工單已執行結案";
+            }
+
+            return "該筆工單尚未全部抽驗完成";
+        }
+
         /// <summary>
         /// 更新FQC檢驗單結果
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/MaterialItemController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/MaterialItemController.cs
index 734bc238..4971d029 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/MaterialItemController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/MaterialItemController.cs
@@ -68,7 +68,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         public async Task <MaterialItem> GetMaterialItemByItemNO(string id)
         {
             IQueryable<MaterialItem> q = _context.MaterialItems;
-            var result =  q.Where(p => p.ItemNo == id).FirstOrDefault();
+            var result =  await q.Where(p => p.ItemNo == id).FirstOrDefaultAsync();
 
             return result;
         }
@@ -87,6 +87,18 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return result;
         }
 
+        /// <summary>
+        /// 關鍵字查詢
+        /// </summary>
+        /// <param name="id">料號</param>
+        /// <returns></returns>
+        [HttpGet("AutoComplete/{id}")]
+        public async Task<ActionResult<IEnumerable<MaterialItem>>> GetMeterialAutoComplete(string id)
+        {
+            var materialItems = await _context.MaterialItems.Where(w => w.ItemNo.ToUpper().Contains(id.ToUpper())).Take(20).ToListAsync();
+            return materialItems;
+        }
+
         /// <summary>
         /// 新增料號基本資料檔
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/QcItemController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/QcItemController.cs
index d8501646..78b52aba 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/QcItemController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/QcItemController.cs
@@ -56,9 +56,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <param name="limit">筆數</param>
         /// <param name="itemNo">料號</param>
         /// <param name="wipNo">工單號碼</param>
+        /// <param name="fqcItemGroupId">FQC檢驗設定群組</param>
         /// <returns></returns>
         [HttpGet("QcItemQuery")]
-        public async Task<ResultModel<QcItemDto>> GetQcItemQuery(int groupID = 0, int page = 0, int limit = 10, string itemNo = null, string wipNo = null)
+        public async Task<ResultModel<QcItemDto>> GetQcItemQuery(int groupID = 0, int page = 0, int limit = 10, string itemNo = null, string wipNo = null, int fqcItemGroupId = 0)
         {
             IQueryable<QcItem> q = _context.QcItems;
             ResultModel<QcItemDto> result = new ResultModel<QcItemDto>();
@@ -75,8 +76,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 q = q.Skip((page - 1) * limit).Take(limit);
             }
 
-            //var aa = System.Enum.IsDefined(typeof(EnumFQC.EnumQCItem_Type), "A") ? EnumFQC.GetDisplayName((EnumFQC.EnumQCItem_Type)System.Enum.Parse(typeof(EnumFQC.EnumQCItem_Type), "A")) : "";
-
             result.Data = await q.Select(s => new QcItemDto
             {
                 ItemID = s.ItemID,
@@ -91,19 +90,30 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 GroupNameEN = s.GetQcGroup.GroupNameCN ?? "",
                 ItemType = s.Type
             }).ToListAsync();
+
             // 先判斷工單是否有資料
-            var wipFqcItem = await _context.WipFqcItems.Where(w => w.WipNo == wipNo).ToListAsync();
-            if (wipFqcItem.Count != 0)
+            if (!string.IsNullOrWhiteSpace(wipNo))
             {
-                foreach (var item in result.Data)
+                var wipFqcItem = await _context.WipFqcItems.Where(w => w.WipNo == wipNo).ToListAsync();
+                if (wipFqcItem.Count != 0)
                 {
-                    if (wipFqcItem.Where(w => w.QcItemID == item.ItemID).Any())
-                        item.check = true;
+                    foreach (var item in result.Data)
+                    {
+                        if (wipFqcItem.Where(w => w.QcItemID == item.ItemID).Any())
+                            item.check = true;
+                    }
+                    result.Data.Select(s => s.ItemTypeName =
+                                              System.Enum.IsDefined(typeof(EnumFQC.EnumQCItem_Type), s.ItemType ?? "") ?
+                                              EnumFQC.GetDisplayName((EnumFQC.EnumQCItem_Type)System.Enum.Parse(typeof(EnumFQC.EnumQCItem_Type), s.ItemType)) : "")
+                                              .ToList();
+
+                    return result;
                 }
             }
-            else
+
+            // 有輸入料號跟QCITEM 比對有資料打勾
+            if (!string.IsNullOrWhiteSpace(itemNo))
             {
-                // 有輸入料號跟QCITEM 比對有資料打勾
                 var itemID = _context.MaterialItems.Where(w => w.ItemNo == itemNo).FirstOrDefault();
                 if (itemID != null)
                 {
@@ -116,6 +126,17 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 }
             }
 
+            // 有設定FQC檢驗項目群組
+            if (fqcItemGroupId != 0)
+            {
+                var fqcItem = await _context.FqcItems.Where(w => w.GroupId == fqcItemGroupId).ToListAsync();
+                foreach (var item in result.Data)
+                {
+                    if (fqcItem.Where(w => w.QcItemId == item.ItemID).Any())
+                        item.check = true;
+                }
+            }
+
             result.Data.Select(s => s.ItemTypeName =
             System.Enum.IsDefined(typeof(EnumFQC.EnumQCItem_Type), s.ItemType ?? "") ?
             EnumFQC.GetDisplayName((EnumFQC.EnumQCItem_Type)System.Enum.Parse(typeof(EnumFQC.EnumQCItem_Type), s.ItemType)) : "")
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipFqcItemController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipFqcItemController.cs
index 3fe31a14..154d675e 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipFqcItemController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipFqcItemController.cs
@@ -8,6 +8,8 @@ using Microsoft.EntityFrameworkCore;
 using AMESCoreStudio.WebApi;
 using AMESCoreStudio.WebApi.Models.AMES;
 using AMESCoreStudio.CommonTools.Result;
+using Dapper;
+using AMESCoreStudio.WebApi.Extensions;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
@@ -113,6 +115,59 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return result;
         }
 
+        /// <summary>
+        /// 判斷工單號碼是否有資料，沒有在取FQC群組建立資料
+        /// </summary>
+        /// <param name="wipNo">工單號碼</param>
+        /// <returns></returns>
+        [HttpPost("ByWipNo/{wipNo}")]
+        public async Task<ResultModel<WipFqcItem>> PostWipFqcItemByWipNo(string wipNo)
+        {
+            var wipFqcItem = await _context.WipFqcItems.Where(w => w.WipNo == wipNo).AnyAsync();
+            ResultModel<WipFqcItem> result = new ResultModel<WipFqcItem> { Success = true };
+            // 沒有資料 再由FQC_ITEM新增
+            if (!wipFqcItem)
+            {
+                var querySql = @" SELECT DISTINCT A.WIP_NO AS WipNo , 
+                                  A.ITEM_NO AS ItemNo , 
+                                  F.QC_GROUP_ID AS QcGroupID , 
+                                  F.QC_ITEM_ID AS QcItemID
+                                  FROM JHAMES.WIP_ATT A
+                                  INNER JOIN JHAMES.MATERIAL_ITEM M ON A.ITEM_NO = M.ITEM_NO-- 料號對應檔
+                                  INNER JOIN JHAMES.FQC_ITEM_GROUP_MATERIAL FM ON FM.ITEM_ID = M.ITEM_ID--料號ID對應FQC群組
+                                  INNER JOIN JHAMES.FQC_ITEM F ON F.GROUP_ID = FM.GROUP_ID-- FQC群組對應綁定項目
+                                  WHERE A.WIP_NO = :WipNo ";
+
+                DynamicParameters p = new DynamicParameters();
+                p.Add("WipNo", wipNo);
+                var query = await _context.Database.DapperQueryAsync<WipFqcItem>(querySql, p);
+
+                if (query.Any())
+                {
+                    Helper helper = new Helper(_context);
+                    foreach (var item in query)
+                    {
+                        item.WipFqcitemID = helper.GetIDKey("WIP_FQCITEM_ID").Result;
+                        _context.WipFqcItems.Add(item);
+                    }
+
+                    try
+                    {
+                        await _context.SaveChangesAsync();
+                        result.Success = true;
+                        result.Msg = "OK";
+                    }
+                    catch (Exception ex)
+                    {
+                        result.Success = false;
+                        result.Msg = ex.InnerException.Message;
+                    }
+                    return result;
+                }
+            }
+            return result;
+        }
+
         // DELETE: api/WipFqcItem/5
         [HttpDelete("{id}")]
         public async Task<ActionResult<WipFqcItem>> DeleteWipFqcItem(int id)
diff --git a/AMESCoreStudio.WebApi/DTO/AMES/FqcDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/FqcDto.cs
index 85777e3c..1b885659 100644
--- a/AMESCoreStudio.WebApi/DTO/AMES/FqcDto.cs
+++ b/AMESCoreStudio.WebApi/DTO/AMES/FqcDto.cs
@@ -375,7 +375,15 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         [DataMember]
         [StringLength(5)]
         public string LocationNo { get; set; }
-        
+
+        /// <summary>
+        /// 入庫單開單時間
+        /// </summary>
+        [NotMapped]
+        [DataMember]
+        [Display(Name = "入庫單開單時間")]
+        public DateTime CreateDate { get; set; }
+
 
         public List<FqcDetailDto> fqcDetails { get; set; }
 
diff --git a/AMESCoreStudio.WebApi/DTO/AMES/FqcResultDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/FqcResultDto.cs
index b970b3a0..75da362d 100644
--- a/AMESCoreStudio.WebApi/DTO/AMES/FqcResultDto.cs
+++ b/AMESCoreStudio.WebApi/DTO/AMES/FqcResultDto.cs
@@ -63,7 +63,7 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         /// </summary>
         [Display(Name = "狀態")]
         [Column("STATUS_NO")]
-        public string StatusNo { get; set; } = "P";
+        public string StatusNo { get; set; }
 
         /// <summary>
         /// IsSample
diff --git a/AMESCoreStudio.WebApi/Models/AMES/FqcItem.cs b/AMESCoreStudio.WebApi/Models/AMES/FqcItem.cs
index bc1b9e88..f3cd5815 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/FqcItem.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/FqcItem.cs
@@ -2,51 +2,47 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
 using System.Runtime.Serialization;
+using Microsoft.EntityFrameworkCore;
 
 #nullable disable
 
 namespace AMESCoreStudio.WebApi.Models.AMES
 {
     /// <summary>
-    /// FQC细目資料檔
+    /// FQC檢驗項目群組綁定設定檔
     /// </summary>
-    [Keyless]
     [Table("FQC_ITEM", Schema = "JHAMES")]
-    [Index(nameof(FqcID), nameof(ItemID), Name = "FQC_ITEM_AK1", IsUnique = true)]
     public partial class FqcItem
     {
-
         /// <summary>
-        /// FQC檢驗結果ID
+        /// ID
         /// </summary>
         [Key]
         [DataMember]
-        [Display(Name = "FQC檢驗結果ID")]
-        [Required(ErrorMessage = "{0},不能空白")]
-        [Column("FQC_ID")]
-        public int FqcID { get; set; }
+        [Column("FQC_ITEM_ID")]
+        public int FqcItemId { get; set; }
 
         /// <summary>
-        /// 细目序號ID
+        /// FQC檢驗項目群組ID
+        /// </summary>
+        [DataMember]
+        [Column("GROUP_ID")]
+        public int GroupId { get; set; }
+
+        /// <summary>
+        /// 檢驗類別ID
         /// </summary>
-        [Key]
         [DataMember]
-        [Display(Name = "细目序號ID")]
-        [Required(ErrorMessage = "{0},不能空白")]
-        [Column("ITEM_ID")]
-        public int ItemID { get; set; }
+        [Column("QC_GROUP_ID")]
+        public int QcGroupId { get; set; }
 
         /// <summary>
-        /// 细目内容
+        /// 檢驗項目ID
         /// </summary>
         [DataMember]
-        [Display(Name = "细目内容")]
-        [Required(ErrorMessage = "{0},不能空白")]
-        [Column("ITEM_CONTENT")]
-        [StringLength(200)]
-        public string ItemContent { get; set; }
+        [Column("QC_ITEM_ID")]
+        public int QcItemId { get; set; }
 
         /// <summary>
         /// 建立UserID
diff --git a/AMESCoreStudio.WebApi/Models/AMESContext.cs b/AMESCoreStudio.WebApi/Models/AMESContext.cs
index 9283bd46..ab2a96bd 100644
--- a/AMESCoreStudio.WebApi/Models/AMESContext.cs
+++ b/AMESCoreStudio.WebApi/Models/AMESContext.cs
@@ -117,7 +117,6 @@ namespace AMESCoreStudio.WebApi
             modelBuilder.Entity<FqcInhouseDetail>().HasKey(c => new { c.InhouseNo, c.SeqID, c.SerialNo });
             modelBuilder.Entity<FqcResultDetail>().HasKey(c => new { c.FqcID, c.BoxNo, c.BarcodeNo });
             modelBuilder.Entity<FqcBarcode>().HasKey(c => new { c.FqcID, c.BarcodeID });
-            modelBuilder.Entity<FqcItem>().HasKey(c => new { c.FqcID, c.ItemID });
             modelBuilder.Entity<FqcResultMasterBlob>().HasKey(e => new { e.FqcID, e.CreateDate });
             modelBuilder.Entity<NgInfo>().HasOne(r => r.Barcode).WithMany().HasForeignKey(r => r.BarcodeID).IsRequired();
             modelBuilder.Entity<NgInfo>().HasOne(r => r.Wip).WithMany().HasForeignKey(r => r.WipId).IsRequired();
@@ -156,7 +155,7 @@ namespace AMESCoreStudio.WebApi
             modelBuilder.Entity<NGReason>().HasKey(c => new { c.NGClassNo, c.NGReasonNo });
             modelBuilder.Entity<QcRate>().HasKey(c => new { c.Yrer, c.Month, c.QcRateType, c.ProductType });
             modelBuilder.Entity<CSfisKeypart>().HasNoKey();
-
+            modelBuilder.Entity<FqcItemGroupMaterial>().HasKey(c => new { c.GroupId, c.ItemId });
             //modelBuilder.Entity<LabelItemReqModel>().HasOne(r => r.LabelTemplateMaster).WithMany().HasForeignKey(r => r.TEMPLATE_ID).IsRequired();
             //modelBuilder.Entity<LabelItemReqModel>().HasOne(r => r.LabelParam).WithMany().HasForeignKey(r => r.LABEL_FIELD_ID).IsRequired();
             //modelBuilder.Entity<LabelItemDetail>().HasOne(r => r.LabelTemplateMaster).WithMany().HasForeignKey(r => r.TEMPLATE_ID).IsRequired();
@@ -660,11 +659,6 @@ namespace AMESCoreStudio.WebApi
         /// </summary>
         public virtual DbSet<FqcBarcode> FqcBarcodes { get; set; }
 
-        /// <summary>
-        /// FQC细目資料檔
-        /// </summary>
-        public virtual DbSet<FqcItem> FqcItems { get; set; }
-
         /// <summary>
         /// 抽驗批退資料檔
         /// </summary>
@@ -1016,6 +1010,21 @@ namespace AMESCoreStudio.WebApi
         public DbSet<LabelItemParam> LabelItemParam { get; set; }
 
         public DbSet<NgKeypart> NgKeyparts { get; set; }
+
+        /// <summary>
+        /// FQC檢驗項目群組綁定設定檔
+        /// </summary>
+        public virtual DbSet<FqcItem> FqcItems { get; set; }
+
+        /// <summary>
+        /// FQC檢驗項目群組名稱
+        /// </summary>
+        public virtual DbSet<FqcItemGroup> FqcItemGroups { get; set; }
+
+        /// <summary>
+        /// FQC檢驗項目群組指定料號設定檔
+        /// </summary>
+        public virtual DbSet<FqcItemGroupMaterial> FqcItemGroupMaterials { get; set; }
     }
 
 }