diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs
index cc98044c..553f4cd8 100644
--- a/AMESCoreStudio.Web/Controllers/FQCController.cs
+++ b/AMESCoreStudio.Web/Controllers/FQCController.cs
@@ -105,19 +105,59 @@ namespace AMESCoreStudio.Web.Controllers
         }
 
         /// <summary>
-        /// 不良狀態 Select
+        /// 不良群組
         /// </summary>
         /// <returns></returns>
-        private async Task GetNGReasonSelect()
+        private async Task GetNGGroupSelect()
         {
-            var result = await _fqcApi.GetNGReasons();
+            var result = await _fqcApi.GetNGGroups(0);
 
-            var NGReasonList = new List<SelectListItem>();
+            var NGGroupList = new List<SelectListItem>();
             for (int i = 0; i < result.Count; i++)
             {
-                NGReasonList.Add(new SelectListItem(result[i].NGReasonDesc, result[i].NGReasonNo.ToString()));
+                NGGroupList.Add(new SelectListItem(result[i].NGGroupName, result[i].NGGroupNo.ToString()));
             }
-            ViewBag.NGReasonSelect = NGReasonList;
+            ViewBag.NGGroupSelect = NGGroupList;
+        }
+
+        /// <summary>
+        /// 不良類別 By NGGroup
+        /// </summary>
+        /// <param name="group_no">NGGroupNo</param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<JsonResult> GetNGClassByGroupAsync(string group_no)
+        {
+            var result = await _fqcApi.GetNGClassesByGroup(group_no);
+
+            var item = new List<SelectListItem>();
+
+            for (int i = 0; i < result.Count; i++)
+            {
+                item.Add(new SelectListItem(result[i].NGClassName, result[i].NGClassNo.ToString()));
+            }
+            //将数据Json化并传到前台视图
+            return Json(new { data = item });
+        }
+
+        /// <summary>
+        /// 不良原因 By NGClass
+        /// </summary>
+        /// <param name="ngClassNo"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<JsonResult> GetNGReasonsByClassAsync(string ngClassNo)
+        {
+            var result = await _fqcApi.GetNGReasonsByClass(ngClassNo);
+
+            var item = new List<SelectListItem>();
+
+            for (int i = 0; i < result.Count; i++)
+            {
+                item.Add(new SelectListItem(result[i].NGReasonDesc, result[i].NGReasonNo.ToString()));
+            }
+            //将数据Json化并传到前台视图
+            return Json(new { data = item });
         }
         #endregion
 
