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

Fix vari in accettazione da ordine

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-05-15 18:28:37 +02:00
parent f4c64e5f04
commit 9bf0dacda6
4 changed files with 216 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
.idea/codeStyles/Project.xml generated
View File

@@ -1,5 +1,40 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<JavaCodeStyleSettings>
<option name="IMPORT_LAYOUT_TABLE">
<value>
<package name="" withSubpackages="true" static="false" module="true" />
<package name="android" withSubpackages="true" static="true" />
<package name="androidx" withSubpackages="true" static="true" />
<package name="com" withSubpackages="true" static="true" />
<package name="junit" withSubpackages="true" static="true" />
<package name="net" withSubpackages="true" static="true" />
<package name="org" withSubpackages="true" static="true" />
<package name="java" withSubpackages="true" static="true" />
<package name="javax" withSubpackages="true" static="true" />
<package name="" withSubpackages="true" static="true" />
<emptyLine />
<package name="android" withSubpackages="true" static="false" />
<emptyLine />
<package name="androidx" withSubpackages="true" static="false" />
<emptyLine />
<package name="com" withSubpackages="true" static="false" />
<emptyLine />
<package name="junit" withSubpackages="true" static="false" />
<emptyLine />
<package name="net" withSubpackages="true" static="false" />
<emptyLine />
<package name="org" withSubpackages="true" static="false" />
<emptyLine />
<package name="java" withSubpackages="true" static="false" />
<emptyLine />
<package name="javax" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="false" />
<emptyLine />
</value>
</option>
</JavaCodeStyleSettings>
<JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>

3
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
View File

@@ -702,6 +702,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
.findFirst().get()
.isCanBeRecovered(),
false,
ReportManager.getReportNameLUFromGestione(GestioneEnum.ACQUISTO));
this.startActivityForResult(myIntent, PICK_UL_REQUEST);
@@ -791,7 +792,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
if (!mDialogInputQuantityV2View.isVisible())
mDialogInputQuantityV2View
.setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO).setOnComplete(resultDTO -> {
if (resultDTO == null) {
if (resultDTO == null || resultDTO.isAborted()) {
this.mViewModel.resetMatchedRows();
return;
}

112
app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
View File

@@ -27,10 +27,10 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:background="?attr/selectableItemBackground">
android:padding="8dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/art_detail"
@@ -40,52 +40,25 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/qta_box"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
<TextView
android:id="@+id/articolo_textview"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@{mtbColr.codMart}"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/qta_layout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="COD MART" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/orange_600"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:text="@{UtilityNumber.decimalToString(mtbColr.qtaCol) + mtbColr.mtbAart.untMis}"
android:textColor="@android:color/white"
android:textSize="14sp"
android:textStyle="bold"
android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.flagQtaCnfFissaBoolean) ? View.VISIBLE : View.GONE}"
tools:text="PESO KG" />
</RelativeLayout>
<TextView
android:id="@+id/articolo_descrizione_textview"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
@@ -94,62 +67,87 @@
android:text="@{mtbColr.getDescrizione()}"
android:textColor="@android:color/black"
android:textSize="16sp"
app:layout_constraintEnd_toStartOf="@+id/qta_layout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/articolo_textview"
tools:text="Descrizione lunga articolo" />
<TextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}"
android:textSize="14sp"
android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.INVISIBLE : View.VISIBLE}"
app:layout_constraintEnd_toStartOf="@+id/qta_layout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/articolo_descrizione_textview"
app:visibilityWhenNotNull="@{mtbColr.getPartitaMag()}"
tools:text="Lotto: ABCDE" />
</LinearLayout>
<RelativeLayout
android:id="@+id/qta_box"
android:layout_width="wrap_content"
<LinearLayout
android:id="@+id/qta_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:gravity="center_vertical"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/num_cnf_text"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="-16dp"
android:background="@drawable/badge_round_corner_top"
android:backgroundTint="?colorSecondaryContainer"
android:gravity="center_horizontal"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:paddingBottom="16dp"
android:text="@{UtilityNumber.decimalToString(mtbColr.numCnf) + ` CNF`}"
android:textColor="?colorOnSecondaryContainer"
android:textSize="14sp"
android:textStyle="bold"
app:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.flagQtaCnfFissaBoolean)}"
tools:text="NUM CNF" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/qta_textview"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="?colorPrimary"
android:backgroundTint="?colorPrimaryContainer"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
android:paddingRight="6dp"
android:paddingBottom="2dp"
android:textAllCaps="true"
android:textColor="@android:color/white"
android:textColor="?colorOnPrimaryContainer"
android:textSize="16sp"
android:textStyle="bold"
tools:text="280.45\nCONF" />
</RelativeLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.card.MaterialCardView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:visibility="@{mtbColr.numColloRif != null ? View.VISIBLE : View.GONE}"
android:focusable="false"
android:clickable="false"
android:focusable="false"
android:visibility="@{mtbColr.numColloRif != null ? View.VISIBLE : View.GONE}"
app:cardElevation="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/art_detail"
app:cardElevation="0dp"
app:strokeWidth="0dp">
<androidx.appcompat.widget.LinearLayoutCompat
@@ -177,10 +175,10 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:text="@{&quot;#&quot; + mtbColr.numColloRif + &quot; (&quot; + mtbColr.serColloRif + &quot;)&quot;}"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:singleLine="true"
android:ellipsize="end"
tools:text="#5230 (/)" />
<androidx.appcompat.widget.AppCompatTextView
@@ -189,17 +187,17 @@
android:text="@{mtbColr.gestioneRifEnum != null ? GestioneToTextConverter.convert(mtbColr.gestioneRifEnum) : &quot;&quot;}"
android:textAppearance="@style/TextAppearance.Material3.BodySmall"
android:textColor="?attr/colorOutline"
tools:text="Lavorazione"/>
tools:text="Lavorazione" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:text="@{UtilityDate.formatDate(mtbColr.dataColloRifD, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:singleLine="true"
android:ellipsize="end"
tools:text="20 gennaio 2025" />
</androidx.appcompat.widget.LinearLayoutCompat>

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

