標工維護問題修正

AMESCoreStudio.Web/Views/WHS/WHS022.cshtml

@@ -113,7 +113,7 @@
         });
         function tt() {
             table = hg.table.datatable('test', '報工生產單位維護', '/WHS/GetWorkingUnits' 
-                , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+                , {}, tableCols, toolbar, false, 'full-100', ['filter', 'print', 'exports']);
         }
 
     </script>

AMESCoreStudio.Web/Views/WHS/WHS022U.cshtml

@@ -22,7 +22,7 @@
 
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="WorkingUnitName" class="control-label col-sm-3"></label>
-                <input asp-for="WorkingUnitName" class="form-control col-sm-9" />
+                <input asp-for="WorkingUnitName" class="form-control col-sm-9" readonly/>
                 <span asp-validation-for="WorkingUnitName" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
@@ -32,7 +32,7 @@
             </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"></select>
+                <select asp-for="UnitNo" asp-items="@ViewBag.FactoryUnit" class="custom-select col-sm-9" disabled ></select>
                 <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/WHS023.cshtml

@@ -135,7 +135,7 @@
         function tt() {
             var unit = $("#unitNo").val();
             table = hg.table.datatable('test', '報工線別維護', '/WHS/GetworkingLines?id=' + unit
-                , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+                , {}, tableCols, toolbar, false, 'full-100', ['filter', 'print', 'exports']);
         }
 
     </script>

AMESCoreStudio.Web/Views/WHS/WHS023U.cshtml

@@ -22,7 +22,7 @@
 
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="WorkingUnitID" class="control-label col-sm-3"></label>
-                <select asp-for="WorkingUnitID" asp-items="@ViewBag.WorkingUnitNo" class="custom-select col-sm-9"></select>
+                <select asp-for="WorkingUnitID" asp-items="@ViewBag.WorkingUnitNo" class="custom-select col-sm-9" disabled></select>
                 <span asp-validation-for="WorkingUnitID" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">

AMESCoreStudio.Web/Views/WHS/WHS024.cshtml

@@ -143,7 +143,7 @@
         function tt() {
             var unit = $("#unitNo").val();
             table = hg.table.datatable('test', '報工工作站別維護', '/WHS/GetWorkingStations?id=' + unit
-                , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+                , {}, tableCols, toolbar, false, '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/WHS024C.cshtml

@@ -29,6 +29,7 @@
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="TypeNo" class="control-label col-sm-3"></label>
                 <select asp-for="TypeNo" class="custom-select col-sm-9">
+				    <option value="N/A">N/A</option>
                     <option value="0010">0010</option>
                     <option value="0020">0020</option>
                     <option value="0030">0030</option>

AMESCoreStudio.Web/Views/WHS/WHS024U.cshtml

@@ -33,6 +33,7 @@
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="TypeNo" class="control-label col-sm-3"></label>
                 <select asp-for="TypeNo" class="custom-select col-sm-9">
+				    <option value="N/A">N/A</option>
                     <option value="0010">0010</option>
                     <option value="0020">0020</option>
                     <option value="0030">0030</option>
@@ -41,7 +42,7 @@
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="WorkingUnitID" class="control-label col-sm-3"></label>
-                <select asp-for="WorkingUnitID" asp-items="@ViewBag.WorkingUnitNo" class="custom-select col-sm-9"></select>
+                <select asp-for="WorkingUnitID" asp-items="@ViewBag.WorkingUnitNo" class="custom-select col-sm-9" disabled></select>
                 <span asp-validation-for="WorkingUnitID" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
 

AMESCoreStudio.Web/Views/WHS/WHS025.cshtml

@@ -91,7 +91,7 @@
             },
             {
                 field: 'unitName',
-                title: '對應途程站別'
+                title: '對應途程生產單位'
             },
             {
                 field: 'machineCnt',

AMESCoreStudio.Web/Views/WHS/WHS025L.cshtml

@@ -25,7 +25,7 @@
             { field: 'side', title: '面別' },
             { field: 'opCnt', title: '標準人力' },
             { field: 'ct', title: '標準工時(分)' },
-            { field: 'unitName', title: '對應途程站別' },
+            { field: 'unitName', title: '對應途程生產單位' },
             { field: 'machineCnt', title: '作業機台數' },
             { field: 'createDate', title: '修改日' },
             { field: 'createUserName', title: '修改人' },

AMESCoreStudio.WebApi/Controllers/AMES/WorkingStandardWorkTimeController.cs

@@ -244,17 +244,17 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             var newLog = new WorkingStandardWorkTimeLog
             {
                 WorkingStandardLogID = WorkingSTLog_ID,
-                WorkingStandardID = oldData.WorkingStandardID,
-                ItemNo = oldData.ItemNo,
-                WorkingUnitID = oldData.WorkingUnitID,
-                WorkingLineID = oldData.WorkingLineID,
-                UnitNo = oldData.UnitNo,
-                WorkingStationID = oldData.WorkingStationID,
-                Side = oldData.Side,
-                OpCnt = oldData.OpCnt,
-                Ct = oldData.Ct,
-                MachineCnt = oldData.MachineCnt,
-                Remark = oldData.Remark,
+                WorkingStandardID = model.WorkingStandardID,
+                ItemNo = model.ItemNo,
+                WorkingUnitID = model.WorkingUnitID,
+                WorkingLineID = model.WorkingLineID,
+                UnitNo = model.UnitNo,
+                WorkingStationID = model.WorkingStationID,
+                Side = model.Side,
+                OpCnt = model.OpCnt,
+                Ct = model.Ct,
+                MachineCnt = model.MachineCnt,
+                Remark = model.Remark,
                 CreateUserID = model.UpdateUserID,
                 CreateDate = DateTime.Now,
                 Action = "U"