diff --git a/app/build.gradle b/app/build.gradle
index c445c335..f92c2109 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android {
- def appVersionCode = 386
- def appVersionName = '1.34.02'
+ def appVersionCode = 387
+ def appVersionName = '1.34.03'
signingConfigs {
release {
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;
///Informazioni interne
- public String Internal1;
+ public String Internal1; //USED FOR COD_MART
///Informazioni interne
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);