diff --git a/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.Designer.cs b/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.Designer.cs index 983635a..add77d3 100644 --- a/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.Designer.cs +++ b/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.Designer.cs @@ -30,6 +30,8 @@ { this.components = new System.ComponentModel.Container(); this.aCreateDeliveryNoteOutfromStorageOut = new DevExpress.ExpressApp.Actions.PopupWindowShowAction(this.components); + this.aPrint_DeliveryNoteOutHeader = new DevExpress.ExpressApp.Actions.SimpleAction(this.components); + this.aStornoDeliveryNoteOutfromStorageOut = new DevExpress.ExpressApp.Actions.SimpleAction(this.components); // // aCreateDeliveryNoteOutfromStorageOut // @@ -38,20 +40,50 @@ this.aCreateDeliveryNoteOutfromStorageOut.Caption = "aCreate Delivery Note Outfrom Storage Out"; this.aCreateDeliveryNoteOutfromStorageOut.ConfirmationMessage = null; this.aCreateDeliveryNoteOutfromStorageOut.Id = "aCreateDeliveryNoteOutfromStorageOut"; + this.aCreateDeliveryNoteOutfromStorageOut.SelectionDependencyType = DevExpress.ExpressApp.Actions.SelectionDependencyType.RequireSingleObject; this.aCreateDeliveryNoteOutfromStorageOut.TargetObjectType = typeof(Nuvolar.Module.StorageOutHeader); this.aCreateDeliveryNoteOutfromStorageOut.TargetViewNesting = DevExpress.ExpressApp.Nesting.Root; this.aCreateDeliveryNoteOutfromStorageOut.TargetViewType = DevExpress.ExpressApp.ViewType.ListView; this.aCreateDeliveryNoteOutfromStorageOut.ToolTip = null; this.aCreateDeliveryNoteOutfromStorageOut.TypeOfView = typeof(DevExpress.ExpressApp.ListView); + this.aCreateDeliveryNoteOutfromStorageOut.CustomizePopupWindowParams += new DevExpress.ExpressApp.Actions.CustomizePopupWindowParamsEventHandler(this.aCreateDeliveryNoteOutfromStorageOut_CustomizePopupWindowParams); + this.aCreateDeliveryNoteOutfromStorageOut.Execute += new DevExpress.ExpressApp.Actions.PopupWindowShowActionExecuteEventHandler(this.aCreateDeliveryNoteOutfromStorageOut_Execute); + // + // aPrint_DeliveryNoteOutHeader + // + this.aPrint_DeliveryNoteOutHeader.Caption = "aPrint_DeliveryNoteOutHeader"; + this.aPrint_DeliveryNoteOutHeader.ConfirmationMessage = null; + this.aPrint_DeliveryNoteOutHeader.Id = "aPrint_DeliveryNoteOutHeader"; + this.aPrint_DeliveryNoteOutHeader.SelectionDependencyType = DevExpress.ExpressApp.Actions.SelectionDependencyType.RequireSingleObject; + this.aPrint_DeliveryNoteOutHeader.TargetObjectType = typeof(Nuvolar.Module.StorageOutHeader); + this.aPrint_DeliveryNoteOutHeader.TargetViewNesting = DevExpress.ExpressApp.Nesting.Root; + this.aPrint_DeliveryNoteOutHeader.TargetViewType = DevExpress.ExpressApp.ViewType.ListView; + this.aPrint_DeliveryNoteOutHeader.ToolTip = null; + this.aPrint_DeliveryNoteOutHeader.TypeOfView = typeof(DevExpress.ExpressApp.ListView); + this.aPrint_DeliveryNoteOutHeader.Execute += new DevExpress.ExpressApp.Actions.SimpleActionExecuteEventHandler(this.aPrint_DeliveryNoteOutHeader_Execute); + // + // aStornoDeliveryNoteOutfromStorageOut + // + this.aStornoDeliveryNoteOutfromStorageOut.Caption = "aStorno Delivery Note Outfrom Storage Out"; + this.aStornoDeliveryNoteOutfromStorageOut.ConfirmationMessage = null; + this.aStornoDeliveryNoteOutfromStorageOut.Id = "aStornoDeliveryNoteOutfromStorageOut"; + this.aStornoDeliveryNoteOutfromStorageOut.SelectionDependencyType = DevExpress.ExpressApp.Actions.SelectionDependencyType.RequireSingleObject; + this.aStornoDeliveryNoteOutfromStorageOut.TargetObjectType = typeof(Nuvolar.Module.StorageOutHeader); + this.aStornoDeliveryNoteOutfromStorageOut.ToolTip = null; + this.aStornoDeliveryNoteOutfromStorageOut.Execute += new DevExpress.ExpressApp.Actions.SimpleActionExecuteEventHandler(this.aStornoDeliveryNoteOutfromStorageOut_Execute); // // StorageOut_VC // this.Actions.Add(this.aCreateDeliveryNoteOutfromStorageOut); + this.Actions.Add(this.aPrint_DeliveryNoteOutHeader); + this.Actions.Add(this.aStornoDeliveryNoteOutfromStorageOut); } #endregion private DevExpress.ExpressApp.Actions.PopupWindowShowAction aCreateDeliveryNoteOutfromStorageOut; + private DevExpress.ExpressApp.Actions.SimpleAction aPrint_DeliveryNoteOutHeader; + private DevExpress.ExpressApp.Actions.SimpleAction aStornoDeliveryNoteOutfromStorageOut; } } diff --git a/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.cs b/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.cs index 398fe92..80f47c4 100644 --- a/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.cs +++ b/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.cs @@ -13,6 +13,9 @@ using DevExpress.ExpressApp.Templates; using DevExpress.ExpressApp.Utils; using DevExpress.Persistent.Base; using DevExpress.Persistent.Validation; +using DevExpress.ExpressApp.Xpo; +using DevExpress.Persistent.BaseImpl; +using Nuvolar.Module.Helpers; namespace Nuvolar.Module.Controllers { @@ -39,5 +42,107 @@ namespace Nuvolar.Module.Controllers // Unsubscribe from previously subscribed events and release other references and resources. base.OnDeactivated(); } + + /// + /// Kitárolási bizonylatról => szállítólevél (egy az egyben !) + /// + /// + /// + private void aCreateDeliveryNoteOutfromStorageOut_Execute(object sender, PopupWindowShowActionExecuteEventArgs e) + { + //Ellenőrzés, hogy készült-e már minden kitárolási sorról szállítólevél + XPObjectSpace _ocur = View.ObjectSpace as XPObjectSpace; + StorageOutHeader _StorageOutHeader = _ocur.GetObject(View.CurrentObject) as StorageOutHeader; + bool _Ok = true; + foreach (StorageOutRows _StorageOutRows in _StorageOutHeader.StorageOutRows) + { + if (_StorageOutRows.QTT_To_DeliveryOut == _StorageOutRows.QTT) + { + _Ok = false; + break; + } + } + if (_StorageOutHeader.DeliveryNoteOutHeader != null) + { + _Ok = false; + } + if (_Ok) + { + DeliveryNoteOutHeader _DeliveryNoteOutHeader = BusinessDocumentHelper.CreateNewDeliveryNoteOutHeader(_ocur, e.PopupWindow.View.CurrentObject as DeliveryNoteView); + long i = 1; + foreach (StorageOutRows _StorageOutRows in _StorageOutHeader.StorageOutRows) + { + foreach (StorageOutRowsInRows _StorageOutRowsInRows in _StorageOutRows.StorageOutRowsInRows) + { + _StorageOutRowsInRows.QTT_Will = _StorageOutRowsInRows.QTT; + BusinessDocumentHelper.AddNewDeliveryNoteOutRows(_ocur, _DeliveryNoteOutHeader, _StorageOutRowsInRows, i); + i += 1; + } + + } + if (BusinessDocumentHelper.FinalizeDeliveryNoteOutHeader(_ocur, _DeliveryNoteOutHeader, _StorageOutHeader)) + { + //Nyomtatás + BusinessDocumentHelper.PrintDeliveryNoteOutHeader(_ocur, Frame, _DeliveryNoteOutHeader); + } + } + + } + + private void aCreateDeliveryNoteOutfromStorageOut_CustomizePopupWindowParams(object sender, CustomizePopupWindowParamsEventArgs e) + { + XPObjectSpace _onew = Application.CreateObjectSpace() as XPObjectSpace; + DeliveryNoteView _DeliveryNoteView = _onew.CreateObject(); + StorageOutHeader _StorageOutHeader = _onew.GetObject(View.CurrentObject) as StorageOutHeader; + + _DeliveryNoteView.Customers = _StorageOutHeader.Customers; + _DeliveryNoteView.TransportAddress = _StorageOutHeader.Storage.Address; + _DeliveryNoteView.DateExecution = DateTime.Now; + _DeliveryNoteView.CurrencyName = _onew.FindObject(CriteriaOperator.Parse("ShortName='HUF'")); + if (_StorageOutHeader.StorageMoveType.MoveType==eMoveType.InventoryTransfer) + { + _DeliveryNoteView.DeliveryNoteOutType = _StorageOutHeader.Storage.DeliveryNoteOutType_InventoryTransfer; + } + if (_StorageOutHeader.StorageMoveType.MoveType == eMoveType.ReturnBack) + { + _DeliveryNoteView.DeliveryNoteOutType = _StorageOutHeader.Storage.DeliveryNoteOutType_ReturnBack; + } + + + if (_StorageOutHeader.Customers != null) + { + if (_StorageOutHeader.Customers.Address1 != null) _DeliveryNoteView.TransportAddress = _onew.GetObjectByKey
(_StorageOutHeader.Customers.Address1.Oid); + if (_StorageOutHeader.Customers.Address2 != null) _DeliveryNoteView.TransportAddress = _onew.GetObjectByKey
(_StorageOutHeader.Customers.Address2.Oid); + if (_StorageOutHeader.Customers.ShipmentOption != null) _DeliveryNoteView.ShipmentOption = _onew.GetObjectByKey(_StorageOutHeader.Customers.ShipmentOption.Oid); + if (_StorageOutHeader.Customers.QualityOption != null) _DeliveryNoteView.QualityOption = _onew.GetObjectByKey(_StorageOutHeader.Customers.QualityOption.Oid); + } + + e.View = Application.CreateDetailView(_onew, "DeliveryNoteView_DetailView", false, _DeliveryNoteView); + } + + /// + /// Kitárolási bizonylathoz kapcsolódó szállítólevél újranyomtatása + /// + /// + /// + private void aPrint_DeliveryNoteOutHeader_Execute(object sender, SimpleActionExecuteEventArgs e) + { + XPObjectSpace _ocur = View.ObjectSpace as XPObjectSpace; + StorageOutHeader _StorageOutHeader = View.CurrentObject as StorageOutHeader; + BusinessDocumentHelper.PrintDeliveryNoteOutHeader(_ocur, Frame, _StorageOutHeader.DeliveryNoteOutHeader); + + } + + private void aStornoDeliveryNoteOutfromStorageOut_Execute(object sender, SimpleActionExecuteEventArgs e) + { + XPObjectSpace _ocur = View.ObjectSpace as XPObjectSpace; + StorageOutHeader _StorageOutHeader = View.CurrentObject as StorageOutHeader; + DeliveryNoteOutHeader _DeliveryNoteOutHeader = BusinessDocumentHelper.StornoDeliveryNoteOutHeaderfromStorageOutHeader(_ocur, _StorageOutHeader); + if (_DeliveryNoteOutHeader!=null) + { + BusinessDocumentHelper.PrintDeliveryNoteOutHeader(_ocur, Frame, _DeliveryNoteOutHeader); + } + + } } } diff --git a/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.resx b/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.resx index a3fac4e..bfd927b 100644 --- a/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.resx +++ b/Nuvolar.Module.CSharp/Controllers/StorageOut_VC.resx @@ -118,7 +118,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 17, 17 + 17, 56 + + + 290, 17 + + + 290, 56 False diff --git a/Nuvolar.Module.CSharp/Helpers/BusinessDocumentHelper.cs b/Nuvolar.Module.CSharp/Helpers/BusinessDocumentHelper.cs index 91c6fa2..4ede5d7 100644 --- a/Nuvolar.Module.CSharp/Helpers/BusinessDocumentHelper.cs +++ b/Nuvolar.Module.CSharp/Helpers/BusinessDocumentHelper.cs @@ -1,4 +1,6 @@ -using DevExpress.ExpressApp.Xpo; +using DevExpress.Data.Filtering; +using DevExpress.ExpressApp; +using DevExpress.ExpressApp.Xpo; using System; using System.Collections.Generic; using System.Linq; @@ -19,14 +21,206 @@ namespace Nuvolar.Module.Helpers return _DeliveryNoteOutHeader; } - - public static bool AddNewDeliveryNoteOutRows(XPObjectSpace _ObjectSpace, DeliveryNoteOutHeader _DeliveryNoteOutHeader) + /// + /// Új kimenő szállíttólevél fejléc a _deliveryNoteView popup alapján + /// + /// + /// + /// + public static DeliveryNoteOutHeader CreateNewDeliveryNoteOutHeader(XPObjectSpace _ObjectSpace, DeliveryNoteView _DeliveryNoteView) { - return true; + DeliveryNoteOutHeader _DeliveryNoteOutHeader = _ObjectSpace.CreateObject(); + try + { + _DeliveryNoteOutHeader.CustomersFrom = _ObjectSpace.GetObject(_DeliveryNoteView.CustomersFrom); + _DeliveryNoteOutHeader.ConnectInfo = ""; + _DeliveryNoteOutHeader.CurrencyName = _ObjectSpace.GetObject((_DeliveryNoteView.CurrencyName)); + _DeliveryNoteOutHeader.Customers = _ObjectSpace.GetObject((_DeliveryNoteView.Customers)); + _DeliveryNoteOutHeader.DateCreated = GeneralFunction.GetSQLTime(_ObjectSpace.Session); + _DeliveryNoteOutHeader.DateExecution = GeneralFunction.GetSQLTime(_ObjectSpace.Session); + _DeliveryNoteOutHeader.DeliveryNoteOutType = _ObjectSpace.GetObject((_DeliveryNoteView.DeliveryNoteOutType)); + _DeliveryNoteOutHeader.DocumentNumber = ""; + _DeliveryNoteOutHeader.IsEditable = false; + _DeliveryNoteOutHeader.IsStorno = false; + _DeliveryNoteOutHeader.Note = _ObjectSpace.GetObject((_DeliveryNoteView.Note)); + _DeliveryNoteOutHeader.QualityOption = _ObjectSpace.GetObject((_DeliveryNoteView.QualityOption)); + _DeliveryNoteOutHeader.ShipmentOption = _ObjectSpace.GetObject((_DeliveryNoteView.ShipmentOption)); + _DeliveryNoteOutHeader.TransportAddress = _ObjectSpace.GetObject((_DeliveryNoteView.TransportAddress)); + } + catch (Exception) + { + _ObjectSpace.Delete(_DeliveryNoteOutHeader); + _DeliveryNoteOutHeader = null; + } + + return _DeliveryNoteOutHeader; } + /// + /// Létrehoz egy új DeliveryNoteOutRows objektumot (üresen, de a DeliveryNoteOutHeader-t beilleszti) + /// + /// + /// + /// + public static DeliveryNoteOutRows AddNewDeliveryNoteOutRows(XPObjectSpace _ObjectSpace, DeliveryNoteOutHeader _DeliveryNoteOutHeader) + { + DeliveryNoteOutRows _DeliveryNoteOutRows = _ObjectSpace.CreateObject(); + + + _DeliveryNoteOutRows.DeliveryNoteOutHeader = _DeliveryNoteOutHeader; + + return _DeliveryNoteOutRows; + } + /// + /// Kitárolási sor FIFO lábaiból a QTT alapján egy kiszállítási sort készít + /// + /// + /// + /// + /// + public static DeliveryNoteOutRows AddNewDeliveryNoteOutRows(XPObjectSpace _ObjectSpace, DeliveryNoteOutHeader _DeliveryNoteOutHeader, StorageOutRowsInRows _StorageOutRowsInRows, long _RowIndex) + { + DeliveryNoteOutRows _DeliveryNoteOutRows = _ObjectSpace.CreateObject(); + try + { + + + _DeliveryNoteOutRows.DeliveryNoteOutHeader = _DeliveryNoteOutHeader; + _DeliveryNoteOutRows.DividedOriginal = 0; + _DeliveryNoteOutRows.QTT = _StorageOutRowsInRows.QTT_Will; + _DeliveryNoteOutRows.QTT_Invoiced = 0; + _DeliveryNoteOutRows.QTT_Will = 0; + _DeliveryNoteOutRows.RowIndex = _RowIndex; + _DeliveryNoteOutRows.StorageOutRowsInRows = _ObjectSpace.GetObject(_StorageOutRowsInRows); + + _StorageOutRowsInRows.QTT_To_DeliveryOut = _DeliveryNoteOutRows.QTT; // A kitárolási sor is update !!!! + } + catch (Exception) + { + + _ObjectSpace.Delete(_DeliveryNoteOutRows); + _DeliveryNoteOutRows = null; + } + + return _DeliveryNoteOutRows; + } + /// + /// Véglegesíti a korábban elkezdett DeliveryNoteOutHeader-t + /// + /// + /// + /// public static bool FinalizeDeliveryNoteOutHeader(XPObjectSpace _ObjectSpace, DeliveryNoteOutHeader _DeliveryNoteOutHeader) { - return true; + bool _Ok = true; + try + { + _ObjectSpace.CommitChanges(); + } + catch (Exception) + { + + _Ok = false; + } + + return _Ok; + } + public static bool FinalizeDeliveryNoteOutHeader(XPObjectSpace _ObjectSpace, DeliveryNoteOutHeader _DeliveryNoteOutHeader, StorageOutHeader _StorageOutHeader) + { + bool _Ok = true; + try + { + _StorageOutHeader.DeliveryNoteOutHeader = _ObjectSpace.GetObject(_DeliveryNoteOutHeader); + _ObjectSpace.CommitChanges(); + } + catch (Exception) + { + + _Ok = false; + } + + return _Ok; + } + /// + /// Szállítólevél nyomtatása + /// + /// + /// + /// + public static void PrintDeliveryNoteOutHeader(XPObjectSpace _ObjectSpace, Frame _Frame, DeliveryNoteOutHeader _DeliveryNoteOutHeader) + { + if (_DeliveryNoteOutHeader==null) + { + return; + } + if (_DeliveryNoteOutHeader.DeliveryNoteOutType.ReportDataV2 != null) + { + XAFPrintHelper _XAFPrintHelper = new XAFPrintHelper(_ObjectSpace, _Frame, _DeliveryNoteOutHeader.DeliveryNoteOutType.ReportDataV2, + CriteriaOperator.Parse("DeliveryNoteOutHeader.Oid = ?", _DeliveryNoteOutHeader.Oid)); + _XAFPrintHelper.ShowPreviewV2(); + } + + } + /// + /// Kitárolási bizonylatról kiszállítótt szállító stornírozása + /// + /// + /// + /// + /// + public static DeliveryNoteOutHeader StornoDeliveryNoteOutHeaderfromStorageOutHeader(XPObjectSpace _ObjectSpace, StorageOutHeader _StorageOutHeader) + { + + DeliveryNoteOutHeader _DeliveryNoteOutHeader = CreateNewDeliveryNoteOutHeader(_ObjectSpace); + try + { + _StorageOutHeader.DeliveryNoteOutHeader.IsEditable = false; + _StorageOutHeader.DeliveryNoteOutHeader.IsStorno = true; + + + _DeliveryNoteOutHeader.ConnectInfo = _StorageOutHeader.DeliveryNoteOutHeader.DocumentNumber; + _DeliveryNoteOutHeader.CurrencyName = _StorageOutHeader.DeliveryNoteOutHeader.CurrencyName; + _DeliveryNoteOutHeader.Customers = _StorageOutHeader.DeliveryNoteOutHeader.Customers; + _DeliveryNoteOutHeader.CustomersFrom = _StorageOutHeader.DeliveryNoteOutHeader.CustomersFrom; + _DeliveryNoteOutHeader.DateCreated = GeneralFunction.GetSQLTime(_ObjectSpace.Session); + _DeliveryNoteOutHeader.DateExecution = GeneralFunction.GetSQLTime(_ObjectSpace.Session); + _DeliveryNoteOutHeader.DeliveryNoteOutType = _StorageOutHeader.DeliveryNoteOutHeader.DeliveryNoteOutType; + _DeliveryNoteOutHeader.IsEditable = false; + _DeliveryNoteOutHeader.IsStorno = true; + _DeliveryNoteOutHeader.Note = _StorageOutHeader.DeliveryNoteOutHeader.Note; + _DeliveryNoteOutHeader.QualityOption = _StorageOutHeader.DeliveryNoteOutHeader.QualityOption; + _DeliveryNoteOutHeader.ShipmentOption = _StorageOutHeader.DeliveryNoteOutHeader.ShipmentOption; + _DeliveryNoteOutHeader.TransportAddress = _StorageOutHeader.DeliveryNoteOutHeader.TransportAddress; + + foreach (DeliveryNoteOutRows _DeliveryNoteOutRows_Original in _StorageOutHeader.DeliveryNoteOutHeader.DeliveryNoteOutRows) + { + + _DeliveryNoteOutRows_Original.StorageOutRowsInRows.QTT_To_DeliveryOut = 0; + DeliveryNoteOutRows _DeliveryOutRows = _ObjectSpace.CreateObject(); + + _DeliveryOutRows.DeliveryNoteOutHeader = _DeliveryNoteOutHeader; + _DeliveryOutRows.ADRNumber = _DeliveryNoteOutRows_Original.ADRNumber; + _DeliveryOutRows.Note = _DeliveryNoteOutRows_Original.Note; + _DeliveryOutRows.QTT = _DeliveryNoteOutRows_Original.QTT * -1; + _DeliveryOutRows.QTT_Invoiced = 0; + _DeliveryOutRows.QTT_Will = 0; + _DeliveryOutRows.RowIndex = _DeliveryNoteOutRows_Original.RowIndex; + _DeliveryOutRows.StorageOutRowsInRows = _DeliveryNoteOutRows_Original.StorageOutRowsInRows; + + + } + + _StorageOutHeader.DeliveryNoteOutHeader = null; + _ObjectSpace.CommitChanges(); + } + catch (Exception) + { + + } + finally + { + + } + return _DeliveryNoteOutHeader; } #endregion #region Invoice diff --git a/Nuvolar.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml b/Nuvolar.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml index d0d04c8..0acaf05 100644 --- a/Nuvolar.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml +++ b/Nuvolar.Module.CSharp/Model.DesignedDiffs.Localization.hu.xafml @@ -2,11 +2,14 @@ + + + diff --git a/Nuvolar.Module.CSharp/Model.DesignedDiffs.xafml b/Nuvolar.Module.CSharp/Model.DesignedDiffs.xafml index 79738a1..e6d4c6b 100644 --- a/Nuvolar.Module.CSharp/Model.DesignedDiffs.xafml +++ b/Nuvolar.Module.CSharp/Model.DesignedDiffs.xafml @@ -2,13 +2,15 @@ - + + + diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/DeliveryNoteOut/DeliveryNoteOutRows.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/DeliveryNoteOut/DeliveryNoteOutRows.vb index 325fde2..327ab37 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/DeliveryNoteOut/DeliveryNoteOutRows.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/DeliveryNoteOut/DeliveryNoteOutRows.vb @@ -107,7 +107,11 @@ Public Class DeliveryNoteOutRows 'Szállítólevél sorok SetPropertyValue("QTT_Will", _QTT_Will, value) End Set End Property - _ + ''' + ''' Megjegyzés (Note) + ''' + ''' + Property Note() As String Get Return _Note @@ -116,6 +120,10 @@ Public Class DeliveryNoteOutRows 'Szállítólevél sorok SetPropertyValue("Note", _Note, value) End Set End Property + ''' + ''' ADR szám a szállításhoz (ADRNumber) + ''' + ''' Property ADRNumber As Double Get Return _ADRNumber @@ -124,6 +132,10 @@ Public Class DeliveryNoteOutRows 'Szállítólevél sorok SetPropertyValue("ADRNumber", _ADRNumber, value) End Set End Property + ''' + ''' Eredeti megosztási sor + ''' + ''' Property DividedOriginal As Long Get @@ -133,6 +145,11 @@ Public Class DeliveryNoteOutRows 'Szállítólevél sorok SetPropertyValue("DividedOriginal", _DividedOriginal, value) End Set End Property + + ''' + ''' Megosztási sor azonosító + ''' + ''' Property DividedGUID As Guid Get diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.Designer.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.Designer.vb index 4dc90d8..ab45dce 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.Designer.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.Designer.vb @@ -21,11 +21,11 @@ Partial Class OrderInVC 'Required by the Component Designer Private components As System.ComponentModel.IContainer - 'NOTE: The following procedure is required by the Component Designer - 'It can be modified using the Component Designer. - 'Do not modify it using the code editor. - _ - Private Sub InitializeComponent() + 'NOTE: The following procedure is required by the Component Designer + 'It can be modified using the Component Designer. + 'Do not modify it using the code editor. + + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.aFinalizeOrderIn = New DevExpress.ExpressApp.Actions.SimpleAction(Me.components) Me.aStornoOrderIn = New DevExpress.ExpressApp.Actions.SimpleAction(Me.components) diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.resx b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.resx index 9d66e34..ef741b8 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.resx +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.resx @@ -118,109 +118,109 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 404, 17 - - - 544, 17 - - - 1129, 17 - - - 17, 56 - - - 174, 56 - - - 499, 56 - - - 825, 56 - - - 1065, 56 - - - 310, 95 - - - 798, 95 - - - 1156, 95 - - - 196, 134 - - - 636, 134 - - - 840, 134 - - - 974, 134 - - - 17, 173 - - - 502, 173 - - - 689, 173 - - - 1125, 173 - - - 490, 212 - - - 224, 212 - - 17, 212 - - 895, 173 + + 1313, 173 - - 233, 173 + + 1165, 173 - - 1137, 134 + + 1038, 17 - - 17, 134 + + 1044, 173 - - 461, 134 + + 907, 173 - - 949, 95 + + 667, 173 - - 544, 95 + + 206, 56 - + + 433, 173 + + + 282, 173 + + 17, 95 + + 17, 173 + + + 1302, 134 + + + 1168, 134 + + + 1005, 134 + + + 508, 95 + + + 818, 134 + + + 612, 134 + + + 17, 134 + + + 450, 134 + + + 184, 134 + + + 1223, 95 + + + 993, 95 + + + 724, 95 + + + 278, 95 + + + 1174, 56 + + + 1353, 56 + + + 967, 56 + + + 713, 56 + + + 420, 56 + - 636, 56 + 17, 56 - 295, 56 + 1195, 17 - 1277, 17 + 853, 17 - 921, 17 + 645, 17 - 680, 17 + 404, 17 223, 17 diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Out/StorageOutHeader.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Out/StorageOutHeader.vb index c649fb3..aab112d 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Out/StorageOutHeader.vb +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Out/StorageOutHeader.vb @@ -48,6 +48,8 @@ Public Class StorageOutHeader Private _WorkSheet_Header As WorkSheet_Header 'Melyik munkalaphoz kapcsolódik a kitárolás Private _StoragePDACollectionHeader As StoragePDACollectionHeader Private _ConnectInfo As String + Private _DeliveryNoteOutHeader As DeliveryNoteOutHeader 'Milyen szállítólevelen lett raktárközi kiszállítva, visszárúzva stb. + '---------------------------------------------------------------------------- Private _row_OutMode As eOutMode @@ -239,6 +241,18 @@ Public Class StorageOutHeader SetPropertyValue("ConnectInfo", _ConnectInfo, value) End Set End Property + ''' + ''' Milyen szállítólevelen lett kiszállítva (raktárközi, visszárú esetén) + ''' + ''' + Property DeliveryNoteOutHeader As DeliveryNoteOutHeader + Get + Return _DeliveryNoteOutHeader + End Get + Set(value As DeliveryNoteOutHeader) + SetPropertyValue("DeliveryNoteOutHeader", _DeliveryNoteOutHeader, value) + End Set + End Property 'Nonpersistent @@ -298,9 +312,9 @@ Public Class StorageOutHeader End Property 'XPCollections - _ - _ - Public ReadOnly Property StorageOutRows() As XPCollection(Of StorageOutRows) + + + Public ReadOnly Property StorageOutRows As XPCollection(Of StorageOutRows) Get Return GetCollection(Of StorageOutRows)("StorageOutRows") End Get diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/Storage.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/Storage.vb index ba37074..a82bafa 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/Storage.vb +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/Storage.vb @@ -28,13 +28,18 @@ Public Class Storage '-- Raktárak ------------ Private _ReportIn As ReportData ' -- Nyomtatvány betárolás Private _ReportOut As ReportData ' -- Nyomtatvány kitárolás Private _ReportInventory As ReportData '--Leltár nyomtatvány DataType InventorySIR - + Private _DeliveryNoteOutType_InventoryTransfer As DeliveryNoteOutType '--Szállítólevél a raktárközi átadás hoz + Private _DeliveryNoteOutType_ReturnBack As DeliveryNoteOutType '--Szállítólevél a visszárúhoz Public Sub New(ByVal session As Session) MyBase.New(session) End Sub Public Overrides Sub AfterConstruction() End Sub + ''' + ''' Saját cég + ''' + ''' Property CustomersFrom As CustomersFrom Get Return _CustomersFrom @@ -43,6 +48,10 @@ Public Class Storage '-- Raktárak ------------ SetPropertyValue("CustomersFrom", _CustomersFrom, value) End Set End Property + ''' + ''' A raktár címe + ''' + ''' Property Address As Address Get @@ -52,7 +61,11 @@ Public Class Storage '-- Raktárak ------------ SetPropertyValue("Address", _Address, value) End Set End Property - _ + ''' + ''' Rövid megnevezés + ''' + ''' + Property ShortName As String Get Return _ShortName @@ -61,7 +74,11 @@ Public Class Storage '-- Raktárak ------------ SetPropertyValue("ShortName", _ShortName, value) End Set End Property - _ + ''' + ''' Leírás (max 100 karakter) + ''' + ''' + Property Description As String Get Return _Description @@ -70,7 +87,11 @@ Public Class Storage '-- Raktárak ------------ SetPropertyValue("Description", _Description, value) End Set End Property - _ + ''' + ''' Kitárolás sorszám generátora + ''' + ''' + Property NumberGeneratorOut As NumberGenerator Get Return _NumberGeneratorOut @@ -79,7 +100,11 @@ Public Class Storage '-- Raktárak ------------ SetPropertyValue("NumberGeneratorOut", _NumberGeneratorOut, value) End Set End Property - _ + ''' + ''' Betárolás sorszámgenerátora + ''' + ''' + Property NumberGeneratorIn As NumberGenerator Get Return _NumberGeneratorIn @@ -88,7 +113,11 @@ Public Class Storage '-- Raktárak ------------ SetPropertyValue("NumberGeneratorIn", _NumberGeneratorIn, value) End Set End Property - _ + ''' + ''' Kitárolás stornó sorszámgenerátora + ''' + ''' + Property NumberGeneratorOutS As NumberGenerator Get Return _NumberGeneratorOutS @@ -97,7 +126,11 @@ Public Class Storage '-- Raktárak ------------ SetPropertyValue("NumberGeneratorOutS", _NumberGeneratorOutS, value) End Set End Property - _ + ''' + ''' Betárolás stornó sorszámgenerátora + ''' + ''' + Property NumberGeneratorInS As NumberGenerator Get Return _NumberGeneratorInS @@ -106,6 +139,10 @@ Public Class Storage '-- Raktárak ------------ SetPropertyValue("NumberGeneratorInS", _NumberGeneratorInS, value) End Set End Property + ''' + ''' Betárolás nyomtatványa + ''' + ''' Property ReportIn As ReportData Get Return _ReportIn @@ -114,6 +151,10 @@ Public Class Storage '-- Raktárak ------------ SetPropertyValue("ReportIn", _ReportIn, value) End Set End Property + ''' + ''' Kitárolás nyomtatvány + ''' + ''' Property ReportOut As ReportData Get Return _ReportOut @@ -122,6 +163,10 @@ Public Class Storage '-- Raktárak ------------ SetPropertyValue("ReportOut", _ReportOut, value) End Set End Property + ''' + ''' Leltár nyomtatvány + ''' + ''' Property ReportInventory As ReportData Get Return _ReportInventory @@ -130,7 +175,30 @@ Public Class Storage '-- Raktárak ------------ SetPropertyValue("ReportInventory", _ReportInventory, value) End Set End Property - + ''' + ''' Szállítólevél a raktárközi átadás hoz + ''' + ''' + Property DeliveryNoteOutType_InventoryTransfer As DeliveryNoteOutType + Get + Return _DeliveryNoteOutType_InventoryTransfer + End Get + Set(value As DeliveryNoteOutType) + SetPropertyValue("DeliveryNoteOutType_InventoryTransfer", _DeliveryNoteOutType_InventoryTransfer, value) + End Set + End Property + ''' + ''' Szállítólevél a visszárúhoz + ''' + ''' + Property DeliveryNoteOutType_ReturnBack As DeliveryNoteOutType + Get + Return _DeliveryNoteOutType_ReturnBack + End Get + Set(value As DeliveryNoteOutType) + SetPropertyValue("DeliveryNoteOutType_ReturnBack", _DeliveryNoteOutType_ReturnBack, value) + End Set + End Property '-------------ReadOnly-------------- _ Private ReadOnly Property CustomersFrom_Address As XPCollection(Of Address) diff --git a/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml b/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml index f76cc49..24391a8 100644 --- a/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml +++ b/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml @@ -7177,6 +7177,8 @@ + + @@ -7383,6 +7385,7 @@ + @@ -8568,6 +8571,10 @@ + + + + @@ -15109,8 +15116,8 @@ - - + + diff --git a/Nuvolar.Module/Model.DesignedDiffs.xafml b/Nuvolar.Module/Model.DesignedDiffs.xafml index 47d62e0..7151e80 100644 --- a/Nuvolar.Module/Model.DesignedDiffs.xafml +++ b/Nuvolar.Module/Model.DesignedDiffs.xafml @@ -26570,27 +26570,31 @@ - - - - - - + + + + + + + + - - - - - - + + + + + + + - - - - + + + + +