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

Finish v1_7_6(83)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-09-24 15:51:50 +02:00
commit 0a713f7630
6 changed files with 27 additions and 6 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.

2
.idea/runConfigurations/app.xml generated
View File

@ -6,7 +6,7 @@
<option name="DEPLOY_AS_INSTANT" value="false" /> <option name="DEPLOY_AS_INSTANT" value="false" />
<option name="ARTIFACT_NAME" value="" /> <option name="ARTIFACT_NAME" value="" />
<option name="PM_INSTALL_OPTIONS" value="" /> <option name="PM_INSTALL_OPTIONS" value="" />
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic_frudis,dynamic_ime,dynamic_vgalimenti" /> <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_ime,dynamic_vgalimenti" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" /> <option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" /> <option name="MODE" value="default_activity" />
<option name="CLEAR_LOGCAT" value="true" /> <option name="CLEAR_LOGCAT" value="true" />

4
app/build.gradle
View File

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 82 def appVersionCode = 83
def appVersionName = '1.7.5' def appVersionName = '1.7.6'
signingConfigs { signingConfigs {
release { release {

1
app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java
View File

@ -57,6 +57,7 @@ public class ProdRecuperoMaterialeHelper {
"LEFT OUTER JOIN jtb_fasi ON mtb_colt.cod_jfas = jtb_fasi.cod_jfas " + "LEFT OUTER JOIN jtb_fasi ON mtb_colt.cod_jfas = jtb_fasi.cod_jfas " +
"WHERE jtb_fasi.cod_jfas IS NOT NULL " + "WHERE jtb_fasi.cod_jfas IS NOT NULL " +
"AND segno = -1 " + "AND segno = -1 " +
"AND qta_col > 0 " +
"GROUP BY jtb_fasi.cod_jfas, " + "GROUP BY jtb_fasi.cod_jfas, " +
"jtb_fasi.descrizione, " + "jtb_fasi.descrizione, " +
"mtb_colr.gestione, " + "mtb_colr.gestione, " +

20
app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java
View File

@ -132,10 +132,26 @@ public class ProdRecuperoMaterialeViewModel {
qtaDaEvadere = qtaDaEvadere.add(item.getQtaCol()); qtaDaEvadere = qtaDaEvadere.add(item.getQtaCol());
InputQuantityToReturnDialog.make(mContext, item.getMtbAart(), BigDecimal.ONE, qtaDaEvadere, quantity -> { DialogInputQuantity.DTO dto = new DialogInputQuantity.DTO()
onItemDispatched(item, quantity); .setBatchLot(item.getPartitaMag())
.setQtaDaEvadere(null)
.setQtaOrd(null)
.setMtbAart(item.getMtbAart())
.setCanPartitaMagBeChanged(false)
.setQtaTot(BigDecimal.ONE)
.setMaxQta(qtaDaEvadere)
.setQtaDisponibile(qtaDaEvadere);
DialogInputQuantity.makeBase(mContext, dto, false, quantity -> {
onItemDispatched(item, quantity.qtaTot.getBigDecimal());
}, () -> {
}).show(); }).show();
// InputQuantityToReturnDialog.make(mContext, item.getMtbAart(), BigDecimal.ONE, qtaDaEvadere, quantity -> {
// onItemDispatched(item, quantity);
// }).show();
} }
private void onItemDispatched(HistoryVersamentoProdUL item, BigDecimal quantity) { private void onItemDispatched(HistoryVersamentoProdUL item, BigDecimal quantity) {

6
app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java
View File

@ -1,6 +1,7 @@
package it.integry.integrywmsnative.gest.prod_versamento_materiale.viewmodel; package it.integry.integrywmsnative.gest.prod_versamento_materiale.viewmodel;
import android.app.Activity; import android.app.Activity;
import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.text.Html; import android.text.Html;
import android.text.SpannableString; import android.text.SpannableString;
@ -15,6 +16,7 @@ import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.model.MtbDepoPosizione; import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.core.utility.UtilityProgress;
import it.integry.integrywmsnative.databinding.FragmentProdVersamentoMaterialeBinding; import it.integry.integrywmsnative.databinding.FragmentProdVersamentoMaterialeBinding;
import it.integry.integrywmsnative.gest.prod_versamento_materiale.core.ProdVersamentoMaterialHelper; import it.integry.integrywmsnative.gest.prod_versamento_materiale.core.ProdVersamentoMaterialHelper;
import it.integry.integrywmsnative.view.dialogs.DialogConsts; import it.integry.integrywmsnative.view.dialogs.DialogConsts;
@ -94,12 +96,14 @@ public class ProdVersamentoMaterialViewModel {
private void createColloScarico(MtbDepoPosizione mtbDepoPosizione) { private void createColloScarico(MtbDepoPosizione mtbDepoPosizione) {
ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
MtbColt cloneUL = ((MtbColt) mtbColt.get().clone()); MtbColt cloneUL = ((MtbColt) mtbColt.get().clone());
cloneUL.setCodJfas(mtbDepoPosizione.getPosizione()); cloneUL.setCodJfas(mtbDepoPosizione.getPosizione());
cloneUL.setSerCollo(null);
ColliMagazzinoRESTConsumer.createColloScaricoDaCarico(cloneUL, mtbDepoPosizione, generatedMtbColt -> { ColliMagazzinoRESTConsumer.createColloScaricoDaCarico(cloneUL, mtbDepoPosizione, generatedMtbColt -> {
showDataSavedDialog(() -> { showDataSavedDialog(() -> {
progressDialog.dismiss();
mOnVersamentoCompleted.run(); mOnVersamentoCompleted.run();
}); });
}, ex -> { }, ex -> {