diff --git a/.idea/runConfigurations/app_base.xml b/.idea/runConfigurations/app_base.xml
index ea7e0c82..ecabc4a7 100644
--- a/.idea/runConfigurations/app_base.xml
+++ b/.idea/runConfigurations/app_base.xml
@@ -14,8 +14,6 @@
-
-
@@ -42,7 +40,7 @@
-
+
diff --git a/.idea/runConfigurations/app_frudis.xml b/.idea/runConfigurations/app_frudis.xml
index b81d38bb..163ef97d 100644
--- a/.idea/runConfigurations/app_frudis.xml
+++ b/.idea/runConfigurations/app_frudis.xml
@@ -14,8 +14,6 @@
-
-
@@ -42,7 +40,7 @@
-
+
diff --git a/.idea/runConfigurations/app_ime.xml b/.idea/runConfigurations/app_ime.xml
index 49781a95..8aabbab4 100644
--- a/.idea/runConfigurations/app_ime.xml
+++ b/.idea/runConfigurations/app_ime.xml
@@ -14,8 +14,6 @@
-
-
@@ -42,7 +40,7 @@
-
+
diff --git a/.idea/runConfigurations/app_saporiveri.xml b/.idea/runConfigurations/app_saporiveri.xml
index 5db7ea6d..36db206d 100644
--- a/.idea/runConfigurations/app_saporiveri.xml
+++ b/.idea/runConfigurations/app_saporiveri.xml
@@ -14,8 +14,6 @@
-
-
@@ -42,7 +40,7 @@
-
+
diff --git a/.idea/runConfigurations/app_saporiveri_pv.xml b/.idea/runConfigurations/app_saporiveri_pv.xml
index 42c223ff..bc7e791b 100644
--- a/.idea/runConfigurations/app_saporiveri_pv.xml
+++ b/.idea/runConfigurations/app_saporiveri_pv.xml
@@ -14,8 +14,6 @@
-
-
@@ -42,7 +40,7 @@
-
+
diff --git a/.idea/runConfigurations/app_vglimenti.xml b/.idea/runConfigurations/app_vglimenti.xml
index a3b3823b..7aed918f 100644
--- a/.idea/runConfigurations/app_vglimenti.xml
+++ b/.idea/runConfigurations/app_vglimenti.xml
@@ -14,8 +14,6 @@
-
-
@@ -42,7 +40,7 @@
-
+
diff --git a/app/build.gradle b/app/build.gradle
index 8504bab6..8f2cbf11 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android {
- def appVersionCode = 137
- def appVersionName = '1.12.8'
+ def appVersionCode = 138
+ def appVersionName = '1.12.9'
signingConfigs {
release {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
index b2fbde39..be8a7417 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
@@ -220,7 +220,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
});
}
- public static void createColliScaricoDaOrdineLavorazione(MtbColt sourceMtbColt, MtbDepoPosizione posizione, List ordini, RunnableArgs onComplete, RunnableArgs onFailed) {
+ public static void createColliScaricoDaOrdineLavorazione(MtbColt sourceMtbColt,MtbColr sourceMtbColr, MtbDepoPosizione posizione, List ordini, RunnableArgs onComplete, RunnableArgs onFailed) {
MtbColt newMtbColt = new MtbColt()
.initDefaultFields()
@@ -252,7 +252,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
// onFailed.run(new Exception());
// return;
// }
- MtbColr original = sourceMtbColt.getMtbColr().get(0);
+ MtbColr original = sourceMtbColr;
MtbColr mtbColrClone = new MtbColr();
mtbColrClone
.setNumCollo(null)
@@ -527,23 +527,19 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
}
- public static void changePosizione(MtbColt testata, MtbDepoPosizione posizione, Runnable onComplete, RunnableArgs onFailed) {
+ public static void changePosizione(MtbColt mtbColtToSave, MtbDepoPosizione posizione, Runnable onComplete, RunnableArgs onFailed) {
+ MtbColt mtbColtToSaveClone = (MtbColt) mtbColtToSave.clone();
- testata.setOperation(CommonModelConsts.OPERATION.UPDATE);
+ mtbColtToSaveClone.setOperation(CommonModelConsts.OPERATION.UPDATE);
+ mtbColtToSaveClone.setMtbColr(new ObservableArrayList<>());
- if (posizione == null) testata.setPosizione(null);
- else testata.setPosizione(posizione.getPosizione());
+ if (posizione == null) mtbColtToSaveClone.setPosizione(null);
+ else mtbColtToSaveClone.setPosizione(posizione.getPosizione());
- ColliMagazzinoRESTConsumer.saveCollo(testata, new ISimpleOperationCallback() {
- @Override
- public void onSuccess(MtbColt value) {
- if (onComplete != null) onComplete.run();
- }
-
- @Override
- public void onFailed(Exception ex) {
- if (onFailed != null) onFailed.run(ex);
- }
+ ColliMagazzinoRESTConsumer.saveCollo(mtbColtToSaveClone, mtbColt -> {
+ if (onComplete != null) onComplete.run();
+ }, ex -> {
+ if (onFailed != null) onFailed.run(ex);
});
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/core/ChooseOrdsLavFromListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/core/ChooseOrdsLavFromListAdapter.java
index 94d0cce0..77e0c8de 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/core/ChooseOrdsLavFromListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/core/ChooseOrdsLavFromListAdapter.java
@@ -40,10 +40,10 @@ public class ChooseOrdsLavFromListAdapter extends RecyclerView.Adapter mDatasetPositions = new HashMap<>();
- public ChooseOrdsLavFromListAdapter(Context context, List myDataset, MtbColt mtbColt) throws ParseException, TimeNotRecognizedException, DateNotRecognizedException {
+ public ChooseOrdsLavFromListAdapter(Context context, List myDataset, MtbColt mtbColt, MtbColr mtbColr) throws ParseException, TimeNotRecognizedException, DateNotRecognizedException {
mContext = context;
mMtbColt = mtbColt;
- mMtbColr = mtbColt.getMtbColr().get(0);
+ mMtbColr = mtbColr;
if (myDataset != null) {
mDataset = Stream.of(myDataset)
.withoutNulls()
@@ -92,7 +92,7 @@ public class ChooseOrdsLavFromListAdapter extends RecyclerView.Adapter mDataset = new ArrayList<>();
private ChooseOrdsLavFromListAdapter currentAdapter;
public ObservableField mtbColt = new ObservableField<>();
+ public MtbColr mMtbColr;
public void init(Activity context, FragmentProdVersamentoMaterialeBinding binding, ProdVersamentoMaterialHelper helper, Runnable onVersamentoCompleted) {
@@ -72,6 +73,7 @@ public class ProdVersamentoMaterialViewModel {
}
public void setMtbColr(MtbColr mtbColr) {
+ mMtbColr = mtbColr;
mBinding.descrArt.setText(mtbColr.getDescrizione());
mBinding.codArt.setText(mtbColr.getCodMart());
mBinding.batch.setText(mtbColr.getPartitaMag() + ((mtbColr.getRifPartitaMag() != null) ? " - "+ mtbColr.getRifPartitaMag().getDescrizione() : ""));
@@ -88,7 +90,6 @@ public class ProdVersamentoMaterialViewModel {
}
}
-
public void openLU() {
DialogScanOrCreateLU.make(mContext, false, false, true, false, (mtbColt, created) -> {
if (mtbColt == null) {
@@ -159,7 +160,6 @@ public class ProdVersamentoMaterialViewModel {
return UtilityString.isNullOrEmpty(articolo.getIdArtEqui()) ? articolo.getCodMart() : articolo.getIdArtEqui();
}
-
private void createColloScarico(MtbDepoPosizione mtbDepoPosizione) {
Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
@@ -170,7 +170,6 @@ public class ProdVersamentoMaterialViewModel {
}), ex -> UtilityExceptions.defaultException(mContext, ex));
}
-
public void setMtbColt(MtbColt mtbColt) {
this.mtbColt.set(mtbColt);
this.setMtbColr(mtbColt.getMtbColr().get(0));
@@ -178,6 +177,7 @@ public class ProdVersamentoMaterialViewModel {
public void resetMtbColt() {
this.mtbColt.set(null);
+ this.mMtbColr = null;
openLU();
}
@@ -208,7 +208,7 @@ public class ProdVersamentoMaterialViewModel {
List ordLavs = currentAdapter.getSelectedItems();
if (ordLavs.size() > 0) {
Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
- ColliMagazzinoRESTConsumer.createColliScaricoDaOrdineLavorazione(mtbColt.get(), mtbDepoPosizione, ordLavs, generatedMtbColt -> DialogCommon.showDataSaved(mContext, () -> {
+ ColliMagazzinoRESTConsumer.createColliScaricoDaOrdineLavorazione(mtbColt.get(), mMtbColr, mtbDepoPosizione, ordLavs, generatedMtbColt -> DialogCommon.showDataSaved(mContext, () -> {
progressDialog.dismiss();
mOnVersamentoCompleted.run();
}), ex -> UtilityExceptions.defaultException(mContext, ex));
@@ -224,7 +224,7 @@ public class ProdVersamentoMaterialViewModel {
mBinding.dialogChooseArtsFromListaArtMainList.setLayoutManager(new LinearLayoutManager(mContext));
- currentAdapter = new ChooseOrdsLavFromListAdapter(mContext, mDataset, mtbColt.get());
+ currentAdapter = new ChooseOrdsLavFromListAdapter(mContext, mDataset, mtbColt.get(), mMtbColr);
mBinding.dialogChooseArtsFromListaArtMainList.setAdapter(currentAdapter);
}