@@ -27,10 +27,10 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:background="?attr/selectableItemBackground">
android:padding="8dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/art_detail"
@@ -40,89 +40,88 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/num_cnf_text"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
<TextView
android:id="@+id/articolo_textview"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@{mtbColr.codMart}"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/qta_layout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="COD MART" />
</RelativeLayout>
<TextView
android:id="@+id/articolo_descrizione_textview"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="start"
android:maxLines="2"
android:paddingStart="0dp"
android:paddingEnd="8dp"
android:text="@{mtbColr.getDescrizione()}"
android:textColor="@android:color/black"
android:textSize="16sp"
app:layout_constraintEnd_toStartOf="@+id/qta_layout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/articolo_textview"
tools:text="Descrizione lunga articolo" />
<TextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}"
android:textSize="14sp"
android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.INVISIBLE : View.VISIBLE}"
app:layout_constraintEnd_toStartOf="@+id/qta_layout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/articolo_descrizione_textview"
tools:text="Lotto: ABCDE" />
</LinearLayout>
<LinearLayout
android:id="@+id/qta_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/num_cnf_text"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:gravity="center_horizontal"
android:background="@drawable/badge_round_corner_top"
android:backgroundTint="?colorSecondaryContainer"
android:gravity="center_horizontal"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:paddingBottom="16dp"
android:layout_marginBottom="-16dp"
android:text="@{UtilityNumber.decimalToString(mtbColr.numCnf) + ` CNF`}"
android:textColor="?colorOnSecondaryContainer"
android:textSize="14sp"
android:textStyle="bold"
android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.flagQtaCnfFissaBoolean) ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.flagQtaCnfFissaBoolean)}"
tools:text="NUM CNF" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/qta_textview"
style="@style/AppTheme.NewMaterial.Text.Small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/num_cnf_text"
app:layout_constraintStart_toStartOf="@id/num_cnf_text"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-16dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="?colorPrimaryContainer"
android:gravity="center"
@@ -135,20 +134,21 @@
android:textSize="16sp"
android:textStyle="bold"
tools:text="280.45\nCONF" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.card.MaterialCardView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:visibility="@{mtbColr.numColloRif != null ? View.VISIBLE : View.GONE}"
android:focusable="false"
android:clickable="false"
android:focusable="false"
app:cardElevation="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/art_detail"
app:cardElevation="0dp"
app:strokeWidth="0dp">
app:strokeWidth="0dp"
app:visibilityWhenNotNull="@{mtbColr.numColloRif}">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
@@ -175,10 +175,10 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:text="@{&quot;#&quot; + mtbColr.numColloRif + &quot; (&quot; + mtbColr.serColloRif + &quot;)&quot;}"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:singleLine="true"
android:ellipsize="end"
tools:text="#5230 (/)" />
<androidx.appcompat.widget.AppCompatTextView
@@ -187,17 +187,17 @@
android:text="@{mtbColr.gestioneRifEnum != null ? GestioneToTextConverter.convert(mtbColr.gestioneRifEnum) : &quot;&quot;}"
android:textAppearance="@style/TextAppearance.Material3.BodySmall"
android:textColor="?attr/colorOutline"
tools:text="Lavorazione"/>
tools:text="Lavorazione" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:text="@{UtilityDate.formatDate(mtbColr.dataColloRifD, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:singleLine="true"
android:ellipsize="end"
tools:text="20 gennaio 2025" />
</androidx.appcompat.widget.LinearLayoutCompat>