From eb99ec5437ea3bb74d41440eab0463e5a0d93fbc Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 30 Jan 2024 18:41:59 +0100
Subject: [PATCH] Fix ItemDTO

---
 EgwProxy.MagMan/DTO/ItemDTO.cs                | 18 ++++++++++++-----
 MagMan.Core/DTO/ItemDTO.cs                    | 20 +++++++++++++------
 .../Controllers/TenantController.cs           | 20 ++++++++++---------
 TestConsoleApp/Program.cs                     |  2 +-
 4 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/EgwProxy.MagMan/DTO/ItemDTO.cs b/EgwProxy.MagMan/DTO/ItemDTO.cs
index 4129673..3f19305 100644
--- a/EgwProxy.MagMan/DTO/ItemDTO.cs
+++ b/EgwProxy.MagMan/DTO/ItemDTO.cs
@@ -6,17 +6,25 @@ using System.Threading.Tasks;
 
 namespace EgwProxy.MagMan.DTO
 {
+    // <Auto-Generated>
+    // This is here so CodeMaid doesn't reorganize this document
+    // </Auto-Generated>
     public class ItemDTO
     {
+        /// <summary>
+        /// Ext Ref Key Materiale (DB) / CLOUD
+        /// </summary>
+        public int MatCloudId { get; set; } = 0;
+
+        /// <summary>
+        /// Ext Ref Key Materiale (DB) / istanza locale
+        /// </summary>
+        public int MatLocalId { get; set; } = 0;
 
         /// <summary>
         /// Codice Univoco (DB)
         /// </summary>
-        public int ItemID { get; set; } = 0;
-        /// <summary>
-        /// Codice Materiale di provenienza
-        /// </summary>
-        public int MatID { get; set; } = 0;
+        public int RawItemCloudId { get; set; } = 0;
 
         /// <summary>
         /// Check if is a Remnant
diff --git a/MagMan.Core/DTO/ItemDTO.cs b/MagMan.Core/DTO/ItemDTO.cs
index 2096c18..f13fa59 100644
--- a/MagMan.Core/DTO/ItemDTO.cs
+++ b/MagMan.Core/DTO/ItemDTO.cs
@@ -6,7 +6,10 @@ using System.Text;
 using System.Threading.Tasks;
 
 namespace MagMan.Core.DTO
-{
+{   
+    // <Auto-Generated>
+    // This is here so CodeMaid doesn't reorganize this document
+    // </Auto-Generated>
     public class ItemDTO
     {
         /// <summary>
@@ -44,6 +47,11 @@ namespace MagMan.Core.DTO
         /// </summary>
         public int QtyAvail { get; set; } = 0;
 
+        /// <summary>
+        /// Item's Thikness
+        /// </summary>
+        public decimal HMm { get; set; } = 0;
+
         /// <summary>
         /// Item's Lenght
         /// </summary>
@@ -54,14 +62,14 @@ namespace MagMan.Core.DTO
         /// </summary>
         public decimal WMm { get; set; } = 0;
 
-        /// <summary>
-        /// Item's Thikness
-        /// </summary>
-        public decimal HMm { get; set; } = 0;
-
         /// <summary>
         /// Note (optional)
         /// </summary>
         public string Note { get; set; } = "";
+
+        /// <summary>
+        /// Codice QR/Matrix Item
+        /// </summary>
+        public string ItemDtmx { get; set; } = "";
     }
 }
diff --git a/MagMan.Data.Tenant/Controllers/TenantController.cs b/MagMan.Data.Tenant/Controllers/TenantController.cs
index 06b9d74..42d6e98 100644
--- a/MagMan.Data.Tenant/Controllers/TenantController.cs
+++ b/MagMan.Data.Tenant/Controllers/TenantController.cs
@@ -377,13 +377,13 @@ namespace MagMan.Data.Tenant.Controllers
             RawItemModel answ = new RawItemModel()
             {
                 MatId = origItem.MatCloudId,
-                Note = origItem.Note,
-                LMm = origItem.LMm,
-                WMm = origItem.WMm,
-                HMm = origItem.HMm,
                 IsRemn = origItem.IsRemn,
                 Location = origItem.Location,
                 QtyAvail = origItem.QtyAvail,
+                HMm = origItem.HMm,
+                LMm = origItem.LMm,
+                WMm = origItem.WMm,
+                Note = origItem.Note,
                 IsActive = isActive
             };
 
@@ -400,13 +400,15 @@ namespace MagMan.Data.Tenant.Controllers
             ItemDTO answ = new ItemDTO()
             {
                 MatCloudId = origItem.MatId,
-                Note = origItem.Note,
-                LMm = origItem.LMm,
-                WMm = origItem.WMm,
-                HMm = origItem.HMm,
+                RawItemCloudId = origItem.RawItemId,
                 IsRemn = origItem.IsRemn,
                 Location = origItem.Location,
-                QtyAvail = origItem.QtyAvail
+                QtyAvail = origItem.QtyAvail,
+                HMm = origItem.HMm,
+                LMm = origItem.LMm,
+                WMm = origItem.WMm,
+                Note = origItem.Note,
+                ItemDtmx = origItem.ItemDtmx
             };
 
             return answ;
diff --git a/TestConsoleApp/Program.cs b/TestConsoleApp/Program.cs
index 0691fa5..7a482c3 100644
--- a/TestConsoleApp/Program.cs
+++ b/TestConsoleApp/Program.cs
@@ -87,7 +87,7 @@ namespace DemoApp
                             foreach (var itemInv in itemMat.ItemList)
                             {
                                 Console.WriteLine(sepShort);
-                                Console.WriteLine($"ID: {itemInv.ItemID}");
+                                Console.WriteLine($"ID: {itemInv.RawItemCloudId}");
                                 Console.WriteLine($"Location: {itemInv.Location}");
                                 Console.WriteLine($"Descript: {itemInv.Note}");
                                 Console.WriteLine($"Giacenza: {itemInv.QtyAvail}");