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

Finish v1_6_4(65)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-06-27 21:31:47 +02:00
commit 0c1498573f
4 changed files with 53 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 64 def appVersionCode = 65
def appVersionName = '1.6.3' def appVersionName = '1.6.4'
signingConfigs { signingConfigs {
release { release {

4
app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java
View File

@ -145,10 +145,6 @@ public class MainListVenditaAdapter extends RecyclerView.Adapter<MainListVendita
//mOnGroupSelected.run(mDataset.get(finalPosition)); //mOnGroupSelected.run(mDataset.get(finalPosition));
}); });
final View existColloView = ordineView.findViewById(R.id.exist_collo);
// existColloView.setAlpha(ordine.isExistCollo() ? 1 : 0);
TextView testataOrdTextView = ordineView.findViewById(R.id.vendita_main_list_group_item_container_testata_ord); TextView testataOrdTextView = ordineView.findViewById(R.id.vendita_main_list_group_item_container_testata_ord);
String testataOrdString = String.format(mContext.getString(R.string.ord_ven_testata), String.valueOf(ordine.getNumero()), UtilityDate.formatDate(ordine.getData(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)); String testataOrdString = String.format(mContext.getString(R.string.ord_ven_testata), String.valueOf(ordine.getNumero()), UtilityDate.formatDate(ordine.getData(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));

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

@ -655,18 +655,23 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
if(!anyMatch) { if(!anyMatch) {
matchPickingObjectByArt.remove(i); matchPickingObjectByArt.remove(i);
i--; i--;
} else if(matchWithPartitaMag.size() == 1){ } else {
MtbColr matchRow = matchWithPartitaMag.get(0);
PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData() for(int k = 0; k < matchWithPartitaMag.size(); k++) {
.setBatchLot(matchRow.getPartitaMag())
.setDataScad(matchRow.getDataScadPartitaD())
.setNumCnf(matchRow.getNumCnf())
.setQtaCnf(matchRow.getQtaCnf())
.setQtaTot(matchRow.getQtaCol())
.setSourceMtbColt(scannedUL);
tmpPickObj.setTempPickData(pickData);
MtbColr matchRow = matchWithPartitaMag.get(k);
PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData()
.setBatchLot(matchRow.getPartitaMag())
.setDataScad(matchRow.getDataScadPartitaD())
.setNumCnf(matchRow.getNumCnf())
.setQtaCnf(matchRow.getQtaCnf())
.setQtaTot(matchRow.getQtaCol())
.setSourceMtbColt(scannedUL);
tmpPickObj.setTempPickData(pickData);
}
} }
} }
@ -677,9 +682,10 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
List<MtbColr> matchWithColloRow = Stream.of(scannedUL.getMtbColr()) List<MtbColr> matchWithColloRow = Stream.of(scannedUL.getMtbColr())
.filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart())).toList(); .filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart())).toList();
if(matchWithColloRow.size() == 1){ for(int k = 0; k < matchWithColloRow.size(); k++) {
MtbColr matchRow = matchWithColloRow.get(0);
MtbColr matchRow = matchWithColloRow.get(k);
PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData() PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData()
.setBatchLot(matchRow.getPartitaMag()) .setBatchLot(matchRow.getPartitaMag())
.setDataScad(matchRow.getDataScadPartitaD()) .setDataScad(matchRow.getDataScadPartitaD())

84
app/src/main/res/layout/vendita_main_list_group_model.xml
View File

@ -2,69 +2,51 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:padding="8dp">
<CheckBox
android:id="@+id/vendita_main_list_group_item_container_checkBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<RelativeLayout <RelativeLayout
android:id="@+id/content" android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="8dp" android:layout_toRightOf="@id/vendita_main_list_group_item_container_checkBox"
android:paddingTop="8dp" android:layout_alignParentEnd="true">
android:paddingBottom="8dp"
android:paddingEnd="4dp"
android:layout_toStartOf="@id/exist_collo">
<CheckBox <TextView
android:id="@+id/vendita_main_list_group_item_container_checkBox" android:id="@+id/vendita_main_list_group_item_container_testata_data_cons"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toEndOf="@id/vendita_main_list_group_item_container_checkBox" android:text="Cons 07 nov 2018"
android:layout_alignParentEnd="true"> android:layout_alignParentEnd="true"
android:textColor="#000" />
<TextView <TextView
android:id="@+id/vendita_main_list_group_item_container_testata_data_cons" android:id="@+id/vendita_main_list_group_item_container_testata_ord"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Cons 07 nov 2018" android:text="Ord. Ven. 39 del 27 ott 2017"
android:layout_alignParentEnd="true" android:ellipsize="end"
android:textColor="#000" /> android:maxLines="1"
android:textColor="#000"
<TextView android:layout_alignParentLeft="true"
android:id="@+id/vendita_main_list_group_item_container_testata_ord" android:layout_toLeftOf="@id/vendita_main_list_group_item_container_testata_data_cons"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Ord. Ven. 39 del 27 ott 2017"
android:ellipsize="end"
android:maxLines="1"
android:textColor="#000"
android:layout_alignParentStart="true"
android:layout_toLeftOf="@id/vendita_main_list_group_item_container_testata_data_cons"/>
<LinearLayout <LinearLayout
android:id="@+id/vendita_main_list_group_item_container_clienti_ord" android:id="@+id/vendita_main_list_group_item_container_clienti_ord"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentStart="true" android:layout_below="@+id/vendita_main_list_group_item_container_testata_ord"
android:layout_alignParentEnd="true" android:orientation="vertical">
android:layout_below="@+id/vendita_main_list_group_item_container_testata_ord" </LinearLayout>
android:orientation="vertical">
</LinearLayout>
</RelativeLayout>
</RelativeLayout> </RelativeLayout>
<View
android:id="@+id/exist_collo"
android:layout_width="6dp"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignBottom="@id/content"
android:background="@color/red_400"/>
</RelativeLayout> </RelativeLayout>