From 30363f6c5bbbed812a815510b94ba681181899e7 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 3 Aug 2021 20:15:45 +0000 Subject: [PATCH] --- server/AyaNova/biz/PMBiz.cs | 31 ++++++++++++++++++++----------- server/AyaNova/resource/de.json | 3 ++- server/AyaNova/resource/en.json | 3 ++- server/AyaNova/resource/es.json | 3 ++- server/AyaNova/resource/fr.json | 3 ++- 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/server/AyaNova/biz/PMBiz.cs b/server/AyaNova/biz/PMBiz.cs index 32732c35..5068a808 100644 --- a/server/AyaNova/biz/PMBiz.cs +++ b/server/AyaNova/biz/PMBiz.cs @@ -4780,6 +4780,13 @@ namespace AyaNova.Biz log.LogInformation($"Found {l.Count} inventory checkable PM orders for subscription id {sub.Id}"); #endif +//Get the translations for this user +List transl=new List(); +transl.Add("Part"); +transl.Add("PartWarehouse"); +transl.Add("required"); +TranslationBiz.GetSubsetForUserStaticAsync(,sub.UserId); + //process those pms foreach (long pmid in l) { @@ -4787,16 +4794,17 @@ namespace AyaNova.Biz log.LogInformation($"processing pm id {pmid}"); #endif - //look for same delivery already made and skip if already notified (sb one time only but will repeat for > 90 days as delivery log gets pruned) - if (await ct.NotifyDeliveryLog.AnyAsync(z => z.NotifySubscriptionId == sub.Id && z.ObjectId == pmid)) - { - log.LogTrace($"PM {pmid} insufficient inventory already notified to subscriber within last 90 days, no need to send again, skipping"); +//############### TODO UNCOMMENT THIS AFTER TESTING ############################ +// //look for same delivery already made and skip if already notified (sb one time only but will repeat for > 90 days as delivery log gets pruned) +// if (await ct.NotifyDeliveryLog.AnyAsync(z => z.NotifySubscriptionId == sub.Id && z.ObjectId == pmid)) +// { +// log.LogTrace($"PM {pmid} insufficient inventory already notified to subscriber within last 90 days, no need to send again, skipping"); -#if (DEBUG) - log.LogInformation($"PM {pmid} insufficient inventory already notified to subscriber within last 90 days, no need to send again, skipping"); -#endif - continue; - } +// #if (DEBUG) +// log.LogInformation($"PM {pmid} insufficient inventory already notified to subscriber within last 90 days, no need to send again, skipping"); +// #endif +// continue; +// } //Ok, it's worth checking out and could be a potential notification @@ -4853,14 +4861,15 @@ namespace AyaNova.Biz { var part = await ct.Part.AsNoTracking().Where(x => x.Id == i.PartId).Select(x => x.PartNumber).FirstOrDefaultAsync(); var whs = await ct.PartWarehouse.AsNoTracking().Where(x => x.Id == i.WarehouseId).Select(x => x.Name).FirstOrDefaultAsync(); - sb.AppendLine($"{part} @ {whs}: {i.QuantityRequired - dBalance}"); + var qty=(i.QuantityRequired-dBalance).ToString("G29", System.Globalization.CultureInfo.InvariantCulture); + sb.Append($"~part~ {part}, ~whs~ {whs} ~required~ {qty}\n"); } } if (sb.Length > 0) { NotifyEvent n = new NotifyEvent() { - EventType = NotifyEventType.PMStopGeneratingDateReached, + EventType = NotifyEventType.PMInsufficientInventory, UserId = sub.UserId, AyaType = AyaType.PM, ObjectId = p.Id, diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 65866d8a..e3d081df 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -2300,5 +2300,6 @@ "PMNextWoGenerateDate":"Nächstes Generierungsdatum", "ExcludeDaysOfWeek":"Wochentage ausschließen", "ErrorGenBeforeTooSmall":"Muss kleiner sein als Wiederholungsintervall", - "ErrorRepeatIntervalTooSmall":"Mindestens eine Stunde" + "ErrorRepeatIntervalTooSmall":"Mindestens eine Stunde", + "QuantityRequired":"Quantity required" } \ No newline at end of file diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index e0f482c8..cb478e44 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -2300,6 +2300,7 @@ "PMNextWoGenerateDate":"Next generate event", "ExcludeDaysOfWeek":"Exclude days of week", "ErrorGenBeforeTooSmall":"Must be smaller than Repeat interval", - "ErrorRepeatIntervalTooSmall":"Minimum one hour" + "ErrorRepeatIntervalTooSmall":"Minimum one hour", + "QuantityRequired":"Quantity required" } \ No newline at end of file diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index 17db2626..7a27d98e 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -2300,5 +2300,6 @@ "PMNextWoGenerateDate":"Siguiente evento de generación", "ExcludeDaysOfWeek":"Excluir días de la semana", "ErrorGenBeforeTooSmall":"Debe ser menor que el intervalo de repetición", - "ErrorRepeatIntervalTooSmall":"Mínimo una hora" + "ErrorRepeatIntervalTooSmall":"Mínimo una hora", + "QuantityRequired":"Quantity required" } \ No newline at end of file diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index d317db3f..7b36b2e4 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -2300,5 +2300,6 @@ "PMNextWoGenerateDate":"Prochain événement de génération", "ExcludeDaysOfWeek":"Exclure les jours de la semaine", "ErrorGenBeforeTooSmall":"Doit être inférieur à l'intervalle de répétition", - "ErrorRepeatIntervalTooSmall":"Au moins une heure" + "ErrorRepeatIntervalTooSmall":"Au moins une heure", + "QuantityRequired":"Quantity required" } \ No newline at end of file