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

Finish v1_0_27(30)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-01-24 15:41:35 +01:00
commit fabe1cedbb
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

4
app/build.gradle
View File

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 29 def appVersionCode = 30
def appVersionName = '1.0.26' def appVersionName = '1.0.27'
signingConfigs { signingConfigs {
release { release {

2
app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
View File

@ -179,7 +179,7 @@ public class SettingsManager {
dbSettingsModelIstance.setEnableCheckPartitaMagCheckPickingV(valueEnableCheckPartitaMag); dbSettingsModelIstance.setEnableCheckPartitaMagCheckPickingV(valueEnableCheckPartitaMag);
GestSetupRESTConsumer.getBooleanValue("PICKING", "SETUP", "FLAG_MULTI_CLIENTE_ORD_VENDITA", valueFlagMultiClienteOrdVendita -> { GestSetupRESTConsumer.getBooleanValue("PICKING", "SETUP", "FLAG_MULTI_CLIENTE_ORD_VENDITA", valueFlagMultiClienteOrdVendita -> {
dbSettingsModelIstance.setFlagMultiClienteOrdV(valueFlagMultiClienteOrdVendita); dbSettingsModelIstance.setFlagMultiClienteOrdV(valueFlagMultiClienteOrdVendita);
GestSetupRESTConsumer.getValue("PICKING", "SETUP", "COD_ANAG_DEFAULT", valueCodAnagDefault -> { GestSetupRESTConsumer.getValue("PICKING", "SETUP", "COD_ANAG_DEFAULT", valueCodAnagDefault -> {
dbSettingsModelIstance.setDefaultCodAnag(valueCodAnagDefault.value); dbSettingsModelIstance.setDefaultCodAnag(valueCodAnagDefault.value);

3
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
View File

@ -402,8 +402,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
if(thereIsAnOpenedUL()) { if(thereIsAnOpenedUL()) {
final ProgressDialog progress = ProgressDialog.show(mContext, mContext.getText(R.string.waiting), final ProgressDialog progress = UtilityProgress.createDefaultProgressDialog(mContext);
mContext.getText(R.string.loading) + " ...", true);
if (thereIsAnyRowInUL()) { if (thereIsAnyRowInUL()) {

2
app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
View File

@ -54,7 +54,7 @@ import it.integry.plugins.waterfalltoolbar.WaterfallToolbar;
public class MainVenditaFragment extends Fragment implements ITitledFragment, IScrollableFragment, ISelectAllFragment, IFilterableFragment { public class MainVenditaFragment extends Fragment implements ITitledFragment, IScrollableFragment, ISelectAllFragment, IFilterableFragment {
private static WaterfallToolbar mWaterfallToolbar; private WaterfallToolbar mWaterfallToolbar;
private VenditaHelper mHelper; private VenditaHelper mHelper;
private FragmentMainVenditaBinding mBinding = null; private FragmentMainVenditaBinding mBinding = null;

6
app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
View File

@ -296,7 +296,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
} }
mtbColtSessionID = ColliDataRecover.startNewSession(recoveredMtbColt);
setULToCurrentContext(recoveredMtbColt); setULToCurrentContext(recoveredMtbColt);
refreshOrderBy(false); refreshOrderBy(false);
} }
@ -710,7 +710,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
if(thereIsAnyRowInUL()) { if(thereIsAnyRowInUL()) {
updateDataFine(progress, () -> distribuisciCollo(progress, (generatedMtbColts) -> printCollo(progress, generatedMtbColts))); updateDataFine(progress, () -> distribuisciCollo(progress, (generatedMtbColts) -> printCollo(progress, generatedMtbColts)));
} else { } else {
ColliDataRecover.closeSession(mtbColtSessionID); if(mtbColtSessionID != null) ColliDataRecover.closeSession(mtbColtSessionID);
deleteCollo(progress); deleteCollo(progress);
} }
@ -745,7 +745,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
ColliMagazzinoRESTConsumer.distribuisciCollo(cloneMtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(), ColliMagazzinoRESTConsumer.distribuisciCollo(cloneMtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(),
mtbColts -> { mtbColts -> {
ColliDataRecover.closeSession(mtbColtSessionID); if(mtbColtSessionID != null) ColliDataRecover.closeSession(mtbColtSessionID);
onComplete.run(mtbColts); onComplete.run(mtbColts);
}, },
ex -> UtilityExceptions.defaultException(mActivity, ex, progress)); ex -> UtilityExceptions.defaultException(mActivity, ex, progress));