diff --git a/EgwCoreLib.Lux.Data/DbModel/Production/ProductionItemModel.cs b/EgwCoreLib.Lux.Data/DbModel/Production/ProductionItemModel.cs
index a3c30f2..6a96522 100644
--- a/EgwCoreLib.Lux.Data/DbModel/Production/ProductionItemModel.cs
+++ b/EgwCoreLib.Lux.Data/DbModel/Production/ProductionItemModel.cs
@@ -20,7 +20,7 @@ namespace EgwCoreLib.Lux.Data.DbModel.Production
         /// <summary>
         /// Riga Ordine da cui scaturisce
         /// </summary>
-        public int OrderRowID { get; set; }
+        public int OrderRowID { get; set; } = 0;
 
         /// <summary>
         /// CodArticolo (opzionale) numerico
@@ -33,9 +33,10 @@ namespace EgwCoreLib.Lux.Data.DbModel.Production
         public string ExtItemCode { get; set; } = "";
 
         /// <summary>
-        /// Batch di produzione cui è correlato
+        /// Batch di produzione cui è correlato (può essere nullo inizialmente e poi variato)
         /// </summary>
-        public int ProductionBatchID { get; set; } = 0;
+        public int? ProductionBatchID { get; set; }
+
 #if false
         /// <summary>
         /// Cod Fornitore (opzionale)
@@ -62,7 +63,13 @@ namespace EgwCoreLib.Lux.Data.DbModel.Production
         /// </summary>
         public string UM { get; set; } = "#"; 
 #endif
-
+        /// <summary>
+        /// Etichetta dell'item
+        /// </summary>
+        public string ProdLabel
+        {
+            get => $"PT{ProdItemID:X8}";
+        }
 
         /// <summary>
         /// Navigazione OrderRow
@@ -74,7 +81,7 @@ namespace EgwCoreLib.Lux.Data.DbModel.Production
         /// Navigazione Batch Produzione
         /// </summary>
         [ForeignKey("ProductionBatchID")]
-        public virtual ProductionBatchModel ProductionBatchNav { get; set; } = null!;
+        public virtual ProductionBatchModel? ProductionBatchNav { get; set; }
 
     }
 }
diff --git a/EgwCoreLib.Lux.Data/DbModel/Sales/OrderModel.cs b/EgwCoreLib.Lux.Data/DbModel/Sales/OrderModel.cs
index 6148303..703cc1b 100644
--- a/EgwCoreLib.Lux.Data/DbModel/Sales/OrderModel.cs
+++ b/EgwCoreLib.Lux.Data/DbModel/Sales/OrderModel.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+using EgwCoreLib.Lux.Data.DbModel.Production;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using static EgwCoreLib.Lux.Core.Enums;
 
@@ -129,7 +130,7 @@ namespace EgwCoreLib.Lux.Data.DbModel.Sales
         [NotMapped]
         public double NumProdItems
         {
-            get => OrderRowNav?.Sum(x => x.ProdItemQty) ?? 0;
+            get => OrderRowNav?.Sum(x => x.ProdItemQtyTot) ?? 0;
         }
 
         /// <summary>
@@ -190,5 +191,6 @@ namespace EgwCoreLib.Lux.Data.DbModel.Sales
         /// Navigazione alle righe ordine
         /// </summary>
         public virtual ICollection<OrderRowModel> OrderRowNav { get; set; } = new List<OrderRowModel>();
+
     }
 }
diff --git a/EgwCoreLib.Lux.Data/DbModel/Sales/OrderRowModel.cs b/EgwCoreLib.Lux.Data/DbModel/Sales/OrderRowModel.cs
index b9dfb21..14197b4 100644
--- a/EgwCoreLib.Lux.Data/DbModel/Sales/OrderRowModel.cs
+++ b/EgwCoreLib.Lux.Data/DbModel/Sales/OrderRowModel.cs
@@ -177,6 +177,14 @@ namespace EgwCoreLib.Lux.Data.DbModel.Sales
         /// </summary>
         public int ProdItemQty { get; set; } = 0;
 
+        /// <summary>
+        /// Quantità degli item da produrre per PEZZO (es parti del serramento, singole parti BTL...)
+        /// </summary>
+        public double ProdItemQtyTot
+        {
+            get => Qty * ProdItemQty;
+        }
+
         /// <summary>
         /// Riferimento JobID Ciclo corrente (tra quelli ammissibili dato ItemJCD)
         /// </summary>