diff --git a/AMESCoreStudio.Web/ViewModels/WHS/WHS025ViewModel.cs b/AMESCoreStudio.Web/ViewModels/WHS/WHS025ViewModel.cs index 0833008..467c6e8 100644 --- a/AMESCoreStudio.Web/ViewModels/WHS/WHS025ViewModel.cs +++ b/AMESCoreStudio.Web/ViewModels/WHS/WHS025ViewModel.cs @@ -38,6 +38,7 @@ namespace AMESCoreStudio.Web.ViewModels.WHS public string Side { get; set; } [Required(ErrorMessage = "{0},不能空白")] + [Range(1, int.MaxValue, ErrorMessage = "{0} 必須大於 0")] [Display(Name = "標準人力")] public int OpCnt { get; set; } @@ -47,6 +48,7 @@ namespace AMESCoreStudio.Web.ViewModels.WHS public decimal Ct { get; set; } [Required(ErrorMessage = "{0},不能空白")] + [Range(1, int.MaxValue, ErrorMessage = "{0} 必須大於 0")] [Display(Name = "作業機台數")] public int MachineCnt { get; set; } diff --git a/AMESCoreStudio.Web/Views/WHS/WHS025C.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS025C.cshtml index f8422e2..bb63341 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS025C.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS025C.cshtml @@ -60,7 +60,7 @@
- +
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS025L.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS025L.cshtml index b5aeae5..2083e2c 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS025L.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS025L.cshtml @@ -27,7 +27,7 @@ { field: 'ct', title: '標準工時(分)' }, { field: 'unitName', title: '對應途程生產單位' }, { field: 'machineCnt', title: '作業機台數' }, - { field: 'createDate', title: '修改日' }, + { field: 'createDate', title: '修改日', templet: '
{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd HH:mm:ss") }}
' }, { field: 'createUserName', title: '修改人' }, { field: 'remark', title: '備註' }, { diff --git a/AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml index 77acfb2..744459b 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml @@ -58,7 +58,7 @@
- +
diff --git a/AMESCoreStudio.WebApi/Models/AMES/WorkingStandardWorkTime.cs b/AMESCoreStudio.WebApi/Models/AMES/WorkingStandardWorkTime.cs index 7ccf505..aeab0ae 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/WorkingStandardWorkTime.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/WorkingStandardWorkTime.cs @@ -78,8 +78,9 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// [Column("OP_CNT")] [DataMember] + [Range(1, int.MaxValue, ErrorMessage = "{0} 必須大於 0")] [Display(Name = "標準人力")] - public int OpCnt { get; set; } = 0; + public int OpCnt { get; set; } = 1; /// /// 標準工時(分) @@ -96,8 +97,9 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// [Column("MACHINE_CNT")] [DataMember] + [Range(1, int.MaxValue, ErrorMessage = "{0} 必須大於 0")] [Display(Name = "作業機台數")] - public int MachineCnt { get; set; } = 0; + public int MachineCnt { get; set; } = 1; /// /// 備註