1、修改報工工作站 敘述 改為報工站別

2、修改報工站別、報工線別、報工生產單位修改資料時 Working_unit_id 不見的問題
3、標準工時備註改為非必填

AMESCoreStudio.Web/Controllers/WHSController.cs

@@ -3338,7 +3338,7 @@ namespace AMESCoreStudio.Web.Controllers
 
         #endregion
 
-        #region WHS024報工工作站基本資料相關
+        #region WHS024報工站別基本資料相關
 
         public async Task<IActionResult> WHS024()
         {

AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs

@@ -785,7 +785,7 @@ namespace AMESCoreStudio.Web
 
         #endregion
 
-        #region WHS024 報工工作站基本資料
+        #region WHS024 報工站別基本資料
         /// <summary>
         /// 新增報工線別基本資料
         /// </summary>

AMESCoreStudio.Web/ViewModels/WHS/WHS025ViewModel.cs

@@ -50,7 +50,6 @@ namespace AMESCoreStudio.Web.ViewModels.WHS
         [Display(Name = "作業機台數")]
         public int MachineCnt { get; set; }
 
-        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "備註")]
         public string Remark { get; set; }
 

AMESCoreStudio.Web/Views/WHS/WHS022U.cshtml

@@ -32,7 +32,8 @@
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="UnitNo" class="control-label col-sm-3"></label>
-                <select asp-for="UnitNo" asp-items="@ViewBag.FactoryUnit" class="custom-select col-sm-9" disabled ></select>
+                <select asp-for="UnitNo" asp-items="@ViewBag.FactoryUnit" class="custom-select col-sm-9" disabled></select>
+                <input type="hidden" asp-for="UnitNo" />
                 <span asp-validation-for="UnitNo" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>

AMESCoreStudio.Web/Views/WHS/WHS023U.cshtml

@@ -16,6 +16,7 @@
         <form enctype="multipart/form-data" method="post" asp-action="WHS023USave">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
             <input type="hidden" asp-for="WorkingLineID" />
+            <input type="hidden" asp-for="WorkingUnitID" />
             <input type="hidden" asp-for="StatusNo" />
             <input type="hidden" asp-for="CreateDate" />
             <input type="hidden" asp-for="CreateUserID" />

AMESCoreStudio.Web/Views/WHS/WHS024.cshtml

@@ -1,5 +1,5 @@
 @{
-    ViewData["Title"] = "報工工作站基本資料";
+    ViewData["Title"] = "報工站別基本資料";
     Layout = "~/Views/Shared/_AMESLayout.cshtml";
 }
 
@@ -49,11 +49,11 @@
             {
                 field: 'workingStationName',
                 width: 300,
-                title: '報工工作站別名稱'
+                title: '報工站別名稱'
             },
             {
                 field: 'workingStationDesc',
-                title: '報工工作站敘述',
+                title: '報工站別敘述',
             },
             {
                 field: 'typeNo',
@@ -86,7 +86,7 @@
         //通过行tool編輯，lay-event="edit"
         function edit(obj) {
             if (obj.data.workingStationID) {
-                hg.open('修改報工工作站', '/WHS/WHS024U/' + obj.data.workingStationID, 640,480);
+                hg.open('修改報工站別', '/WHS/WHS024U/' + obj.data.workingStationID, 640,480);
             }
         }
 
@@ -96,7 +96,7 @@
                     str = '停用';
                 else
                     str = '啟用';
-                hg.confirm("報工工作站別名稱：" + obj.data.workingStationName + "，確定要" + str + "嗎?", function () {
+                hg.confirm("報工站別名稱：" + obj.data.workingStationName + "，確定要" + str + "嗎?", function () {
                     $.ajax({
                         url: '/WHS/WHS024D',
                         data: { id: obj.data.workingStationID },
@@ -124,7 +124,7 @@
             layuiicon: '',
             class: 'layui-btn-normal',
             handler: function () {
-                hg.open('新增報工工作站別', '/WHS/WHS024C', 640, 480);
+                hg.open('新增報工站別', '/WHS/WHS024C', 640, 480);
 
             }
         }
@@ -143,9 +143,9 @@
         //基本資料表格
         function tt() {
             var unit = $("#unitNo").val();
-            table = hg.table.datatable('test', '報工工作站別維護', '/WHS/GetWorkingStations?id=' + unit
+            table = hg.table.datatable('test', '報工站別維護', '/WHS/GetWorkingStations?id=' + unit
                 , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
         }
-      //  var table = hg.table.datatable('test', '報工工作站別維護', '/WHS/GetWorkingStations', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+      //  var table = hg.table.datatable('test', '報工站別維護', '/WHS/GetWorkingStations', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
     </script>
 }

AMESCoreStudio.Web/Views/WHS/WHS024U.cshtml

@@ -16,6 +16,7 @@
         <form enctype="multipart/form-data" method="post" asp-action="WHS024USave">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
             <input type="hidden" asp-for="WorkingStationID" />
+            <input type="hidden" asp-for="WorkingUnitID" />
             <input type="hidden" asp-for="StatusNo" />
             <input type="hidden" asp-for="CreateUserID" />
             <input type="hidden" asp-for="CreateDate" />

AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml

@@ -15,6 +15,7 @@
         <form enctype="multipart/form-data" method="post" asp-action="WHS025USave">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
             <input type="hidden" asp-for="WorkingStandardID" />
+            <input type="hidden" asp-for="WorkingUnitID" />
             <input type="hidden" asp-for="CreateUserID" />
             <input type="hidden" asp-for="UpdateUserID" value="0" />
             <input type="hidden" asp-for="CreateDate" />

AMESCoreStudio.WebApi/Models/AMES/WorkingStation.cs

@@ -5,35 +5,35 @@ using System.Runtime.Serialization;
 namespace AMESCoreStudio.WebApi.Models.AMES
 {
     /// <summary>
-    /// 報工工作站基本資料
+    /// 報工站別基本資料
     /// </summary>
     [Table("WORKING_STATIONS", Schema = "JHAMES")]
     public class WorkingStation
     {
         /// <summary>
-        /// 報工工作站ID
+        /// 報工站別ID
         /// </summary>
         [Key]
         [Column("WORKING_STATION_ID")]
         [DataMember]
-        [Display(Name = "報工工作站ID")]
+        [Display(Name = "報工站別ID")]
         public int WorkingStationID { get; set; }
 
         /// <summary>
-        /// 報工工作站名稱
+        /// 報工站別名稱
         /// </summary>
         [Column("WORKING_STATION_NAME")]
         [DataMember]
         [Required(ErrorMessage = "{0} 不能空白")]
-        [Display(Name = "報工工作站名稱")]
+        [Display(Name = "報工站別名稱")]
         public string WorkingStationName { get; set; }
         /// <summary>
-        /// 報工工作站敘述
+        /// 報工站別敘述
         /// </summary>
         [Column("WORKING_STATION_DESC")]
         [DataMember]
         [Required(ErrorMessage = "{0} 不能空白")]
-        [Display(Name = "報工工作站敘述")]
+        [Display(Name = "報工站別敘述")]
         public string WorkingStationDesc { get; set; }
         /// <summary>
         /// 報工生產單位代碼