Browse Source

同上

master
yiru 2 months ago
parent
commit
597c73e3cf
  1. 2
      AMESCoreStudio.Web/ViewModels/WHS/WHS025ViewModel.cs
  2. 2
      AMESCoreStudio.Web/Views/WHS/WHS025C.cshtml
  3. 2
      AMESCoreStudio.Web/Views/WHS/WHS025L.cshtml
  4. 2
      AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml
  5. 6
      AMESCoreStudio.WebApi/Models/AMES/WorkingStandardWorkTime.cs

2
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; }

2
AMESCoreStudio.Web/Views/WHS/WHS025C.cshtml

@ -60,7 +60,7 @@
</div>
<div class="form-group form-inline my-sm-1">
<label asp-for="OpCnt" class="control-label col-sm-3"></label>
<input asp-for="OpCnt" type="number" min="0" class="form-control col-sm-7" placeholder="請輸入作業人數" />
<input asp-for="OpCnt" class="form-control col-sm-7" placeholder="請輸入作業人數" />
<span asp-validation-for="OpCnt" class="text-danger offset-sm-3 my-sm-1"></span>
</div>

2
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: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd HH:mm:ss") }}</div>' },
{ field: 'createUserName', title: '修改人' },
{ field: 'remark', title: '備註' },
{

2
AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml

@ -58,7 +58,7 @@
</div>
<div class="form-group form-inline my-sm-1">
<label asp-for="OpCnt" class="control-label col-sm-3"></label>
<input asp-for="OpCnt" type="number" min="0" class="form-control col-sm-7" placeholder="請輸入作業人數" />
<input asp-for="OpCnt" class="form-control col-sm-7" placeholder="請輸入作業人數" />
<span asp-validation-for="OpCnt" class="text-danger offset-sm-3 my-sm-1"></span>
</div>

6
AMESCoreStudio.WebApi/Models/AMES/WorkingStandardWorkTime.cs

@ -78,8 +78,9 @@ namespace AMESCoreStudio.WebApi.Models.AMES
/// </summary>
[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;
/// <summary>
/// 標準工時(分)
@ -96,8 +97,9 @@ namespace AMESCoreStudio.WebApi.Models.AMES
/// </summary>
[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;
/// <summary>
/// 備註

Loading…
Cancel
Save