diff --git a/SHERPA.AD/SHERPA.AD.csproj b/SHERPA.AD/SHERPA.AD.csproj index 406c62a..705d383 100644 --- a/SHERPA.AD/SHERPA.AD.csproj +++ b/SHERPA.AD/SHERPA.AD.csproj @@ -4,7 +4,7 @@ net6.0 enable enable - 2.0.2309.0211 + 2.0.2309.0408 Egalware 2021+ diff --git a/SHERPA.BBM.CORE/Controllers/BBMController.cs b/SHERPA.BBM.CORE/Controllers/BBMController.cs index 4d809ac..2594e1c 100644 --- a/SHERPA.BBM.CORE/Controllers/BBMController.cs +++ b/SHERPA.BBM.CORE/Controllers/BBMController.cs @@ -25,6 +25,50 @@ namespace SHERPA.BBM.CORE.Controllers #region Public Methods + /// + /// Elenco movimenti x ordine dato suo ID + /// + /// + public List AccMovByOrd(int OrdId) + { + List dbResult = new List(); + using (SHERPABBMContext dbCtx = new SHERPABBMContext(_configuration)) + { + dbResult = dbCtx + .DbSetAccMov + .Where(x => (x.OrdId == OrdId)) + //.Include(e => e.OrderNav) + //.Include(e => e.BillNav) + .OrderBy(x => x.AccMovId) + .ToList(); + } + return dbResult; + } + + /// + /// Elimina movimento associazione (Ord/Fatt) dato suo ID + /// + /// + /// + public bool AccMovDelete(int AccMovId) + { + bool done = false; + using (SHERPABBMContext dbCtx = new SHERPABBMContext(_configuration)) + { + var item2del = dbCtx + .DbSetAccMov + .Where(x => x.AccMovId == AccMovId) + .FirstOrDefault(); + if (item2del != null) + { + dbCtx.DbSetAccMov.Remove(item2del); + dbCtx.SaveChanges(); + done = true; + } + } + return done; + } + /// /// Aggiunge un nuovo item Basket /// @@ -209,7 +253,7 @@ namespace SHERPA.BBM.CORE.Controllers using (SHERPABBMContext dbCtx = new SHERPABBMContext(_configuration)) { dbResult = dbCtx - .DbSetBill2Ord + .DbSetAccMov .Where(x => (x.IdxBillExt == IdxBillExt)) .OrderByDescending(x => x.AccMovId) .ToList(); @@ -228,7 +272,7 @@ namespace SHERPA.BBM.CORE.Controllers using (SHERPABBMContext dbCtx = new SHERPABBMContext(_configuration)) { dbResult = dbCtx - .DbSetBill2Ord + .DbSetAccMov .Where(x => (x.OrdId == OrdId)) .OrderByDescending(x => x.AccMovId) .ToList(); @@ -249,13 +293,13 @@ namespace SHERPA.BBM.CORE.Controllers try { var item2del = dbCtx - .DbSetBill2Ord + .DbSetAccMov .Where(x => x.IdxBillExt == IdxBillExt) .ToList(); // se trovato --> elimino if (item2del != null) { - dbCtx.DbSetBill2Ord.RemoveRange(item2del); + dbCtx.DbSetAccMov.RemoveRange(item2del); dbCtx.SaveChanges(); } done = true; @@ -281,13 +325,13 @@ namespace SHERPA.BBM.CORE.Controllers try { var item2del = dbCtx - .DbSetBill2Ord + .DbSetAccMov .Where(x => x.OrdId == OrdId) .ToList(); // se trovato --> elimino if (item2del != null) { - dbCtx.DbSetBill2Ord.RemoveRange(item2del); + dbCtx.DbSetAccMov.RemoveRange(item2del); dbCtx.SaveChanges(); } done = true; @@ -2293,7 +2337,7 @@ namespace SHERPA.BBM.CORE.Controllers //.Where(x => (x.DataIns.Year == anno || anno == 0)) //.Select(x => x.Importo) //.Sum(); - .DbSetBill2Ord + .DbSetAccMov .Include(o => o.BillNav) .Where(x => (x.BillNav.YearRef == anno || anno == 0)) .Sum(x => x.Amount); @@ -2316,7 +2360,7 @@ namespace SHERPA.BBM.CORE.Controllers //.Where(x => (x.DataIns.Year == anno || anno == 0)) //.Select(x => x.Incassato) //.Sum(); - .DbSetBill2Ord + .DbSetAccMov .Include(o => o.BillNav) .Where(x => (x.BillNav.YearRef == anno || anno == 0)) .Sum(x => x.Paid); diff --git a/SHERPA.BBM.CORE/DbModels/OrderResModel.cs b/SHERPA.BBM.CORE/DbModels/OrderResModel.cs index 2264387..8a4d980 100644 --- a/SHERPA.BBM.CORE/DbModels/OrderResModel.cs +++ b/SHERPA.BBM.CORE/DbModels/OrderResModel.cs @@ -36,6 +36,7 @@ namespace SHERPA.BBM.CORE.DbModels [Column("QtyOff")] public double QtyOff { get; set; } = 1; + [NotMapped] public double StdPrice { diff --git a/SHERPA.BBM.CORE/SHERPABBMContext.cs b/SHERPA.BBM.CORE/SHERPABBMContext.cs index 3603b20..07aa5ae 100644 --- a/SHERPA.BBM.CORE/SHERPABBMContext.cs +++ b/SHERPA.BBM.CORE/SHERPABBMContext.cs @@ -55,7 +55,7 @@ namespace SHERPA.BBM.CORE public virtual DbSet DbSetBilling { get; set; } public virtual DbSet DbSetBillingExt { get; set; } public virtual DbSet DbSetCustDecod { get; set; } - public virtual DbSet DbSetBill2Ord { get; set; } + public virtual DbSet DbSetAccMov { get; set; } public virtual DbSet DbSetNegotType { get; set; } public virtual DbSet DbSetBasketData { get; set; } = null!; public virtual DbSet DbSetNegotData { get; set; } = null!; diff --git a/SHERPA.BBM.UI/Components/AccMov.razor b/SHERPA.BBM.UI/Components/AccMov.razor new file mode 100644 index 0000000..8b0f14d --- /dev/null +++ b/SHERPA.BBM.UI/Components/AccMov.razor @@ -0,0 +1,91 @@ +
+
+ Dettaglio Movimenti +
+
+
+ @if (CurrOrd == null) + { +
+ +
+ } + else + { + @if (ListRecords == null || ListRecords.Count == 0) + { +
+
Nessun record trovato
+
+ } + else + { + + + + @if (EnableEdit) + { + + } + + + + + @if (EnableEdit) + { + + } + + + + @foreach (var record in ListRecords) + { + + + @if (EnableEdit) + { + + } + + + + + @if (EnableEdit) + { + + } + + } + +
OrdFattImportoPagato
+ + + @if (record.IsOrdOk) + { + + } + else + { + + } + + @if(record.IsBillOk) + { + + } + else + { + + } + + @record.Amount.ToString("C2") + + @record.Paid.ToString("C2") + + +
+ } + } +
+
+
\ No newline at end of file diff --git a/SHERPA.BBM.UI/Components/AccMov.razor.cs b/SHERPA.BBM.UI/Components/AccMov.razor.cs new file mode 100644 index 0000000..0d0142c --- /dev/null +++ b/SHERPA.BBM.UI/Components/AccMov.razor.cs @@ -0,0 +1,107 @@ +using global::Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; +using SHERPA.BBM.CORE.DbModels; +using SHERPA.BBM.UI.Data; + +namespace SHERPA.BBM.UI.Components +{ + public partial class AccMov + { + #region Public Properties + + [Parameter] + public OrderModel? CurrOrd { get; set; } = null; + + [Parameter] + public bool EnableEdit { get; set; } = true; + + #endregion Public Properties + + #region Public Methods + + public string CheckSelect(int AccMovId) + { + string answ = ""; + if (currItem != null) + { + try + { + answ = (currItem.AccMovId == AccMovId) ? "table-info" : ""; + } + catch + { } + } + return answ; + } + + #endregion Public Methods + + #region Protected Properties + + protected bool IsLoading { get; set; } = false; + + protected List? ListRecords { get; set; } = null; + + #endregion Protected Properties + + #region Protected Methods + + protected async Task Delete(AccMovModel currRecord) + { + if (!await JSRuntime.InvokeAsync("confirm", $"Sicuro di voler eliminare il record? ORD {currRecord.OrdId} | BILL {currRecord.IdxBillExt}' di {currRecord.Amount:C2}?")) + return; + + await BBMService.AccMovDelete(currRecord.AccMovId); + await ReloadData(); + } + + protected void Edit(AccMovModel currRecord) + { + currItem = currRecord; + } + + + protected override async Task OnParametersSetAsync() + { + await ReloadData(); + } + + #endregion Protected Methods + + #region Private Fields + + private AccMovModel? currItem = null; + + #endregion Private Fields + + #region Private Properties + + [Inject] + private BBM_EFService BBMService { get; set; } = null!; + + [Inject] + private IJSRuntime JSRuntime { get; set; } = null!; + + #endregion Private Properties + + #region Private Methods + + private async Task ReloadData() + { + IsLoading = true; + await Task.Delay(1); + if (CurrOrd != null) + { + ListRecords = await BBMService.AccMovByOrd(CurrOrd.OrdId); + } + else + { + ListRecords = new List(); + } + IsLoading = false; + await Task.Delay(1); + } + + #endregion Private Methods + } +} \ No newline at end of file diff --git a/SHERPA.BBM.UI/Components/OrdRes.razor b/SHERPA.BBM.UI/Components/OrdRes.razor index 6d99660..f24f7c6 100644 --- a/SHERPA.BBM.UI/Components/OrdRes.razor +++ b/SHERPA.BBM.UI/Components/OrdRes.razor @@ -14,7 +14,9 @@ { @if (ListRecords == null || ListRecords.Count == 0) { -
Nessun record trovato
+
+
Nessun record trovato
+
} else { @@ -45,12 +47,11 @@ { - @*   *@ }
- @record.ItemNav.UM x @record.QtyOff + @record.ItemNav?.UM x @record.QtyOff
prev: @record.QtyPrev @@ -58,7 +59,7 @@
@record.Note
-
@record.ItemNav.Descript
+
@record.ItemNav?.Descript
diff --git a/SHERPA.BBM.UI/Components/OrdRes.razor.cs b/SHERPA.BBM.UI/Components/OrdRes.razor.cs index 34b7b46..e7e4076 100644 --- a/SHERPA.BBM.UI/Components/OrdRes.razor.cs +++ b/SHERPA.BBM.UI/Components/OrdRes.razor.cs @@ -60,14 +60,6 @@ namespace SHERPA.BBM.UI.Components currItem = currRecord; } - protected void Move(OrderResModel currRecord, int move) - { -#if false - BBMService.ResourceUpdateOrder(currRecord.ResourceId, move); - updateTable().ConfigureAwait(false); -#endif - } - protected override async Task OnParametersSetAsync() { await ReloadData(); diff --git a/SHERPA.BBM.UI/Components/OrderList.razor b/SHERPA.BBM.UI/Components/OrderList.razor index 7ba3835..bc42b26 100644 --- a/SHERPA.BBM.UI/Components/OrderList.razor +++ b/SHERPA.BBM.UI/Components/OrderList.razor @@ -152,11 +152,18 @@ else } - @if (currItem != null && record.Equals(currItem)) + @if (currItem != null && record.OrdId == currItem.OrdId) { - - + +
+
+ +
+
+ +
+
} diff --git a/SHERPA.BBM.UI/Components/OrderList.razor.cs b/SHERPA.BBM.UI/Components/OrderList.razor.cs index c3afa94..a25edf5 100644 --- a/SHERPA.BBM.UI/Components/OrderList.razor.cs +++ b/SHERPA.BBM.UI/Components/OrderList.razor.cs @@ -34,6 +34,8 @@ namespace SHERPA.BBM.UI.Components [Parameter] public bool EnableRowEdit { get; set; } = false; + [Parameter] + public bool EnableAccMovEdit { get; set; } = false; [Parameter] public bool ShowAll { get; set; } = true; diff --git a/SHERPA.BBM.UI/Components/OrdersCard.razor b/SHERPA.BBM.UI/Components/OrdersCard.razor index 9c4b41b..f44b1f2 100644 --- a/SHERPA.BBM.UI/Components/OrdersCard.razor +++ b/SHERPA.BBM.UI/Components/OrdersCard.razor @@ -48,7 +48,7 @@
- +
- +
} \ No newline at end of file diff --git a/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj b/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj index e42944f..c8d951f 100644 --- a/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj +++ b/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj @@ -4,7 +4,7 @@ net6.0 60fcdaab-6c1e-4bec-9d88-f7727ef1c12c wwwroot\favicon.ico - 2.0.2309.0211 + 2.0.2309.0408 enable enable Egalware 2021+