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

bugfix in schermata dialog_input_quantity_v2

Browse Source
This commit is contained in:
Valerio Castellana 2022-05-27 16:22:34 +02:00
parent 33a01b2c15
commit 344fc42d03
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/it/integry/integrywmsnative/core/rest/model/SitArtOrdDTO.java
View File

@ -26,6 +26,7 @@ public class SitArtOrdDTO {
private String descrizioneMsgr; private String descrizioneMsgr;
private String codMsfa; private String codMsfa;
private String descrizioneMsfa; private String descrizioneMsfa;
private String untord;
private final HashMap<String, Object> extraInfo = new HashMap<>(); private final HashMap<String, Object> extraInfo = new HashMap<>();
@ -212,4 +213,13 @@ public class SitArtOrdDTO {
public HashMap<String, Object> getExtraInfo() { public HashMap<String, Object> getExtraInfo() {
return extraInfo; return extraInfo;
} }
public String getUntord() {
return untord;
}
public SitArtOrdDTO setUntord(String untord) {
this.untord = untord;
return this;
}
} }

8
app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
View File

@ -24,6 +24,7 @@ import com.pedromassango.doubleclick.DoubleClick;
import com.pedromassango.doubleclick.DoubleClickListener; import com.pedromassango.doubleclick.DoubleClickListener;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
@ -57,6 +58,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
private Runnable mOnAbort; private Runnable mOnAbort;
public ObservableField<Integer> currentTextNumCnfToTake = new ObservableField<>(0); public ObservableField<Integer> currentTextNumCnfToTake = new ObservableField<>(0);
public ObservableField<Boolean> flagShowCnfToTakeLabel = new ObservableField<>(true);
public ObservableField<Integer> currentTextNumPezziToTake = new ObservableField<>(0); public ObservableField<Integer> currentTextNumPezziToTake = new ObservableField<>(0);
public ObservableField<String> currentPartitaMag = new ObservableField<>(); public ObservableField<String> currentPartitaMag = new ObservableField<>();
@ -408,8 +410,9 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
this.currentTaraArticolo.set(this.mViewModel.getMtbAart().getTaraKg()); this.currentTaraArticolo.set(this.mViewModel.getMtbAart().getTaraKg());
if (this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd() != null && !this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().equals(BigDecimal.ZERO) && !(this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().intValue() == 0)) { if (this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd() != null && !this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().equals(BigDecimal.ZERO) && !(this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().intValue() == 0)) {
this.currentTextNumCnfToTake.set(this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().intValue()); int numCnftoTake = this.mDialogInputQuantityV2DTO.getTotalQtaOrd().divide(this.mDialogInputQuantityV2DTO.getQtaCnfOrd(), 0, RoundingMode.DOWN).intValue();
int qtaText = this.mDialogInputQuantityV2DTO.getTotalQtaOrd().intValue() % this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().intValue(); this.currentTextNumCnfToTake.set(numCnftoTake);
int qtaText = this.mDialogInputQuantityV2DTO.getTotalQtaOrd().intValue() % this.mDialogInputQuantityV2DTO.getQtaCnfOrd().intValue();
this.currentTextNumPezziToTake.set(qtaText); this.currentTextNumPezziToTake.set(qtaText);
} else { } else {
this.currentTextNumCnfToTake.set(0); this.currentTextNumCnfToTake.set(0);
@ -451,6 +454,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
BigDecimal taraTot = this.mViewModel.getNumCnf().multiply(articolo.getTaraKg()); BigDecimal taraTot = this.mViewModel.getNumCnf().multiply(articolo.getTaraKg());
this.currentTaraTot.set(taraTot); this.currentTaraTot.set(taraTot);
this.currentPesoLordo.set(this.mViewModel.getQtaTot().add(taraTot)); this.currentPesoLordo.set(this.mViewModel.getQtaTot().add(taraTot));
this.flagShowCnfToTakeLabel.set(false);
} }
this.mBindings.executePendingBindings(); this.mBindings.executePendingBindings();

2
app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml
View File

@ -193,7 +193,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:gravity="center" android:gravity="center"
android:visibility="@{view.currentTextNumCnfToTake > 0 || view.currentTextNumPezziToTake > 0 ? View.VISIBLE : View.GONE}"> android:visibility="@{view.flagShowCnfToTakeLabel &amp;&amp; (view.currentTextNumCnfToTake > 0 || view.currentTextNumPezziToTake > 0 )? View.VISIBLE : View.GONE}">
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat

2
app/src/main/res/layout/dialog_input_quantity_v2.xml
View File

@ -203,7 +203,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:gravity="center" android:gravity="center"
android:visibility="@{view.currentTextNumCnfToTake > 0 || view.currentTextNumPezziToTake > 0 ? View.VISIBLE : View.GONE}"> android:visibility="@{view.flagShowCnfToTakeLabel &amp;&amp; (view.currentTextNumCnfToTake > 0 || view.currentTextNumPezziToTake > 0) ? View.VISIBLE : View.GONE}">
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat