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

Vario

Browse Source
This commit is contained in:
Giuseppe Scorrano 2020-06-08 09:24:23 +02:00
parent 4f4cb60e7f
commit d388d1d0a4
4 changed files with 167 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.idea/jarRepositories.xml generated Normal file
View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="Google" />
<option name="name" value="Google" />
<option name="url" value="https://maven.google.com/" />
</remote-repository>
<remote-repository>
<option name="id" value="BintrayJCenter" />
<option name="name" value="BintrayJCenter" />
<option name="url" value="https://jcenter.bintray.com/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven" />
<option name="name" value="maven" />
<option name="url" value="https://jitpack.io" />
</remote-repository>
<remote-repository>
<option name="id" value="MavenRepo" />
<option name="name" value="MavenRepo" />
<option name="url" value="https://repo.maven.apache.org/maven2/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven2" />
<option name="name" value="maven2" />
<option name="url" value="https://maven.fabric.io/public" />
</remote-repository>
</component>
</project>

10
app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
View File

@ -1034,11 +1034,17 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
MtbColr withdrawRow = this.mPickingList.get(i).getWithdrawRows().get(k);
this.mPickingList.get(i).setQtaCollo(this.mPickingList.get(i).getQtaCollo().subtract(withdrawRow.getQtaCol()));
this.mPickingList.get(i).setQtaOrd(this.mPickingList.get(i).getQtaOrd().subtract(withdrawRow.getQtaCol()));
this.mPickingList.get(i).setNumCnfCollo(this.mPickingList.get(i).getNumCnfCollo().subtract(withdrawRow.getNumCnf()));
this.mPickingList.get(i).setNumCnfOrd(this.mPickingList.get(i).getNumCnfOrd().subtract(withdrawRow.getNumCnf()));
if(this.mPickingList.get(i).getQtaCollo() != null) {
this.mPickingList.get(i).setQtaCollo(this.mPickingList.get(i).getQtaCollo().subtract(withdrawRow.getQtaCol()));
}
if(this.mPickingList.get(i).getNumCnfCollo() != null) {
this.mPickingList.get(i).setNumCnfCollo(this.mPickingList.get(i).getNumCnfCollo().subtract(withdrawRow.getNumCnf()));
}
}
this.mPickingList.get(i).getWithdrawRows().clear();

2
app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java
View File

@ -75,7 +75,7 @@ public class DialogBasketLU_Page2_ViewModel extends DialogBasketLU_BaseViewModel
private void initRecyclerView(List<MtbColr> dataset) {
mBinding.dialogBasketLuMtbColrList.setNestedScrollingEnabled(false);
//mBinding.dialogBasketLuMtbColrList.setNestedScrollingEnabled(false);
mBinding.dialogBasketLuMtbColrList.setHasFixedSize(true);
mBinding.dialogBasketLuMtbColrList.setLayoutManager(new LinearLayoutManager(mContext));

31
app/src/main/res/layout/dialog_basket_lu__page2.xml
View File

@ -7,10 +7,28 @@
android:orientation="vertical">
<androidx.core.widget.NestedScrollView
android:id="@+id/myScrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/buttons">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/dialog_basket_lu__mtb_colr_list"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
@ -69,9 +87,11 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="52dp"
android:layout_marginTop="8dp">
<androidx.constraintlayout.widget.Guideline
@ -91,8 +111,8 @@
android:layout_marginRight="8dp"
android:text="@string/back"
app:icon="@drawable/ic_black_back"
app:iconSize="24dp"
app:iconGravity="textStart"
app:iconSize="24dp"
app:layout_constraintEnd_toStartOf="@id/center_buttons_guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@ -108,14 +128,15 @@
android:layout_marginRight="8dp"
android:text="@string/use"
app:icon="@drawable/ic_black_tick"
app:iconSize="24dp"
app:iconGravity="textStart"
app:iconSize="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/center_buttons_guideline"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.core.widget.NestedScrollView>
</LinearLayout>
</layout>