From 86930952e893d4761c9840746fc3f36528d63b81 Mon Sep 17 00:00:00 2001 From: Marvin Date: Fri, 11 Mar 2022 10:01:45 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=A9=A2=E5=88=86?= =?UTF-8?q?=E9=A0=81=E9=BB=98=E8=AA=8Dpage=3D0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/BASController.cs | 2 +- .../Controllers/FQCController.cs | 14 ++++++------- .../Controllers/KCSController.cs | 8 ++++---- .../Controllers/PCSController.cs | 8 ++++---- .../Controllers/PPSController.cs | 20 +++++++++---------- .../Controllers/QRSController.cs | 6 +++--- .../Controllers/REPController.cs | 2 +- .../Controllers/SYSController.cs | 16 +++++++-------- AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs | 14 ++++++------- AMESCoreStudio.Web/HttpApis/AMES/IKCS.cs | 8 ++++---- AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs | 6 +++--- AMESCoreStudio.Web/HttpApis/AMES/IPPS.cs | 20 +++++++++---------- AMESCoreStudio.Web/HttpApis/IBAS.cs | 2 +- AMESCoreStudio.Web/HttpApis/ISYS.cs | 16 +++++++-------- .../AMES/BarcodeInfoesController.cs | 2 +- .../Controllers/AMES/BarcodeLockController.cs | 2 +- .../AMES/BarcodeStationController.cs | 2 +- .../Controllers/AMES/CycleTimesController.cs | 2 +- .../AMES/FqcInhouseMasterController.cs | 2 +- .../Controllers/AMES/FqcResultController.cs | 2 +- .../Controllers/AMES/KPLinksController.cs | 2 +- .../Controllers/AMES/NGClassesController.cs | 2 +- .../Controllers/AMES/NGGroupsController.cs | 2 +- .../Controllers/AMES/NGReasonsController.cs | 2 +- .../Controllers/AMES/NgRepairsController.cs | 2 +- .../Controllers/AMES/PartMapsController.cs | 2 +- .../Controllers/AMES/QATypesController.cs | 2 +- .../Controllers/AMES/QcCriterionController.cs | 2 +- .../Controllers/AMES/QcGroupController.cs | 2 +- .../Controllers/AMES/QcItemController.cs | 2 +- .../Controllers/AMES/QcQuotController.cs | 2 +- .../Controllers/AMES/RMAClassesController.cs | 2 +- .../Controllers/AMES/RMAReasonsController.cs | 2 +- .../Controllers/AMES/RepairItemsController.cs | 2 +- .../Controllers/AMES/RepairTypesController.cs | 2 +- .../Controllers/AMES/StatusTypeController.cs | 2 +- .../Controllers/AMES/WipInfosController.cs | 4 ++-- .../Controllers/AMES/WipLockController.cs | 2 +- .../Controllers/BAS/RuleStationsController.cs | 2 +- .../Controllers/SYS/ModuleInfoesController.cs | 2 +- .../SYS/ProgramInfoesController.cs | 2 +- .../Controllers/SYS/RoleInfoesController.cs | 2 +- .../Controllers/SYS/RoleModulesController.cs | 2 +- .../Controllers/SYS/RoleProgramsController.cs | 2 +- .../Controllers/SYS/SystemInfoesController.cs | 2 +- .../Controllers/SYS/UserInfoesController.cs | 2 +- .../Controllers/SYS/UserRolesController.cs | 2 +- 47 files changed, 105 insertions(+), 105 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/BASController.cs b/AMESCoreStudio.Web/Controllers/BASController.cs index bdb50fd7..a2beb66f 100644 --- a/AMESCoreStudio.Web/Controllers/BASController.cs +++ b/AMESCoreStudio.Web/Controllers/BASController.cs @@ -1266,7 +1266,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetRuleStationsByFlowAsync(int flowId, int page = 1, int limit = 10) + public async Task GetRuleStationsByFlowAsync(int flowId, int page = 0, int limit = 10) { var result_total = await _basApi.GetRuleStationsByFlow(flowId, 0, limit); diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs index 04bd82a1..58e4529a 100644 --- a/AMESCoreStudio.Web/Controllers/FQCController.cs +++ b/AMESCoreStudio.Web/Controllers/FQCController.cs @@ -224,7 +224,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task FQC001QueryAsync(int page = 1, int limit = 10) + public async Task FQC001QueryAsync(int page = 0, int limit = 10) { var result = await _fqcApi.GetQcGroupQuery(page, limit); @@ -302,7 +302,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task FQC002QueryAsync(int groupID = 0, int page = 1, int limit = 10) + public async Task FQC002QueryAsync(int groupID = 0, int page = 0, int limit = 10) { var result = await _fqcApi.GetQcItemQuery(groupID, page, limit); @@ -377,7 +377,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task FQC003QueryAsync(int page = 1, int limit = 10) + public async Task FQC003QueryAsync(int page = 0, int limit = 10) { var result = await _fqcApi.GetFqcResultQuery(page, limit); @@ -452,7 +452,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task FQC004QueryAsync(int page = 1, int limit = 10) + public async Task FQC004QueryAsync(int page = 0, int limit = 10) { var result = await _fqcApi.GetQcQuotQuery(page, limit); @@ -547,7 +547,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task FQC005QueryAsync(int quotID = 0, int page = 1, int limit = 10) + public async Task FQC005QueryAsync(int quotID = 0, int page = 0, int limit = 10) { var result = await _fqcApi.GetQcCriterionQuery(quotID, page, limit); @@ -636,7 +636,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task FQC006QueryAsync(int page = 1, int limit = 10) + public async Task FQC006QueryAsync(int page = 0, int limit = 10) { var result = await _fqcApi.GetStatusTypeQuery(page, limit); @@ -921,7 +921,7 @@ namespace AMESCoreStudio.Web.Controllers public async Task FQC008QueryAsync(string barcodeNo, string wipNo , string boxNo, string inhouseNo, string date_str, string date_end - , string status, int page = 1, int limit = 10) + , string status, int page = 0, int limit = 10) { IResultModel result = await _fqcApi.GetFqcInhouseMasterQuery(barcodeNo: barcodeNo, wipNo: wipNo , boxNo: boxNo, inhouseNo: inhouseNo, date_str: date_str, date_end: date_end diff --git a/AMESCoreStudio.Web/Controllers/KCSController.cs b/AMESCoreStudio.Web/Controllers/KCSController.cs index f9ccf6d0..8f9448b8 100644 --- a/AMESCoreStudio.Web/Controllers/KCSController.cs +++ b/AMESCoreStudio.Web/Controllers/KCSController.cs @@ -194,7 +194,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetMACInfoesAsync(int page = 1, int limit = 10) + public async Task GetMACInfoesAsync(int page = 0, int limit = 10) { var result_total = await _kcsApi.GetMACInfoes(0, limit); var result = await _kcsApi.GetMACInfoes(page, limit); @@ -302,7 +302,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetPartMapsAsync(int page = 1, int limit = 10) + public async Task GetPartMapsAsync(int page = 0, int limit = 10) { var result_total = await _kcsApi.GetPartMaps(0, limit); var result = await _kcsApi.GetPartMaps(page, limit); @@ -410,7 +410,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetKPLinksAsync(int page = 1, int limit = 10) + public async Task GetKPLinksAsync(int page = 0, int limit = 10) { var result_total = await _kcsApi.GetKPLinks(0, limit); var result = await _kcsApi.GetKPLinks(page, limit); @@ -524,7 +524,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetItemsAsync(int page = 1, int limit = 10) + public async Task GetItemsAsync(int page = 0, int limit = 10) { var result_total = await _kcsApi.GetItems(0, limit); var result = await _kcsApi.GetItems(page, limit); diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs index 359c77ce..879f109f 100644 --- a/AMESCoreStudio.Web/Controllers/PCSController.cs +++ b/AMESCoreStudio.Web/Controllers/PCSController.cs @@ -1553,7 +1553,7 @@ namespace AMESCoreStudio.Web.Controllers /// 生產單位 /// 工單號碼 /// - public async Task PCS004QueryAsync(string unitno, string wipno, int page = 1, int limit = 10) + public async Task PCS004QueryAsync(string unitno, string wipno, int page = 0, int limit = 10) { IResultModel result = await _pcsApi.GetWipInfoSelectParameter(unitno: unitno , wipno: wipno @@ -1782,7 +1782,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task PCS006QueryAsync(string unitno, string wipno, int page = 1, int limit = 10) + public async Task PCS006QueryAsync(string unitno, string wipno, int page = 0, int limit = 10) { // 工單基本資料 IResultModel result = await _pcsApi.GetWipInfoSelectParameter(unitno: unitno @@ -2191,7 +2191,7 @@ namespace AMESCoreStudio.Web.Controllers /// 鎖定日期迄 /// public async Task PCS012QueryAsync(string lockStatus, string lockType, string lockReasonType, string stations, - string wipNO, string itemNO, string dateStr, string dateEnd, int page = 1, int limit = 10) + string wipNO, string itemNO, string dateStr, string dateEnd, int page = 0, int limit = 10) { IResultModel result = await _pcsApi.GetWipLockQuery(lockStatus: lockStatus, lockType: lockType, lockReasonType: lockReasonType, stations: stations, wipNO: wipNO, itemNO: itemNO, date_str: dateStr, date_end: dateEnd @@ -2467,7 +2467,7 @@ namespace AMESCoreStudio.Web.Controllers /// 鎖定日期迄 /// public async Task PCS015QueryAsync(string barCodeNo, string wipNO, string itemNO, - string lockStatus, string dateStr, string dateEnd, int page = 1, int limit = 10) + string lockStatus, string dateStr, string dateEnd, int page = 0, int limit = 10) { IResultModel result = await _pcsApi.GetBarcodeLockQuery(barCodeNo: barCodeNo, wipNo: wipNO, itemNo: itemNO, lockStatus: lockStatus, date_Str: dateStr, date_End: dateEnd diff --git a/AMESCoreStudio.Web/Controllers/PPSController.cs b/AMESCoreStudio.Web/Controllers/PPSController.cs index 4bdcf0f5..45eb641f 100644 --- a/AMESCoreStudio.Web/Controllers/PPSController.cs +++ b/AMESCoreStudio.Web/Controllers/PPSController.cs @@ -536,7 +536,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetCycleTimesAsync(int page = 1, int limit = 10) + public async Task GetCycleTimesAsync(int page = 0, int limit = 10) { var result = await _ppsApi.GetCycleTimes(page,limit); var result_total = await _ppsApi.GetCycleTimes(0, limit); @@ -1009,7 +1009,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetNGGroupsAsync(int page = 1, int limit = 10) + public async Task GetNGGroupsAsync(int page = 0, int limit = 10) { var result_total = await _ppsApi.GetNGGroups(page, limit); var result = await _ppsApi.GetNGGroups(page, limit); @@ -1131,7 +1131,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetNGClassesByGroupAsync(string ngGroupNo, int page = 1, int limit = 10) + public async Task GetNGClassesByGroupAsync(string ngGroupNo, int page = 0, int limit = 10) { if (ngGroupNo == null) { @@ -1266,7 +1266,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetNGReasonsByClassAsync(string ngClassNo, int page = 1, int limit = 10) + public async Task GetNGReasonsByClassAsync(string ngClassNo, int page = 0, int limit = 10) { if (ngClassNo == null || ngClassNo == "0") { @@ -1381,7 +1381,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetRMAGroupsAsync(int page = 1, int limit = 10) + public async Task GetRMAGroupsAsync(int page = 0, int limit = 10) { var result_total = await _ppsApi.GetRMAGroups(0, limit); var result = await _ppsApi.GetRMAGroups(page, limit); @@ -1505,7 +1505,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetRMAClassesByGroupAsync(string rmaGroupNo, int page = 1, int limit = 10) + public async Task GetRMAClassesByGroupAsync(string rmaGroupNo, int page = 0, int limit = 10) { if (rmaGroupNo == null) { @@ -1644,7 +1644,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetRMAReasonsByClassAsync(string rmaClassNo, int page = 1, int limit = 10) + public async Task GetRMAReasonsByClassAsync(string rmaClassNo, int page = 0, int limit = 10) { if (rmaClassNo == null || rmaClassNo == "0") { @@ -1756,7 +1756,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetRepairTypesAsync(int page = 1, int limit = 10) + public async Task GetRepairTypesAsync(int page = 0, int limit = 10) { var result_total = await _ppsApi.GetRepairTypes(0, limit); var result = await _ppsApi.GetRepairTypes(page, limit); @@ -1863,7 +1863,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetRepairItemsAsync(int page = 1, int limit = 10) + public async Task GetRepairItemsAsync(int page = 0, int limit = 10) { var result_total = await _ppsApi.GetRepairItems(0, limit); var result = await _ppsApi.GetRepairItems(page, limit); @@ -1952,7 +1952,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetQATypesAsync(int page = 1, int limit = 10) + public async Task GetQATypesAsync(int page = 0, int limit = 10) { var result_total = await _ppsApi.GetQATypes(0, limit); var result = await _ppsApi.GetQATypes(page, limit); diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs index b99b707f..b95b5d33 100644 --- a/AMESCoreStudio.Web/Controllers/QRSController.cs +++ b/AMESCoreStudio.Web/Controllers/QRSController.cs @@ -282,7 +282,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetWipStationPassBarcode(string id, int page = 1, int limit = 10) + public async Task GetWipStationPassBarcode(string id, int page = 0, int limit = 10) { string[] param = id.Split("_"); int wip_id = int.Parse(param[0]); @@ -300,7 +300,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetWipStationFailBarcode(string id, int page = 1, int limit = 10) + public async Task GetWipStationFailBarcode(string id, int page = 0, int limit = 10) { string[] param = id.Split("_"); int wip_id = int.Parse(param[0]); @@ -318,7 +318,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetWipStationBarcode(string id, int page = 1, int limit = 10) + public async Task GetWipStationBarcode(string id, int page = 0, int limit = 10) { string[] param = id.Split("_"); int wip_id = int.Parse(param[0]); diff --git a/AMESCoreStudio.Web/Controllers/REPController.cs b/AMESCoreStudio.Web/Controllers/REPController.cs index 69429f02..421b4ddc 100644 --- a/AMESCoreStudio.Web/Controllers/REPController.cs +++ b/AMESCoreStudio.Web/Controllers/REPController.cs @@ -894,7 +894,7 @@ namespace AMESCoreStudio.Web.Controllers } - public async Task REP012QueryAsync(string productTypeNo, string testTypeNo, string unitNo, string lineID, string stationID, string wipNO, string itemNO, string dateStart, string dateEnd, int page = 1, int limit = 10) + public async Task REP012QueryAsync(string productTypeNo, string testTypeNo, string unitNo, string lineID, string stationID, string wipNO, string itemNO, string dateStart, string dateEnd, int page = 0, int limit = 10) { var result = await _repApi.GetRepairData4REP012(productTypeNo, testTypeNo, unitNo, lineID, stationID, wipNO, itemNO, dateStart, dateEnd, page, limit); diff --git a/AMESCoreStudio.Web/Controllers/SYSController.cs b/AMESCoreStudio.Web/Controllers/SYSController.cs index b78b856e..0fb1c212 100644 --- a/AMESCoreStudio.Web/Controllers/SYSController.cs +++ b/AMESCoreStudio.Web/Controllers/SYSController.cs @@ -207,7 +207,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetSystemInfoesAsync(int page = 1, int limit = 10) + public async Task GetSystemInfoesAsync(int page = 0, int limit = 10) { var result = await _sysApi.GetSystemInfoes(page,limit); var result_total = await _sysApi.GetSystemInfoes(0, limit); @@ -356,7 +356,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetModuleInfoesBySystemAsync(int systemID, int page = 1, int limit = 10) + public async Task GetModuleInfoesBySystemAsync(int systemID, int page = 0, int limit = 10) { var result = await _sysApi.GetModuleInfoesBySystem(systemID, page, limit); var result_total = await _sysApi.GetModuleInfoesBySystem(systemID, 0, limit); @@ -478,7 +478,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetProgramInfoesByModuleAsync(int moduleID, int page = 1, int limit = 10) + public async Task GetProgramInfoesByModuleAsync(int moduleID, int page = 0, int limit = 10) { var result = await _sysApi.GetProgramInfoesByMoudle(moduleID, page, limit); var result_total = await _sysApi.GetProgramInfoesByMoudle(moduleID, 0, limit); @@ -568,7 +568,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetRoleInfoesAsync(int page = 1, int limit = 10) + public async Task GetRoleInfoesAsync(int page = 0, int limit = 10) { var result = await _sysApi.GetRoleInfoes(page,limit); var result_total = await _sysApi.GetRoleInfoes(0,limit); @@ -705,7 +705,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetRoleModulesByRoleAsync(int roleID, int page = 1, int limit = 10) + public async Task GetRoleModulesByRoleAsync(int roleID, int page = 0, int limit = 10) { var result = await _sysApi.GetRoleModulesByRole(roleID,page,limit); var result_total = await _sysApi.GetRoleModulesByRole(roleID, 0, limit); @@ -842,7 +842,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetRoleProgramsByRoleAsync(int roleID, int page = 1, int limit = 10) + public async Task GetRoleProgramsByRoleAsync(int roleID, int page = 0, int limit = 10) { var result = await _sysApi.GetRoleProgramsByRole(roleID, page, limit); var result_total = await _sysApi.GetRoleProgramsByRole(roleID,0,limit); @@ -1052,7 +1052,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetUserInfoesAsync(int page = 1, int limit = 10) + public async Task GetUserInfoesAsync(int page = 0, int limit = 10) { var result = await _sysApi.GetUserInfoes(page,limit); var result_total = await _sysApi.GetUserInfoes(0,limit); @@ -1188,7 +1188,7 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetUserRolesByUserAsync(int userID, int page = 1, int limit = 10) + public async Task GetUserRolesByUserAsync(int userID, int page = 0, int limit = 10) { var result = await _sysApi.GetUserRolesByUser(userID,page,limit); var result_total = await _sysApi.GetUserRolesByUser(userID,0,limit); diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs b/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs index 615b0530..dfb56054 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs @@ -41,7 +41,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/QcGroup/QcGroupQuery")] - ITask> GetQcGroupQuery(int page = 1, int limit = 10); + ITask> GetQcGroupQuery(int page = 0, int limit = 10); /// /// 查詢檢驗類別維護 ID @@ -127,7 +127,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/FqcResult/FqcResultQuery")] - ITask> GetFqcResultQuery(int page = 1, int limit = 10); + ITask> GetFqcResultQuery(int page = 0, int limit = 10); /// /// 查詢檢驗結果維護 ID @@ -166,7 +166,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/QcQuot/QcQuotQuery")] - ITask> GetQcQuotQuery(int page = 1, int limit = 10); + ITask> GetQcQuotQuery(int page = 0, int limit = 10); /// /// 查詢抽驗係數維護 ID @@ -260,7 +260,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/StatusType/StatusTypeQuery")] - ITask> GetStatusTypeQuery(int page = 1, int limit = 10); + ITask> GetStatusTypeQuery(int page = 0, int limit = 10); /// /// 查詢過站狀態檔 ID @@ -327,14 +327,14 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/NGGroups")] - ITask> GetNGGroups(int page = 1, int limit = 10); + ITask> GetNGGroups(int page = 0, int limit = 10); /// /// 根据群組代碼獲取不良現象類別資料 /// /// [WebApiClient.Attributes.HttpGet("api/NGClasses/Group/{no}")] - ITask> GetNGClassesByGroup(string no, int page = 1, int limit = 10); + ITask> GetNGClassesByGroup(string no, int page = 0, int limit = 10); /// @@ -419,7 +419,7 @@ namespace AMESCoreStudio.Web [WebApiClient.Attributes.HttpGet("api/FqcInhouseMaster/FqcInhouseMasterQuery")] ITask> GetFqcInhouseMasterQuery(string barcodeNo = null, string wipNo = null , string boxNo = null, string inhouseNo = null, string date_str = null, string date_end = null - , string status = null, int page = 1, int limit = 10); + , string status = null, int page = 0, int limit = 10); #endregion } diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IKCS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IKCS.cs index 74c73bc0..9fe3f517 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/IKCS.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/IKCS.cs @@ -47,7 +47,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/MACInfoes")] - ITask> GetMACInfoes(int page = 1, int limit = 10); + ITask> GetMACInfoes(int page = 0, int limit = 10); #endregion @@ -86,7 +86,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/PartMaps")] - ITask> GetPartMaps(int page = 1, int limit = 10); + ITask> GetPartMaps(int page = 0, int limit = 10); #endregion @@ -125,7 +125,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/KPLinks")] - ITask> GetKPLinks(int page = 1, int limit = 10); + ITask> GetKPLinks(int page = 0, int limit = 10); #endregion @@ -164,7 +164,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/Items")] - ITask> GetItems(int page = 1, int limit = 10); + ITask> GetItems(int page = 0, int limit = 10); #endregion diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs index d7002b13..a6ed2834 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs @@ -89,7 +89,7 @@ namespace AMESCoreStudio.Web [WebApiClient.Attributes.HttpGet("api/WipInfos/GetWipInfoSelectParameter")] //ITask> GetWipInfoSelectParameter(string unitno = null, string wipno = null); ITask> GetWipInfoSelectParameter(string unitno = null, string wipno = null, int lineid = 0 - , string itemno = null, DateTime? date_str = null, DateTime? date_end = null, int page = 1, int limit = 10); + , string itemno = null, DateTime? date_str = null, DateTime? date_end = null, int page = 0, int limit = 10); /// /// 查詢工單基本資料+是否已過站 @@ -448,7 +448,7 @@ namespace AMESCoreStudio.Web [WebApiClient.Attributes.HttpGet("api/WipLock/GetWipLockQuery")] ITask> GetWipLockQuery(string lockStatus = null, string lockType = null, string lockReasonType = null , string stations = null, string wipNO = null, string itemNO = null, string date_str = null, string date_end = null - , int page = 1, int limit = 10); + , int page = 0, int limit = 10); /// /// 工單號碼 by 工單鎖定資料檔 @@ -498,7 +498,7 @@ namespace AMESCoreStudio.Web /// [WebApiClient.Attributes.HttpGet("api/BarcodeLock/GetBarcodeLockQuery")] ITask> GetBarcodeLockQuery(string barCodeNo = null, string wipNo = null, string lockStatus = null - , string itemNo = null, string date_Str = null, string date_End = null, int page = 1, int limit = 10); + , string itemNo = null, string date_Str = null, string date_End = null, int page = 0, int limit = 10); /// /// 新增工單鎖定資料檔 diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IPPS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IPPS.cs index 4ff35eac..c960e17e 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/IPPS.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/IPPS.cs @@ -125,7 +125,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/CycleTimes")] - ITask> GetCycleTimes(int page = 1, int limit = 10); + ITask> GetCycleTimes(int page = 0, int limit = 10); #endregion @@ -295,7 +295,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/NGGroups")] - ITask> GetNGGroups(int page = 1, int limit = 10); + ITask> GetNGGroups(int page = 0, int limit = 10); #endregion @@ -341,7 +341,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/NGClasses/Group/{no}")] - ITask> GetNGClassesByGroup(string no, int page = 1, int limit = 10); + ITask> GetNGClassesByGroup(string no, int page = 0, int limit = 10); #endregion @@ -387,7 +387,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/NGReasons/Class/{no}")] - ITask> GetNGReasonsByClass(string no, int page = 1, int limit = 10); + ITask> GetNGReasonsByClass(string no, int page = 0, int limit = 10); #endregion @@ -426,7 +426,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/RMAGroups")] - ITask> GetRMAGroups(int page = 1, int limit = 10); + ITask> GetRMAGroups(int page = 0, int limit = 10); #endregion @@ -472,7 +472,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/RMAClasses/Group/{no}")] - ITask> GetRMAClassesByGroup(string no, int page = 1, int limit = 10); + ITask> GetRMAClassesByGroup(string no, int page = 0, int limit = 10); #endregion @@ -518,7 +518,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/RMAReasons/Class/{no}")] - ITask> GetRMAReasonsByClass(string no, int page = 1, int limit = 10); + ITask> GetRMAReasonsByClass(string no, int page = 0, int limit = 10); #endregion @@ -557,7 +557,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/RepairTypes")] - ITask> GetRepairTypes(int page = 1, int limit = 10); + ITask> GetRepairTypes(int page = 0, int limit = 10); #endregion @@ -596,7 +596,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/RepairItems")] - ITask> GetRepairItems(int page = 1, int limit = 10); + ITask> GetRepairItems(int page = 0, int limit = 10); #endregion @@ -635,7 +635,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/QATypes")] - ITask> GetQATypes(int page = 1, int limit = 10); + ITask> GetQATypes(int page = 0, int limit = 10); #endregion diff --git a/AMESCoreStudio.Web/HttpApis/IBAS.cs b/AMESCoreStudio.Web/HttpApis/IBAS.cs index 0d6f7546..1ddc5d48 100644 --- a/AMESCoreStudio.Web/HttpApis/IBAS.cs +++ b/AMESCoreStudio.Web/HttpApis/IBAS.cs @@ -404,7 +404,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/RuleStations/Flow/{id}")] - ITask> GetRuleStationsByFlow(int id, int page = 1, int limit = 10); + ITask> GetRuleStationsByFlow(int id, int page = 0, int limit = 10); /// /// 獲取流程站別資料 diff --git a/AMESCoreStudio.Web/HttpApis/ISYS.cs b/AMESCoreStudio.Web/HttpApis/ISYS.cs index ed8f5645..cd5d50bb 100644 --- a/AMESCoreStudio.Web/HttpApis/ISYS.cs +++ b/AMESCoreStudio.Web/HttpApis/ISYS.cs @@ -46,7 +46,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/SystemInfoes")] - ITask> GetSystemInfoes(int page = 1, int limit = 10); + ITask> GetSystemInfoes(int page = 0, int limit = 10); #endregion @@ -92,7 +92,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/ModuleInfoes/System/{id}")] - ITask> GetModuleInfoesBySystem(int id, int page = 1, int limit = 10); + ITask> GetModuleInfoesBySystem(int id, int page = 0, int limit = 10); #endregion @@ -138,7 +138,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/ProgramInfoes/Module/{id}")] - ITask> GetProgramInfoesByMoudle(int id, int page = 1, int limit = 10); + ITask> GetProgramInfoesByMoudle(int id, int page = 0, int limit = 10); #endregion @@ -177,7 +177,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/RoleInfoes")] - ITask> GetRoleInfoes(int page = 1, int limit = 10); + ITask> GetRoleInfoes(int page = 0, int limit = 10); #endregion @@ -223,7 +223,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/RoleModules/Role/{id}")] - ITask> GetRoleModulesByRole(int id, int page = 1, int limit = 10); + ITask> GetRoleModulesByRole(int id, int page = 0, int limit = 10); #endregion @@ -269,7 +269,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/RolePrograms/Role/{id}")] - ITask> GetRoleProgramsByRole(int id, int page = 1, int limit = 10); + ITask> GetRoleProgramsByRole(int id, int page = 0, int limit = 10); #endregion @@ -347,7 +347,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/UserInfoes")] - ITask> GetUserInfoes(int page = 1, int limit = 10); + ITask> GetUserInfoes(int page = 0, int limit = 10); #endregion @@ -393,7 +393,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/UserRoles/User/{id}")] - ITask> GetUserRolesByUser(int id, int page = 1, int limit = 10); + ITask> GetUserRolesByUser(int id, int page = 0, int limit = 10); #endregion diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs index 1966a8b1..e68db1c9 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs @@ -95,7 +95,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// [Route("[action]")] [HttpGet] - public async Task> GetWipBarcode4QRS009(int wipID, int ruleStationID, int page = 1, int limit = 10) + public async Task> GetWipBarcode4QRS009(int wipID, int ruleStationID, int page = 0, int limit = 10) { ResultModel result = new ResultModel(); var q = from q1 in _context.BarcodeInfoes diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeLockController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeLockController.cs index 53d4f2ed..c1d122c4 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeLockController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeLockController.cs @@ -79,7 +79,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// [HttpGet("GetBarcodeLockQuery")] public async Task> GetBarcodeLockQuery(string barCodeNo, string wipNo, string lockStatus - , string itemNo, string date_Str = null, string date_End = null, int page = 1, int limit = 10) + , string itemNo, string date_Str = null, string date_End = null, int page = 0, int limit = 10) { IQueryable q = _context.BarcodeLocks; diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs index d5b8ff05..32d373b2 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs @@ -99,7 +99,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// [Route("[action]")] [HttpGet] - public async Task> GetWipStationBarcode4QRS009(int wipID, int ruleStationID, string ruleStatus, int page = 1, int limit = 10) + public async Task> GetWipStationBarcode4QRS009(int wipID, int ruleStationID, string ruleStatus, int page = 0, int limit = 10) { ResultModel result = new ResultModel(); var q = from q1 in _context.BarcodeStation diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/CycleTimesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/CycleTimesController.cs index dbcdf773..b20baf4a 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/CycleTimesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/CycleTimesController.cs @@ -35,7 +35,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// // GET: api/CycleTimes [HttpGet] - public async Task>> GetCycleTime(int page = 1, int limit = 10) + public async Task>> GetCycleTime(int page = 0, int limit = 10) { IQueryable q = _context.CycleTimes; if (page > 0) diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs index 63fa814b..5fd7f469 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs @@ -93,7 +93,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// [HttpGet("FqcInhouseMasterQuery")] public async Task> GetFqcInhouseMasterQuery(string barcodeNo, string wipNo, string boxNo - , string inhouseNo, string date_str, string date_end, string status, int page = 1, int limit = 10) + , string inhouseNo, string date_str, string date_end, string status, int page = 0, int limit = 10) { IQueryable q = from q1 in _context.FqcInhouseMasters join q2 in _context.FqcInhouseDetails on new { q1.InhouseNo, q1.SeqID } equals new { q2.InhouseNo, q2.SeqID } diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultController.cs index c47911aa..4003e4aa 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultController.cs @@ -53,7 +53,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// 筆數 /// [HttpGet("FqcResultQuery")] - public async Task> GetFqcResultQuery(int page = 1, int limit = 10) + public async Task> GetFqcResultQuery(int page = 0, int limit = 10) { IQueryable q = _context.FqcResults; ResultModel result = new ResultModel(); diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/KPLinksController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/KPLinksController.cs index 9e5706d4..5da1d1c8 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/KPLinksController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/KPLinksController.cs @@ -35,7 +35,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// // GET: api/KPLinks [HttpGet] - public async Task>> GetKPLink(int page = 1, int limit = 10) + public async Task>> GetKPLink(int page = 0, int limit = 10) { IQueryable q = _context.KPLinks; if (page > 0) diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/NGClassesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/NGClassesController.cs index c524233d..2a36b312 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/NGClassesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/NGClassesController.cs @@ -54,7 +54,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// // GET: api/NGClasses/Group/S [HttpGet("Group/{no}")] - public async Task>> GetNGClassByGroup(string no, int page = 1, int limit = 10) + public async Task>> GetNGClassByGroup(string no, int page = 0, int limit = 10) { IQueryable q = _context.NGClasses; diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/NGGroupsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/NGGroupsController.cs index 61d7e3f0..eb61e16f 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/NGGroupsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/NGGroupsController.cs @@ -37,7 +37,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// // GET: api/NGGroups [HttpGet] - public async Task>> GetNGGroup(int page = 1, int limit = 10) + public async Task>> GetNGGroup(int page = 0, int limit = 10) { IQueryable q = _context.NGGroups; if (page > 0) diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/NGReasonsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/NGReasonsController.cs index b5a532ab..01e73733 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/NGReasonsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/NGReasonsController.cs @@ -54,7 +54,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// // GET: api/NGReasons/Class/S [HttpGet("Class/{no}")] - public async Task>> GetNGReasonByClass(string no, int page = 1, int limit = 10) + public async Task>> GetNGReasonByClass(string no, int page = 0, int limit = 10) { IQueryable q = _context.NGReasons; diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs index d18d8255..03ee3bc1 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs @@ -101,7 +101,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// [Route("[action]")] [HttpGet] - public async Task> GetRepairData4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, int page = 1, int limit = 10) + public async Task> GetRepairData4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, int page = 0, int limit = 10) { ResultModel result = new ResultModel(); var q = from q1 in _context.NgRepairs diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/PartMapsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/PartMapsController.cs index fd541deb..2fffc9b6 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/PartMapsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/PartMapsController.cs @@ -35,7 +35,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// // GET: api/PartMaps [HttpGet] - public async Task>> GetPartMap(int page = 1, int limit = 10) + public async Task>> GetPartMap(int page = 0, int limit = 10) { IQueryable q = _context.PartMaps; if (page > 0) diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/QATypesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/QATypesController.cs index 6710bc41..4728bfc9 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/QATypesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/QATypesController.cs @@ -35,7 +35,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// // GET: api/QATypes [HttpGet] - public async Task>> GetQAType(int page = 1, int limit = 10) + public async Task>> GetQAType(int page = 0, int limit = 10) { IQueryable q = _context.QATypes; if (page > 0) diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/QcCriterionController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/QcCriterionController.cs index ad9cfef8..3fc01c88 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/QcCriterionController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/QcCriterionController.cs @@ -79,7 +79,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES } [HttpGet("QcCriterionQuery")] - public async Task> GetQcCriterionQuery(int quotID = 0, int page = 1, int limit = 10) + public async Task> GetQcCriterionQuery(int quotID = 0, int page = 0, int limit = 10) { IQueryable q = _context.QcCriteria; ResultModel result = new ResultModel(); diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/QcGroupController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/QcGroupController.cs index c9c627e8..91b41496 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/QcGroupController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/QcGroupController.cs @@ -47,7 +47,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES } [HttpGet("QcGroupQuery")] - public async Task> GetQcGroupQuery(int page = 1, int limit = 10) + public async Task> GetQcGroupQuery(int page = 0, int limit = 10) { IQueryable q = _context.QcGroups; ResultModel result = new ResultModel(); diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/QcItemController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/QcItemController.cs index 4ec2258c..16a5d6b4 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/QcItemController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/QcItemController.cs @@ -55,7 +55,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// 筆數 /// [HttpGet("QcItemQuery")] - public async Task> GetQcItemQuery(int groupID = 0, int page = 1, int limit = 10) + public async Task> GetQcItemQuery(int groupID = 0, int page = 0, int limit = 10) { IQueryable q = _context.QcItems; ResultModel result = new ResultModel(); diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/QcQuotController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/QcQuotController.cs index b363213d..c834a83c 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/QcQuotController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/QcQuotController.cs @@ -51,7 +51,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES } [HttpGet("QcQuotQuery")] - public async Task> GetQcQuotQuery(int page = 1, int limit = 10) + public async Task> GetQcQuotQuery(int page = 0, int limit = 10) { IQueryable q = _context.QcQuots; ResultModel result = new ResultModel(); diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/RMAClassesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/RMAClassesController.cs index eb74eac3..9f76d27b 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/RMAClassesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/RMAClassesController.cs @@ -54,7 +54,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// // GET: api/RMAClasses/Group/S [HttpGet("Group/{no}")] - public async Task>> GetRMAClassByGroup(string no, int page = 1, int limit = 10) + public async Task>> GetRMAClassByGroup(string no, int page = 0, int limit = 10) { IQueryable q = _context.RMAClasses; diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/RMAReasonsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/RMAReasonsController.cs index 3f71435a..eb8993f2 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/RMAReasonsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/RMAReasonsController.cs @@ -54,7 +54,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// // GET: api/RMAReasons/Class/S [HttpGet("Class/{no}")] - public async Task>> GetRMAReasonByClass(string no, int page = 1, int limit = 10) + public async Task>> GetRMAReasonByClass(string no, int page = 0, int limit = 10) { IQueryable q = _context.RMAReasons; diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/RepairItemsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/RepairItemsController.cs index ff0bc35b..2d619efc 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/RepairItemsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/RepairItemsController.cs @@ -35,7 +35,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// // GET: api/RepairItems [HttpGet] - public async Task>> GetRepairItem(int page = 1, int limit = 10) + public async Task>> GetRepairItem(int page = 0, int limit = 10) { IQueryable q = _context.RepairItems; if (page > 0) diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/RepairTypesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/RepairTypesController.cs index 92def5a2..f9e6956f 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/RepairTypesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/RepairTypesController.cs @@ -35,7 +35,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// // GET: api/RepairTypes [HttpGet] - public async Task>> GetRepairType(int page = 1, int limit = 10) + public async Task>> GetRepairType(int page = 0, int limit = 10) { IQueryable q = _context.RepairTypes; if (page > 0) diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/StatusTypeController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/StatusTypeController.cs index 8ea4939b..6705a547 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/StatusTypeController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/StatusTypeController.cs @@ -47,7 +47,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES } [HttpGet("StatusTypeQuery")] - public async Task> GetStatusTypeQuery(int page = 1, int limit = 10) + public async Task> GetStatusTypeQuery(int page = 0, int limit = 10) { IQueryable q = _context.StatusTypes; ResultModel result = new ResultModel(); diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs index aa856cf8..9ff4b843 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs @@ -105,7 +105,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// [Route("[action]")] [HttpGet] - public async Task> GetWipInfoSelectParameter([FromQuery] WipInfoDto value, int page = 1, int limit = 10) + public async Task> GetWipInfoSelectParameter([FromQuery] WipInfoDto value, int page = 0, int limit = 10) { ResultModel result = new ResultModel(); var q = from q1 in _context.WipInfos @@ -185,7 +185,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// //[Route("[action]")] //[HttpGet] - //public async Task> GetWipInfoSelectParameterInBarCodeStation([FromQuery] WipInfoDto value, int page = 1, int limit = 10) + //public async Task> GetWipInfoSelectParameterInBarCodeStation([FromQuery] WipInfoDto value, int page = 0, int limit = 10) //{ //ResultModel result = new ResultModel(); diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs index 85eafeba..880b68c3 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs @@ -97,7 +97,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES [HttpGet] public async Task> GetWipLockQuery(string wipNO, string lockstatus, string locktype , string itemno, string lockreasontype, int stations = 0, string date_str = null, string date_end = null - , int page = 1, int limit = 10) + , int page = 0, int limit = 10) { IQueryable q = _context.WipLocks; diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs index 4b109450..820809f6 100644 --- a/AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs @@ -67,7 +67,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS /// // GET: api/RuleStations/Flow/5 [HttpGet("Flow/{id}")] - public async Task>> GetRuleStationByFlow(int id, int page = 1, int limit = 10) + public async Task>> GetRuleStationByFlow(int id, int page = 0, int limit = 10) { IQueryable q = _context.RuleStations; diff --git a/AMESCoreStudio.WebApi/Controllers/SYS/ModuleInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/SYS/ModuleInfoesController.cs index d6c991ee..09b3d872 100644 --- a/AMESCoreStudio.WebApi/Controllers/SYS/ModuleInfoesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/SYS/ModuleInfoesController.cs @@ -52,7 +52,7 @@ namespace AMESCoreStudio.WebApi.Controllers.SYS /// // GET: api/ModuleInfoes/System/5 [HttpGet("System/{id}")] - public async Task>> GetModuleInfoBySystem(int id, int page = 1, int limit = 10) + public async Task>> GetModuleInfoBySystem(int id, int page = 0, int limit = 10) { IQueryable q = _context.ModuleInfoes; diff --git a/AMESCoreStudio.WebApi/Controllers/SYS/ProgramInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/SYS/ProgramInfoesController.cs index 34b6bd49..ab8429ee 100644 --- a/AMESCoreStudio.WebApi/Controllers/SYS/ProgramInfoesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/SYS/ProgramInfoesController.cs @@ -46,7 +46,7 @@ namespace AMESCoreStudio.WebApi.Controllers.SYS /// // GET: api/ProgramInfoes/Module/5 [HttpGet("Module/{id}")] - public async Task>> GetProgramInfoByModule(int id, int page = 1, int limit = 10) + public async Task>> GetProgramInfoByModule(int id, int page = 0, int limit = 10) { IQueryable q = _context.ProgramInfoes; diff --git a/AMESCoreStudio.WebApi/Controllers/SYS/RoleInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/SYS/RoleInfoesController.cs index 7af28fc1..2737147e 100644 --- a/AMESCoreStudio.WebApi/Controllers/SYS/RoleInfoesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/SYS/RoleInfoesController.cs @@ -32,7 +32,7 @@ namespace AMESCoreStudio.WebApi.Controllers.SYS /// // GET: api/RoleInfoes [HttpGet] - public async Task>> GetRoleInfo(int page = 1, int limit = 10) + public async Task>> GetRoleInfo(int page = 0, int limit = 10) { IQueryable q = _context.RoleInfoes; q = q.Where(p => p.RoleID > 0); diff --git a/AMESCoreStudio.WebApi/Controllers/SYS/RoleModulesController.cs b/AMESCoreStudio.WebApi/Controllers/SYS/RoleModulesController.cs index 7068b801..90e627bb 100644 --- a/AMESCoreStudio.WebApi/Controllers/SYS/RoleModulesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/SYS/RoleModulesController.cs @@ -64,7 +64,7 @@ namespace AMESCoreStudio.WebApi.Controllers.SYS /// // GET: api/RoleModules/Role/5 [HttpGet("Role/{id}")] - public async Task>> GetRoleModuleByRole(int id, int page = 1, int limit = 10) + public async Task>> GetRoleModuleByRole(int id, int page = 0, int limit = 10) { //IQueryable q = _context.RoleModules.Include(r=>r.Module); IQueryable q = _context.RoleModules; diff --git a/AMESCoreStudio.WebApi/Controllers/SYS/RoleProgramsController.cs b/AMESCoreStudio.WebApi/Controllers/SYS/RoleProgramsController.cs index d5c86871..70d1a9e2 100644 --- a/AMESCoreStudio.WebApi/Controllers/SYS/RoleProgramsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/SYS/RoleProgramsController.cs @@ -64,7 +64,7 @@ namespace AMESCoreStudio.WebApi.Controllers.SYS /// // GET: api/RolePrograms/Role/5 [HttpGet("Role/{id}")] - public async Task>> GetRoleProgramByRole(int id, int page = 1, int limit = 10) + public async Task>> GetRoleProgramByRole(int id, int page = 0, int limit = 10) { IQueryable q = _context.RolePrograms; diff --git a/AMESCoreStudio.WebApi/Controllers/SYS/SystemInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/SYS/SystemInfoesController.cs index 0d44872c..d9e1b3ba 100644 --- a/AMESCoreStudio.WebApi/Controllers/SYS/SystemInfoesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/SYS/SystemInfoesController.cs @@ -34,7 +34,7 @@ namespace AMESCoreStudio.WebApi.Controllers.SYS /// // GET: api/SystemInfoes [HttpGet] - public async Task>> GetSystemInfo(int page = 1, int limit = 10) + public async Task>> GetSystemInfo(int page = 0, int limit = 10) { IQueryable q = _context.SystemInfoes; diff --git a/AMESCoreStudio.WebApi/Controllers/SYS/UserInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/SYS/UserInfoesController.cs index e4db4ae2..a0e14ff4 100644 --- a/AMESCoreStudio.WebApi/Controllers/SYS/UserInfoesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/SYS/UserInfoesController.cs @@ -32,7 +32,7 @@ namespace AMESCoreStudio.WebApi.Controllers.SYS /// // GET: api/UserInfoes [HttpGet] - public async Task>> GetUserInfo(int page = 1, int limit = 10) + public async Task>> GetUserInfo(int page = 0, int limit = 10) { IQueryable q = _context.UserInfoes; q = q.Where(p => p.UserID > 0); diff --git a/AMESCoreStudio.WebApi/Controllers/SYS/UserRolesController.cs b/AMESCoreStudio.WebApi/Controllers/SYS/UserRolesController.cs index 5ac14d2c..4c040675 100644 --- a/AMESCoreStudio.WebApi/Controllers/SYS/UserRolesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/SYS/UserRolesController.cs @@ -62,7 +62,7 @@ namespace AMESCoreStudio.WebApi.Controllers.SYS /// // GET: api/UserRoles/User/5 [HttpGet("User/{id}")] - public async Task>> GetUserRoleByUser(int id, int page = 1, int limit = 10) + public async Task>> GetUserRoleByUser(int id, int page = 0, int limit = 10) { IQueryable q = _context.UserRoles;