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

Korrekturen nach Test Christin II

Browse Source
This commit is contained in:
Daniel Schick 2023-01-05 12:34:33 +01:00
parent 1777a81772
commit e013591a40
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsmd.database/TOWD.cs
View File

@ -146,7 +146,7 @@ namespace bsmd.database
} }
else else
{ {
scmd.Parameters.AddWithValue(@"ID", this.Id); scmd.Parameters.AddWithValue("ID", this.Id);
scmd.CommandText = string.Format("UPDATE {0} SET TowageOnDepartureName = @P2, TowageOnDepartureFlag = @P3, " + scmd.CommandText = string.Format("UPDATE {0} SET TowageOnDepartureName = @P2, TowageOnDepartureFlag = @P3, " +
"TowageOnDepartureOperatorCompanyName = @P4, TowageOnDepartureOperatorStreetNameAndNumber = @P5, " + "TowageOnDepartureOperatorCompanyName = @P4, TowageOnDepartureOperatorStreetNameAndNumber = @P5, " +
"TowageOnDepartureOperatorPostalCode = @P6, TowageOnDepartureOperatorCity = @P7, TowageOnDepartureOperatorCountry = @P8, " + "TowageOnDepartureOperatorPostalCode = @P6, TowageOnDepartureOperatorCity = @P7, TowageOnDepartureOperatorCountry = @P8, " +

21
bsmd.dbh/RequestUtil.cs
View File

@ -192,13 +192,13 @@ namespace bsmd.dbh
if (noa_nod.ETAToKielCanal.HasValue) if (noa_nod.ETAToKielCanal.HasValue)
{ {
choiceList.Add(ItemsChoiceType.ETAToKielCanal); choiceList.Add(ItemsChoiceType.ETAToKielCanal);
choices.Add(noa_nod.ETAToKielCanal.Value.ToDBHDateString()); choices.Add(noa_nod.ETAToKielCanal.Value);
} }
if (noa_nod.ETDFromKielCanal.HasValue) if (noa_nod.ETDFromKielCanal.HasValue)
{ {
choiceList.Add(ItemsChoiceType.ETDFromKielCanal); choiceList.Add(ItemsChoiceType.ETDFromKielCanal);
choices.Add(noa_nod.ETDFromKielCanal.Value.ToDBHDateString()); choices.Add(noa_nod.ETDFromKielCanal.Value);
} }
} }
else else
@ -206,13 +206,13 @@ namespace bsmd.dbh
if (noa_nod.ETAToPortOfCall.HasValue) if (noa_nod.ETAToPortOfCall.HasValue)
{ {
choiceList.Add(ItemsChoiceType.ETAToPortOfCall); choiceList.Add(ItemsChoiceType.ETAToPortOfCall);
choices.Add(noa_nod.ETAToPortOfCall.Value.ToDBHDateString()); choices.Add(noa_nod.ETAToPortOfCall.Value);
} }
if (noa_nod.ETDFromPortOfCall.HasValue) if (noa_nod.ETDFromPortOfCall.HasValue)
{ {
choiceList.Add(ItemsChoiceType.ETDFromPortOfCall); choiceList.Add(ItemsChoiceType.ETDFromPortOfCall);
choices.Add(noa_nod.ETDFromPortOfCall.Value.ToDBHDateString()); choices.Add(noa_nod.ETDFromPortOfCall.Value);
} }
for (int i = 0; i < noa_nod.CallPurposes.Count; i++) for (int i = 0; i < noa_nod.CallPurposes.Count; i++)
@ -1075,8 +1075,10 @@ namespace bsmd.dbh
rootTowd.TowageOnDeparture[i].TowageOnDepartureOperator.TowageOnDepartureOperatorPhone = towd.TowageOnDepartureOperatorPhone; rootTowd.TowageOnDeparture[i].TowageOnDepartureOperator.TowageOnDepartureOperatorPhone = towd.TowageOnDepartureOperatorPhone;
rootTowd.TowageOnDeparture[i].TowageOnDepartureOperator.TowageOnDepartureOperatorFax = towd.TowageOnDepartureOperatorFax; rootTowd.TowageOnDeparture[i].TowageOnDepartureOperator.TowageOnDepartureOperatorFax = towd.TowageOnDepartureOperatorFax;
rootTowd.TowageOnDeparture[i].TowageOnDepartureOperator.TowageOnDepartureOperatorEMail = towd.TowageOnDepartureOperatorEmail; rootTowd.TowageOnDeparture[i].TowageOnDepartureOperator.TowageOnDepartureOperatorEMail = towd.TowageOnDepartureOperatorEmail;
rootTowd.TowageOnDeparture[i].TowageOnDepartureLengthOverall_MTRSpecified = towd.TowageOnDepartureLengthOverall_MTR.HasValue;
if (towd.TowageOnDepartureLengthOverall_MTR.HasValue) if (towd.TowageOnDepartureLengthOverall_MTR.HasValue)
rootTowd.TowageOnDeparture[i].TowageOnDepartureLengthOverall_MTR = decimal.Round((decimal)towd.TowageOnDepartureLengthOverall_MTR.Value, 2); rootTowd.TowageOnDeparture[i].TowageOnDepartureLengthOverall_MTR = decimal.Round((decimal)towd.TowageOnDepartureLengthOverall_MTR.Value, 2);
rootTowd.TowageOnDeparture[i].TowageOnDepartureBeam_MTRSpecified = towd.TowageOnDepartureBeam_MTR.HasValue;
if (towd.TowageOnDepartureBeam_MTR.HasValue) if (towd.TowageOnDepartureBeam_MTR.HasValue)
rootTowd.TowageOnDeparture[i].TowageOnDepartureBeam_MTR = decimal.Round((decimal)towd.TowageOnDepartureBeam_MTR.Value, 2); rootTowd.TowageOnDeparture[i].TowageOnDepartureBeam_MTR = decimal.Round((decimal)towd.TowageOnDepartureBeam_MTR.Value, 2);
if (towd.TowageOnDepartureDraught_DMT.HasValue) if (towd.TowageOnDepartureDraught_DMT.HasValue)
@ -1140,6 +1142,7 @@ namespace bsmd.dbh
Request.IMDGPosition rootIMDG = new Request.IMDGPosition(); Request.IMDGPosition rootIMDG = new Request.IMDGPosition();
rootIMDG.UNNumber = imdgPos.UNNumber; rootIMDG.UNNumber = imdgPos.UNNumber;
rootIMDG.PackingGroupSpecified = imdgPos.PackingGroup.HasValue;
if (imdgPos.PackingGroup.HasValue) if (imdgPos.PackingGroup.HasValue)
rootIMDG.PackingGroup = (Request.PackingGroupType)imdgPos.PackingGroup.Value; rootIMDG.PackingGroup = (Request.PackingGroupType)imdgPos.PackingGroup.Value;
rootIMDG.ProperShippingName = imdgPos.ProperShippingName; rootIMDG.ProperShippingName = imdgPos.ProperShippingName;
@ -1155,7 +1158,7 @@ namespace bsmd.dbh
{ {
rootIMDG.Class7MaxActivity = new IMDGPositionClass7MaxActivity(); rootIMDG.Class7MaxActivity = new IMDGPositionClass7MaxActivity();
rootIMDG.Class7MaxActivity.MaxActivityValue = decimal.Round((decimal)imdgPos.Class7MaxActivity_BQL.Value, 3); rootIMDG.Class7MaxActivity.MaxActivityValue = decimal.Round((decimal)imdgPos.Class7MaxActivity_BQL.Value, 3);
// rootIMDG.Class7MaxActivity.MaxActivityUnit = imdgPos. rootIMDG.Class7MaxActivity.MaxActivityUnit = ActivityUnitType.BQL;
} }
rootIMDG.Class7CategorySpecified = imdgPos.Class7Category.HasValue; rootIMDG.Class7CategorySpecified = imdgPos.Class7Category.HasValue;
if (imdgPos.Class7Category.HasValue) if (imdgPos.Class7Category.HasValue)
@ -1331,7 +1334,7 @@ namespace bsmd.dbh
for (int i = 0; i < haz.MARPOLPositions.Count; i++) for (int i = 0; i < haz.MARPOLPositions.Count; i++)
{ {
MARPOLPosition rootMarpol = new MARPOLPosition(); MARPOLPosition rootMarpol = new MARPOLPosition();
MARPOL_Annex_I_Position marpolPos = haz.MARPOLPositions[i] as MARPOL_Annex_I_Position; MARPOL_Annex_I_Position marpolPos = haz.MARPOLPositions[i];
rootMarpol.Name = marpolPos.Name; rootMarpol.Name = marpolPos.Name;
if (marpolPos.FlashpointInformation.HasValue) if (marpolPos.FlashpointInformation.HasValue)
@ -1412,6 +1415,7 @@ namespace bsmd.dbh
bsmd.dbh.Request.IMDGPosition rootIMDG = new bsmd.dbh.Request.IMDGPosition(); bsmd.dbh.Request.IMDGPosition rootIMDG = new bsmd.dbh.Request.IMDGPosition();
rootIMDG.UNNumber = imdgPos.UNNumber; rootIMDG.UNNumber = imdgPos.UNNumber;
rootIMDG.PackingGroupSpecified = imdgPos.PackingGroup.HasValue;
if (imdgPos.PackingGroup.HasValue) if (imdgPos.PackingGroup.HasValue)
rootIMDG.PackingGroup = (PackingGroupType)imdgPos.PackingGroup.Value; rootIMDG.PackingGroup = (PackingGroupType)imdgPos.PackingGroup.Value;
rootIMDG.ProperShippingName = imdgPos.ProperShippingName; rootIMDG.ProperShippingName = imdgPos.ProperShippingName;
@ -1427,6 +1431,7 @@ namespace bsmd.dbh
{ {
rootIMDG.Class7MaxActivity = new IMDGPositionClass7MaxActivity(); rootIMDG.Class7MaxActivity = new IMDGPositionClass7MaxActivity();
rootIMDG.Class7MaxActivity.MaxActivityValue = decimal.Round((decimal)imdgPos.Class7MaxActivity_BQL.Value, 6); rootIMDG.Class7MaxActivity.MaxActivityValue = decimal.Round((decimal)imdgPos.Class7MaxActivity_BQL.Value, 6);
rootIMDG.Class7MaxActivity.MaxActivityUnit = ActivityUnitType.BQL;
} }
rootIMDG.Class7CategorySpecified = imdgPos.Class7Category.HasValue; rootIMDG.Class7CategorySpecified = imdgPos.Class7Category.HasValue;
if (imdgPos.Class7Category.HasValue) if (imdgPos.Class7Category.HasValue)
@ -1601,7 +1606,7 @@ namespace bsmd.dbh
for (int i = 0; i < haz.MARPOLPositions.Count; i++) for (int i = 0; i < haz.MARPOLPositions.Count; i++)
{ {
MARPOLPosition rootMarpol = new MARPOLPosition(); MARPOLPosition rootMarpol = new MARPOLPosition();
MARPOL_Annex_I_Position marpolPos = haz.MARPOLPositions[i] as MARPOL_Annex_I_Position; MARPOL_Annex_I_Position marpolPos = haz.MARPOLPositions[i];
rootMarpol.Name = marpolPos.Name; rootMarpol.Name = marpolPos.Name;
if (marpolPos.FlashpointInformation.HasValue) if (marpolPos.FlashpointInformation.HasValue)
@ -1612,7 +1617,7 @@ namespace bsmd.dbh
rootMarpol.StowagePosition = marpolPos.StowagePosition; rootMarpol.StowagePosition = marpolPos.StowagePosition;
rootMarpol.PortOfLoading = marpolPos.PortOfLoading; rootMarpol.PortOfLoading = marpolPos.PortOfLoading;
rootMarpol.PortOfDischarge = marpolPos.PortOfDischarge; rootMarpol.PortOfDischarge = marpolPos.PortOfDischarge;
if (!rootMarpol.Remarks.IsNullOrEmpty()) if (!marpolPos.Remarks.IsNullOrEmpty())
rootMarpol.Remarks = marpolPos.Remarks; rootMarpol.Remarks = marpolPos.Remarks;
dpgOnDeparture.DPGItemMARPOLAnnexI[i] = rootMarpol; dpgOnDeparture.DPGItemMARPOLAnnexI[i] = rootMarpol;