diff --git a/server/AyaNova/Controllers/WorkOrderController.cs b/server/AyaNova/Controllers/WorkOrderController.cs index 2b0265fb..e8beb12d 100644 --- a/server/AyaNova/Controllers/WorkOrderController.cs +++ b/server/AyaNova/Controllers/WorkOrderController.cs @@ -264,10 +264,10 @@ namespace AyaNova.Api.Controllers /// /// Delete WorkOrderItem /// - /// + /// /// NoContent - [HttpDelete("{id}")] - public async Task DeleteWorkOrderItem([FromRoute] long id) + [HttpDelete("items/{WorkOrderItemId}")] + public async Task DeleteWorkOrderItem([FromRoute] long WorkOrderItemId) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -276,7 +276,7 @@ namespace AyaNova.Api.Controllers WorkOrderBiz biz = WorkOrderBiz.GetBiz(ct, HttpContext); if (!Authorized.HasDeleteRole(HttpContext.Items, AyaType.WorkOrderItem)) return StatusCode(403, new ApiNotAuthorizedResponse()); - if (!await biz.ItemDeleteAsync(id)) + if (!await biz.ItemDeleteAsync(WorkOrderItemId)) return BadRequest(new ApiErrorResponse(biz.Errors)); return NoContent(); } diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index 393678c2..e49f4b56 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -436,11 +436,13 @@ namespace AyaNova.Biz //Delete children foreach (long l in LaborIds) { - if (!await LaborDeleteAsync(id)) return false; + if (!await LaborDeleteAsync(id)) + return false; } foreach (long l in PartIds) { - if (!await LaborDeleteAsync(id)) return false; + if (!await PartDeleteAsync(id)) + return false; } ct.WorkOrderItem.Remove(dbObject);