From 8ec314044fb21d8c8f58d27cd35bf9e69a635614 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 30 Jun 2023 17:01:53 +0200
Subject: [PATCH] Cambiata lettura barcode in dettaglio linee

---
 .../integrywmsnative/core/rest/model/Ean128Model.java  |  2 +-
 .../ProdDettaglioLineaViewModel.java                   | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java
index 6ada378c..e7d9e757 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java
@@ -313,7 +313,7 @@ public class Ean128Model {
     public String InternalPart;
 
     ///<summary>Informazioni interne</summary>
-    public String Internal1;
+    public String Internal1; //USED FOR COD_MART
 
     ///<summary>Informazioni interne</summary>
     public String Internal2;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaViewModel.java
index 77e031d7..e2632733 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaViewModel.java
@@ -172,14 +172,20 @@ public class ProdDettaglioLineaViewModel {
 
     public void checkBarcodeAndStartOrdine(BarcodeScanDTO dto) {
         this.sendOnLoadingStarted();
+
         ProdLineStatusDTO prodLine = lineaProd.getValue();
         mBarcodeRESTConsumer.decodeEan128(dto, (ean128) -> {
-            String codMart = ean128.Content;
+            String codMart = ean128.Internal1;
             String partitaMag = ean128.BatchLot;
-            if (!prodLine.isStarted()) {
+            if(prodLine == null) {
+                this.sendError(new Exception("Impossibile leggere lo stato della linea"));
+
+            } else if (!prodLine.isStarted()) {
                 this.sendError(new Exception("Impossibile avviare una produzione su una linea ferma!"));
+
             } else if (UtilityString.isNullOrEmpty(prodLine.getListaOrd())) {
                 this.startProduction(codMart, partitaMag);
+
             } else {
                 this.mListener.confirmOrderClose(() -> {
                     this.startProduction(codMart, partitaMag);