@@ -457,6 +497,7 @@ namespace AMESCoreStudio.Web.Controllers
         [HttpPost]
         public async Task<IActionResult> FQC005Async(QcCriterion model)
         {
+            await GetQcQuotSelect();
             if (ModelState.IsValid)
             {
                 #region 判斷設定起訖數量區間是否有重疊
@@ -605,7 +646,7 @@ namespace AMESCoreStudio.Web.Controllers
         #endregion
 
         #region FQC007 FQC抽驗作業
-        public async Task<IActionResult> FQC007()
+        public IActionResult FQC007()
         {
             var model = new FqcDto();
             return View(model);
@@ -615,9 +656,15 @@ namespace AMESCoreStudio.Web.Controllers
         [HttpPost]
         public async Task<IActionResult> FQC007Async(FqcDto model)
         {
+            if (string.IsNullOrWhiteSpace(model.InhouseNo))
+            {
+                ModelState.AddModelError("error", "請輸入入庫單號");
+                return View("FQC007", model);
+            }
+
             IResultModel<FqcDto> result;
 
-            result = await _fqcApi.GetFqcQuery(model.InhouseNo , model.SeqID);
+            result = await _fqcApi.GetFqcQuery(model.InhouseNo, model.SeqID);
 
             //if (result.Success)
             //{
@@ -628,24 +675,41 @@ namespace AMESCoreStudio.Web.Controllers
             //{
             //    ModelState.AddModelError("error", result.Msg);
             //}
-            model = result.Data.FirstOrDefault();
+
+
+            if (result.Data.Count() != 0)
+            {
+                model = result.Data.FirstOrDefault();
+                model.h_InhouseNo = model.InhouseNo;
+                model.h_SeqID = model.SeqID.ToString();
+            }
+            else
+            {
+                ModelState.AddModelError("error", "找不到入庫單號【" + model.InhouseNo + "】的資料");
+                model.h_InhouseNo = "";
+                model.h_SeqID = "";
+            }
+
             return View("FQC007", model);
         }
 
         [HttpGet]
-        public async Task<IActionResult> FQC007C(string inhouseNo, int seq)
+        public async Task<IActionResult> FQC007C(string inhouseNo, string seq)
         {
             await GetStatusTypeSelect();
-            await GetNGReasonSelect();
-            return View();
+            await GetNGGroupSelect();
+            var model = new FqcResultDto();
+            model.InhouseNo = inhouseNo;
+            model.SeqID = int.Parse(seq);
+            return View(model);
         }
 
         [HttpPost]
-        public async Task<IActionResult> FQC007CAsync(FqcResultDetail model)
+        public async Task<IActionResult> FQC007CAsync(FqcResultDto model)
         {
             await GetStatusTypeSelect();
-            await GetNGReasonSelect();
-            if (string.IsNullOrWhiteSpace(model.BarcodeNo) && 
+            await GetNGGroupSelect();
+            if (string.IsNullOrWhiteSpace(model.BarcodeNo) &&
                 string.IsNullOrWhiteSpace(model.BoxNo) &&
                 string.IsNullOrWhiteSpace(model.ExtraBarcodeNo))
             {
@@ -653,29 +717,187 @@ namespace AMESCoreStudio.Web.Controllers
                 return View("FQC007C", model);
             }
 
+            #region 相關查詢序號找出包裝箱號
+            var result_BarCodeInfo = new List<BarcodeInfo>();
+            if (!string.IsNullOrWhiteSpace(model.BarcodeNo))
+            {
+                result_BarCodeInfo = await _fqcApi.GetBarcodeInfoesByNo(model.BarcodeNo);
+            }
+            else if (!string.IsNullOrWhiteSpace(model.ExtraBarcodeNo))
+            {
+                result_BarCodeInfo = await _fqcApi.GetBarcodeInfoesByExtraNo(model.ExtraBarcodeNo);
+            }
+            else if (!string.IsNullOrWhiteSpace(model.BoxNo))
+            {
+                result_BarCodeInfo = await _fqcApi.GetBarcodeInfoesByBoxNo(model.BoxNo);
+            }
 
-            if (ModelState.IsValid)
+            if (result_BarCodeInfo.Count == 0)
             {
-                IResultModel result;
+                ModelState.AddModelError("error", "找不到相關資料");
+                return View("FQC007C", model);
+            }
+            else
+                model.BoxNo = result_BarCodeInfo.FirstOrDefault().BoxNo;
+            #endregion
 
-                result = await _fqcApi.PostStatusType(JsonConvert.SerializeObject(model));
+            #region 判斷是否包裝外箱是否跟入庫單號綁一起
+            var result_FqcInhouseDetail = await _fqcApi.GetFqcInhouseDetail(model.InhouseNo, model.SeqID);
+            if (!result_FqcInhouseDetail.Where(w => w.SerialNo == model.BoxNo).Any())
+            {
+                ModelState.AddModelError("error", "入庫單號【" + model.InhouseNo + "】找不到包裝箱號【" + model.BoxNo + "】");
+                return View("FQC007C", model);
+            }
+            #endregion
 
-                if (result.Success)
-                {
-                    var _msg = "新增成功！";
-                    return RedirectToAction("Refresh", "Home", new { msg = _msg });
-                }
-                else
+            #region Set_FqcResultDetail
+            if (model.StatusNo == "F" && model.NgReasonNo == "0")
+            {
+                ModelState.AddModelError("error", "請選擇不良代碼");
+                return View("FQC007C", model);
+            };
+
+            var FqcResultDetail = new FqcResultDetail
+            {
+                BarcodeNo = result_BarCodeInfo.FirstOrDefault().BarcodeNo,
+                ExtraBarcodeNo = result_BarCodeInfo.FirstOrDefault().ExtraBarcodeNo,
+                BoxNo = result_BarCodeInfo.FirstOrDefault().BoxNo,
+                StatusNo = model.StatusNo,
+                NgMemo = model.NgMemo,
+                NgReasonNo = model.NgReasonNo
+            };
+            #endregion
+
+            #region 判斷已有抽驗過
+            var result_FqcResultMaster = await _fqcApi.GetFqcResultMasterByInhouseNo(model.InhouseNo, model.SeqID);
+            if (result_FqcResultMaster.Count() != 0)
+            {
+                var result_ResultDetail = await _fqcApi.GetFqcResultDetail(result_FqcResultMaster.FirstOrDefault().FqcID);
+                if (result_ResultDetail.Where(w => w.BarcodeNo == FqcResultDetail.BarcodeNo).Any())
                 {
-                    ModelState.AddModelError("error", result.Msg);
+                    ModelState.AddModelError("error", "內部序號【" + FqcResultDetail.BarcodeNo + "】已抽驗過");
+                    return View("FQC007C", model);
                 }
             }
+            #endregion
 
-            return View("FQC006C", model);
-            return View();
+            #region Set_FqcResultMaster
+            var FqcResultMaster = new FqcResultMaster();
+            if (result_FqcResultMaster.Count != 0)
+            {
+                FqcResultMaster = result_FqcResultMaster.FirstOrDefault();
+                FqcResultMaster.QaQty += 1;
+                FqcResultMaster.UpdateDate = DateTime.Now;
+            }
+            else
+            {
+                IResultModel<FqcDto> FqcDto;
+                FqcDto = await _fqcApi.GetFqcQuery(model.InhouseNo, model.SeqID);
+                var FirstFqc = FqcDto.Data.FirstOrDefault();
+                FqcResultMaster.InhouseNo = model.InhouseNo;
+                FqcResultMaster.SeqID = model.SeqID;
+                FqcResultMaster.LotQty = FirstFqc.InhouseQty;
+                FqcResultMaster.WipNo = FirstFqc.WipNo;
+                FqcResultMaster.QaQty = 1;
+                FqcResultMaster.ItemNo = FirstFqc.ItemNo;
+                FqcResultMaster.ModelNo = FirstFqc.ModelNo;
+                FqcResultMaster.StartTime = DateTime.Now;
+                FqcResultMaster.EndTime = DateTime.Now;
+            }
+
+            // 判斷是PASS || FAIL
+            if (model.StatusNo == "F")
+                FqcResultMaster.FailQty += 1;
+            else
+                FqcResultMaster.PassQty += 1;
+            #endregion
+
+
+            IResultModel<FqcResultMaster> result;
+            if (result_FqcResultMaster.Count == 0)
+            {
+                result = await _fqcApi.PostFqcResultMaster(JsonConvert.SerializeObject(FqcResultMaster));
+                FqcResultDetail.FqcID = result.Data.FirstOrDefault().FqcID;
+            }
+            else
+            {
+                result = await _fqcApi.PutFqcResultMaster(JsonConvert.SerializeObject(FqcResultMaster));
+                FqcResultDetail.FqcID = result_FqcResultMaster.FirstOrDefault().FqcID;
+            }
+            IResultModel result_detail;
+            result_detail = await _fqcApi.PostFqcResultDetail(JsonConvert.SerializeObject(FqcResultDetail));
+
+            if (result_detail.Success)
+            {
+                var _msg = "新增成功！";
+                return RedirectToAction("Refresh", "Home", new { msg = _msg });
+            }
+            else
+            {
+                ModelState.AddModelError("error", result.Msg);
+            }
+
+
+            return View("FQC007C", model);
         }
         #endregion
 
+        [HttpGet]
+        public async Task<IActionResult> FQC007B(string inhouseNo, string seq , int fqc)
+        {
+            var model = new FqcResultMaster();
+            model.InhouseNo = inhouseNo;
+            model.SeqID = int.Parse(seq);
+            model.FqcID = fqc;
+            return View(model);
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> FQC007BAsync(FqcResultMaster model)
+        {
+            var fqcResultMaster = await _fqcApi.GetFqcResultMaster(model.FqcID);
+            var fqcInhouseMaster = await _fqcApi.GetFqcInhouseMaster(model.InhouseNo, model.SeqID);
+            if (model.QaResult == "P")
+            {
+                fqcResultMaster.QaResult = model.QaResult;
+                fqcResultMaster.QaMeno = model.QaMeno;
+                fqcResultMaster.EndTime = DateTime.Now;
+                fqcResultMaster.UpdateDate = DateTime.Now;
+
+                fqcInhouseMaster.Status = model.QaResult;
+                fqcInhouseMaster.UpdateDate = DateTime.Now;
+            }
+            else
+            {
+                fqcResultMaster.QaResult = model.QaResult;
+                fqcResultMaster.QaMeno = model.QaMeno;
+                fqcResultMaster.EndTime = DateTime.Now;
+                fqcResultMaster.UpdateDate = DateTime.Now;
+
+                fqcInhouseMaster.Status = model.QaResult;
+                fqcInhouseMaster.UpdateDate = DateTime.Now;
+
+                //var qngInfo = new QngInfo();
+                //qngInfo.FqcID = model.FqcID;
+            }
+
+            IResultModel result;
+            result = await _fqcApi.PutFqcInhouseMaster(JsonConvert.SerializeObject(fqcInhouseMaster));
+            result = await _fqcApi.PutFqcResultMaster(JsonConvert.SerializeObject(fqcResultMaster));
+            if (result.Success)
+            {
+                var _msg = "新增成功！";
+                return RedirectToAction("Refresh", "Home", new { msg = _msg });
+            }
+            else
+            {
+                ModelState.AddModelError("error", result.Msg);
+            }
+
+
+            return View("FQC007B", model);
+        }
+
         #region FQC008 FQC查詢
         public IActionResult FQC008()
         {
diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs b/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs
index ced4092c..615b0530 100644
--- a/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs
+++ b/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs
@@ -276,21 +276,130 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/StatusType")]
         ITask<List<StatusType>> GetStatusType();
 
+
+        #endregion
+
+        #region FQC007 FQC抽驗作業
         /// <summary>
-        /// 不良現象-List
+        /// 新增FQC檢驗單結果
         /// </summary>
         /// <returns></returns>
-        [WebApiClient.Attributes.HttpGet("api/NGReasons")]
-        ITask<List<NGReason>> GetNGReasons();
-        #endregion
+        [WebApiClient.Attributes.HttpPost("api/FqcResultMaster")]
+        ITask<ResultModel<FqcResultMaster>> PostFqcResultMaster([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// 更新FQC檢驗單結果
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPut("api/FqcResultMaster")]
+        ITask<ResultModel<FqcResultMaster>> PutFqcResultMaster([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// 新增FQC檢驗結果明細
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPost("api/FqcResultDetail")]
+        ITask<ResultModel<FqcResultDetail>> PostFqcResultDetail([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// 更新入庫單
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPut("api/FqcInhouseMaster")]
+        ITask<ResultModel<FqcInhouseMaster>> PutFqcInhouseMaster([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// 新增抽驗批退
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPost("api/QngInfo")]
+        ITask<ResultModel<QngInfo>> PostQngInfo([FromBody, RawJsonContent] string model);
 
-        #region FQC007 FQC抽驗作業
         /// <summary>
         /// 查詢過站狀態檔 ID
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/FqcInhouseMaster/FqcQuery/{inhouseNo}")]
-        ITask<ResultModel<FqcDto>> GetFqcQuery(string inhouseNo,int seqid = 1);
+        ITask<ResultModel<FqcDto>> GetFqcQuery(string inhouseNo,int? seqid = 1);
+
+        /// <summary>
+        /// 獲取不良現象群組資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/NGGroups")]
+        ITask<List<NGGroup>> GetNGGroups(int page = 1, int limit = 10);
+
+        /// <summary>
+        /// 根据群組代碼獲取不良現象類別資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/NGClasses/Group/{no}")]
+        ITask<List<NGClass>> GetNGClassesByGroup(string no, int page = 1, int limit = 10);
+
+
+        /// <summary>
+        /// 不良現象-List
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/NGReasons/Class/{no}")]
+        ITask<List<NGReason>> GetNGReasonsByClass(string no , int page = 0, int limit = 1000);
+
+        /// <summary>
+        /// 用內部序號取BarCode資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/BarcodeInfoes/No/{id}")]
+        ITask<List<BarcodeInfo>> GetBarcodeInfoesByNo(string id);
+
+        /// <summary>
+        /// 用客戶序號取BarCode資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/BarcodeInfoes/ByExtraNo/{extraNo}")]
+        ITask<List<BarcodeInfo>> GetBarcodeInfoesByExtraNo(string extraNo);
+
+        /// <summary>
+        /// 用包裝箱號取BarCode資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/BarcodeInfoes/ByBoxNo/{boxNo}")]
+        ITask<List<BarcodeInfo>> GetBarcodeInfoesByBoxNo(string boxNo);
+
+        /// <summary>
+        /// 用入庫單號與序號取檢驗單結果
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/FqcResultMaster/ByInhouseNo/{inhouseNo}/{seq}")]
+        ITask<List<FqcResultMaster>> GetFqcResultMasterByInhouseNo(string inhouseNo,int seq);
+
+        /// <summary>
+        /// 用入庫單號與序號取檢驗單明细資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/FqcInhouseDetail/{inhouseNo}/{seq}")]
+        ITask<List<FqcInhouseDetail>> GetFqcInhouseDetail(string inhouseNo, int seq);
+
+        /// <summary>
+        /// 用FQCID取檢驗結果明細
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/FqcResultDetail/{id}")]
+        ITask<List<FqcResultDetail>> GetFqcResultDetail(int id);
+
+
+        /// <summary>
+        /// 用id取檢驗單結果
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/FqcResultMaster/{id}")]
+        ITask<FqcResultMaster> GetFqcResultMaster(int id);
+
+        /// <summary>
+        /// 用id取檢驗單結果
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/FqcInhouseMaster/{inhouseNo}/{seqID}")]
+        ITask<FqcInhouseMaster> GetFqcInhouseMaster(string inhouseNo, int seqID);
         #endregion
 
         #region FQC008 FQC查詢
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC006.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC006.cshtml
index 0afff99b..8874c0bb 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC006.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC006.cshtml
@@ -20,7 +20,7 @@
     <script type="text/javascript">
         //监听表单提交事件
         hg.form.onsubmit('querysubmit', function (data) {
-            table && table.reload(data);
+            //table && table.reload(data);
         });
         var tableCols = [[
             {
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
index 730a04b8..28a22242 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
@@ -8,7 +8,6 @@
     <form enctype="multipart/form-data" method="post" asp-action="FQC007" class="layui-form">
         <div asp-validation-summary="ModelOnly" class="text-danger"></div>
         <div class="layui-card-header">
-
             <div class="layui-form">
                 <div class="layui-form-item ">
                     <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
@@ -27,7 +26,7 @@
                         <button class="layui-btn layui-btn-sm layui-btn-normal" type="submit" lay-submit lay-filter="querysubmit">
                             <i class="layui-icon layui-icon-sm">&#xe615;</i>
                         </button>
-                        <input class="layui-btn layui-btn-sm layui-btn-normal" type="submit" />
+
                         @*<i class="layui-icon layui-icon-sm">&#xe615;</i>*@
 
                     </div>
@@ -36,13 +35,16 @@
         </div>
         <div class="layui-card-body">
             <div class="layui-row">
+                <input type="hidden" id="hInhouseNo" value="@Model.h_InhouseNo" />
+                <input type="hidden" id="hSeqID" value="@Model.h_SeqID" />
+                <input type="hidden" id="hFqcID" value="@Model.FqcID" />
                 <div class="layui-col-xs2">
                     <label class="layui-form-label-col" style="text-align:right;">入庫單號：</label>
                 </div>
                 <div class="layui-col-xs2">
                     <div class="layui-form-item">
                         <div class="layui-input-block" style="margin-left:auto;">
-                            <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.InhouseNo</label>
+                            <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.h_InhouseNo</label>
                         </div>
                     </div>
                 </div>
@@ -79,22 +81,22 @@
                     </div>
                 </div>
                 <div class="layui-col-xs2">
-                    <label class="layui-form-label-col" style="text-align:right;">拒收點數：</label>
+                    <label class="layui-form-label-col" style="text-align:right;">允收點數：</label>
                 </div>
                 <div class="layui-col-xs2">
                     <div class="layui-form-item">
                         <div class="layui-input-block" style="margin-left:auto;">
-                            <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.ReQty</label>
+                            <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.AcQty</label>
                         </div>
                     </div>
                 </div>
                 <div class="layui-col-xs2">
-                    <label class="layui-form-label-col" style="text-align:right;">不良數：</label>
+                    <label class="layui-form-label-col" style="text-align:right;">拒收點數：</label>
                 </div>
                 <div class="layui-col-xs2">
                     <div class="layui-form-item">
                         <div class="layui-input-block" style="margin-left:auto;">
-                            <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.FailQty</label>
+                            <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.ReQty</label>
                         </div>
                     </div>
                 </div>
@@ -203,7 +205,7 @@
                     </div>
                 </div>
             </div>
-            <div class="layui-row">
+            <div class="layui-row" id="click">
                 <div class="layui-col-xs10">
                 </div>
                 <div class="layui-col-xs1 layui-col-xs-offset10">
@@ -274,96 +276,68 @@
         await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
     <script type="text/javascript" src="~/js/grids.min.js"></script>
     <script type="text/javascript">
-        layui.use(['form', 'laydate'], function () {
+        layui.use(['form' ,'layer','laydate'], function () {
             var form = layui.form;
+
         });
 
         function edit() {
-            hg.open('抽驗', '/FQC/FQC007C?inhouseNo=@Model.InhouseNo"&seq="@Model.SeqID', 600, 600);
+            layui.use('layer', function () {
+                var layer = layui.layer;
+                layer.open({
+                    title: '抽驗',
+                    type: 2,
+                    area: ['600px', '600px'],
+                    fixed: false, //不固定
+                    maxmin: true,
+                    content: '/FQC/FQC007C?inhouseNo=@Model.h_InhouseNo&seq=@Model.h_SeqID',
+                    end: function () {
+                        //hg.msg('新增成功');
+                        window.location.reload();
+                    }
+                });
+            });
+            //hg.open('抽驗', '/FQC/FQC007C?inhouseNo=@Model.h_InhouseNo&seq=@Model.h_SeqID', 600, 600);
 
         };
 
         function result() {
-            hg.open('判定結果', '/FQC/FQC007B/', 400, 300);
-
+            //hg.open('判定結果', '/FQC/FQC007B/', 600, 400);
+              layui.use('layer', function () {
+                var layer = layui.layer;
+                layer.open({
+                    title: '抽判定結果',
+                    type: 2,
+                    area: ['600px', '400px'],
+                    fixed: false, //不固定
+                    maxmin: true,
+                    content: '/FQC/FQC007B?inhouseNo=@Model.h_InhouseNo&seq=@Model.h_SeqID&fqc=@Model.FqcID',
+                    end: function () {
+                        //hg.msg('新增成功');
+                        window.location.reload();
+                    }
+                });
+            });
         };
 
-        //监听表单提交事件
-        //hg.form.onsubmit('querysubmit', function (data) {
-        //    table && table.reload(data);
-        //});
-        //var tableCols = [[
-        //    {
-        //        field: 'groupNameCN',
-        //        title: '箱號',
-        //        sort: true
-        //    },
-        //    {
-        //        field: 'groupNameEN',
-        //        title: '總數量',
-        //        sort: true
-        //    },
-        //    {
-        //        field: 'groupNameEN',
-        //        title: '已抽數量',
-        //        sort: true
-        //    },
-        //    {
-        //        field: 'groupNameEN',
-        //        title: '抽驗PASS數量',
-        //        sort: true
-        //    },
-        //    {
-        //        field: 'groupNameEN',
-        //        title: '抽驗FAIL數量',
-        //        sort: true
-        //    },
-        //    {
-        //        field: 'right',
-        //        width: 100,
-        //        title: '操作',
-        //        fixed: 'right',
-        //        templet: function (d) {
-        //            return '<a class="layui-btn layui-btn-warm layui-icon layui-icon-list layui-btn-xs" lay-event="detail">檢視</a>'
-        //        }
-        //    }]
-        //];
 
-        ////通过行tool删除，lay-event="del"
-        //function del(obj) {
-        //    if (obj.data.groupID) {
-        //        hg.confirm("檢驗類別：" + obj.data.groupNameCN + "【" + obj.data.groupNameEN + "】，確定要刪除嗎？", function () {
-        //            $.ajax({
-        //                url: '/FQC/FQC001D',
-        //                data: { id: obj.data.groupID },
-        //                type: 'POST',
-        //                success: function (data) {
-        //                    if (data.success) {
-        //                        obj.del(); //只删本地数据
-        //                        hg.msghide("删除成功！");
-        //                    }
-        //                    else {
-        //                        hg.msg(data.msg);
-        //                    }
-        //                },
-        //                error: function () {
-        //                    hg.msg("網路請求失敗！");
-        //                }
-        //            });
-        //        });
-        //    }
-        //}
-        //var toolbar = [{
-        //    text: '新增',
-        //    layuiicon: '&#xe608;',
-        //    class: 'layui-btn-normal',
-        //    handler: function () {
-        //        hg.open('新增檢驗類別', '/FQC/FQC001C', 400, 400);
 
-        //    }
-        //}
-        //];
-        ////基本数据表格
-        //var table = hg.table.datatable('test', '檢驗類別維護', '/FQC/FQC001Query', {}, tableCols, '', false, 'full-100', []);
+        $(document).ready(function () {
+
+        var error = '@Html.ValidationMessage("error")';
+        if ($(error).text() != '') {
+            parent.hg.msg(error);
+                };
+                let InhouseNo = $("#hInhouseNo").val().trim();
+                let SeqID = $("#hSeqID").val().trim();
+                if (InhouseNo.length == 0 && SeqID.length == 0) {
+                    $("#click").hide();
+                }
+                else {
+                    $("#click").show();
+                }
+    });
+
+
     </script>
 }
\ No newline at end of file
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007B.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007B.cshtml
new file mode 100644
index 00000000..f5e0a5a8
--- /dev/null
+++ b/AMESCoreStudio.Web/Views/FQC/FQC007B.cshtml
@@ -0,0 +1,115 @@
+@model AMESCoreStudio.WebApi.Models.AMES.FqcResultMaster
+
+
+@{
+    Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
+
+<style>
+    .control-label {
+        justify-content: flex-end !important;
+    }
+</style>
+
+<div class="layui-card">
+
+
+    <form enctype="multipart/form-data" method="post" asp-action="FQC007B" class="layui-form">
+        <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+        <input type="hidden" asp-for="InhouseNo" value="@Model.InhouseNo" />
+        <input type="hidden" asp-for="SeqID" value="@Model.SeqID" />
+        <input type="hidden" asp-for="FqcID" value="@Model.FqcID" />
+        <div class="layui-row">
+            <div class="layui-col-xs2" style="text-align:right">
+                <div class="layui-form-item">
+                    <input type="radio" asp-for="QaResult" value="P" title="允許" checked="">
+                </div>
+            </div>
+            <div class="layui-col-xs10">
+                <div class="layui-form-item">
+                    <div class="layui-inline" style="width:100px">
+                        <select id="pass" lay-filter="pass" lay-submit>
+                            <option value="0">N/A</option>
+                            <option value="1">特採時</option>
+                        </select>
+                    </div>
+                    <div class="layui-inline" id="Special">
+                        <label class="layui-form-label">特採單號：</label>
+                        <div class="layui-input-inline">
+                            <input name="title" type="text" class="layui-input">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="layui-row">
+            <div class="layui-col-xs2" style="text-align:right">
+                <div class="layui-form-item">
+                    <input type="radio" asp-for="QaResult" value="R" title="批退">
+                </div>
+            </div>
+            <div class="layui-col-xs10">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">批退類型：</label>
+                        <div class="layui-input-inline">
+                            <select id="ngClass" lay-filter="ngClass" lay-submit>
+                                <option value="M">重缺</option>
+                                <option value="S">次缺</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="layui-row">
+            <div class="layui-col-xs2" style="text-align:right">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">備註</label>
+                </div>
+            </div>
+            <div class="layui-col-xs10" style="text-align:left">
+                <div class="layui-form-item">
+                    <div class="layui-input-block" style="margin-left:auto">
+                        <textarea asp-for="QaMeno" class="layui-textarea"></textarea>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
+        <div class="layui-row" style="text-align:center">
+            <div class="layui-col-md12">
+                <input type="submit" value="保存" class="layui-btn" />
+            </div>
+        </div>
+    </form>
+</div>
+
+@section Scripts {
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
+
+    <script type="text/javascript">
+
+        layui.use(['form'], function () {
+            form = layui.form;
+            form.on('select(pass)', function (data) {
+                if (data.value == "1") {
+                    $("#Special").show();
+                }
+                else {
+                    $("#Special").hide();
+                }
+            });
+        });
+
+        $(document).ready(function () {
+            var error = '@Html.ValidationMessage("error")';
+            if ($(error).text() != '') {
+                parent.hg.msg(error);
+            }
+            $("#Special").hide();
+        });
+    </script>
+
+
+}
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007C.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007C.cshtml
index a8aa1636..1f921d3c 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC007C.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC007C.cshtml
@@ -1,7 +1,7 @@
-@model AMESCoreStudio.WebApi.Models.AMES.FqcResultDetail
+@model AMESCoreStudio.WebApi.DTO.AMES.FqcResultDto
 
 
-@{ 
+@{
     Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
 
 <style>
@@ -15,12 +15,12 @@
         <div class="col-sm-12">
             <form enctype="multipart/form-data" method="post" asp-action="FQC007C" class="layui-form">
                 <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-
+                <input type="hidden" asp-for="InhouseNo" value="@Model.InhouseNo" />
+                <input type="hidden" asp-for="SeqID" value="@Model.SeqID" />
                 <div class="layui-form-item">
                     <label asp-for="BarcodeNo" class="layui-form-label"></label>
                     <div class="layui-input-block">
                         <input asp-for="BarcodeNo" class="layui-input" autocomplete="off" />
-                        <span asp-validation-for="BarcodeNo" class="layui-bg-red"></span>
                     </div>
                 </div>
 
@@ -28,7 +28,6 @@
                     <label asp-for="ExtraBarcodeNo" class="layui-form-label"></label>
                     <div class="layui-input-block">
                         <input asp-for="ExtraBarcodeNo" class="layui-input" />
-                        <span asp-validation-for="ExtraBarcodeNo" class="layui-bg-red"></span>
                     </div>
                 </div>
 
@@ -36,14 +35,30 @@
                     <label asp-for="BoxNo" class="layui-form-label"></label>
                     <div class="layui-input-block">
                         <input asp-for="BoxNo" class="layui-input" />
-                        <span asp-validation-for="BoxNo" class="layui-bg-red"></span>
                     </div>
                 </div>
 
                 <div class="layui-form-item">
                     <label asp-for="StatusNo" class="layui-form-label"></label>
                     <div class="layui-input-block">
-                        <select asp-for="StatusNo"  lay-submit asp-items="@ViewBag.StatusTypeSelect">
+                        <select asp-for="StatusNo" lay-submit asp-items="@ViewBag.StatusTypeSelect">
+                        </select>
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">不良群組</label>
+                    <div class="layui-input-block">
+                        <select id="ngGroup" lay-filter="ngGroup" lay-submit asp-items="@ViewBag.NGGroupSelect">
+                        </select>
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">不良類別</label>
+                    <div class="layui-input-block">
+                        <select id="ngClass" lay-filter="ngClass" lay-submit>
+                            <option value="0">N/A</option>
                         </select>
                     </div>
                 </div>
@@ -51,7 +66,7 @@
                 <div class="layui-form-item">
                     <label asp-for="NgReasonNo" class="layui-form-label"></label>
                     <div class="layui-input-block">
-                        <select asp-for="NgReasonNo" lay-submit asp-items="@ViewBag.NGReasonSelect">
+                        <select asp-for="NgReasonNo" id="ngReasonNo" lay-submit>
                             <option value="0">N/A</option>
                         </select>
                     </div>
@@ -79,17 +94,84 @@
     @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
         await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
 
-    <script type="text/javascript">
+<script type="text/javascript">
+          function getNGClassList(data)
+        {
+            $.ajax(
+                {
+                    url: "@Url.Action("GetNGClassByGroup", "FQC")",
+                    dataType: 'json',
+                    data: { "group_no": data},
+                    //contentType: "application/json",
+                    type: 'post',
+                    success: function (result)
+                    {
+                        console.info(result.data);
+                        $("#ngClass").empty();//清空下拉框的值
+                        $("#ngClass").append(new Option("N/A", "0"));
+                        $("#ngReasonNo").empty();//清空下拉框的值
+                        $("#ngReasonNo").append(new Option("N/A", "0"));
+                        $.each(result.data, function (index, item) {
+                            $("#ngClass").append(new Option(item.text, item.value));// 下拉菜单里添加元素
+                            //$("#errorClass").append($("<option>").text(item.text).val(item.value))
+                        });
+
+                        layui.form.render("select");//重新渲染 固定写法
+                    },
+                    error: function (result)
+                    {
+                        alert(result);
+                    }
+                });
+        };
+
+    function getNgReasonNoList(data)
+        {
+            $.ajax(
+                {
+                    url: "@Url.Action("GetNGReasonsByClass", "FQC")",
+                    dataType: 'json',
+                    data: { "ngClassNo": data},
+                    //contentType: "application/json",
+                    type: 'post',
+                    success: function (result)
+                    {
+                        console.info(result.data);
+                        $("#ngReasonNo").empty();//清空下拉框的值
+                        $("#ngReasonNo").append(new Option("N/A", "0"));
+                        $.each(result.data, function (index, item) {
+                            $("#ngReasonNo").append(new Option(item.text, item.value));// 下拉菜单里添加元素
+                            //$("#errorClass").append($("<option>").text(item.text).val(item.value))
+                        });
+
+                        layui.form.render("select");//重新渲染 固定写法
+                    },
+                    error: function (result)
+                    {
+                        alert(result);
+                    }
+                });
+        };
+
         layui.use(['form'], function () {
             form = layui.form;
+
+            form.on('select(ngGroup)', function (data) {
+                getNGClassList(data.value);
+            });
+
+            form.on('select(ngClass)', function (data) {
+                getNgReasonNoList(data.value);
+            });
         });
+
         $(document).ready(function () {
             var error = '@Html.ValidationMessage("error")';
             if ($(error).text() != '') {
                 parent.hg.msg(error);
             }
         });
-    </script>
+</script>
 
 
 }
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs
index 7119160d..a7526fe4 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs
@@ -117,6 +117,47 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return NotFound();
         }
 
+        /// <summary>
+        /// 用客戶序號找條碼资料
+        /// </summary>
+        /// <param name="extraNo">客戶序號</param>
+        /// <returns></returns>
+        [HttpGet("ByExtraNo/{extraNo}")]
+        public async Task<ActionResult<IEnumerable<BarcodeInfo>>> GetBarcodeInfoesByExtraNo(string extraNo)
+        {
+            IQueryable<BarcodeInfo> q = _context.BarcodeInfoes;
+            q = q.Where(p => p.ExtraBarcodeNo == extraNo);
+            var barcodeInfo = await q.ToListAsync();
+
+            if (barcodeInfo == null)
+            {
+                return NotFound();
+            }
+
+            return barcodeInfo;
+        }
+
+        /// <summary>
+        /// 用包裝箱號获取该條碼资料
+        /// </summary>
+        /// <param name="boxNo">包裝箱號</param>
+        /// <returns></returns>
+        // GET: api/BarcodeInfoes/5
+        [HttpGet("ByBoxNo/{boxNo}")]
+        public async Task<ActionResult<IEnumerable<BarcodeInfo>>> GetBarcodeInfoesByBoxNo(string boxNo)
+        {
+            IQueryable<BarcodeInfo> q = _context.BarcodeInfoes;
+            q = q.Where(p => p.BoxNo == boxNo);
+            var barcodeInfo = await q.ToListAsync();
+
+            if (barcodeInfo == null)
+            {
+                return NotFound();
+            }
+
+            return barcodeInfo;
+        }
+
         /// <summary>
         /// 更新條碼资料
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs
index 56efc3d3..3e87dcaa 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using AMESCoreStudio.WebApi;
 using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.CommonTools.Result;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
@@ -31,16 +32,18 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return await _context.FqcInhouseDetails.ToListAsync();
         }
 
-        // GET: api/FqcInhouseDetail/5
-        [HttpGet("{id}")]
-        public async Task<ActionResult<FqcInhouseDetail>> GetFqcInhouseDetail(string id)
+        /// <summary>
+        /// By 入庫單號 序號
+        /// </summary>
+        /// <param name="inhouseNo">入庫單號</param>
+        /// <param name="seq">序號</param>
+        /// <returns></returns>
+        [HttpGet("{inhouseNo}/{seq}")]
+        public async Task<ActionResult<IEnumerable<FqcInhouseDetail>>> GetFqcInhouseDetail(string inhouseNo, int seq)
         {
-            var fqcInhouseDetail = await _context.FqcInhouseDetails.FindAsync(id);
-
-            if (fqcInhouseDetail == null)
-            {
-                return NotFound();
-            }
+            var fqcInhouseDetail = await _context.FqcInhouseDetails
+                                    .Where(w => w.InhouseNo == inhouseNo && w.SeqID == seq)
+                                    .ToListAsync();
 
             return fqcInhouseDetail;
         }
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
index 71f9107c..5c3621b7 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
@@ -34,10 +34,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         }
 
         // GET: api/FqcInhouseMaster/5
-        [HttpGet("{id}")]
-        public async Task<ActionResult<FqcInhouseMaster>> GetFqcInhouseMaster(string id)
+        [HttpGet("{inhouseNo}/{seqID}")]
+        public async Task<ActionResult<FqcInhouseMaster>> GetFqcInhouseMaster(string inhouseNo,int seqID)
         {
-            var fqcInhouseMaster = await _context.FqcInhouseMasters.FindAsync(id);
+            var fqcInhouseMaster = await _context.FqcInhouseMasters.FindAsync(inhouseNo, seqID);
 
             if (fqcInhouseMaster == null)
             {
@@ -152,10 +152,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                        WipNo = q1.WipNo,
                                        ItemNo = q1.ItemNo,
                                        ModelNo = q1.ModelNo,
+                                       InhouseQty = q1.InhouseQty,
                                        QcQty = q3.QcQty,
+                                       AcQty = q3.AcQty,
                                        ReQty = q3.ReQty,
                                        StatusName = q1.Status,
-                                       FqcID = q2.FqcID == null ? new Nullable<int>() : q2.FqcID,
+                                       FqcID = q2.WipNo == null ? 0 : q2.FqcID,
                                        InhouseMemo = q2.InhouseMemo,
                                        ManualQaMeno = q2.ManualQaMeno,
                                        QaMeno = q2.QaMeno
@@ -167,6 +169,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             if (query.Count() != 0)
             {
                 var Detail = _context.FqcInhouseDetails.Where(w => w.InhouseNo == inhouseNo && w.SeqID == seqid);
+
+
                 foreach (var item in Detail)
                 {
                     // 取抽驗結果明細檔資料
@@ -177,9 +181,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         SerialNo = item.SerialNo,
                         Qty = _context.BarcodeInfoes.Where(w => w.BoxNo == item.SerialNo).Count(),
                         HasQty = FqcResultDetail.Count(),
-                        PassQty = FqcResultDetail.Where(w => w.StatusNo == "P").Count(),
+                        PassQty = FqcResultDetail.Where(w => w.StatusNo != "F").Count(),
                         FailQty = FqcResultDetail.Where(w => w.StatusNo == "F").Count()
                     });
+
+                    // 總數
+                    query.FirstOrDefault().PassQty += FqcResultDetail.Where(w => w.StatusNo != "F").Count();
+                    query.FirstOrDefault().FailQty += FqcResultDetail.Where(w => w.StatusNo == "F").Count();
                 }
             }
 
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultDetailController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultDetailController.cs
index f57d34f2..8790dd5d 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultDetailController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultDetailController.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using AMESCoreStudio.WebApi;
 using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.CommonTools.Result;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
@@ -31,76 +32,68 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return await _context.FqcResultDetails.ToListAsync();
         }
 
-        // GET: api/FqcResultDetail/5
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="id">FQCID</param>
+        /// <returns></returns>
         [HttpGet("{id}")]
-        public async Task<ActionResult<FqcResultDetail>> GetFqcResultDetail(int id)
+        public async Task<ActionResult<IEnumerable<FqcResultDetail>>> GetFqcResultDetail(int id)
         {
-            var fqcResultDetail = await _context.FqcResultDetails.FindAsync(id);
-
-            if (fqcResultDetail == null)
-            {
-                return NotFound();
-            }
-
+            var fqcResultDetail = await _context.FqcResultDetails.Where(w => w.FqcID == id).ToListAsync();
             return fqcResultDetail;
         }
 
-        // PUT: api/FqcResultDetail/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> PutFqcResultDetail(int id, FqcResultDetail fqcResultDetail)
+        /// <summary>
+        /// 更新FQC檢驗結果明細
+        /// </summary>
+        /// <param name="fqcResultDetail"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<ResultModel<FqcResultDetail>> PutFqcResultDetail(FqcResultDetail fqcResultDetail)
         {
-            if (id != fqcResultDetail.FqcID)
-            {
-                return BadRequest();
-            }
-
+            ResultModel<FqcResultDetail> result = new ResultModel<FqcResultDetail>();
             _context.Entry(fqcResultDetail).State = EntityState.Modified;
+            fqcResultDetail.UpdateDate = DateTime.Now;
+            fqcResultDetail.UpdateUserID = 0;
 
             try
             {
                 await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
             }
-            catch (DbUpdateConcurrencyException)
+            catch (Exception ex)
             {
-                if (!FqcResultDetailExists(id))
-                {
-                    return NotFound();
-                }
-                else
-                {
-                    throw;
-                }
+                result.Success = false;
+                result.Msg = ex.Message;
             }
-
-            return NoContent();
+            return result;
         }
 
-        // POST: api/FqcResultDetail
-        // 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>
+        /// 新增FQC檢驗結果明細
+        /// </summary>
+        /// <param name="fqcResultDetail"></param>
+        /// <returns></returns>
         [HttpPost]
-        public async Task<ActionResult<FqcResultDetail>> PostFqcResultDetail(FqcResultDetail fqcResultDetail)
+        public async Task<ResultModel<FqcResultDetail>> PostFqcResultDetail(FqcResultDetail fqcResultDetail)
         {
+            ResultModel<FqcResultDetail> result = new ResultModel<FqcResultDetail>();
             _context.FqcResultDetails.Add(fqcResultDetail);
             try
             {
                 await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
             }
-            catch (DbUpdateException)
+            catch (Exception ex)
             {
-                if (FqcResultDetailExists(fqcResultDetail.FqcID))
-                {
-                    return Conflict();
-                }
-                else
-                {
-                    throw;
-                }
+                result.Success = false;
+                result.Msg = ex.Message;
             }
-
-            return CreatedAtAction("GetFqcResultDetail", new { id = fqcResultDetail.FqcID }, fqcResultDetail);
+            return result;
         }
 
         // DELETE: api/FqcResultDetail/5
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultMasterController.cs
index cb22c784..6ea5caf4 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultMasterController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultMasterController.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using AMESCoreStudio.WebApi;
 using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.CommonTools.Result;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
@@ -45,48 +46,80 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return fqcResultMaster;
         }
 
-        // PUT: api/FqcResultMaster/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> PutFqcResultMaster(int id, FqcResultMaster fqcResultMaster)
+        /// <summary>
+        /// 用入庫單號 and 序號找資料
+        /// </summary>
+        /// <param name="inhouseNo">入庫單號</param>
+        /// <param name="seq">序號</param>
+        /// <returns></returns>
+        [HttpGet("ByInhouseNo/{inhouseNo}/{seq}")]
+        public async Task<ActionResult<IEnumerable<FqcResultMaster>>> GetFqcResultMasterByInhouseNo(string inhouseNo , int seq)
         {
-            if (id != fqcResultMaster.FqcID)
-            {
-                return BadRequest();
-            }
+            var fqcResultMaster = await _context.FqcResultMasters
+                                  .Where(w => w.InhouseNo == inhouseNo && w.SeqID == seq)
+                                  .ToListAsync();
+
+            //if (fqcResultMaster == null)
+            //{
+            //    return NotFound();
+            //}
 
+            return fqcResultMaster;
+        }
+
+        /// <summary>
+        /// 更新FQC檢驗單結果
+        /// </summary>
+        /// <param name="fqcResultMaster"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<ResultModel<FqcResultMaster>> PutFqcResultMaster(FqcResultMaster fqcResultMaster)
+        {
+            ResultModel<FqcResultMaster> result = new ResultModel<FqcResultMaster>();
             _context.Entry(fqcResultMaster).State = EntityState.Modified;
+            fqcResultMaster.UpdateDate = DateTime.Now;
+            fqcResultMaster.UpdateUserID = 0;
 
             try
             {
                 await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
             }
-            catch (DbUpdateConcurrencyException)
+            catch (Exception ex)
             {
-                if (!FqcResultMasterExists(id))
-                {
-                    return NotFound();
-                }
-                else
-                {
-                    throw;
-                }
+                result.Success = false;
+                result.Msg = ex.Message;
             }
-
-            return NoContent();
+            return result;
         }
 
-        // POST: api/FqcResultMaster
-        // 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>
+        /// 新增FQC檢驗單結果
+        /// </summary>
+        /// <param name="fqcResultMaster"></param>
+        /// <returns></returns>
         [HttpPost]
-        public async Task<ActionResult<FqcResultMaster>> PostFqcResultMaster(FqcResultMaster fqcResultMaster)
+        public async Task<ResultModel<FqcResultMaster>> PostFqcResultMaster(FqcResultMaster fqcResultMaster)
         {
+            ResultModel<FqcResultMaster> result = new ResultModel<FqcResultMaster>();
+            Helper helper = new Helper(_context);
+            fqcResultMaster.FqcID = helper.GetIDKey("FQC_ID").Result;
             _context.FqcResultMasters.Add(fqcResultMaster);
-            await _context.SaveChangesAsync();
-
-            return CreatedAtAction("GetFqcResultMaster", new { id = fqcResultMaster.FqcID }, fqcResultMaster);
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Data = new List<FqcResultMaster> { fqcResultMaster };
+                result.Success = true;
+                result.Msg = "OK";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.Message;
+            }
+            return result;
         }
 
         // DELETE: api/FqcResultMaster/5
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/QngInfoeController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/QngInfoeController.cs
index 9042e28b..bb4891e6 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/QngInfoeController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/QngInfoeController.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using AMESCoreStudio.WebApi;
 using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.CommonTools.Result;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
@@ -45,48 +46,57 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return qngInfo;
         }
 
-        // PUT: api/QngInfoe/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> PutQngInfo(int id, QngInfo qngInfo)
+        /// <summary>
+        /// 更新抽驗批退
+        /// </summary>
+        /// <param name="qngInfo"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<ResultModel<QngInfo>> PutQngInfo(QngInfo qngInfo)
         {
-            if (id != qngInfo.QngID)
-            {
-                return BadRequest();
-            }
-
+            ResultModel<QngInfo> result = new ResultModel<QngInfo>();
             _context.Entry(qngInfo).State = EntityState.Modified;
+            qngInfo.UpdateDate = DateTime.Now;
+            qngInfo.UpdateUserID = 0;
 
             try
             {
                 await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
             }
-            catch (DbUpdateConcurrencyException)
+            catch (Exception ex)
             {
-                if (!QngInfoExists(id))
-                {
-                    return NotFound();
-                }
-                else
-                {
-                    throw;
-                }
+                result.Success = false;
+                result.Msg = ex.Message;
             }
-
-            return NoContent();
+            return result;
         }
 
-        // POST: api/QngInfoe
-        // 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="qngInfo"></param>
+        /// <returns></returns>
         [HttpPost]
-        public async Task<ActionResult<QngInfo>> PostQngInfo(QngInfo qngInfo)
+        public async Task<ResultModel<QngInfo>> PostQngInfo(QngInfo qngInfo)
         {
+            ResultModel<QngInfo> result = new ResultModel<QngInfo>();
+            Helper helper = new Helper(_context);
+            qngInfo.QngID = helper.GetIDKey("QNG_ID").Result;
             _context.QngInfos.Add(qngInfo);
-            await _context.SaveChangesAsync();
-
-            return CreatedAtAction("GetQngInfo", new { id = qngInfo.QngID }, qngInfo);
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.Message;
+            }
+            return result;
         }
 
         // DELETE: api/QngInfoe/5
diff --git a/AMESCoreStudio.WebApi/DTO/AMES/FqcDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/FqcDto.cs
index 52f7788c..35b81114 100644
--- a/AMESCoreStudio.WebApi/DTO/AMES/FqcDto.cs
+++ b/AMESCoreStudio.WebApi/DTO/AMES/FqcDto.cs
@@ -32,14 +32,28 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         /// </summary>
         [DataMember]
         [Display(Name = "序號")]
-        public int SeqID { get; set; } = 1;
+        public int? SeqID { get; set; } = 1;
+
+        /// <summary>
+        /// h入庫單號碼
+        /// </summary>
+        [DataMember]
+        [Display(Name = "入庫單號")]
+        public string h_InhouseNo { get; set; } = string.Empty;
+
+        /// <summary>
+        /// h序號
+        /// </summary>
+        [DataMember]
+        [Display(Name = "序號")]
+        public string h_SeqID { get; set; } = string.Empty;
 
         /// <summary>
         /// FqcID
         /// </summary>
         [DataMember]
         [Display(Name = "FqcID")]
-        public int? FqcID { get; set; } = 0;
+        public int FqcID { get; set; } = 0;
 
         /// <summary>
         /// 工單號碼
@@ -62,6 +76,12 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         [Display(Name = "品名")]
         public string ModelNo { get; set; }
 
+        /// <summary>
+        /// 本批完成量
+        /// </summary>
+        [DataMember]
+        [Display(Name = "本批完成量")]
+        public int InhouseQty { get; set; }
 
         /// <summary>
         /// 抽驗狀態  P-PASS(允收);R-REJECT(批退); A-初始狀態
@@ -69,7 +89,7 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         [DataMember]
         [Display(Name = "抽驗狀態")]
 
-        public string StatusName { get; set; } = "A";
+        public string StatusName { get; set; }
 
         /// <summary>
         /// 抽驗數量
@@ -93,6 +113,13 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         [Display(Name = "不良數")]
         public int FailQty { get; set; } = 0;
 
+        /// <summary>
+        /// 允收數量
+        /// </summary>
+        [DataMember]
+        [Display(Name = "允收數量")]
+        public int AcQty { get; set; } = 0;
+
         /// <summary>
         /// 拒收數量
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/DTO/AMES/FqcResultDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/FqcResultDto.cs
new file mode 100644
index 00000000..76c0dfb4
--- /dev/null
+++ b/AMESCoreStudio.WebApi/DTO/AMES/FqcResultDto.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
+using System.Runtime.Serialization;
+
+
+#nullable disable
+
+namespace AMESCoreStudio.WebApi.DTO.AMES
+{
+    /// <summary>
+    /// 入庫單資料檔 Dto
+    /// </summary>
+    public partial class FqcResultDto
+    {
+        /// <summary>
+        /// 入庫單號碼
+        /// </summary>
+        [DataMember]
+        [Display(Name = "入庫單號")]
+        public string InhouseNo { get; set; }
+
+        /// <summary>
+        /// 序號
+        /// </summary>
+        [DataMember]
+        [Display(Name = "序號")]
+        public int SeqID { get; set; } = 1;
+
+        /// <summary>
+        /// FqcID
+        /// </summary>
+        [DataMember]
+        [Display(Name = "FqcID")]
+        public int FqcID { get; set; } = 0;
+
+
+        /// <summary>
+        /// 箱號
+        /// </summary>
+        [Display(Name = "箱號")]
+        [Column("BOX_NO")]
+        [StringLength(30)]
+        public string BoxNo { get; set; }
+
+        /// <summary>
+        /// 生產序號
+        /// </summary>
+        [Display(Name = "生產序號")]
+        [Column("BARCODE_NO")]
+        [StringLength(30)]
+        public string BarcodeNo { get; set; }
+
+        /// <summary>
+        /// 外部序號
+        /// </summary>
+        [Display(Name = "外部序號")]
+        [Column("EXTRA_BARCODE_NO")]
+        [StringLength(30)]
+        public string ExtraBarcodeNo { get; set; }
+
+        /// <summary>
+        /// 狀態 P-PASS;F-FAIL;C-CPN
+        /// </summary>
+        [Display(Name = "狀態")]
+        [Column("STATUS_NO")]
+        [StringLength(2)]
+        public string StatusNo { get; set; } = "P";
+
+        /// <summary>
+        /// 不良代碼
+        /// </summary>
+        [Display(Name = "不良代碼")]
+        [Column("NG_REASON_NO")]
+        [StringLength(6)]
+        public string NgReasonNo { get; set; }
+
+        /// <summary>
+        /// 不良備註
+        /// </summary>
+        [Display(Name = "不良備註")]
+        [Column("NG_MEMO")]
+        [StringLength(100)]
+        public string NgMemo { get; set; }
+    }
+}
diff --git a/AMESCoreStudio.WebApi/Models/AMES/FqcResultDetail.cs b/AMESCoreStudio.WebApi/Models/AMES/FqcResultDetail.cs
index ddf09c28..42a48ae2 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/FqcResultDetail.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/FqcResultDetail.cs
@@ -34,7 +34,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Key]
         [DataMember]
         [Display(Name = "箱號")]
-        [Required(ErrorMessage = "{0},不能空白")]
         [Column("BOX_NO")]
         [StringLength(30)]
         public string BoxNo { get; set; }
@@ -45,7 +44,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Key]
         [DataMember]
         [Display(Name = "生產序號")]
-        [Required(ErrorMessage = "{0},不能空白")]
         [Column("BARCODE_NO")]
         [StringLength(30)]
         public string BarcodeNo { get; set; }
@@ -55,7 +53,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [DataMember]
         [Display(Name = "外部序號")]
-        [Required(ErrorMessage = "{0},不能空白")]
         [Column("EXTRA_BARCODE_NO")]
         [StringLength(30)]
         public string ExtraBarcodeNo { get; set; }
diff --git a/AMESCoreStudio.WebApi/Models/AMES/FqcResultMaster.cs b/AMESCoreStudio.WebApi/Models/AMES/FqcResultMaster.cs
index beade7d2..8ca95c6e 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/FqcResultMaster.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/FqcResultMaster.cs
@@ -23,7 +23,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Required(ErrorMessage = "{0},不能空白")]
         [Key]
         [Column("FQC_ID")]
-        public int? FqcID { get; set; }
+        public int FqcID { get; set; }
 
         /// <summary>
         /// 入庫單號碼
@@ -44,6 +44,14 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Column("SEQ_ID")]
         public int SeqID { get; set; } = 1;
 
+        /// <summary>
+        /// 特採單號
+        /// </summary>
+        [DataMember]
+        [Display(Name = "特採單號")]
+        [Column("SPECIAL_PO")]
+        public string SpecialPo{ get; set; }
+
         /// <summary>
         /// 本批次總數量
         /// </summary>
diff --git a/開發文件/Table(FQC管理控管模組).docx b/開發文件/Table(FQC管理控管模組).docx
index 49653814..2252a401 100644
--- a/開發文件/Table(FQC管理控管模組).docx
+++ b/開發文件/Table(FQC管理控管模組).docx
@@ -1063,6 +1063,9 @@ BOX_NO
 WIP_BOX
 FQC_RESULT_DETAIL_FK4
 STATUS_NO
+STATUS_TYPE
+FQC_RESULT_DETAIL_FK5
+STATUS_NO
 STATUS_TYPE
                                     序號
 欄位名稱
@@ -1107,34 +1110,41 @@ VARCHAR2
                                        X
                                        
                                       06
+NG_REASON_NO
+不良代碼
+VARCHAR2
+                                       6
+                                       
+                                       
+                                      07
 NG_MEMO
 不良備註
 VARCHAR2
                                       100
                                        
                                        
-                                      07
+                                      08
 CREATE_USERID
 建立者
 NUMBER
                                        
                                        X
                                        0
-                                      08
+                                      09
 CREATE_DATE
 建立日期
 DATE
                                        
                                        X
                                        
-                                      09
+                                      10
 UPDATE_USERID
 更新者
 NUMBER
                                        
                                        X
                                        0
-                                      10
+                                      11
 UPDATE_DATE
 更新日期
 DATE
@@ -1371,94 +1381,157 @@ NUMBER
                                        X
                                        1
                                       04
-START_TIME
-開始抽驗時間
-DATE
+SPECIAL_PO
+特採單號
+VARCHAR2
+                                      20
                                        
-                                       X
                                        
                                       05
-END_TIME
-結束抽驗時間
-DATE
-                                       
-                                       
-                                       
-                                      06
 LOT_QTY
 本批次總數量
 NUMBER
                                        
                                        X
                                        
+                                      06
+WIP_NO
+工單號碼
+VARCHAR2
+                                      30
+                                       X
+                                       
                                       07
+QA_RESULT
+抽驗結果
+VARCHAR2
+                                      10
+                                       X
+                                    "A"
+                                      08
+QA_QTY
+抽驗數量
+NUMBER
+                                       
+                                       X
+                                       
+                                      09
 PASS_QTY
 PASS數量
 NUMBER
                                        
                                        X
                                        0
-                                      08
+                                      10
 FAIL_QTY
 FAIL數量
 NUMBER
                                        
                                        X
                                        0
-                                      09
-QA_RESULT
-抽驗结果
+                                      11
+INHOUSE_MEMO
+入庫單備註
 VARCHAR2
-                                       3
+                                      150
+                                       
+                                       
+                                      12
+ITEM_NO
+料號
+VARCHAR2
+                                      20
                                        X
-                                   `N/A'
-                                      10
-MEMO
-備註
+                                       
+                                      13
+QA_MENO
+判定備註
 VARCHAR2
-                                      150
+                                      100
                                        
                                        
-                                      11
-CREATE_USERID
-建立者
-NUMBER
+                                      14
+MANUAL_QA_MENO
+手動判定備註
+VARCHAR2
+                                      200
+                                       
+                                       
+                                      15
+MODEL_NO
+品名/機種
+VARCHAR2
+                                      30
+                                       
+                                       
+                                      16
+REJECT_TYPE
+批退類型
+VARCHAR2
+                                       2
+                                       
+                                       
+                                      17
+START_TIME
+開始抽驗時間
+DATE
                                        
                                        X
                                        
-                                      12
-UPDATE_USERID 
-更新者
+                                      18
+END_TIME
+結束抽驗時間
+DATE
+                                       
+                                       X
+                                       
+                                      19
+AQL_ENABLE_FLAG
+AQL有效標誌
+VARCHAR2
+                                       2
+                                       
+                                       
+                                      20
+CREATE_USERID
+建立者
 NUMBER
                                        
                                        X
                                        
-                                      13
+                                      21
 CREATE_DATE
 建立日期
 DATE
                                        
                                        X
                                        
-                                      14
+                                      22
+UPDATE_USERID 
+更新者
+NUMBER
+                                       
+                                       X
+                                       
+                                      23
 UPDATE_DATE
 更新日期
 DATE
                                        
                                        X
                                        
-                                      15
-REJECT_TYPE
-批退類型
-VARCHAR2
-                                       1
                                        
+
+
+
+                                       
+                                       
+                                       
+                                       
+
+
+
                                        
-                                      16
-AQL_ENABLE_FLAG
-AQL有效標誌
-VARCHAR2
-                                       1
                                        
                                        
 QA_RESULT:P-PASS(允收);R-REJECT(批退);N/A初始状态；
@@ -1669,7 +1742,7 @@ VARCHAR2
 SPECIAL_PO
 特採單號
 VARCHAR2
-                                       1
+                                      20
                                        
                                        
                                       10