admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-06-30 22:30:46 +00:00
parent 779a695ff7
commit 32f1b8dc15
6 changed files with 37 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -53,7 +53,7 @@
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
"AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
"AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE": "false",
"AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
"AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"

13
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -4027,9 +4027,8 @@ namespace AyaNova.Biz
// //
internal async Task<bool> PartDeleteAsync(long id, IDbContextTransaction parentTransaction = null) internal async Task<bool> PartDeleteAsync(long id, IDbContextTransaction parentTransaction = null)
{ {
// var transaction = parentTransaction ?? await ct.Database.BeginTransactionAsync(); var transaction = parentTransaction ?? await ct.Database.BeginTransactionAsync();
using (var transaction = parentTransaction ?? await ct.Database.BeginTransactionAsync())
{
try try
{ {
var dbObject = await PartGetAsync(id, false); var dbObject = await PartGetAsync(id, false);
@@ -4059,7 +4058,6 @@ namespace AyaNova.Biz
//Just re-throw for now, let exception handler deal, but in future may want to deal with this more here //Just re-throw for now, let exception handler deal, but in future may want to deal with this more here
throw; throw;
} }
}
return true; return true;
} }
@@ -4385,15 +4383,8 @@ namespace AyaNova.Biz
if (newObj.Quantity != 0 && !string.IsNullOrWhiteSpace(newObj.Serials)) if (newObj.Quantity != 0 && !string.IsNullOrWhiteSpace(newObj.Serials))
await PartBiz.RemoveSerialsAsync(newObj.PartId, newObj.Serials, ct, UserId); await PartBiz.RemoveSerialsAsync(newObj.PartId, newObj.Serials, ct, UserId);
} }
} }
} }
} }

1
server/AyaNova/resource/de.json
View File

@@ -2209,6 +2209,7 @@
"WorkOrderSerialNumber": "Nummer", "WorkOrderSerialNumber": "Nummer",
"Sequence": "Reihenfolge", "Sequence": "Reihenfolge",
"SoftDelete": "Zum Löschen markieren", "SoftDelete": "Zum Löschen markieren",
"SoftDeleteAll": "*alle* zum Löschen markieren",
"Undelete": "Wiederherstellen", "Undelete": "Wiederherstellen",
"NewStatus": "Neuer Status", "NewStatus": "Neuer Status",
"WorkOrderCustom1": "Angepasstes Feld 1", "WorkOrderCustom1": "Angepasstes Feld 1",

1
server/AyaNova/resource/en.json
View File

@@ -2209,6 +2209,7 @@
"WorkOrderSerialNumber": "Number", "WorkOrderSerialNumber": "Number",
"Sequence": "Sequence", "Sequence": "Sequence",
"SoftDelete": "Mark for deletion", "SoftDelete": "Mark for deletion",
"SoftDeleteAll": "Mark *all* for deletion",
"Undelete": "Undelete", "Undelete": "Undelete",
"NewStatus": "New status", "NewStatus": "New status",
"WorkOrderCustom1": "Custom1", "WorkOrderCustom1": "Custom1",

1
server/AyaNova/resource/es.json
View File

@@ -2209,6 +2209,7 @@
"WorkOrderSerialNumber": "Número", "WorkOrderSerialNumber": "Número",
"Sequence": "Secuencia", "Sequence": "Secuencia",
"SoftDelete": "Marcar para borrar", "SoftDelete": "Marcar para borrar",
"SoftDeleteAll": "Marcar *todo* para borrar",
"Undelete": "Recuperar", "Undelete": "Recuperar",
"NewStatus": "Nuevo estado", "NewStatus": "Nuevo estado",
"WorkOrderCustom1": "Campo personalizado 1", "WorkOrderCustom1": "Campo personalizado 1",

1
server/AyaNova/resource/fr.json
View File

@@ -2209,6 +2209,7 @@
"WorkOrderSerialNumber": "Numéro", "WorkOrderSerialNumber": "Numéro",
"Sequence": "Séquence", "Sequence": "Séquence",
"SoftDelete": "Marquer pour suppression", "SoftDelete": "Marquer pour suppression",
"SoftDeleteAll": "Marquer *tout* pour suppression",
"Undelete": "Annuler la suppression", "Undelete": "Annuler la suppression",
"NewStatus": "Nouveau statut", "NewStatus": "Nouveau statut",
"WorkOrderCustom1": "Champ personnalisé 1", "WorkOrderCustom1": "Champ personnalisé 1",