diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index e03d7e6c..f8762c5a 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.POService/POService.cs b/nsw/Source/bsmd.POService/POService.cs
index 41097001..2f7ceee3 100644
--- a/nsw/Source/bsmd.POService/POService.cs
+++ b/nsw/Source/bsmd.POService/POService.cs
@@ -110,8 +110,7 @@ namespace bsmd.POService
try
{
- string messageId = "";
- string attachmentLocalPath = null;
+ string messageId = "";
string mailSender = "";
const string receiptSubject = "PO number service INFO";
string mailSubject = "";
@@ -157,15 +156,25 @@ namespace bsmd.POService
// Der Nummerstring ist vielleicht im Betreff, im Body oder im Dateinamen des
// PDF Attachments. In den PDF's selbst habe ich den (kompletten) String aktuell nicht gefunden.
- if (!ParsePO(mailSubject, ref poNumber, ref port, ref shipname, ref something, ref dateString))
+ try
{
- if (!ParsePO(body, ref poNumber, ref port, ref shipname, ref something, ref dateString))
+
+ if (!ParsePO(mailSubject, ref poNumber, ref port, ref shipname, ref something, ref dateString))
{
- string attachmentFileName = bsmdPopClient.GetNameOfFirstMailEmailPDFAttachment(messageId);
- if (attachmentFileName != null)
- ParsePO(attachmentFileName, ref poNumber, ref port, ref shipname, ref something, ref dateString);
+ if (!ParsePO(body, ref poNumber, ref port, ref shipname, ref something, ref dateString))
+ {
+ string attachmentFileName = bsmdPopClient.GetNameOfFirstMailEmailPDFAttachment(messageId);
+ if (attachmentFileName != null)
+ ParsePO(attachmentFileName, ref poNumber, ref port, ref shipname, ref something, ref dateString);
+ }
}
+
}
+ catch(Exception ex)
+ {
+ _log.WarnFormat("Exception looking for PO number: {0}", ex.ToString());
+ }
+
if (poNumber != null)
{
diff --git a/nsw/Source/bsmd.POService/ProjectInstaller.Designer.cs b/nsw/Source/bsmd.POService/ProjectInstaller.Designer.cs
new file mode 100644
index 00000000..a2237fc4
--- /dev/null
+++ b/nsw/Source/bsmd.POService/ProjectInstaller.Designer.cs
@@ -0,0 +1,59 @@
+namespace bsmd.POService
+{
+ partial class ProjectInstaller
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.serviceProcessInstallerPOService = new System.ServiceProcess.ServiceProcessInstaller();
+ this.serviceInstallerPOService = new System.ServiceProcess.ServiceInstaller();
+ //
+ // serviceProcessInstallerPOService
+ //
+ this.serviceProcessInstallerPOService.Account = System.ServiceProcess.ServiceAccount.LocalSystem;
+ this.serviceProcessInstallerPOService.Password = null;
+ this.serviceProcessInstallerPOService.Username = null;
+ //
+ // serviceInstallerPOService
+ //
+ this.serviceInstallerPOService.Description = "Add PO numbers sent via mail to cores";
+ this.serviceInstallerPOService.DisplayName = "NSW PO number service";
+ this.serviceInstallerPOService.ServiceName = "PONumberService";
+ //
+ // ProjectInstaller
+ //
+ this.Installers.AddRange(new System.Configuration.Install.Installer[] {
+ this.serviceProcessInstallerPOService,
+ this.serviceInstallerPOService});
+
+ }
+
+ #endregion
+
+ private System.ServiceProcess.ServiceProcessInstaller serviceProcessInstallerPOService;
+ private System.ServiceProcess.ServiceInstaller serviceInstallerPOService;
+ }
+}
\ No newline at end of file
diff --git a/nsw/Source/bsmd.POService/ProjectInstaller.cs b/nsw/Source/bsmd.POService/ProjectInstaller.cs
new file mode 100644
index 00000000..0fdb46c4
--- /dev/null
+++ b/nsw/Source/bsmd.POService/ProjectInstaller.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Configuration.Install;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace bsmd.POService
+{
+ [RunInstaller(true)]
+ public partial class ProjectInstaller : System.Configuration.Install.Installer
+ {
+ public ProjectInstaller()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/nsw/Source/bsmd.POService/ProjectInstaller.resx b/nsw/Source/bsmd.POService/ProjectInstaller.resx
new file mode 100644
index 00000000..ec4ab820
--- /dev/null
+++ b/nsw/Source/bsmd.POService/ProjectInstaller.resx
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 41, 98
+
+
+ 38, 50
+
+
+ False
+
+
\ No newline at end of file
diff --git a/nsw/Source/bsmd.POService/bsmd.POService.csproj b/nsw/Source/bsmd.POService/bsmd.POService.csproj
index f08ebf7a..ecfde013 100644
--- a/nsw/Source/bsmd.POService/bsmd.POService.csproj
+++ b/nsw/Source/bsmd.POService/bsmd.POService.csproj
@@ -38,7 +38,9 @@
packages\log4net.2.0.8\lib\net45-full\log4net.dll
+
+
@@ -57,6 +59,12 @@
Properties\AssemblyProjectKeyInfo.cs
+
+ Component
+
+
+ ProjectInstaller.cs
+
True
True
@@ -90,5 +98,10 @@
bsmd.email
+
+
+ ProjectInstaller.cs
+
+
\ No newline at end of file