SERV / Auswahl erweitert / Stundenabschluss Sept 21
This commit is contained in:
parent
3b849fe653
commit
613d598e36
@ -26,12 +26,12 @@
|
|||||||
<value>1000</value>
|
<value>1000</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="LockingServerAddress" serializeAs="String">
|
<setting name="LockingServerAddress" serializeAs="String">
|
||||||
<value>http://192.168.2.24/LockingService/LockingService.svc</value>
|
<!--value>http://192.168.2.24/LockingService/LockingService.svc</value-->
|
||||||
<!--value>http://heupferd/bsmd.LockingService/LockingService.svc</value-->
|
<value>http://heupferd/bsmd.LockingService/LockingService.svc</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="ConnectionString" serializeAs="String">
|
<setting name="ConnectionString" serializeAs="String">
|
||||||
<value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
|
<!--value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value-->
|
||||||
<!--value>Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False</value-->
|
<value>Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False</value>
|
||||||
</setting>
|
</setting>
|
||||||
</ENI2.Properties.Settings>
|
</ENI2.Properties.Settings>
|
||||||
</applicationSettings>
|
</applicationSettings>
|
||||||
|
|||||||
@ -144,6 +144,7 @@ namespace ENI2.Controls
|
|||||||
case 1: if (core.IsFlagSet(MessageCore.CoreFlags.MAERSK_BHV)) this.filteredResult.Add(core); break;
|
case 1: if (core.IsFlagSet(MessageCore.CoreFlags.MAERSK_BHV)) this.filteredResult.Add(core); break;
|
||||||
case 2: if (core.IsFlagSet(MessageCore.CoreFlags.SEAGO_BHV)) this.filteredResult.Add(core); break;
|
case 2: if (core.IsFlagSet(MessageCore.CoreFlags.SEAGO_BHV)) this.filteredResult.Add(core); break;
|
||||||
case 3: if (core.IsFlagSet(MessageCore.CoreFlags.SEAGO_WHV)) this.filteredResult.Add(core); break;
|
case 3: if (core.IsFlagSet(MessageCore.CoreFlags.SEAGO_WHV)) this.filteredResult.Add(core); break;
|
||||||
|
case 4: if (core.IsFlagSet(MessageCore.CoreFlags.HOEGH)) this.filteredResult.Add(core); break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.dataGridPOCores.ItemsSource = this.filteredResult;
|
this.dataGridPOCores.ItemsSource = this.filteredResult;
|
||||||
@ -179,6 +180,7 @@ namespace ENI2.Controls
|
|||||||
editedCore.SetFlag(false, MessageCore.CoreFlags.MAERSK_BHV);
|
editedCore.SetFlag(false, MessageCore.CoreFlags.MAERSK_BHV);
|
||||||
editedCore.SetFlag(false, MessageCore.CoreFlags.SEAGO_BHV);
|
editedCore.SetFlag(false, MessageCore.CoreFlags.SEAGO_BHV);
|
||||||
editedCore.SetFlag(false, MessageCore.CoreFlags.SEAGO_WHV);
|
editedCore.SetFlag(false, MessageCore.CoreFlags.SEAGO_WHV);
|
||||||
|
editedCore.SetFlag(false, MessageCore.CoreFlags.HOEGH);
|
||||||
if (coreFlag != MessageCore.CoreFlags.NONE)
|
if (coreFlag != MessageCore.CoreFlags.NONE)
|
||||||
{
|
{
|
||||||
editedCore.SetFlag(true, coreFlag);
|
editedCore.SetFlag(true, coreFlag);
|
||||||
|
|||||||
@ -18,6 +18,7 @@
|
|||||||
<col:DictionaryEntry Key="Maersk BHV" Value="1" />
|
<col:DictionaryEntry Key="Maersk BHV" Value="1" />
|
||||||
<col:DictionaryEntry Key="SeaGo BHV" Value="2" />
|
<col:DictionaryEntry Key="SeaGo BHV" Value="2" />
|
||||||
<col:DictionaryEntry Key="SeaGo WHV" Value="4" />
|
<col:DictionaryEntry Key="SeaGo WHV" Value="4" />
|
||||||
|
<col:DictionaryEntry Key="Hoegh BHV" Value="8" />
|
||||||
</col:ArrayList>
|
</col:ArrayList>
|
||||||
</UserControl.Resources>
|
</UserControl.Resources>
|
||||||
<GroupBox Name="portNotificationGroupBox" Header="{x:Static p:Resources.textPortNotification}">
|
<GroupBox Name="portNotificationGroupBox" Header="{x:Static p:Resources.textPortNotification}">
|
||||||
|
|||||||
@ -158,6 +158,7 @@ namespace ENI2.DetailViewControls
|
|||||||
if (this.Core.IsFlagSet(MessageCore.CoreFlags.MAERSK_BHV)) this.comboBoxGroup.SelectedIndex = 1;
|
if (this.Core.IsFlagSet(MessageCore.CoreFlags.MAERSK_BHV)) this.comboBoxGroup.SelectedIndex = 1;
|
||||||
if (this.Core.IsFlagSet(MessageCore.CoreFlags.SEAGO_BHV)) this.comboBoxGroup.SelectedIndex = 2;
|
if (this.Core.IsFlagSet(MessageCore.CoreFlags.SEAGO_BHV)) this.comboBoxGroup.SelectedIndex = 2;
|
||||||
if (this.Core.IsFlagSet(MessageCore.CoreFlags.SEAGO_WHV)) this.comboBoxGroup.SelectedIndex = 3;
|
if (this.Core.IsFlagSet(MessageCore.CoreFlags.SEAGO_WHV)) this.comboBoxGroup.SelectedIndex = 3;
|
||||||
|
if (this.Core.IsFlagSet(MessageCore.CoreFlags.HOEGH)) this.comboBoxGroup.SelectedIndex = 4;
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
@ -369,12 +370,14 @@ namespace ENI2.DetailViewControls
|
|||||||
this.Core.SetFlag(false, MessageCore.CoreFlags.MAERSK_BHV);
|
this.Core.SetFlag(false, MessageCore.CoreFlags.MAERSK_BHV);
|
||||||
this.Core.SetFlag(false, MessageCore.CoreFlags.SEAGO_BHV);
|
this.Core.SetFlag(false, MessageCore.CoreFlags.SEAGO_BHV);
|
||||||
this.Core.SetFlag(false, MessageCore.CoreFlags.SEAGO_WHV);
|
this.Core.SetFlag(false, MessageCore.CoreFlags.SEAGO_WHV);
|
||||||
|
this.Core.SetFlag(false, MessageCore.CoreFlags.HOEGH);
|
||||||
|
|
||||||
DictionaryEntry selectedItem = (DictionaryEntry) this.comboBoxGroup.SelectedItem;
|
DictionaryEntry selectedItem = (DictionaryEntry) this.comboBoxGroup.SelectedItem;
|
||||||
if(Int32.TryParse((string)selectedItem.Value, out int selectedValue))
|
if(Int32.TryParse((string)selectedItem.Value, out int selectedValue))
|
||||||
{
|
{
|
||||||
if (selectedValue == (int)MessageCore.CoreFlags.MAERSK_BHV) CheckServiceEntryMaerskBHV();
|
if (selectedValue == (int)MessageCore.CoreFlags.MAERSK_BHV) CheckServiceEntryMaerskBHV();
|
||||||
if (selectedValue == (int)MessageCore.CoreFlags.SEAGO_BHV) CheckServiceEntrySeaGoBHV();
|
if (selectedValue == (int)MessageCore.CoreFlags.SEAGO_BHV) CheckServiceEntrySeaGoBHV();
|
||||||
|
if (selectedValue == (int)MessageCore.CoreFlags.HOEGH) CheckServiceEntryHoegh();
|
||||||
this.Core.SetFlag(true, (MessageCore.CoreFlags)selectedValue);
|
this.Core.SetFlag(true, (MessageCore.CoreFlags)selectedValue);
|
||||||
DBManager.Instance.Save(this.Core);
|
DBManager.Instance.Save(this.Core);
|
||||||
}
|
}
|
||||||
@ -430,6 +433,30 @@ namespace ENI2.DetailViewControls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void CheckServiceEntryHoegh()
|
||||||
|
{
|
||||||
|
bool found = false;
|
||||||
|
foreach (SERV serv in this._servMessage.Elements)
|
||||||
|
{
|
||||||
|
if (serv.ServiceBeneficiary.Equals("Höegh Autoliners AS, Oslo, Norway"))
|
||||||
|
found = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!found)
|
||||||
|
{
|
||||||
|
SERV newServ = new SERV();
|
||||||
|
newServ.ServiceBeneficiary = "Höegh Autoliners AS, Oslo, Norway";
|
||||||
|
newServ.ServiceInvoiceRecipient = " PWL Port Services GmbH & Co. KG";
|
||||||
|
newServ.ServiceName = "HOEGH BHV";
|
||||||
|
newServ.MessageHeader = this._servMessage;
|
||||||
|
newServ.Identifier = SERV.GetNewIdentifier(_servMessage.Elements);
|
||||||
|
this._servMessage.Elements.Add(newServ);
|
||||||
|
this.dataGridSERV.Items.Refresh();
|
||||||
|
this.SublistElementChanged(Message.NotificationClass.SERV);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
@ -93,7 +93,8 @@ namespace bsmd.database
|
|||||||
NONE = 0,
|
NONE = 0,
|
||||||
MAERSK_BHV = 1,
|
MAERSK_BHV = 1,
|
||||||
SEAGO_BHV = 2,
|
SEAGO_BHV = 2,
|
||||||
SEAGO_WHV = 4
|
SEAGO_WHV = 4,
|
||||||
|
HOEGH = 8
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user