diff --git a/AMESCoreStudio.Web/Controllers/WHSController.cs b/AMESCoreStudio.Web/Controllers/WHSController.cs index 69a920e..ba74b9d 100644 --- a/AMESCoreStudio.Web/Controllers/WHSController.cs +++ b/AMESCoreStudio.Web/Controllers/WHSController.cs @@ -3516,6 +3516,11 @@ namespace AMESCoreStudio.Web.Controllers ModelState.AddModelError("error", "請至少選擇一個線別"); return View("WHS025C", model); } + if (model.Ct <= 0) + { + ModelState.AddModelError("error", "CT不可小於0"); + return View("WHS025C", model); + } // 複製 model 中的其他欄位,產生新的物件 var item = new WorkingStandardWorkTime { @@ -3563,6 +3568,11 @@ namespace AMESCoreStudio.Web.Controllers if (ModelState.IsValid) { IResultModel result; + if (model.Ct <= 0) + { + ModelState.AddModelError("error", "CT不可小於0"); + return View("WHS025U", model); + } result = await _whsApi.PutWorkingStandardWorkTime(model.WorkingStandardID, JsonConvert.SerializeObject(model)); @@ -3826,9 +3836,10 @@ namespace AMESCoreStudio.Web.Controllers ErrorMsg += $"{rowMsg}人數必須大於 0\n"; continue; } - if (!int.TryParse(CtStr, out int Ct)) + if (!decimal.TryParse(CtStr, out decimal Ct)) { - ErrorMsg += $"{rowMsg}CT格式錯誤\n"; continue; + ErrorMsg += $"{rowMsg}CT 格式錯誤\n"; + continue; } if (Ct <= 0) { diff --git a/AMESCoreStudio.Web/ViewModels/WHS/WHS025ViewModel.cs b/AMESCoreStudio.Web/ViewModels/WHS/WHS025ViewModel.cs index f35107d..4f2f7ad 100644 --- a/AMESCoreStudio.Web/ViewModels/WHS/WHS025ViewModel.cs +++ b/AMESCoreStudio.Web/ViewModels/WHS/WHS025ViewModel.cs @@ -42,8 +42,9 @@ namespace AMESCoreStudio.Web.ViewModels.WHS public int OpCnt { get; set; } [Required(ErrorMessage = "{0},不能空白")] + [Range(0.00001, double.MaxValue, ErrorMessage = "{0},必須大於0")] [Display(Name = "標準工時(分)")] - public int Ct { get; set; } + public decimal Ct { get; set; } [Required(ErrorMessage = "{0},不能空白")] [Display(Name = "作業機台數")] diff --git a/AMESCoreStudio.WebApi/Models/AMES/WorkingStandardWorkTime.cs b/AMESCoreStudio.WebApi/Models/AMES/WorkingStandardWorkTime.cs index 2665377..7ccf505 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/WorkingStandardWorkTime.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/WorkingStandardWorkTime.cs @@ -86,8 +86,9 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// [Column("CT")] [DataMember] + [Range(0.00001, double.MaxValue, ErrorMessage = "{0},必須大於0")] [Display(Name = "標準工時(分)")] - public int Ct { get; set; } = 0; + public decimal Ct { get; set; } = 0; /// diff --git a/AMESCoreStudio.WebApi/Models/AMES/WorkingStandardWorkTimeLog.cs b/AMESCoreStudio.WebApi/Models/AMES/WorkingStandardWorkTimeLog.cs index a539e1d..82ffbde 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/WorkingStandardWorkTimeLog.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/WorkingStandardWorkTimeLog.cs @@ -95,7 +95,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Column("CT")] [DataMember] [Display(Name = "標準工時(分)")] - public int Ct { get; set; } = 0; + public decimal Ct { get; set; } = 0; /// /// 作業機台數