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

7.9.0.3 kleine Korrekturen

Browse Source
This commit is contained in:
Daniel Schick 2023-02-19 11:50:43 +01:00
parent bcf4c33478
commit 2aef20130b
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ENI2/Controls/MaerskListControl.xaml.cs
View File

@ -1,5 +1,5 @@
// Copyright (c) 2017 schick Informatik // Copyright (c) 2017 / 2023 schick Informatik
// Description: PO Nummer Übersicht. Ergänzung Nummern. Excel Export // Description: Request dbh ids for Maersk data lists
// //
using System; using System;
@ -395,7 +395,8 @@ namespace ENI2.Controls
{ {
foreach (MaerskData md in this.dataGridPOCores.SelectedItems) foreach (MaerskData md in this.dataGridPOCores.SelectedItems)
{ {
if ((md.MessageCore != null) || (!md.ColM.IsNullOrEmpty())) continue; // already requested if (md.MessageCore?.VisitId.IsNullOrEmpty() == false) continue; // already requested
if (md.ColM?.IsNullOrEmpty() == false) continue; // already something there
requestList.Add(md); requestList.Add(md);
} }
} }
@ -403,7 +404,8 @@ namespace ENI2.Controls
{ {
foreach(MaerskData md in this.maerskDataList) foreach(MaerskData md in this.maerskDataList)
{ {
if((md.MessageCore == null) && md.ColM.IsNullOrEmpty()) if(((md.MessageCore == null) && md.ColM.IsNullOrEmpty()) ||
((md.MessageCore != null) && md.MessageCore.VisitId.IsNullOrEmpty()))
{ {
if (md.ETA.HasValue && md.ETA.Value.IsNextXDays(3)) if (md.ETA.HasValue && md.ETA.Value.IsNextXDays(3))
requestList.Add(md); requestList.Add(md);
@ -416,8 +418,7 @@ namespace ENI2.Controls
MessageBox.Show("No valid rows selected", "Warning", MessageBoxButton.OK, MessageBoxImage.Exclamation); MessageBox.Show("No valid rows selected", "Warning", MessageBoxButton.OK, MessageBoxImage.Exclamation);
} }
else else
{ {
// Todo:
foreach (MaerskData md in requestList) foreach (MaerskData md in requestList)
{ {
md.Status = MaerskData.MDStatus.REQUESTING_ID; md.Status = MaerskData.MDStatus.REQUESTING_ID;

2
ENI2/ENI2.csproj
View File

@ -36,7 +36,7 @@
<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>3</ApplicationRevision> <ApplicationRevision>4</ApplicationRevision>
<ApplicationVersion>7.9.0.%2a</ApplicationVersion> <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>

4
bsmd.database/MaerskData.cs
View File

@ -250,9 +250,9 @@ namespace bsmd.database
/// </summary> /// </summary>
public int CompareTo(MaerskData other) public int CompareTo(MaerskData other)
{ {
if (this.ColK == null) return 0; if (this.ColA == null) return 0;
if (other == null) return 0; if (other == null) return 0;
return this.ColK.CompareTo(other.ColK); return this.ColA.CompareTo(other.ColA);
} }
public bool Update(MaerskData md) public bool Update(MaerskData md)