From 807f766c37bcbeb3e1e92e7d7633714d3c3d8443 Mon Sep 17 00:00:00 2001
From: Ray <raylin@aten.com>
Date: Wed, 9 Feb 2022 08:46:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=AD=A3=E5=85=A5=E5=BA=AB?=
 =?UTF-8?q?=E5=96=AEAP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/AMES/QcCriterionController.cs | 21 ++++++++++++++++++-
 其他專案資料/AMES_AP/AMES_AP/InHouse.cs | 17 +++++++++++----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/QcCriterionController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/QcCriterionController.cs
index 3ab71288..40876e77 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/QcCriterionController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/QcCriterionController.cs
@@ -59,8 +59,27 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return qcCriterion;
         }
 
+        /// <summary>
+        /// 根據抽驗係數與數量 回傳CritID
+        /// </summary>
+        /// <param name="id">QuotID</param>
+        /// <param name="Qty">抽驗數量</param>
+        /// <returns></returns>
+        [HttpGet("GetCritID/{id}/{Qty}")]
+        public async Task<ActionResult<int>> GetQcCriterion_CritID(int id, int Qty)
+        {
+            var qcCriterion = await _context.QcCriteria.Where(w => w.QuotID == id).ToListAsync();
+
+            qcCriterion = qcCriterion.Where(w => w.QcStart <= Qty && Qty <= w.QcEnd).ToList();
+
+            if (qcCriterion.FirstOrDefault() != null)
+                return qcCriterion.FirstOrDefault().CritID;
+
+            return 0;
+        }
+
         [HttpGet("QcCriterionQuery")]
-        public async Task<ResultModel<QcCriterionDto>> GetQcCriterionQuery(int quotID = 0,int page = 1, int limit = 10)
+        public async Task<ResultModel<QcCriterionDto>> GetQcCriterionQuery(int quotID = 0, int page = 1, int limit = 10)
         {
             IQueryable<QcCriterion> q = _context.QcCriteria;
             ResultModel<QcCriterionDto> result = new ResultModel<QcCriterionDto>();
diff --git a/其他專案資料/AMES_AP/AMES_AP/InHouse.cs b/其他專案資料/AMES_AP/AMES_AP/InHouse.cs
index 4f934990..5adbd15c 100644
--- a/其他專案資料/AMES_AP/AMES_AP/InHouse.cs
+++ b/其他專案資料/AMES_AP/AMES_AP/InHouse.cs
@@ -209,7 +209,16 @@ namespace AMES_AP
                 return;
             }
 
-            string InhouseNo = ApiHelper.GetMethod($"api/FqcInhouseMaster/NewInhouseNo/Q{WipNo.Text}");
+            var Get_result = ApiHelper.GetMethod($"api/QcCriterion/GetCritID/{QcquotSelect.SelectedValue}/{int.Parse(ToQty.Text)}");
+            int CritID = JsonConvert.DeserializeObject<int>(Get_result);
+            if (CritID == 0)
+            {
+                MessageBox.Show("抽驗標準:" + QcquotSelect.Text + "，找不到對應抽驗係數");
+                return;
+            }
+
+            Get_result = ApiHelper.GetMethod($"api/FqcInhouseMaster/NewInhouseNo/Q{WipNo.Text}");
+            string InhouseNo = JsonConvert.DeserializeObject<string>(Get_result);
 
             var wipInfos = JsonConvert.DeserializeObject<List<WipInfo>>(query);
 
@@ -219,7 +228,7 @@ namespace AMES_AP
                 SeqID = 1,
                 ItemNo = wipInfos.FirstOrDefault().GetWipAtt.ItemNO,
                 Plant = materialComboBox2.SelectedItem.ToString(),
-                CritID = 1000,
+                CritID = CritID,
                 ModelNo = wipInfos.FirstOrDefault().GetWipAtt.ModelNO,
                 WipNo = WipNo.Text.ToUpper(),
                 WipQty = wipInfos.FirstOrDefault().PlanQTY,
@@ -238,8 +247,8 @@ namespace AMES_AP
                 });
             }
 
-            var result = ApiHelper.PostInsertMethod("api/FqcInhouseMaster", JsonConvert.SerializeObject(InhouseM));
-            if (result)
+            var Post_result = ApiHelper.PostInsertMethod("api/FqcInhouseMaster", JsonConvert.SerializeObject(InhouseM));
+            if (Post_result)
             {
                 foreach (var item in InhouseD)
                 {