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; } + /// + /// 根據抽驗係數與數量 回傳CritID + /// + /// QuotID + /// 抽驗數量 + /// + [HttpGet("GetCritID/{id}/{Qty}")] + public async Task> 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> GetQcCriterionQuery(int quotID = 0,int page = 1, int limit = 10) + public async Task> GetQcCriterionQuery(int quotID = 0, int page = 1, int limit = 10) { IQueryable q = _context.QcCriteria; ResultModel result = new ResultModel(); 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(Get_result); + if (CritID == 0) + { + MessageBox.Show("抽驗標準:" + QcquotSelect.Text + ",找不到對應抽驗係數"); + return; + } + + Get_result = ApiHelper.GetMethod($"api/FqcInhouseMaster/NewInhouseNo/Q{WipNo.Text}"); + string InhouseNo = JsonConvert.DeserializeObject(Get_result); var wipInfos = JsonConvert.DeserializeObject>(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) {