1.工時類別新增補回

2.巡檢結果查詢後才跑資料

AMESCoreStudio.Web/Views/SPC/SPC005.cshtml

@@ -291,9 +291,9 @@
         ];
         //基本数据表格
         var table;
-        $(function () {
+        //$(function () {
-            tt();
+        //    tt();
-        });
+        //});
         function tt() {
             //基本数据表格
             var form = "";

AMESCoreStudio.Web/Views/WHS/WHS014.cshtml

@@ -1,5 +1,5 @@
 @{
-    ViewData["Title"] = "異常工時類別資料查詢";
+    ViewData["Title"] = "異常工時類別資料維護";
     Layout = "~/Views/Shared/_AMESLayout.cshtml";
 }
 
@@ -115,6 +115,16 @@
             }
         }
 
+        var toolbar = [{
+            text: '新增',
+            layuiicon: '',
+            class: 'layui-btn-normal',
+            handler: function () {
+                hg.open('新增異常工時類別', '/WHS/WHS014C', 640, 320);
+
+            }
+        }
+        ];
         //基本数据表格
         //var table = hg.table.datatable('test', '工作異常工時類別', '/WHS/GetWorkGroups', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
         var table;

AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml

@@ -29,11 +29,30 @@
             <param name="idName"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Helper.GetUserNo(System.Nullable{System.Int32})">
+            <summary>
+            獲取用戶編號
+            </summary>
+            <param name="userId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Helper.GetUserName(System.Nullable{System.Int32})">
+            <summary>
+            獲取用戶編號
+            </summary>
+            <param name="userId"></param>
+            <returns></returns>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.IgnorePropertyAttribute">
             <summary>
             Swagger：隐藏属性
             </summary>
         </member>
+        <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeChangeController">
+            <summary>
+            條碼變更資料表
+            </summary>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeChangeController.#ctor(AMESCoreStudio.WebApi.AMESContext)">
             <summary>
             
@@ -53,6 +72,13 @@
             <param name="id">BarcodeID</param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeChangeController.GetBarcodeChangeByBarcodeID(System.Int32)">
+            <summary>
+            條碼變更資料表 by id
+            </summary>
+            <param name="id">BarcodeID</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeChangeController.PostBarcodeChange(AMESCoreStudio.WebApi.Models.AMES.BarcodeChange)">
             <summary>
             新增條碼變更資料表
@@ -2426,6 +2452,18 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgRepairsController.GetRepairData4REP005(System.String,System.String,System.String,System.String,System.Int32,System.Int32)">
+            <summary>
+            維修進/出條碼查詢
+            </summary>
+            <param name="stationID"></param>
+            <param name="stateID"></param>
+            <param name="dateStart"></param>
+            <param name="dateEnd"></param>
+            <param name="page"></param>
+            <param name="limit"></param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgRepairsController.GetRepairData4REP012(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32)">
             <summary>
             維修資料統計
@@ -2443,6 +2481,18 @@
             <param name="limit"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgRepairsController.GetRepairData4REP013(System.String,System.String,System.String,System.String,System.Int32,System.Int32)">
