Egalware/SHERPA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix display info x NegotDocMover

Browse Source
This commit is contained in:
Samuele Locatelli
2024-02-13 10:27:36 +01:00
parent ed6259cdfe
commit 6e08fda57f
8 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SHERPA.AD/SHERPA.AD.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>2.0.2402.1308</Version>
<Version>2.0.2402.1310</Version>
<Copyright>Egalware 2021+</Copyright>
</PropertyGroup>
SHERPA.BBM.CORE/DbModels/vDocsDataModel.cs
+6
View File
@@ -57,6 +57,12 @@ namespace SHERPA.BBM.CORE.DbModels
[Column("BasketId")]
public int BasketId { get; set; } = 0;
[Column("CodBasket")]
public string CodBasket { get; set; } = "";
[Column("DescBasket")]
public string DescBasket { get; set; } = "";
[Column("RagSoc")]
public string RagSoc { get; set; } = "";
SHERPA.BBM.CORE/DbModels/vItemsDataModel.cs
+3
View File
@@ -27,6 +27,9 @@ namespace SHERPA.BBM.CORE.DbModels
[Column("ResTypeId")]
public int ResTypeId { get; set; } = 0;
[Column("ResName")]
public string ResName { get; set; } = "";
[Column("UM"), MaxLength(50)]
public string UM { get; set; } = "nr";
SHERPA.BBM.CORE/SqlScripts/VIEW/v_ItemsData.sql
+3
View File
@@ -5,6 +5,7 @@
CREATE OR ALTER VIEW [dbo].[v_ItemsData]
AS
WITH cteOrdRes AS
(
SELECT o.ItemId
@@ -28,6 +29,7 @@ WITH cteOrdRes AS
)
SELECT i.*
,ISNULL(r.Name, i.ResTypeId) AS ResName
,ISNULL(d.DocNum,0) AS DocNumRef
,ISNULL(o.OrdNum,0) AS OrdNumRef
,ISNULL(t.TagNum,0) AS TagsNumRef
@@ -35,6 +37,7 @@ FROM dbo.Items AS i
LEFT OUTER JOIN cteOrdRes AS o ON i.ItemId = o.ItemId
LEFT OUTER JOIN cteDoc AS d ON i.ItemId = d.ItemId
LEFT OUTER JOIN cteTag AS t ON i.ItemId = t.ItemId
LEFT OUTER JOIN ResType AS r ON i.ResTypeId = r.ResTypeId
GO
SHERPA.BBM.UI/Components/DocMovList.razor
+9 -9
View File
@@ -10,7 +10,6 @@
<th>Cod</th>
<th>Descrizione</th>
<th class="text-right">Importo</th>
<th class="text-right">Fatturazione</th>
</tr>
</thead>
<tbody>
@@ -20,20 +19,21 @@
<td class="text-nowrap">
<button class="btn btn-sm btn-info" @onclick="() => Move(record)"><span class="fas fa-arrows-alt-h"></span></button>
</td>
<td>
<div title="@record.NegotDescript">@record.CodNegotiation</div>
<div>@record.CodDoc</div>
@*<div class="small">@record.DataIns.ToString("ddd yyyy.MM.dd HH:mm")</div>*@
<td class="text-nowrap">
<div>@record.RagSoc</div>
<div class="small" title="@record.DescBasket">@record.CodBasket</div>
<div class="small" title="@record.NegotDescript">@record.CodNegotiation</div>
<div class="small">@record.CodDoc</div>
</td>
<td>
<div>@record.Descript</div>
<div class="small">@record.Note</div>
</td>
<td class="text-right text-nowrap" title="Importo"><b>@record.Importo.ToString("C2")</b></td>
<td class="text-right text-nowrap">
@if (record.DocType == BbmDocType.ConfermaOrdine)
<td class="text-right text-nowrap" title="Importo">
<b>@record.Importo.ToString("C2")</b>
@if (record.Fatturato > 0)
{
<div title="Fatturato"><b>@record.Fatturato.ToString("C2")</b> [F]</div>
<div title="Fatturato" class="small">@record.Fatturato.ToString("C2") [F]</div>
<div title="Incassato" class="small">@record.Incassato.ToString("C2") [I]</div>
}
</td>
SHERPA.BBM.UI/Components/NegotMovList.razor
+16 -8
View File
@@ -7,10 +7,9 @@
<thead>
<tr>
<th></th>
<th>Cod</th>
<th>Cli/Bask/Trat</th>
<th>Descrizione</th>
<th class="text-right">Importo</th>
<th class="text-right">Fatturazione</th>
</tr>
</thead>
<tbody>
@@ -20,17 +19,26 @@
<td class="text-nowrap">
<button class="btn btn-sm btn-info" @onclick="() => Move(record)"><span class="fas fa-arrows-alt-h"></span></button>
</td>
<td>
<td class="text-nowrap">
<div>@record.RagSoc</div>
<div>@record.CodNegotiation</div>
<div class="small">@record.DataIns.ToString("ddd yyyy.MM.dd HH:mm")</div>
<div class="small" title="@record.BaskDescript">@record.CodBasket</div>
<div class="small">@record.CodNegotiation</div>
</td>
<td>
<div>@record.Descript</div>
<div class="small">@record.NumDocs</div>
<div class="small d-flex justify-content-between">
<div>
@record.DataIns.ToString("ddd yyyy.MM.dd HH:mm")
</div>
<div>
#doc: <b>@record.NumDocs</b>
</div>
</div>
</td>
<td class="text-right text-nowrap" title="Importo">
<b>@record.Importo.ToString("C2")</b>
<div title="Fatturato" class="small">@record.Fatturato.ToString("C2") [F]</div>
</td>
<td class="text-right text-nowrap" title="Importo"><b>@record.Importo.ToString("C2")</b></td>
<td class="text-right text-nowrap" title="Fatturato"><b>@record.Fatturato.ToString("C2")</b></td>
</tr>
}
</tbody>
SHERPA.BBM.UI/Pages/Items.razor
+2 -2
View File
@@ -75,7 +75,7 @@
<Sorter ParamName="Cod" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter>
</th>
<th>
Tipo
Categoria
<Sorter ParamName="Tipo" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter>
</th>
<th>
@@ -119,7 +119,7 @@
}
</td>
<td>@record.CodItem</td>
<td>@record.ResTypeId</td>
<td>@record.ResName</td>
<td>@record.UM</td>
<td>@record.Descript</td>
<td class="text-right">
SHERPA.BBM.UI/SHERPA.BBM.UI.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<UserSecretsId>60fcdaab-6c1e-4bec-9d88-f7727ef1c12c</UserSecretsId>
<ApplicationIcon>wwwroot\favicon.ico</ApplicationIcon>
<Version>2.0.2402.1308</Version>
<Version>2.0.2402.1310</Version>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Copyright>Egalware 2021+</Copyright>