diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs index 09bd7769..fac2d28a 100644 --- a/AMESCoreStudio.Web/Controllers/PCSController.cs +++ b/AMESCoreStudio.Web/Controllers/PCSController.cs @@ -7606,7 +7606,8 @@ namespace AMESCoreStudio.Web.Controllers string boxNo = ids[i].Split(',')[1]; string seq = ids[i].Split(',')[2]; string recordNumber = ids[i].Split(',')[3]; - var result = await PCS0311inhouse(InhouseNo, boxNo, Convert.ToInt16(seq), recordNumber); + string locationNo = ids[i].Split(',')[4]; + var result = await PCS0311inhouse(InhouseNo, boxNo, Convert.ToInt16(seq), recordNumber, locationNo); if (!result.success) { @@ -7623,9 +7624,9 @@ namespace AMESCoreStudio.Web.Controllers } } - public async Task PCS031inhouseAsync(string InhouseNo, string boxNo, int seq, string recordNumber) + public async Task PCS031inhouseAsync(string InhouseNo, string boxNo, int seq, string recordNumber, string locationNo) { - var result = await PCS0311inhouse(InhouseNo, boxNo, seq, recordNumber); + var result = await PCS0311inhouse(InhouseNo, boxNo, seq, recordNumber, locationNo); return Json(new Result() { success = result.success, msg = result.msg }); @@ -7633,7 +7634,7 @@ namespace AMESCoreStudio.Web.Controllers } - private async Task PCS0311inhouse(string InhouseNo, string boxNo, int seq, string recordNumber) + private async Task PCS0311inhouse(string InhouseNo, string boxNo, int seq, string recordNumber,string locationNo) { /* 1.依barcodeinfo 查詢 該箱號所屬序號 * 2.查詢所有序號查詢該流程 是否為最後一個流程(入庫),即在可入庫狀態 @@ -7708,7 +7709,16 @@ namespace AMESCoreStudio.Web.Controllers var WipAtt_result = await _pcsApi.GetWipAtt(Wipinfo_result.Select(s => s.WipNO).First()); //料號 var Userinfo_result = await _sysApi.GetUserInfo(GetLogInUserID()); - + //修改FQC_inhouse_Master LocationNO + var fqcInhouseMaster = await _fqcApi.GetFqcInhouseMaster(InhouseNo, seq); + fqcInhouseMaster.LocationNo = locationNo; + + var result_FQC = await _fqcApi.PutFqcInhouseMaster(JsonConvert.SerializeObject(fqcInhouseMaster)); + if (!result_FQC.Success) + { + _msg = result_FQC.Msg; + return new Result() { success = false, msg = _msg }; + } List PTD101AMESModels = new List(); foreach (var item in result) @@ -7796,7 +7806,8 @@ namespace AMESCoreStudio.Web.Controllers Serial_Type = "B", RecordNumber = recordNumber, Create_UserID = Userinfo_result.Select(s => s.UserID).FirstOrDefault(), - Create_Date = DateTime.Now + Create_Date = DateTime.Now, + LocationNo = locationNo }; var resultPostWH = await _pcsApi.PostWareHouseing(JsonConvert.SerializeObject(Warehouseing));