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

Version 5.0.10

Browse Source 
(reine Korrekturversion von 5.0.9)
This commit is contained in:
Daniel Schick 2018-06-12 06:04:27 +00:00
parent f9d96001dd
commit e6d73f36b7
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
View File

@ -261,27 +261,27 @@ namespace ENI2.DetailViewControls
Waste waste = new Waste(); Waste waste = new Waste();
if (!reader.IsDBNull(1)) o = reader.GetValue(1); if (!reader.IsDBNull(1)) o = reader.GetValue(1); else o = null;
if (o != null) waste.WasteType = Convert.ToInt32(o); if (o != null) waste.WasteType = Convert.ToInt32(o);
if (!reader.IsDBNull(3)) waste.WasteDescription = reader.GetString(3); if (!reader.IsDBNull(3)) waste.WasteDescription = reader.GetString(3);
if (!reader.IsDBNull(4)) o = reader.GetValue(4); if (!reader.IsDBNull(4)) o = reader.GetValue(4); else o = null;
if (o != null) waste.WasteDisposalAmount_MTQ = Convert.ToDouble(o); if (o != null) waste.WasteDisposalAmount_MTQ = Convert.ToDouble(o);
if (!reader.IsDBNull(5)) o = reader.GetValue(5); if (!reader.IsDBNull(5)) o = reader.GetValue(5); else o = null;
if (o != null) waste.WasteCapacity_MTQ = Convert.ToDouble(o); if (o != null) waste.WasteCapacity_MTQ = Convert.ToDouble(o);
if (!reader.IsDBNull(6)) o = reader.GetValue(6); if (!reader.IsDBNull(6)) o = reader.GetValue(6); else o = null;
if (o != null) waste.WasteAmountRetained_MTQ = Convert.ToDouble(o); if (o != null) waste.WasteAmountRetained_MTQ = Convert.ToDouble(o);
if (!reader.IsDBNull(7)) waste.WasteDisposalPort = reader.GetString(7); if (!reader.IsDBNull(7)) waste.WasteDisposalPort = reader.GetString(7);
if (!reader.IsDBNull(8)) o = reader.GetValue(8); if (!reader.IsDBNull(8)) o = reader.GetValue(8); else o = null;
if (o != null) waste.WasteAmountGeneratedTillNextPort_MTQ = Convert.ToDouble(o); if (o != null) waste.WasteAmountGeneratedTillNextPort_MTQ = Convert.ToDouble(o);
if (!reader.IsDBNull(9)) o = reader.GetValue(9); if (!reader.IsDBNull(9)) o = reader.GetValue(9); else o = null;
if (o != null) waste.WasteDisposedAtLastPort_MTQ = Convert.ToDouble(9); if (o != null) waste.WasteDisposedAtLastPort_MTQ = Convert.ToDouble(o);
waste.WAS = this._was; waste.WAS = this._was;
waste.IsDirty = true; waste.IsDirty = true;

4
ENI-2/ENI2/ENI2/ENI2.csproj
View File

@ -35,8 +35,8 @@
<MinimumRequiredVersion>3.5.1.0</MinimumRequiredVersion> <MinimumRequiredVersion>3.5.1.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish> <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage> <WebPage>publish.html</WebPage>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>5.0.9.%2a</ApplicationVersion> <ApplicationVersion>5.0.10.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>

BIN
Stundensheet.xlsx
View File

Binary file not shown.

2
nsw/Source/bsmd.database/MessageCore.cs
View File

@ -520,7 +520,7 @@ namespace bsmd.database
if(searchDict.ContainsKey(SearchFilterType.FILTER_ETA)) if(searchDict.ContainsKey(SearchFilterType.FILTER_ETA))
{ {
// perform NOA_NOD join // perform NOA_NOD join
sb.Append(" LEFT JOIN MessageHeader mh ON mh.MessageCoreId = MessageCore.Id AND mh.NotificationClass = 2 LEFT JOIN NOA_NOD ON MessageHeaderId = mh.Id"); sb.Append(" LEFT JOIN MessageHeader mh2 ON mh2.MessageCoreId = MessageCore.Id AND mh2.NotificationClass = 2 LEFT JOIN NOA_NOD ON NOA_NOD.MessageHeaderId = mh2.Id");
} }
sb.Append(" WHERE "); sb.Append(" WHERE ");