1. FQC007 加入可修改抽驗標準

AMESCoreStudio.Web/Controllers/FQCController.cs

@@ -1304,7 +1304,7 @@ namespace AMESCoreStudio.Web.Controllers
         }
         #endregion
 
-        #region FQC細項資料
+        #region FQC 抽驗係數細項
         /// <summary>
         /// QC 抽驗細項
         /// </summary>
@@ -1318,6 +1318,19 @@ namespace AMESCoreStudio.Web.Controllers
             ViewBag.QCQty = QCQty;
             return View();
         }
+
+        public async Task<IActionResult> FQC007ByCritID(FqcDto model)
+        {
+            FqcInhouseMaster fqcInhouseMaster = new FqcInhouseMaster
+            {
+                InhouseNo = model.InhouseNo,
+                SeqID = (int)model.SeqID,
+                CritID = model.CritID
+            };
+
+            var result = await _fqcApi.PutFqcInhouseMasterForCritID(JsonConvert.SerializeObject(fqcInhouseMaster));
+            return Json(new Result() { success = result.Success, msg = result.Msg });
+        }
         #endregion
 
         #endregion

AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs

@@ -312,6 +312,13 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpPut("api/FqcInhouseMaster")]
         ITask<ResultModel<FqcInhouseMaster>> PutFqcInhouseMaster([FromBody, RawJsonContent] string model);
 
+        /// <summary>
+        /// 更新入庫單 抽驗係數標準
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPut("api/FqcInhouseMaster/PutForCritID")]
+        ITask<ResultModel<FqcInhouseMaster>> PutFqcInhouseMasterForCritID([FromBody, RawJsonContent] string model);
+
         /// <summary>
         /// 新增抽驗批退
         /// </summary>

AMESCoreStudio.Web/Views/FQC/FQC007.cshtml

@@ -5,7 +5,7 @@
 }
 
 <div class="layui-card">
-    <form enctype="multipart/form-data" method="post" asp-action="FQC007" class="layui-form">
+    <form id="FQC007Form" 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">
@@ -110,8 +110,8 @@
                 <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.CustomerNo</label>
-                        </div>*@
+                                <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.CustomerNo</label>
+                            </div>*@
                     </div>
                 </div>
                 <div class="layui-col-xs1">
@@ -129,7 +129,7 @@
                 <div class="layui-col-xs1">
                     <select asp-for="@Model.AQLType" asp-items="@ViewBag.GetAQL_TypeSelect" class=""></select>
                 </div>
-                <div class="layui-col-xs1" style="text-align:center;">
+                <div class="layui-col-xs1" style="text-align:center;display:none;" id="critIDDIV">
                     <input type="hidden" asp-action="CritID" value="@Model.CritID" />
                     @*<a class="layui-btn layui-btn-sm layui-btn-normal" id="attachment" title="抽驗係數" lay-submit lay-filter="attachment" onclick="openQC()">
                             <i class="layui-icon layui-icon-sm" style="font-size: 30px; color: #1E9FFF;">&#xe60a;</i>
@@ -486,7 +486,7 @@
             </div>
 
             <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
-            <div class="layui-form-item">
+            <div class="layui-form-item" style="display:none" id="actionDIV">
                 <div style="text-align:center">
                     <input type="submit" value="儲存" name="action" class="layui-btn" />
                 </div>
@@ -630,6 +630,15 @@
                    $('#ReQty').text(obj.$("#reQty").val());
                    $('#AcQty').text(obj.$("#acQty").val());
                    layer.close(index);
+                   var data = $("#FQC007Form").serialize();
+                   data += "&CritID=" + obj.$("#critID").val();
+                        $.ajax({
+                    url: "@Url.Action("FQC007ByCritID", "FQC")",
+                    type: "POST",
+                    data: data,
+                    success: function (result) {
+                }
+                });
                }
               });
             });
@@ -650,6 +659,8 @@
             let Result = '@Model.StatusName';
             if (InhouseNo.length != 0 && SeqID.length != 0 && Result == '') {
                 $("#click").show();
+                $("#actionDIV").show();
+                $("#critID").show();
             }
             setupEnterToNext();
     });

AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs

@@ -325,6 +325,35 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return result;
         }
 
+        /// <summary>
+        /// 更新入庫單 抽驗係數標準
+        /// </summary>
+        /// <param name="fqcInhouseMaster"></param>
+        /// <returns></returns>
+        [HttpPut("PutForCritID")]
+        public async Task<ResultModel<FqcInhouseMaster>> PutFqcInhouseMasterForCritID(FqcInhouseMaster fqcInhouseMaster)
+        {
+            ResultModel<FqcInhouseMaster> result = new ResultModel<FqcInhouseMaster>();
+            var data = await _context.FqcInhouseMasters.Where(w => w.InhouseNo == fqcInhouseMaster.InhouseNo &&
+                                                                   w.SeqID == fqcInhouseMaster.SeqID).FirstOrDefaultAsync();
+            data.CritID = fqcInhouseMaster.CritID;
+            _context.Entry(data).State = EntityState.Modified;
+            _context.Entry<FqcInhouseMaster>(data).Property("CritID").IsModified = true;
+
+            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>