Fixes (Version 6.4.1)

This commit is contained in:
Daniel Schick 2021-06-04 11:04:21 +00:00
parent 4865e3c080
commit 62bf289b67
4 changed files with 13 additions and 13 deletions

View File

@ -34,8 +34,8 @@
<MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>6.4.0.%2a</ApplicationVersion>
<ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>6.4.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>

Binary file not shown.

View File

@ -1369,7 +1369,7 @@ namespace bsmd.database
cmd.Parameters.AddWithValue("@ID", core.Id);
int total = this.PerformReadIntQuery(cmd) ?? 0;
cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.BSMDStatus = 5 AND MessageHeader.NotificationClass > 2 AND MessageHeader.NotificationClass < 28"; // compare "CONFIRMED"
cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.BSMDStatus = 5 AND MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28"; // compare "CONFIRMED"
int sent = this.PerformReadIntQuery(cmd) ?? 0;
core.NumberSent = string.Format("{0}/{1}", sent, total);

View File

@ -1238,19 +1238,19 @@ namespace bsmd.hisnord
hn_waste.WasteDetails = new wastedetails();
hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQSpecified = waste.WasteAmountGeneratedTillNextPort_MTQ.HasValue;
if (hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQSpecified)
hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQ = (float)waste.WasteAmountGeneratedTillNextPort_MTQ.Value;
hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQSpecified = true; // waste.WasteAmountGeneratedTillNextPort_MTQ.HasValue;
// if (hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQSpecified)
hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQ = (float) (waste.WasteAmountGeneratedTillNextPort_MTQ ?? 0);
hn_waste.WasteDetails.WasteAmountRetained_MTQSpecified = waste.WasteAmountRetained_MTQ.HasValue;
if (hn_waste.WasteDetails.WasteAmountRetained_MTQSpecified)
hn_waste.WasteDetails.WasteAmountRetained_MTQ = (float)waste.WasteAmountRetained_MTQ.Value;
hn_waste.WasteDetails.WasteAmountRetained_MTQSpecified = true; // waste.WasteAmountRetained_MTQ.HasValue;
// if (hn_waste.WasteDetails.WasteAmountRetained_MTQSpecified)
hn_waste.WasteDetails.WasteAmountRetained_MTQ = (float) (waste.WasteAmountRetained_MTQ ?? 0);
hn_waste.WasteDetails.WasteCapacity_MTQSpecified = waste.WasteCapacity_MTQ.HasValue;
if (hn_waste.WasteDetails.WasteCapacity_MTQSpecified)
hn_waste.WasteDetails.WasteCapacity_MTQ = (float)waste.WasteCapacity_MTQ.Value;
hn_waste.WasteDetails.WasteCapacity_MTQSpecified = true; // waste.WasteCapacity_MTQ.HasValue;
// if (hn_waste.WasteDetails.WasteCapacity_MTQSpecified)
hn_waste.WasteDetails.WasteCapacity_MTQ = (float) (waste.WasteCapacity_MTQ ?? 0);
hn_waste.WasteDetails.WasteDisposalPort = waste.WasteDisposalPort;
hn_waste.WasteDetails.WasteDisposalPort = waste.WasteDisposalPort.IsNullOrEmpty() ? "ZZUKN" : waste.WasteDisposalPort;
was_items.Add(hn_waste);
was_item_names.Add(ItemsChoiceType6.Waste);