diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs index d529ba2d..26c67426 100644 --- a/AMESCoreStudio.Web/Controllers/PCSController.cs +++ b/AMESCoreStudio.Web/Controllers/PCSController.cs @@ -2868,7 +2868,8 @@ namespace AMESCoreStudio.Web.Controllers public async Task PCS011Async(WipLock model) { IResultModel result; - + model.UnLockDate = DateTime.Now; + model.UnLockUserID = 0; result = await _pcsApi.PutWipLock(JsonConvert.SerializeObject(model)); if (result.Success) { diff --git a/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml index e22be7c0..85ca4d4d 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml @@ -310,10 +310,10 @@ } if ($("#StationTypeNo").val() == "U" || $("#StationTypeNo").val() == "A") { - $("#InputNo").show(); + $("#inputNo").show(); } else { - $("#InputNo").hide(); + $("#inputNo").hide(); } }); diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeLockController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeLockController.cs index d21d80e2..956ca720 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeLockController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeLockController.cs @@ -142,9 +142,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES ResultModel result = new ResultModel(); _context.Entry(barcodeLock).State = EntityState.Modified; //設置容器空間某一個模型的某一個欄位 不提交到資料庫 - _context.Entry(barcodeLock).Property("CreateDate").IsModified = false; - _context.Entry(barcodeLock).Property("CreateUserID").IsModified = false; - + _context.Entry(barcodeLock).Property("UnLockReason").IsModified = true; + _context.Entry(barcodeLock).Property("UnLockUserID").IsModified = true; + _context.Entry(barcodeLock).Property("UnLockDate").IsModified = true; try { await _context.SaveChangesAsync(); diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/NgComponentsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/NgComponentsController.cs index db3d346e..cef75452 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/NgComponentsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/NgComponentsController.cs @@ -169,7 +169,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES else { result.Success = false; - result.Msg = ex.Message; + result.Msg = ex.InnerException.Message; return result; } } diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipClassController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipClassController.cs index 63e80f6b..dc2dda0f 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipClassController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipClassController.cs @@ -59,7 +59,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES if (ruleStationID != 0) q = q.Where(w => w.RuleStationID == ruleStationID); - if (string.IsNullOrWhiteSpace(ruleStatus)) + if (!string.IsNullOrWhiteSpace(ruleStatus)) q = q.Where(w => w.RuleStatus == ruleStatus); diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs index a6d7b6d9..03890813 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs @@ -280,7 +280,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES wiplock.UnLockDate = DateTime.Now; // 指定更新某個欄位 _context.Entry(wiplock).Property(p => p.UnLockReason).IsModified = true; - try { await _context.SaveChangesAsync(); diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipTimeController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipTimeController.cs index 5fc62c58..a8ca4011 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipTimeController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipTimeController.cs @@ -59,7 +59,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES if (ruleStationID != 0) q = q.Where(w => w.RuleStationID == ruleStationID); - if (string.IsNullOrWhiteSpace(ruleStatus)) + if (!string.IsNullOrWhiteSpace(ruleStatus)) q = q.Where(w => w.RuleStatus == ruleStatus); var result = await q.ToListAsync(); diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs index da2ef4fd..5fdc2237 100644 --- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs @@ -721,53 +721,60 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// private async Task> Table_BurnInfo(BarCodeCheckDto model) { - // 判斷是否有燒機時間 - WipBoardController wipBoardController = new WipBoardController(_context); - var wipBoardTime = wipBoardController.GetWipBoardToBITime(model.wipNo).Result.Value; - WipSystemController wipSystemController = new WipSystemController(_context); - var wipSystemTime = wipSystemController.GetWipSystemToBITime(model.wipNo).Result.Value; - decimal PlanHour = 0; - if (wipBoardTime > 0) - PlanHour = (decimal)wipBoardTime; - else - PlanHour = (decimal)wipSystemTime; - - BurnInfoeController burnInfoeController = new BurnInfoeController(_context); - var result = new ResultModel() { Success = true }; - // 判斷燒機時間是否足夠 - var burnInfos = await burnInfoeController.GetBurnInfosByBarcodeID(model.barcodeID); - if (burnInfos.Value.Count() != 0) + // 判斷作業站是否為燒機站 + StationsesController stationsesController = new StationsesController(_context); + var station = await stationsesController.GetStations(model.station); + if (station.Value.Where(w => w.TypeNo == "F").Any()) { - // 取實際燒機完成時間 空白資料 - var item = burnInfos.Value.Where(w => string.IsNullOrWhiteSpace(w.FinishTime.ToString())).FirstOrDefault(); - if (item != null) + + // 判斷是否有燒機時間 + WipBoardController wipBoardController = new WipBoardController(_context); + var wipBoardTime = wipBoardController.GetWipBoardToBITime(model.wipNo).Result.Value; + WipSystemController wipSystemController = new WipSystemController(_context); + var wipSystemTime = wipSystemController.GetWipSystemToBITime(model.wipNo).Result.Value; + decimal PlanHour = 0; + if (wipBoardTime > 0) + PlanHour = (decimal)wipBoardTime; + else + PlanHour = (decimal)wipSystemTime; + + BurnInfoeController burnInfoeController = new BurnInfoeController(_context); + // 判斷燒機時間是否足夠 + var burnInfos = await burnInfoeController.GetBurnInfosByBarcodeID(model.barcodeID); + if (burnInfos.Value.Count() != 0) { - item.FinishTime = DateTime.Now; - item.OutUserID = 1; - item.UpdateDate = DateTime.Now; - result = await burnInfoeController.PutBurnInfo(item); + // 取實際燒機完成時間 空白資料 + var item = burnInfos.Value.Where(w => string.IsNullOrWhiteSpace(w.FinishTime.ToString())).FirstOrDefault(); + if (item != null) + { + item.FinishTime = DateTime.Now; + item.OutUserID = 1; + item.UpdateDate = DateTime.Now; + result = await burnInfoeController.PutBurnInfo(item); + } } - } - else - { - // 新增 BarCodeStation - var burnInfo = new BurnInfo + else { - BarcodeID = model.barcodeID, - WipNo = model.wipNo, - BurnPlanHour = PlanHour, - StartTime = DateTime.Now, - ScheduleFinishTime = DateTime.Now.AddMinutes((double)PlanHour), - InUserID = 0, - Status = 0 - }; - result = await burnInfoeController.PostBurnInfo(burnInfo); + // 新增 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 + }; + result = await burnInfoeController.PostBurnInfo(burnInfo); + } } return result; } + /// /// NgInfo-測試不良基本資料檔 /// @@ -805,7 +812,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES NgComponent ngComponent = new NgComponent { NgID = result.Data.FirstOrDefault().NgID, - LocationNo = NGNo.oldInputData, + LocationNo = NGNo.oldInputData ?? "N/A", NgNo = NGNo.inputData, }; result_NgComponent = await ngComponentsController.PostNgComponent(ngComponent); @@ -909,9 +916,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES var classInfo = await classInfoesController.GetClassInfoByUnit(barCodeCheckDto.unitNo); if (classInfo.Value.Count() != 0) { - var ID = classInfo.Value.Where(w => string.Compare(w.BeginTime, DateTime.Now.ToString("HH:mm:ss")) <= 0 - && string.Compare(w.EndTime, DateTime.Now.ToString("HH:mm:ss")) >= 0) + var ID = classInfo.Value.Where(w => DateTime.Parse(DateTime.Now.ToString("yyyy/MM/dd") + " " + w.BeginTime) <= DateTime.Now + && DateTime.Now <= DateTime.Parse(DateTime.Now.ToString("yyyy/MM/dd") + " " + w.EndTime)) .FirstOrDefault(); + if (ID != null) { ClassID = ID.ClassID; @@ -971,8 +979,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES var timeSegment = await timeSegmentsController.GetTimeSegment(); if (timeSegment.Value.Count() != 0) { - var ID = timeSegment.Value.Where(w => string.Compare(w.StartTime, DateTime.Now.ToString("HH:mm:ss")) <= 0 - && string.Compare(w.EndTime, DateTime.Now.ToString("HH:mm:ss")) >= 0) + var ID = timeSegment.Value.Where(w => DateTime.Parse(DateTime.Now.ToString("yyyy/MM/dd") + " " + w.StartTime) <= DateTime.Now + && DateTime.Now <= DateTime.Parse(DateTime.Now.ToString("yyyy/MM/dd") + " " + w.EndTime)) .FirstOrDefault(); if (ID != null)