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

Aggiunto diacod in Contenuto UL

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-01-23 19:58:14 +01:00
parent 174f7ebbdc
commit 0baee207ee
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java
View File

@ -47,7 +47,7 @@ public class PickingObjectDTO implements Parcelable {
private Boolean tempHidden = null; private Boolean tempHidden = null;
private PickData tempPickData = null; private PickData tempPickData = null;
private List<MtbColr> withdrawRows = new ArrayList<>(); private ArrayList<MtbColr> withdrawRows = new ArrayList<>();
protected PickingObjectDTO(Parcel in) { protected PickingObjectDTO(Parcel in) {
if (in.readByte() == 0) { if (in.readByte() == 0) {
@ -423,11 +423,12 @@ public class PickingObjectDTO implements Parcelable {
return this; return this;
} }
public List<MtbColr> getWithdrawRows() { public ArrayList<MtbColr> getWithdrawRows() {
if(withdrawRows == null) withdrawRows = new ArrayList<>();
return withdrawRows; return withdrawRows;
} }
public PickingObjectDTO setWithdrawRows(List<MtbColr> withdrawRows) { public PickingObjectDTO setWithdrawRows(ArrayList<MtbColr> withdrawRows) {
this.withdrawRows = withdrawRows; this.withdrawRows = withdrawRows;
return this; return this;
} }

6
app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java
View File

@ -45,9 +45,9 @@ public class VenditaOrdineInevasoActivity extends AppCompatActivity {
FragmentArticoliInColloBottomSheetBinding bindings = this.bindings.bottomSheetInclude; FragmentArticoliInColloBottomSheetBinding bindings = this.bindings.bottomSheetInclude;
mArticoliInColloBottomSheetViewModel = new ArticoliInColloBottomSheetViewModel(this, bindings); mArticoliInColloBottomSheetViewModel = new ArticoliInColloBottomSheetViewModel(this, bindings);
List<PickingObjectDTO> pickingList = DataCache.retrieveItem(getIntent().getStringExtra("keyPickingList")); ArrayList<PickingObjectDTO> pickingList = DataCache.retrieveItem(getIntent().getStringExtra("keyPickingList"));
List<OrdineVenditaGroupedInevasoDTO> testateOrdini = DataCache.retrieveItem(getIntent().getStringExtra("keyTestateOrdini")); ArrayList<OrdineVenditaGroupedInevasoDTO> testateOrdini = DataCache.retrieveItem(getIntent().getStringExtra("keyTestateOrdini"));
List<MtbColt> colliRegistrati = DataCache.retrieveItem(getIntent().getStringExtra("keyColliRegistrati")); ArrayList<MtbColt> colliRegistrati = DataCache.retrieveItem(getIntent().getStringExtra("keyColliRegistrati"));
mVenditaOrdineInevasoViewModel = new VenditaOrdineInevasoViewModel( mVenditaOrdineInevasoViewModel = new VenditaOrdineInevasoViewModel(
this, mArticoliInColloBottomSheetViewModel, pickingList, testateOrdini, colliRegistrati); this, mArticoliInColloBottomSheetViewModel, pickingList, testateOrdini, colliRegistrati);

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

@ -37,6 +37,18 @@
tools:text="COD MART" /> tools:text="COD MART" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:text='@{!UtilityString.isNullOrEmpty(mtbColr.mtbAart.diacod) ? mtbColr.mtbAart.diacod : ""}'
android:textColor="@color/red_600"
android:textSize="14sp"
android:textStyle="bold"
android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.mtbAart.diacod) ? View.GONE : View.VISIBLE}"
tools:text="DIACOD HERE"/>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"