From d4706f65631f33ab83f8ccf4626624ef4c8bd239 Mon Sep 17 00:00:00 2001 From: ray Date: Tue, 26 Apr 2022 21:36:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=AD=A3=E9=81=8E=E7=AB=99?= =?UTF-8?q?=E7=87=92=E6=A9=9FBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PCSController.cs | 2 +- .../Controllers/BLL/BarCodeCheckController.cs | 20 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs index c8ee9a33..29ea8b62 100644 --- a/AMESCoreStudio.Web/Controllers/PCSController.cs +++ b/AMESCoreStudio.Web/Controllers/PCSController.cs @@ -3658,7 +3658,7 @@ namespace AMESCoreStudio.Web.Controllers return Json(new Result() { success = barcode_result.Success, msg = barcode_result.Msg, data = Data }); else { - Msg = "內部序號【" + Data + "】 過站完成!"; + Msg = barcode_result.Msg; Data = string.Empty; } } diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs index cdb07ceb..880dcd45 100644 --- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs @@ -152,7 +152,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES resultModel = (ResultModel)await GetCheckBurn(barCodeCheckDto.wipNo, barCodeCheckDto.barcodeID, barCodeCheckDto.station); if (!resultModel.Success) return resultModel; - else if (resultModel.Data.ToString() == "BurnIn") + else if (resultModel.Msg == "BurnIn") burnIn = true; #endregion @@ -778,6 +778,23 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES item.UpdateUserID = model.userID; result = await burnInfoeController.PutBurnInfo(item); } + else // 新增一筆 + { + // 新增 BarCodeStation + var burnInfo = new BurnInfo + { + BarcodeID = model.barcodeID, + WipNo = model.wipNo, + BurnPlanHour = PlanHour, + StartTime = DateTime.Now, + ScheduleFinishTime = DateTime.Now.AddMinutes((double)PlanHour), + InUserID = 0, + Status = 0, + CreateUserID = model.userID, + UpdateUserID = model.userID + }; + result = await burnInfoeController.PostBurnInfo(burnInfo); + } } else { @@ -1557,6 +1574,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES resultModel.Msg = "BurnIn"; } } + else // 沒有BurnInfo = Burn In { resultModel.Msg = "BurnIn";