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

Merge branch 'develop' into feature/Refactoring_Spedizione

Browse Source 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
#	app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java
This commit is contained in:
Giuseppe Scorrano 2020-05-14 10:29:47 +02:00
parent ebb525da02
commit da3ad5d425
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
View File

@ -14,6 +14,7 @@ import org.jetbrains.annotations.NotNull;
import org.json.JSONObject; import org.json.JSONObject;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

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

@ -460,12 +460,9 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
MtbColt cloneMtbColt = (MtbColt) mtbColt.get().clone(); MtbColt cloneMtbColt = (MtbColt) mtbColt.get().clone();
cloneMtbColt.setOperation(CommonModelConsts.OPERATION.NO_OP); cloneMtbColt.setOperation(CommonModelConsts.OPERATION.NO_OP);
MtbColt cloneMtbColt = (MtbColt) mtbColt.get().clone(); cloneMtbColt.setMtbColr(new ObservableArrayList());
cloneMtbColt.setOperation(CommonModelConsts.OPERATION.NO_OP);
cloneMtbColt.setMtbColr(new ObservableArrayList()); ColliMagazzinoRESTConsumer.saveColloStatic(cloneMtbColt, new ISimpleOperationCallback<MtbColt>() {
ColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, new ISimpleOperationCallback<MtbColt>() {
@Override @Override
public void onSuccess(MtbColt value) { public void onSuccess(MtbColt value) {
@ -698,7 +695,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
mtbColtClone.getMtbColr().add(mtbColrToEditClone); mtbColtClone.getMtbColr().add(mtbColrToEditClone);
mtbColtClone.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); mtbColtClone.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
ColliMagazzinoRESTConsumer.saveCollo(mtbColtClone, valueNewMtbColt -> { ColliMagazzinoRESTConsumer.saveColloStatic(mtbColtClone, valueNewMtbColt -> {
progressDialog.dismiss(); progressDialog.dismiss();
mtbColt.get().getMtbColr().remove(index); mtbColt.get().getMtbColr().remove(index);
@ -749,7 +746,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
}, ex -> UtilityExceptions.defaultException(mContext, ex, progressDialog) }, ex -> UtilityExceptions.defaultException(mContext, ex, progressDialog)
); );
} else { } else {
ColliMagazzinoRESTConsumer.saveCollo(mtbColtClone, value -> { ColliMagazzinoRESTConsumer.saveColloStatic(mtbColtClone, value -> {
progressDialog.dismiss(); progressDialog.dismiss();
mtbColt.get().getMtbColr().remove(mtbColrToDelete); mtbColt.get().getMtbColr().remove(mtbColrToDelete);
}, ex -> { }, ex -> {

2
app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java
View File

@ -159,7 +159,7 @@ public class DialogScanOrCreateLU {
DialogCommon.showNoULFound(mContext, null); DialogCommon.showNoULFound(mContext, null);
} else if (mtbColtList.size() == 1) { } else if (mtbColtList.size() == 1) {
ColliMagazzinoRESTConsumer.getByTestataStatic(mtbColtList.get(0), mShouldCheckResiduo, false, mtbColt -> { ColliMagazzinoRESTConsumer.getByTestataStatic(mtbColtList.get(0), mShouldCheckResiduo, false, mtbColt -> {
sendMtbColt(mtbColt, progressDialog); sendMtbColt(mtbColt, progressDialog, false);
}, ex -> { }, ex -> {
UtilityExceptions.defaultException(mContext, ex, progressDialog); UtilityExceptions.defaultException(mContext, ex, progressDialog);
BarcodeManager.enable(); BarcodeManager.enable();