Compare commits

...

12 Commits

Author SHA1 Message Date
6fbdce86c7 Finish v1.13.14(160) 2020-10-22 11:17:55 +02:00
4bfd68b614 -> v1.13.14 (160) 2020-10-22 11:17:50 +02:00
b57c452648 Implementata gestione del codTcol in Spedizione 2020-10-22 11:17:13 +02:00
0fd4dc668a Finish v1.13.13(159) 2020-10-21 10:15:02 +02:00
726afed296 Finish v1.13.13(159) 2020-10-21 10:15:02 +02:00
5b04e99c33 -> v1.13.13 (159) 2020-10-21 10:14:55 +02:00
5632c6f7ab Aggiunto nuovo modello per Zebra (TC200J) 2020-10-21 10:13:50 +02:00
20a076e705 Finish v13.11.12(158) 2020-10-20 11:13:56 +02:00
fb85af8bbf Finish v13.11.12(158) 2020-10-20 11:13:56 +02:00
6a7f3ee2ed -> v13.11.12 (158) 2020-10-20 11:13:52 +02:00
de4a87658e Fix su click di bottom sheet dialog (contenuto LU).
Ripristinato pulsante Chiudi LU in dialogInputQuantity.
2020-10-20 11:13:19 +02:00
e87f248a12 Finish v1.13.11(157) 2020-10-16 15:34:30 +02:00
6 changed files with 19 additions and 5 deletions

View File

@@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 157 def appVersionCode = 160
def appVersionName = '1.13.11' def appVersionName = '1.13.14'
signingConfigs { signingConfigs {
release { release {

View File

@@ -498,7 +498,8 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
.setQtaCnfAvailable(qtaCnfAvailable) .setQtaCnfAvailable(qtaCnfAvailable)
.setPartitaMag(partitaMag) .setPartitaMag(partitaMag)
.setDataScad(dataScad) .setDataScad(dataScad)
.setCanPartitaMagBeChanged(canPartitaMagBeChanged); .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
.setCanLUBeClosed(true);
DialogInputQuantityV2 DialogInputQuantityV2
.newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> { .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {

View File

@@ -719,7 +719,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
.setQtaCnfAvailable(qtaCnfAvailable) .setQtaCnfAvailable(qtaCnfAvailable)
.setPartitaMag(partitaMag) .setPartitaMag(partitaMag)
.setDataScad(dataScad) .setDataScad(dataScad)
.setCanOverflowOrderQuantity(canOverflowOrderQuantity); .setCanOverflowOrderQuantity(canOverflowOrderQuantity)
.setCanLUBeClosed(true);
DialogInputQuantityV2 DialogInputQuantityV2
.newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> { .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {

View File

@@ -1103,7 +1103,8 @@ public class SpedizioneViewModel {
pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr().get(0) : null; pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr().get(0) : null;
if (mtbColrToDispatch != null) { if (mtbColrToDispatch != null) {
if(UtilityString.isNullOrEmpty(mCurrentMtbColt.getCodTcol()))
mCurrentMtbColt.setCodTcol(UtilityString.empty2null(pickingObjectDTO.getTempPickData().getSourceMtbColt().getCodTcol()));
mtbColr mtbColr
.setCodJcom(UtilityString.empty2null(mtbColrToDispatch.getCodJcom())) .setCodJcom(UtilityString.empty2null(mtbColrToDispatch.getCodJcom()))

View File

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.view.bottom_sheet__lu_content;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.databinding.DataBindingUtil; import androidx.databinding.DataBindingUtil;
@@ -14,6 +15,7 @@ import java.util.List;
import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback; import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
import it.integry.integrywmsnative.core.expansion.OnSingleClickListener;
import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColr;
import it.integry.integrywmsnative.databinding.BottomSheetFragmentLuContentBinding; import it.integry.integrywmsnative.databinding.BottomSheetFragmentLuContentBinding;
import it.integry.integrywmsnative.view.bottom_sheet__base.BottomSheetFragmentBaseView; import it.integry.integrywmsnative.view.bottom_sheet__base.BottomSheetFragmentBaseView;
@@ -42,6 +44,13 @@ public class BottomSheetFragmentLUContentView extends BottomSheetFragmentBaseVie
mBinding.bottomSheetMtbColrEdit.setListener(this); mBinding.bottomSheetMtbColrEdit.setListener(this);
mBinding.bottomSheetMtbColrEdit.init(mBinding.bottomSheetMtbColrEdit, mBinding.bottomSheetMtbColrEditBackground); mBinding.bottomSheetMtbColrEdit.init(mBinding.bottomSheetMtbColrEdit, mBinding.bottomSheetMtbColrEditBackground);
mBinding.titleLayout.setOnClickListener(new OnSingleClickListener() {
@Override
public void onSingleClick(View v) {
toggle();
}
});
this.initCallbacks(); this.initCallbacks();
} }

View File

@@ -33,6 +33,8 @@ public class ZebraBarcodeReader implements BarcodeReaderInterface {
String model = Build.MODEL; String model = Build.MODEL;
if(model.equalsIgnoreCase("TC700H")) { if(model.equalsIgnoreCase("TC700H")) {
return true; return true;
} else if(model.equalsIgnoreCase("TC200J")) {
return true;
} else return false; } else return false;
} }