case 4017

This commit is contained in:
2021-10-25 20:50:13 +00:00
parent bd88089b51
commit a1e0416b02
7 changed files with 26 additions and 18 deletions

View File

@@ -62,4 +62,4 @@ using System.Runtime.InteropServices;
[assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)] [assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)]
//[assembly: log4net.Config.XmlConfigurator(Watch=true)] //[assembly: log4net.Config.XmlConfigurator(Watch=true)]
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: AssemblyFileVersionAttribute("7.6.8.0")] [assembly: AssemblyFileVersionAttribute("7.6.14.0")]

View File

@@ -1842,10 +1842,10 @@ namespace AyaNova
#if(DEBUG) #if(DEBUG)
dlg = new Login("manager", "letmein"); dlg = new Login("manager", "letmein");
#else #else
if(AyaBizUtils.Trial) if (AyaBizUtils.Trial)
dlg = new Login("manager","letmein"); dlg = new Login("manager", "letmein");
else else
dlg = new Login("",""); dlg = new Login("", "");
#endif #endif
dlg.ShowDialog(this); dlg.ShowDialog(this);
bDoLogin = dlg.LoggingIn; bDoLogin = dlg.LoggingIn;
@@ -3917,7 +3917,8 @@ namespace AyaNova
timer1.Stop(); timer1.Stop();
//Check if we are running as a standalone firebird database, //Check if we are running as a standalone firebird database,
//if so then we need to do the notification and PM processing ourselves //if so then we need to do the notification and PM processing ourselves
if (AyaBizUtils.AyaNovaConnectionSetting.SingleUserConnection) if (AyaBizUtils.AyaNovaConnectionSetting.SingleUserConnection)
{ {
//case 1039 //log.Debug("Re-generate (PM & Notifications)"); //case 1039 //log.Debug("Re-generate (PM & Notifications)");
@@ -3955,8 +3956,8 @@ namespace AyaNova
//testing interval (30 seconds) //testing interval (30 seconds)
timer1.Interval = 30000; timer1.Interval = 30000;
#else #else
//5 minutes //5 minutes
timer1.Interval=300000; timer1.Interval = 300000;
#endif #endif
@@ -4257,7 +4258,7 @@ namespace AyaNova
{ {
//DBManager.FireBirdRecomputeStatistics(); //DBManager.FireBirdRecomputeStatistics();
#region Generate huge tracts o' data #region Generate huge tracts o' data
//Random rand=new Random(); //Random rand=new Random();
//Guid gTestSecurityGroupID = new Guid("{EA613C39-38F0-470E-9B76-ABB9B05C5F3A}"); //Guid gTestSecurityGroupID = new Guid("{EA613C39-38F0-470E-9B76-ABB9B05C5F3A}");
@@ -4582,7 +4583,7 @@ namespace AyaNova
#endregion generate huge tracts o' data #endregion generate huge tracts o' data
#region ayascript to update and close selected workorders #region ayascript to update and close selected workorders
//System.Collections.Generic.List<Guid> l= new System.Collections.Generic.List<Guid>(); //System.Collections.Generic.List<Guid> l= new System.Collections.Generic.List<Guid>();
// l.Add(new Guid("c9d07183-89d6-4dc0-bacb-e46a6c7a1b9a")); // l.Add(new Guid("c9d07183-89d6-4dc0-bacb-e46a6c7a1b9a"));
// l.Add(new Guid("d3eea5a5-6181-4484-afc6-20279aa9670d")); // l.Add(new Guid("d3eea5a5-6181-4484-afc6-20279aa9670d"));
@@ -4638,7 +4639,7 @@ namespace AyaNova
#endregion #endregion
#region ayascript to updated selected workorders #region ayascript to updated selected workorders
////============== START OF SCRIPT ========================= ////============== START OF SCRIPT =========================
@@ -4819,7 +4820,7 @@ namespace AyaNova
//ctrl-alt-g for GRID FILTER CRITERIA //ctrl-alt-g for GRID FILTER CRITERIA
#region gen workorders COMMENTED OUT #region gen workorders COMMENTED OUT
//============================================================================== //==============================================================================
//Workorders //Workorders
@@ -4976,7 +4977,7 @@ namespace AyaNova
#endregion #endregion
#region Import utility COMMENTED OUT #region Import utility COMMENTED OUT
////============================================================================== ////==============================================================================
@@ -5148,7 +5149,7 @@ namespace AyaNova
#endregion import util #endregion import util
#region Close selected workorders by criteria COMMENTED OUT #region Close selected workorders by criteria COMMENTED OUT
////**** CLOSE SELECTED WORKORDERS THAT MATCH THE FOLLOWING ****** ////**** CLOSE SELECTED WORKORDERS THAT MATCH THE FOLLOWING ******
////Change these values as required ////Change these values as required
@@ -5283,7 +5284,7 @@ namespace AyaNova
//MessageBox.Show("Finished, " + workordersClosed.ToString() + " workorders were closed and saved"); //MessageBox.Show("Finished, " + workordersClosed.ToString() + " workorders were closed and saved");
#endregion #endregion
#region Generator on demand COMMENTED OUT #region Generator on demand COMMENTED OUT
//try //try
//{ //{
// AyaBizUtils.TG = true; // AyaBizUtils.TG = true;
@@ -5305,7 +5306,7 @@ namespace AyaNova
//} //}
#endregion generator on demand #endregion generator on demand
#region Generate serialized inventory for a single part COMMENTED OUT #region Generate serialized inventory for a single part COMMENTED OUT
//Random rand = new Random(); //Random rand = new Random();
//int snCount = 0; //int snCount = 0;
////get all active warehouses without exception ////get all active warehouses without exception
@@ -5340,7 +5341,7 @@ namespace AyaNova
#endregion generate serialized inventory #endregion generate serialized inventory
#region delete a bunch of clients #region delete a bunch of clients
//StringBuilder sbRet = new StringBuilder(); //StringBuilder sbRet = new StringBuilder();

View File

@@ -64,4 +64,4 @@ using System.Security.Permissions;
// Configure log4net using the .config file // Configure log4net using the .config file
//[assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)] //[assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)]
//[assembly: log4net.Config.XmlConfigurator( ConfigFile="Log4Net.config",Watch=true )] //[assembly: log4net.Config.XmlConfigurator( ConfigFile="Log4Net.config",Watch=true )]
[assembly: AssemblyFileVersionAttribute("7.6.12.0")] [assembly: AssemblyFileVersionAttribute("7.6.14.0")]

View File

@@ -45,11 +45,13 @@ namespace GZTW.AyaNova.BLL
if (GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPUseTLS) if (GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPUseTLS)
mailman.StartTLS = true; mailman.StartTLS = true;
mailman.SmtpUsername = GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPAccount; mailman.SmtpUsername = GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPAccount;
mailman.SmtpPassword = GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPPassword; mailman.SmtpPassword = GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPPassword;
//case 1382 //case 1382
//if can't use smtp server then log and conditionally abort //if can't use smtp server then log and conditionally abort
//## NOTE: this operation sets up what tls level is being used etc
if (!mailman.SmtpNoop()) if (!mailman.SmtpNoop())
{ {
//case 1608 //case 1608
@@ -166,6 +168,9 @@ namespace GZTW.AyaNova.BLL
// Send mail. // Send mail.
bool success; bool success;
success = mailman.SendEmail(email); success = mailman.SendEmail(email);
#if(DEBUG)
NotifyDeliveryLog.LogSMTPDeliveryMessage("POST TLS version: " + mailman.TlsVersion);
#endif
if (success) if (success)
{ {
NotifyDeliveryLog.LogClientDelivery(n.ClientID, true, ""); NotifyDeliveryLog.LogClientDelivery(n.ClientID, true, "");

View File

@@ -37,6 +37,8 @@ namespace GZTW.AyaNova.BLL
if (GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPUseTLS) if (GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPUseTLS)
mailman.StartTLS = true; mailman.StartTLS = true;
mailman.SmtpUsername=Login; mailman.SmtpUsername=Login;
mailman.SmtpPassword=Password; mailman.SmtpPassword=Password;