diff --git a/SHERPA.AD/SHERPA.AD.csproj b/SHERPA.AD/SHERPA.AD.csproj
index f1d12f2..c8f5c9e 100644
--- a/SHERPA.AD/SHERPA.AD.csproj
+++ b/SHERPA.AD/SHERPA.AD.csproj
@@ -4,7 +4,7 @@
net6.0
enable
enable
- 2.0.2402.1308
+ 2.0.2402.1310
Egalware 2021+
diff --git a/SHERPA.BBM.CORE/DbModels/vDocsDataModel.cs b/SHERPA.BBM.CORE/DbModels/vDocsDataModel.cs
index 4a5a028..39f1378 100644
--- a/SHERPA.BBM.CORE/DbModels/vDocsDataModel.cs
+++ b/SHERPA.BBM.CORE/DbModels/vDocsDataModel.cs
@@ -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; } = "";
diff --git a/SHERPA.BBM.CORE/DbModels/vItemsDataModel.cs b/SHERPA.BBM.CORE/DbModels/vItemsDataModel.cs
index 4bc03cc..d1f7aa2 100644
--- a/SHERPA.BBM.CORE/DbModels/vItemsDataModel.cs
+++ b/SHERPA.BBM.CORE/DbModels/vItemsDataModel.cs
@@ -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";
diff --git a/SHERPA.BBM.CORE/SqlScripts/VIEW/v_ItemsData.sql b/SHERPA.BBM.CORE/SqlScripts/VIEW/v_ItemsData.sql
index f336097..d8ef235 100644
--- a/SHERPA.BBM.CORE/SqlScripts/VIEW/v_ItemsData.sql
+++ b/SHERPA.BBM.CORE/SqlScripts/VIEW/v_ItemsData.sql
@@ -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
diff --git a/SHERPA.BBM.UI/Components/DocMovList.razor b/SHERPA.BBM.UI/Components/DocMovList.razor
index d5aebb3..c341ad3 100644
--- a/SHERPA.BBM.UI/Components/DocMovList.razor
+++ b/SHERPA.BBM.UI/Components/DocMovList.razor
@@ -10,7 +10,6 @@
Cod |
Descrizione |
Importo |
- Fatturazione |
@@ -20,20 +19,21 @@
|
-
- @record.CodNegotiation
- @record.CodDoc
- @*@record.DataIns.ToString("ddd yyyy.MM.dd HH:mm") *@
+ |
+ @record.RagSoc
+ @record.CodBasket
+ @record.CodNegotiation
+ @record.CodDoc
|
@record.Descript
@record.Note
|
- @record.Importo.ToString("C2") |
-
- @if (record.DocType == BbmDocType.ConfermaOrdine)
+ |
+ @record.Importo.ToString("C2")
+ @if (record.Fatturato > 0)
{
- @record.Fatturato.ToString("C2") [F]
+ @record.Fatturato.ToString("C2") [F]
@record.Incassato.ToString("C2") [I]
}
|
diff --git a/SHERPA.BBM.UI/Components/NegotMovList.razor b/SHERPA.BBM.UI/Components/NegotMovList.razor
index 5fd0c7a..b13db14 100644
--- a/SHERPA.BBM.UI/Components/NegotMovList.razor
+++ b/SHERPA.BBM.UI/Components/NegotMovList.razor
@@ -7,10 +7,9 @@
|
- Cod |
+ Cli/Bask/Trat |
Descrizione |
Importo |
- Fatturazione |
@@ -20,17 +19,26 @@
|
-
+ |
@record.RagSoc
- @record.CodNegotiation
- @record.DataIns.ToString("ddd yyyy.MM.dd HH:mm")
+ @record.CodBasket
+ @record.CodNegotiation
|
@record.Descript
- @record.NumDocs
+
+
+ @record.DataIns.ToString("ddd yyyy.MM.dd HH:mm")
+
+
+ #doc: @record.NumDocs
+
+
+ |
+
+ @record.Importo.ToString("C2")
+ @record.Fatturato.ToString("C2") [F]
|
- @record.Importo.ToString("C2") |
- @record.Fatturato.ToString("C2") |
}
diff --git a/SHERPA.BBM.UI/Pages/Items.razor b/SHERPA.BBM.UI/Pages/Items.razor
index 93dbf40..9245318 100644
--- a/SHERPA.BBM.UI/Pages/Items.razor
+++ b/SHERPA.BBM.UI/Pages/Items.razor
@@ -75,7 +75,7 @@
- Tipo
+ Categoria
|
@@ -119,7 +119,7 @@
}
| @record.CodItem |
- @record.ResTypeId |
+ @record.ResName |
@record.UM |
@record.Descript |
diff --git a/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj b/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj
index 7f65e5a..270c7a1 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.2402.1308
+ 2.0.2402.1310
enable
enable
Egalware 2021+
|