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

Finish v1.16.14(196)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2021-03-05 15:36:28 +01:00
commit bca0d0cc52
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 195 def appVersionCode = 196
def appVersionName = '1.16.13' def appVersionName = '1.16.14'
signingConfigs { signingConfigs {
release { release {

1
app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java
View File

@ -76,6 +76,7 @@ public class ProdFabbisognoLineeProdRESTConsumer extends _BaseRESTConsumer {
" CROSS APPLY input_values " + " CROSS APPLY input_values " +
" WHERE dtb_ordt.gestione = 'L' " + " WHERE dtb_ordt.gestione = 'L' " +
" AND flag_evaso = 'I' " + " AND flag_evaso = 'I' " +
" AND flag_evaso_prod = 'I' " +
" AND dtb_ordr.flag_evaso_forzato = 'N' " + " AND dtb_ordr.flag_evaso_forzato = 'N' " +
" AND flag_annulla = 'N' " + " AND flag_annulla = 'N' " +
" AND dtb_ordt.cod_mdep = input_values.cod_mdep " + " AND dtb_ordt.cod_mdep = input_values.cod_mdep " +

6
app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
View File

@ -1002,6 +1002,12 @@ public class SpedizioneViewModel {
if (qtaColDaPrelevare != null && numCnfDaPrelevare == null) { if (qtaColDaPrelevare != null && numCnfDaPrelevare == null) {
numCnfDaPrelevare = UtilityBigDecimal.divideToInteger(qtaColDaPrelevare, mtbAart.getQtaCnf()); numCnfDaPrelevare = UtilityBigDecimal.divideToInteger(qtaColDaPrelevare, mtbAart.getQtaCnf());
qtaCnfDaPrelevare = UtilityBigDecimal.divide(qtaColDaPrelevare, numCnfDaPrelevare); qtaCnfDaPrelevare = UtilityBigDecimal.divide(qtaColDaPrelevare, numCnfDaPrelevare);
if (!mtbAart.isFlagQtaCnfFissaBoolean()) {
if (UtilityBigDecimal.equalsTo(numCnfDaPrelevare, BigDecimal.ZERO))
numCnfDaPrelevare = BigDecimal.ONE;
qtaCnfDaPrelevare = UtilityBigDecimal.divide(qtaColDaPrelevare, numCnfDaPrelevare);
}
} else if (numCnfDaPrelevare != null && qtaColDaPrelevare == null) { } else if (numCnfDaPrelevare != null && qtaColDaPrelevare == null) {
qtaCnfDaPrelevare = mtbAart.getQtaCnf(); qtaCnfDaPrelevare = mtbAart.getQtaCnf();
qtaColDaPrelevare = UtilityBigDecimal.multiply(numCnfDaPrelevare, qtaCnfDaPrelevare); qtaColDaPrelevare = UtilityBigDecimal.multiply(numCnfDaPrelevare, qtaCnfDaPrelevare);

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

@ -393,7 +393,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/batch_lot" android:hint="@string/batch_lot"
android:inputType="text" android:inputType="text"
app:binding="@{view.currentPartitaMag}" /> app:binding="@{view.currentPartitaMag}"
android:imeOptions="actionDone" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
@ -446,7 +447,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/num_pcks" android:hint="@string/num_pcks"
android:inputType="number" android:inputType="number"
app:binding="@{view.currentNumCnf}" /> app:binding="@{view.currentNumCnf}"
android:imeOptions="actionDone" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
@ -468,7 +470,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/qty_x_pck" android:hint="@string/qty_x_pck"
android:inputType="numberDecimal" android:inputType="numberDecimal"
app:binding="@{view.currentQtaCnf}" /> app:binding="@{view.currentQtaCnf}"
android:imeOptions="actionDone" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
@ -480,7 +483,8 @@
android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}" android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}"
android:enabled="@{view.enabledQtaTot}" android:enabled="@{view.enabledQtaTot}"
android:focusableInTouchMode="false" android:focusableInTouchMode="false"
tools:layout_weight="1"> tools:layout_weight="1"
android:imeOptions="actionDone">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/input_qta_tot_text" android:id="@+id/input_qta_tot_text"