dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged release/eni7.8.1

Browse Source
This commit is contained in:
Daniel Schick 2023-02-03 08:18:07 +01:00
commit f09c0c178e
7 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ENI2/ENI2.csproj
View File

@ -36,8 +36,8 @@
<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>6</ApplicationRevision> <ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>7.8.0.%2a</ApplicationVersion> <ApplicationVersion>7.8.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>

2
ENI2/EditControls/VisitIdDialog.xaml.cs
View File

@ -35,7 +35,7 @@ namespace ENI2.EditControls
}; };
this.comboBoxInitialHIS.ItemsSource = comboDataSource; this.comboBoxInitialHIS.ItemsSource = comboDataSource;
this.comboBoxInitialHIS.SelectedIndex = 1; this.comboBoxInitialHIS.SelectedIndex = 0;
this.EnableOK(false); this.EnableOK(false);
this.locodePoC.PropertyChanged += LocodePoC_PropertyChanged; this.locodePoC.PropertyChanged += LocodePoC_PropertyChanged;

2
bsmd.database/LADG.cs
View File

@ -199,7 +199,7 @@ namespace bsmd.database
if (!reader.IsDBNull(1)) ladg.CargoHandlingType = reader.GetByte(1); if (!reader.IsDBNull(1)) ladg.CargoHandlingType = reader.GetByte(1);
if (!reader.IsDBNull(2)) ladg.CargoCodeNST = reader.GetString(2); if (!reader.IsDBNull(2)) ladg.CargoCodeNST = reader.GetString(2);
if (!reader.IsDBNull(3)) ladg.CargoNumberOfItems = reader.GetInt32(3); if (!reader.IsDBNull(3)) ladg.CargoNumberOfItems = reader.GetInt32(3);
if (!reader.IsDBNull(4)) ladg.CargoGrossQuantity_TNE = (float) reader.GetDouble(4); if (!reader.IsDBNull(4)) ladg.CargoGrossQuantity_TNE = reader.GetDouble(4);
if (!reader.IsDBNull(5)) ladg.PortOfLoading = reader.GetString(5); if (!reader.IsDBNull(5)) ladg.PortOfLoading = reader.GetString(5);
if (!reader.IsDBNull(6)) ladg.PortOfDischarge = reader.GetString(6); if (!reader.IsDBNull(6)) ladg.PortOfDischarge = reader.GetString(6);
if (!reader.IsDBNull(7)) ladg.Identifier = reader.GetString(7); if (!reader.IsDBNull(7)) ladg.Identifier = reader.GetString(7);

2
bsmd.database/Properties/AssemblyProductInfo.cs
View File

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyCompany("schick Informatik")]
[assembly: AssemblyProduct("BSMD NSW interface")] [assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("7.8.0")] [assembly: AssemblyInformationalVersion("7.8.1")]
[assembly: AssemblyCopyright("Copyright © 2014-2022 schick Informatik")] [assembly: AssemblyCopyright("Copyright © 2014-2022 schick Informatik")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

2
bsmd.database/Properties/AssemblyProjectInfo.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("7.8.0.*")] [assembly: AssemblyVersion("7.8.1.*")]

11
bsmd.dbh/MessageController.cs
View File

@ -112,8 +112,9 @@ 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);

9
bsmd.dbh/RequestUtil.cs
View File

@ -1662,10 +1662,13 @@ 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;
rwr.TreatmentFacilityProvider = new string[was_rcpt.TreatmentFacilityProvider.Count]; if (was_rcpt.TreatmentFacilityProvider.Count > 0)
for (int j = 0; j < was_rcpt.TreatmentFacilityProvider.Count; j++)
{ {
rwr.TreatmentFacilityProvider[j] = was_rcpt.TreatmentFacilityProvider[j].TreatmentFacilityProviderName; rwr.TreatmentFacilityProvider = new string[was_rcpt.TreatmentFacilityProvider.Count];
for (int j = 0; j < was_rcpt.TreatmentFacilityProvider.Count; j++)
{
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();