diff --git a/server/AyaNova/Controllers/PurchaseOrderController.cs b/server/AyaNova/Controllers/PurchaseOrderController.cs index d85df536..fae55f72 100644 --- a/server/AyaNova/Controllers/PurchaseOrderController.cs +++ b/server/AyaNova/Controllers/PurchaseOrderController.cs @@ -97,7 +97,7 @@ namespace AyaNova.Api.Controllers return StatusCode(403, new ApiNotAuthorizedResponse()); if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); - var o = await biz.GetAsync(id); + var o = await biz.GetAsync(id, true, true); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); return Ok(ApiOkResponse.Response(o)); } @@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));; + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); ; } /// diff --git a/server/AyaNova/biz/PurchaseOrderBiz.cs b/server/AyaNova/biz/PurchaseOrderBiz.cs index a67335f4..45039364 100644 --- a/server/AyaNova/biz/PurchaseOrderBiz.cs +++ b/server/AyaNova/biz/PurchaseOrderBiz.cs @@ -73,7 +73,7 @@ namespace AyaNova.Biz { //TODO: allow this but only with ZEROS set for the actual received amount and ignore woitempart requested during dupe? - var dbObject = await GetAsync(id, false); + var dbObject = await GetAsync(id, false, false); if (dbObject == null) { AddError(ApiErrorCode.NOT_FOUND, "id"); @@ -102,15 +102,15 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //GET // - internal async Task GetAsync(long id, bool logTheGetEvent = true) + internal async Task GetAsync(long id, bool populateNames, bool logTheGetEvent) { var ret = await ct.PurchaseOrder.Include(z => z.Items).AsNoTracking().SingleOrDefaultAsync(z => z.Id == id); - //populate names for client ui - var pl= new PickListBiz(ct,UserId,UserTranslationId,CurrentUserRoles); - var log= AyaNova.Util.ApplicationLogging.CreateLogger("PickListBiz::GetTemplatedNameAsync"); - foreach(PurchaseOrderItem item in ret.Items){ - item.PartName= await pl.GetTemplatedNameAsync(AyaType.Part,item.PartId,null,log); + var pl = new PickListBiz(ct, UserId, UserTranslationId, CurrentUserRoles); + var log = AyaNova.Util.ApplicationLogging.CreateLogger("PurchaseOrderBiz::GetAsync"); + foreach (PurchaseOrderItem item in ret.Items) + { + item.PartName = await pl.GetTemplatedNameAsync(AyaType.Part, item.PartId, null, log); } if (logTheGetEvent && ret != null) await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct); @@ -122,7 +122,7 @@ namespace AyaNova.Biz // internal async Task PutAsync(PurchaseOrder putObject) { - var dbObject = await GetAsync(putObject.Id, false); + var dbObject = await GetAsync(putObject.Id, false, false); if (dbObject == null) { AddError(ApiErrorCode.NOT_FOUND, "id"); @@ -171,7 +171,7 @@ namespace AyaNova.Biz { try { - var dbObject = await GetAsync(id, false); + var dbObject = await GetAsync(id, false, false); if (dbObject == null) { AddError(ApiErrorCode.NOT_FOUND); @@ -216,7 +216,7 @@ namespace AyaNova.Biz public async Task GetSearchResultSummary(long id) { - var obj = await GetAsync(id, false); + var obj = await GetAsync(id, false, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); DigestSearchText(obj, SearchParams); return SearchParams; @@ -553,7 +553,7 @@ namespace AyaNova.Biz PurchaseOrder o = null; //save a fetch if it's a delete if (job.SubType != JobSubType.Delete) - o = await GetAsync(id, false); + o = await GetAsync(id, false, false); switch (job.SubType) { case JobSubType.TagAddAny: