Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish v1.34.03(387)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2023-07-03 17:47:00 +02:00
commit dfec2f2bd3
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 386 def appVersionCode = 387
def appVersionName = '1.34.02' def appVersionName = '1.34.03'
signingConfigs { signingConfigs {
release { release {

2
app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java
View File

@ -313,7 +313,7 @@ public class Ean128Model {
public String InternalPart; public String InternalPart;
///<summary>Informazioni interne</summary> ///<summary>Informazioni interne</summary>
public String Internal1; public String Internal1; //USED FOR COD_MART
///<summary>Informazioni interne</summary> ///<summary>Informazioni interne</summary>
public String Internal2; public String Internal2;

10
app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaViewModel.java
View File

@ -172,14 +172,20 @@ public class ProdDettaglioLineaViewModel {
public void checkBarcodeAndStartOrdine(BarcodeScanDTO dto) { public void checkBarcodeAndStartOrdine(BarcodeScanDTO dto) {
this.sendOnLoadingStarted(); this.sendOnLoadingStarted();
ProdLineStatusDTO prodLine = lineaProd.getValue(); ProdLineStatusDTO prodLine = lineaProd.getValue();
mBarcodeRESTConsumer.decodeEan128(dto, (ean128) -> { mBarcodeRESTConsumer.decodeEan128(dto, (ean128) -> {
String codMart = ean128.Content; String codMart = ean128.Internal1;
String partitaMag = ean128.BatchLot; 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!")); this.sendError(new Exception("Impossibile avviare una produzione su una linea ferma!"));
} else if (UtilityString.isNullOrEmpty(prodLine.getListaOrd())) { } else if (UtilityString.isNullOrEmpty(prodLine.getListaOrd())) {
this.startProduction(codMart, partitaMag); this.startProduction(codMart, partitaMag);
} else { } else {
this.mListener.confirmOrderClose(() -> { this.mListener.confirmOrderClose(() -> {
this.startProduction(codMart, partitaMag); this.startProduction(codMart, partitaMag);