Compare commits
3 Commits
develop
...
release/en
| Author | SHA1 | Date | |
|---|---|---|---|
| ac3788d4c9 | |||
| 3dfb5baaa4 | |||
| 0347ede160 |
@ -12,7 +12,7 @@
|
|||||||
</sectionGroup>
|
</sectionGroup>
|
||||||
</configSections>
|
</configSections>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
|
||||||
</startup>
|
</startup>
|
||||||
<applicationSettings>
|
<applicationSettings>
|
||||||
<ENI2.Properties.Settings>
|
<ENI2.Properties.Settings>
|
||||||
@ -29,7 +29,7 @@
|
|||||||
<value>http://192.168.2.24/LockingService/LockingService.svc</value>
|
<value>http://192.168.2.24/LockingService/LockingService.svc</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="ConnectionString" serializeAs="String">
|
<setting name="ConnectionString" serializeAs="String">
|
||||||
<value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
|
<value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
|
||||||
</setting>
|
</setting>
|
||||||
</ENI2.Properties.Settings>
|
</ENI2.Properties.Settings>
|
||||||
</applicationSettings>
|
</applicationSettings>
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
<NuGetPackageImportStamp>
|
<NuGetPackageImportStamp>
|
||||||
</NuGetPackageImportStamp>
|
</NuGetPackageImportStamp>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
<PublishUrl>eni_test\</PublishUrl>
|
<PublishUrl>eni2.publish\</PublishUrl>
|
||||||
<Install>true</Install>
|
<Install>true</Install>
|
||||||
<InstallFrom>Web</InstallFrom>
|
<InstallFrom>Web</InstallFrom>
|
||||||
<UpdateEnabled>true</UpdateEnabled>
|
<UpdateEnabled>true</UpdateEnabled>
|
||||||
@ -28,15 +28,15 @@
|
|||||||
<UpdatePeriodically>false</UpdatePeriodically>
|
<UpdatePeriodically>false</UpdatePeriodically>
|
||||||
<UpdateRequired>false</UpdateRequired>
|
<UpdateRequired>false</UpdateRequired>
|
||||||
<MapFileExtensions>true</MapFileExtensions>
|
<MapFileExtensions>true</MapFileExtensions>
|
||||||
<InstallUrl>http://192.168.2.24/eni_test/</InstallUrl>
|
<InstallUrl>http://192.168.2.24/eni2.publish/</InstallUrl>
|
||||||
<SupportUrl>http://www.textbausteine.net/</SupportUrl>
|
<SupportUrl>http://www.textbausteine.net/</SupportUrl>
|
||||||
<ProductName>ENI Testversion</ProductName>
|
<ProductName>ENI</ProductName>
|
||||||
<PublisherName>Informatikbüro Daniel Schick</PublisherName>
|
<PublisherName>Informatikbüro Daniel Schick</PublisherName>
|
||||||
<SuiteName>NSW</SuiteName>
|
<SuiteName>NSW</SuiteName>
|
||||||
<MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
|
<MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
|
||||||
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
|
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
|
||||||
<WebPage>publish.html</WebPage>
|
<WebPage>publish.html</WebPage>
|
||||||
<ApplicationRevision>4</ApplicationRevision>
|
<ApplicationRevision>6</ApplicationRevision>
|
||||||
<ApplicationVersion>7.8.0.%2a</ApplicationVersion>
|
<ApplicationVersion>7.8.0.%2a</ApplicationVersion>
|
||||||
<UseApplicationTrust>false</UseApplicationTrust>
|
<UseApplicationTrust>false</UseApplicationTrust>
|
||||||
<CreateDesktopShortcut>true</CreateDesktopShortcut>
|
<CreateDesktopShortcut>true</CreateDesktopShortcut>
|
||||||
@ -84,7 +84,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup />
|
<PropertyGroup />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ManifestCertificateThumbprint>F2C2D0164244EC89955EF50201EE24C2A300FF0B</ManifestCertificateThumbprint>
|
<ManifestCertificateThumbprint>62DE8527C377957850DB503DA52FF66F664BD459</ManifestCertificateThumbprint>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<SignManifests>true</SignManifests>
|
<SignManifests>true</SignManifests>
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 39 KiB |
@ -113,7 +113,8 @@ namespace bsmd.dbh
|
|||||||
_log.InfoFormat("sent {0}", sentFile);
|
_log.InfoFormat("sent {0}", sentFile);
|
||||||
string onlyFileName = Path.GetFileName(sentFile);
|
string onlyFileName = Path.GetFileName(sentFile);
|
||||||
string moveTarget = Path.Combine(Properties.Settings.Default.OutgoingArchiveFolder, onlyFileName);
|
string moveTarget = Path.Combine(Properties.Settings.Default.OutgoingArchiveFolder, onlyFileName);
|
||||||
File.Move(sentFile, moveTarget);
|
File.Copy(sentFile, moveTarget, true);
|
||||||
|
File.Delete(sentFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
// receive files from remote host
|
// receive files from remote host
|
||||||
@ -128,13 +129,15 @@ namespace bsmd.dbh
|
|||||||
{
|
{
|
||||||
_log.ErrorFormat("Error reading input file {0}", justFilename);
|
_log.ErrorFormat("Error reading input file {0}", justFilename);
|
||||||
string errorPath = Path.Combine(Properties.Settings.Default.IncomingErrorFolder, justFilename);
|
string errorPath = Path.Combine(Properties.Settings.Default.IncomingErrorFolder, justFilename);
|
||||||
File.Move(inputFile, errorPath);
|
File.Copy(inputFile, errorPath, true);
|
||||||
|
File.Delete(inputFile);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_log.InfoFormat("Incoming file {0} processed", justFilename);
|
_log.InfoFormat("Incoming file {0} processed", justFilename);
|
||||||
string archivePath = Path.Combine(Properties.Settings.Default.IncomingArchiveFolder, justFilename);
|
string archivePath = Path.Combine(Properties.Settings.Default.IncomingArchiveFolder, justFilename);
|
||||||
File.Move(inputFile, archivePath);
|
File.Copy(inputFile, archivePath, true);
|
||||||
|
File.Delete(inputFile);
|
||||||
}
|
}
|
||||||
// remote Dateien löschen
|
// remote Dateien löschen
|
||||||
bsmd.dakosy.SFtp.RemoveProcessedFile(Properties.Settings.Default.RemoteOutgoingFolder, Path.GetFileName(inputFile), Properties.Settings.Default.SFTPSessionName);
|
bsmd.dakosy.SFtp.RemoveProcessedFile(Properties.Settings.Default.RemoteOutgoingFolder, Path.GetFileName(inputFile), Properties.Settings.Default.SFTPSessionName);
|
||||||
|
|||||||
@ -1662,11 +1662,14 @@ namespace bsmd.dbh
|
|||||||
rwr.IdentificationNumber = was_rcpt.IdentificationNumber;
|
rwr.IdentificationNumber = was_rcpt.IdentificationNumber;
|
||||||
rwr.PortReceptionFacilityName = was_rcpt.PortReceptionFacilityName;
|
rwr.PortReceptionFacilityName = was_rcpt.PortReceptionFacilityName;
|
||||||
rwr.PortReceptionFacilityProviderName = was_rcpt.PortReceptionFacilityProviderName;
|
rwr.PortReceptionFacilityProviderName = was_rcpt.PortReceptionFacilityProviderName;
|
||||||
|
if (was_rcpt.TreatmentFacilityProvider.Count > 0)
|
||||||
|
{
|
||||||
rwr.TreatmentFacilityProvider = new string[was_rcpt.TreatmentFacilityProvider.Count];
|
rwr.TreatmentFacilityProvider = new string[was_rcpt.TreatmentFacilityProvider.Count];
|
||||||
for (int j = 0; j < was_rcpt.TreatmentFacilityProvider.Count; j++)
|
for (int j = 0; j < was_rcpt.TreatmentFacilityProvider.Count; j++)
|
||||||
{
|
{
|
||||||
rwr.TreatmentFacilityProvider[j] = was_rcpt.TreatmentFacilityProvider[j].TreatmentFacilityProviderName;
|
rwr.TreatmentFacilityProvider[j] = was_rcpt.TreatmentFacilityProvider[j].TreatmentFacilityProviderName;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (was_rcpt.WasteDeliveryDateFrom.HasValue)
|
if (was_rcpt.WasteDeliveryDateFrom.HasValue)
|
||||||
rwr.WasteDeliveryDateFrom = was_rcpt.WasteDeliveryDateFrom.Value.ToUTCSerializableDateTime();
|
rwr.WasteDeliveryDateFrom = was_rcpt.WasteDeliveryDateFrom.Value.ToUTCSerializableDateTime();
|
||||||
if (was_rcpt.WasteDeliveryDateTo.HasValue)
|
if (was_rcpt.WasteDeliveryDateTo.HasValue)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user