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

fixed Maersk Excel export (sorting and Remark)

Browse Source
This commit is contained in:
Daniel Schick 2023-04-06 09:58:51 +02:00
parent 3010d783f1
commit ae0f6cae51
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ENI2/Excel/ExcelSimpleWriter.cs
View File

@ -59,7 +59,7 @@ namespace ENI2.Excel
ws.Cells[i + 2, 11] = md.ColK; ws.Cells[i + 2, 11] = md.ColK;
ws.Cells[i + 2, 12] = md.ColL; ws.Cells[i + 2, 12] = md.ColL;
ws.Cells[i + 2, 13] = md.ColM ; ws.Cells[i + 2, 13] = md.ColM ;
// ws.Cells[i + 2, 14] = md.Remark; ws.Cells[i + 2, 14] = md.Remark;
if((md.MessageCore != null) && (md.MessageCore.Cancelled ?? false)) if((md.MessageCore != null) && (md.MessageCore.Cancelled ?? false))
{ {

6
bsmd.database/MaerskData.cs
View File

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