This commit is contained in:
@@ -356,10 +356,10 @@ namespace AyaNova.Biz
|
|||||||
o.UnitViz = await ct.Unit.AsNoTracking().Where(x => x.Id == o.UnitId).Select(x => x.Serial).FirstOrDefaultAsync();
|
o.UnitViz = await ct.Unit.AsNoTracking().Where(x => x.Id == o.UnitId).Select(x => x.Serial).FirstOrDefaultAsync();
|
||||||
o.CustomerViz = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => x.Name).FirstOrDefaultAsync();
|
o.CustomerViz = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => x.Name).FirstOrDefaultAsync();
|
||||||
|
|
||||||
//MIGRATE_OUTSTANDING routine to get wo id from the WorkorderItemId
|
//MIGRATE_OUTSTANDING routine to get wo id from the WorkOrderItemId
|
||||||
o.WorkorderItemViz = "MIGRATE_OUTSTANDING woitem display value";
|
o.WorkOrderItemViz = "MIGRATE_OUTSTANDING woitem display value";
|
||||||
// if (o.WorkorderItemId != null)
|
// if (o.WorkOrderItemId != null)
|
||||||
// o.WorkorderItemViz = await ct.WorkorderItem.AsNoTracking().Where(x=>x.Id==o.WorkorderItemId).Select(x => x.Name).FirstOrDefaultAsync();
|
// o.WorkorderItemViz = await ct.WorkorderItem.AsNoTracking().Where(x=>x.Id==o.WorkOrderItemId).Select(x => x.Name).FirstOrDefaultAsync();
|
||||||
|
|
||||||
o.RequestedByUserViz = await ct.User.AsNoTracking().Where(x => x.Id == o.RequestedByUserId).Select(x => x.Name).FirstOrDefaultAsync();
|
o.RequestedByUserViz = await ct.User.AsNoTracking().Where(x => x.Id == o.RequestedByUserId).Select(x => x.Name).FirstOrDefaultAsync();
|
||||||
o.StatusViz = customerServiceRequestStatusEnumList.Where(x => x.Id == (long)o.Status).Select(x => x.Name).First();
|
o.StatusViz = customerServiceRequestStatusEnumList.Where(x => x.Id == (long)o.Status).Select(x => x.Name).First();
|
||||||
|
|||||||
@@ -188,7 +188,7 @@ namespace AyaNova.Biz
|
|||||||
if (serverState.IsSystemLocked) return;
|
if (serverState.IsSystemLocked) return;
|
||||||
|
|
||||||
if (serverState.IsMigrateMode){
|
if (serverState.IsMigrateMode){
|
||||||
log.LogInformation("Server is in migrate mode, skipping non-critical internal jobs");
|
log.LogDebug("Server is in migrate mode, skipping non-critical internal jobs");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4906,8 +4906,8 @@ namespace AyaNova.Biz
|
|||||||
woi.WarrantyService = pmi.WarrantyService;
|
woi.WarrantyService = pmi.WarrantyService;
|
||||||
if (p.CopyWiki)
|
if (p.CopyWiki)
|
||||||
woi.Wiki = pmi.Wiki;
|
woi.Wiki = pmi.Wiki;
|
||||||
woi.WorkorderItemPriorityId = pmi.WorkOrderItemPriorityId;
|
woi.WorkOrderItemPriorityId = pmi.WorkOrderItemPriorityId;
|
||||||
woi.WorkorderItemStatusId = pmi.WorkOrderItemStatusId;
|
woi.WorkOrderItemStatusId = pmi.WorkOrderItemStatusId;
|
||||||
|
|
||||||
foreach (PMItemUnit pmiunit in pmi.Units)
|
foreach (PMItemUnit pmiunit in pmi.Units)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -222,7 +222,7 @@ namespace AyaNova.Biz
|
|||||||
await Task.CompletedTask;
|
await Task.CompletedTask;
|
||||||
//Referential integrity
|
//Referential integrity
|
||||||
//FOREIGN KEY CHECKS
|
//FOREIGN KEY CHECKS
|
||||||
if (await ct.WorkOrderItem.AnyAsync(m => m.WorkorderItemPriorityId == inObj.Id))
|
if (await ct.WorkOrderItem.AnyAsync(m => m.WorkOrderItemPriorityId == inObj.Id))
|
||||||
AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("WorkOrderItem"));
|
AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("WorkOrderItem"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -223,7 +223,7 @@ namespace AyaNova.Biz
|
|||||||
await Task.CompletedTask;
|
await Task.CompletedTask;
|
||||||
//Referential integrity
|
//Referential integrity
|
||||||
//FOREIGN KEY CHECKS
|
//FOREIGN KEY CHECKS
|
||||||
if (await ct.WorkOrderItem.AnyAsync(m => m.WorkorderItemStatusId == inObj.Id))
|
if (await ct.WorkOrderItem.AnyAsync(m => m.WorkOrderItemStatusId == inObj.Id))
|
||||||
AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("WorkOrderItem"));
|
AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("WorkOrderItem"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -31,9 +31,9 @@ namespace AyaNova.Models
|
|||||||
public long? UnitId { get; set; }
|
public long? UnitId { get; set; }
|
||||||
[NotMapped]
|
[NotMapped]
|
||||||
public string UnitViz { get; set; }
|
public string UnitViz { get; set; }
|
||||||
public long? WorkorderItemId { get; set; }
|
public long? WorkOrderItemId { get; set; }
|
||||||
[NotMapped]
|
[NotMapped]
|
||||||
public string WorkorderItemViz { get; set; }
|
public string WorkOrderItemViz { get; set; }
|
||||||
[Required]
|
[Required]
|
||||||
public long RequestedByUserId { get; set; }
|
public long RequestedByUserId { get; set; }
|
||||||
[NotMapped]
|
[NotMapped]
|
||||||
|
|||||||
@@ -25,8 +25,8 @@ namespace AyaNova.Models
|
|||||||
[Required]
|
[Required]
|
||||||
public long WorkOrderId { get; set; }
|
public long WorkOrderId { get; set; }
|
||||||
public string TechNotes { get; set; }
|
public string TechNotes { get; set; }
|
||||||
public long? WorkorderItemStatusId { get; set; }
|
public long? WorkOrderItemStatusId { get; set; }
|
||||||
public long? WorkorderItemPriorityId { get; set; }
|
public long? WorkOrderItemPriorityId { get; set; }
|
||||||
public DateTime? RequestDate { get; set; }
|
public DateTime? RequestDate { get; set; }
|
||||||
public bool WarrantyService { get; set; } = false;
|
public bool WarrantyService { get; set; } = false;
|
||||||
public int Sequence { get; set; }
|
public int Sequence { get; set; }
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ namespace AyaNova.Util
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
internal static class AyaNovaVersion
|
internal static class AyaNovaVersion
|
||||||
{
|
{
|
||||||
public const string VersionString = "8.0.0-alpha.120";
|
public const string VersionString = "8.0.0-alpha.121";
|
||||||
public const string FullNameAndVersion = "AyaNova server " + VersionString;
|
public const string FullNameAndVersion = "AyaNova server " + VersionString;
|
||||||
}//eoc
|
}//eoc
|
||||||
}//eons
|
}//eons
|
||||||
@@ -2841,8 +2841,8 @@ namespace AyaNova.Util
|
|||||||
Notes = $"itemnotes - {y} ",
|
Notes = $"itemnotes - {y} ",
|
||||||
TechNotes = $"technotes - {y}",
|
TechNotes = $"technotes - {y}",
|
||||||
RequestDate = woDate.AddMinutes(y),
|
RequestDate = woDate.AddMinutes(y),
|
||||||
WorkorderItemPriorityId = Fake.Random.Long(1, 5),//there are 5 different sample priorities
|
WorkOrderItemPriorityId = Fake.Random.Long(1, 5),//there are 5 different sample priorities
|
||||||
WorkorderItemStatusId = Fake.Random.Long(1, 3)//there are 3 different sample woitem status
|
WorkOrderItemStatusId = Fake.Random.Long(1, 3)//there are 3 different sample woitem status
|
||||||
};
|
};
|
||||||
|
|
||||||
//UNITS
|
//UNITS
|
||||||
|
|||||||
Reference in New Issue
Block a user