+            <summary>
+            維修進/出統計報表
+            </summary>
+            <param name="wipNo"></param>
+            <param name="itemNo"></param>
+            <param name="dateStart"></param>
+            <param name="dateEnd"></param>
+            <param name="page"></param>
+            <param name="limit"></param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgRepairsController.GetErrorCode4REP012(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
             <summary>
             維修資料統計by不良代碼
@@ -3778,6 +3828,14 @@
             <param name="wipAlarm"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipAlarmsController.PostWipAlarm4ErrorCode(System.String,System.String)">
+            <summary>
+            判斷同一不良代碼累計預警
+            </summary>
+            <param name="wipNO">工單號碼</param>
+            <param name="errorCode">不良代碼</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipAlarmsController.DeleteWipAlarm(System.Int32)">
             <summary>
             
@@ -4147,12 +4205,25 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.GetWipInfo4QRS013(System.String,System.Int32,System.Int32)">
+            <summary>
+            查詢工單KeyParts資料QRS013
+            </summary>
+            <param name="wipNO"></param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.GetWipInfoSelectParameter(AMESCoreStudio.WebApi.DTO.AMES.WipInfoDto,System.Int32,System.Int32)">
             <summary>
             查詢工單資料 by SelectParameter
             </summary>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.GetWipInfoPCS008(AMESCoreStudio.WebApi.DTO.AMES.WipInfoDto,System.String)">
+            <summary>
+            查詢工單資料 未結工單查詢
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.GetWipInfo(System.Int32)">
             <summary>
             查詢工單資料Info By WipID
@@ -5648,6 +5719,12 @@
             <param name="flowRuleIDOld">變更前ID</param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.RuleStationsController.GetRuleStationByFlowDto(System.Int32)">
+            <summary>
+            ByFlowID to DTO 取流程別
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.RuleStationsController.GetRuleStationByUnit(System.String)">
             <summary>
             根據製程單位獲取指定單一資料
@@ -6566,6 +6643,11 @@
             條碼變更資料表
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.BarcodeChangeID">
+            <summary>
+            條碼置換ID
+            </summary>
+        </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.BarcodeID">
             <summary>
             條碼ID
@@ -6586,9 +6668,14 @@
             建立時間
             </summary>
         </member>
-        <member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.UpdateDate">
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.Memo">
             <summary>
-            修改時間
+            備註
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.CreateUserName">
+            <summary>
+            建立者Name
             </summary>
         </member>
         <member name="T:AMESCoreStudio.WebApi.Models.AMES.BarcodeGroup">
@@ -9471,7 +9558,7 @@
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.NgComponent.ErrorDesc">
             <summary>
-            異常描述
+            不良原因描述
             </summary>
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.NgComponent.HeightAvg">
@@ -9831,7 +9918,7 @@
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.NgRepair.RepairTypeNo">
             <summary>
-            維修方式
+            維修方式代碼
             </summary>
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.NgRepair.RepairResponsibleID">

AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml

@@ -29,11 +29,30 @@
             <param name="idName"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Helper.GetUserNo(System.Nullable{System.Int32})">
+            <summary>
+            獲取用戶編號
+            </summary>
+            <param name="userId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Helper.GetUserName(System.Nullable{System.Int32})">
+            <summary>
+            獲取用戶編號
+            </summary>
+            <param name="userId"></param>
+            <returns></returns>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.IgnorePropertyAttribute">
             <summary>
             Swagger：隐藏属性
             </summary>
         </member>
+        <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeChangeController">
+            <summary>
+            條碼變更資料表
+            </summary>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeChangeController.#ctor(AMESCoreStudio.WebApi.AMESContext)">
             <summary>
             
@@ -53,6 +72,13 @@
             <param name="id">BarcodeID</param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeChangeController.GetBarcodeChangeByBarcodeID(System.Int32)">
+            <summary>
+            條碼變更資料表 by id
+            </summary>
+            <param name="id">BarcodeID</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeChangeController.PostBarcodeChange(AMESCoreStudio.WebApi.Models.AMES.BarcodeChange)">
             <summary>
             新增條碼變更資料表
@@ -2426,6 +2452,18 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgRepairsController.GetRepairData4REP005(System.String,System.String,System.String,System.String,System.Int32,System.Int32)">
+            <summary>
+            維修進/出條碼查詢
+            </summary>
+            <param name="stationID"></param>
+            <param name="stateID"></param>
+            <param name="dateStart"></param>
+            <param name="dateEnd"></param>
+            <param name="page"></param>
+            <param name="limit"></param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgRepairsController.GetRepairData4REP012(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32)">
             <summary>
             維修資料統計
@@ -2443,6 +2481,18 @@
             <param name="limit"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgRepairsController.GetRepairData4REP013(System.String,System.String,System.String,System.String,System.Int32,System.Int32)">
+            <summary>
+            維修進/出統計報表
+            </summary>
+            <param name="wipNo"></param>
+            <param name="itemNo"></param>
+            <param name="dateStart"></param>
+            <param name="dateEnd"></param>
+            <param name="page"></param>
+            <param name="limit"></param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgRepairsController.GetErrorCode4REP012(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
             <summary>
             維修資料統計by不良代碼
@@ -3778,6 +3828,14 @@
             <param name="wipAlarm"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipAlarmsController.PostWipAlarm4ErrorCode(System.String,System.String)">
+            <summary>
+            判斷同一不良代碼累計預警
+            </summary>
+            <param name="wipNO">工單號碼</param>
+            <param name="errorCode">不良代碼</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipAlarmsController.DeleteWipAlarm(System.Int32)">
             <summary>
             
@@ -4147,12 +4205,25 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.GetWipInfo4QRS013(System.String,System.Int32,System.Int32)">
+            <summary>
+            查詢工單KeyParts資料QRS013
+            </summary>
+            <param name="wipNO"></param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.GetWipInfoSelectParameter(AMESCoreStudio.WebApi.DTO.AMES.WipInfoDto,System.Int32,System.Int32)">
             <summary>
             查詢工單資料 by SelectParameter
             </summary>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.GetWipInfoPCS008(AMESCoreStudio.WebApi.DTO.AMES.WipInfoDto,System.String)">
+            <summary>
+            查詢工單資料 未結工單查詢
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.GetWipInfo(System.Int32)">
             <summary>
             查詢工單資料Info By WipID
@@ -5648,6 +5719,12 @@
             <param name="flowRuleIDOld">變更前ID</param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.RuleStationsController.GetRuleStationByFlowDto(System.Int32)">
+            <summary>
+            ByFlowID to DTO 取流程別
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.RuleStationsController.GetRuleStationByUnit(System.String)">
             <summary>
             根據製程單位獲取指定單一資料
@@ -6566,6 +6643,11 @@
             條碼變更資料表
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.BarcodeChangeID">
+            <summary>
+            條碼置換ID
+            </summary>
+        </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.BarcodeID">
             <summary>
             條碼ID
@@ -6586,9 +6668,14 @@
             建立時間
             </summary>
         </member>
-        <member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.UpdateDate">
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.Memo">
             <summary>
-            修改時間
+            備註
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeChange.CreateUserName">
+            <summary>
+            建立者Name
             </summary>
         </member>
         <member name="T:AMESCoreStudio.WebApi.Models.AMES.BarcodeGroup">
@@ -9471,7 +9558,7 @@
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.NgComponent.ErrorDesc">
             <summary>
-            異常描述
+            不良原因描述
             </summary>
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.NgComponent.HeightAvg">
@@ -9831,7 +9918,7 @@
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.NgRepair.RepairTypeNo">
             <summary>
-            維修方式
+            維修方式代碼
             </summary>
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.NgRepair.RepairResponsibleID">