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

[CARELLI - Ordini Acquisto]

Browse Source 
Corretto controllo su ordini chiusi a fine validità lisitno
This commit is contained in:
Valerio Castellana 2023-03-28 12:11:14 +02:00
parent 60414c949e
commit 28f4ac4414
8 changed files with 1186 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1168
app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/16.json Normal file
View File

File diff suppressed because it is too large Load Diff

10
app/src/main/java/it/integry/integrywmsnative/core/data_store/db/AppDatabase.java
View File

@ -40,7 +40,7 @@ import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
InventarioRoomDTO.class,
InventarioRowRoomDTO.class
},
version = 15)
version = 16)
@TypeConverters({
DateConverter.class,
BigDecimalConverter.class,
@ -67,7 +67,8 @@ public abstract class AppDatabase extends RoomDatabase {
.addMigrations(MIGRATION_11_12)
.addMigrations(MIGRATION_12_13)
.addMigrations(MIGRATION_13_14)
.addMigrations(MIGRATION_14_15);
.addMigrations(MIGRATION_14_15)
.addMigrations(MIGRATION_15_16);
sInstance = builder.build();
}
@ -155,4 +156,9 @@ public abstract class AppDatabase extends RoomDatabase {
database.execSQL("CREATE UNIQUE INDEX IF NOT EXISTS index_articoli_ordine_id_ordine_cod_mart ON articoli_ordine (id_ordine, cod_mart);");
}
};
static final Migration MIGRATION_15_16 = new Migration(15, 16) {
@Override
public void migrate(@NonNull SupportSQLiteDatabase database) {
}
};
}

5
app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/Ordine.java
View File

@ -51,6 +51,7 @@ public class Ordine {
private boolean orderNewProducts = false;
@ColumnInfo(name = "id_griglia")
@Nullable
private Integer idGriglia;
@ColumnInfo(name = "cod_alis")
@ -80,11 +81,11 @@ public class Ordine {
this.annotazioni = annotazioni;
}
public int getIdGriglia() {
public Integer getIdGriglia() {
return idGriglia;
}
public void setIdGriglia(int idGriglia) {
public void setIdGriglia(Integer idGriglia) {
this.idGriglia = idGriglia;
}

8
app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/views/InputQuantityToReturnDialog.java
View File

@ -5,22 +5,14 @@ import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ArrayAdapter;
import androidx.databinding.DataBindingUtil;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.model.MtbAart;
import it.integry.integrywmsnative.core.model.MtbTCol;
import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.core.utility.UtilityProgress;
import it.integry.integrywmsnative.databinding.DialogInputQuantityToReturnBinding;
public class InputQuantityToReturnDialog {

5
app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java
View File

@ -97,7 +97,7 @@ public class PVOrdineAcquistoEditViewModel {
refreshListArticoli(null);
}
public boolean checkOrderSessionValid() {
public boolean isOrderSessionInvalid() {
Calendar today = Calendar.getInstance();
today.set(Calendar.MILLISECOND, 0);
today.set(Calendar.SECOND, 0);
@ -196,6 +196,7 @@ public class PVOrdineAcquistoEditViewModel {
var articolo = foundArt != null ? completeDataArticoli(foundArt) : convertToArticoloOrdine(art, mCurrentOrdine);
Runnable saveAction = () -> {
articolo.setQtaOrd(articolo.getQtaOrd() + articolo.getQtaCnf());
mArticoliOrdineRepository.saveArticoloToOrdine(articolo, () -> this.refreshListArticoli(onSuccess), onFail);
};
@ -313,7 +314,7 @@ public class PVOrdineAcquistoEditViewModel {
public void exportOrdine(Runnable onComplete) {
this.sendOnLoadingStarted();
if (!checkOrderSessionValid()) {
if (isOrderSessionInvalid()) {
this.sendError(new ExpiredProductListException());
return;
}

4
app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java
View File

@ -181,7 +181,7 @@ public class PVOrdiniAcquistoGrigliaFragment extends BaseFragment implements ITi
}
private void editOrdine(Ordine ordine) {
if (this.mPvOrdiniAcquistoGrigliaViewModel.checkProductListSessionInvalid()) {
if (this.mPvOrdiniAcquistoGrigliaViewModel.isProductListSessionInvalid()) {
this.onError(new ExpiredProductListException());
return;
}
@ -220,7 +220,7 @@ public class PVOrdiniAcquistoGrigliaFragment extends BaseFragment implements ITi
}
public void createNewOrder() {
if (this.mPvOrdiniAcquistoGrigliaViewModel.checkProductListSessionInvalid()) {
if (this.mPvOrdiniAcquistoGrigliaViewModel.isProductListSessionInvalid()) {
this.onError(new ExpiredProductListException());
return;
}

2
app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaViewModel.java
View File

@ -59,7 +59,7 @@ public class PVOrdiniAcquistoGrigliaViewModel {
}
public boolean checkProductListSessionInvalid() {
public boolean isProductListSessionInvalid() {
Calendar today = Calendar.getInstance();
today.set(Calendar.MILLISECOND, 0);
today.set(Calendar.SECOND, 0);

2
app/src/main/res/values-it/strings.xml
View File

@ -447,5 +447,5 @@
<string name="confirm_orderable_qty_exceeded"><![CDATA[La quantità massima consentita per questo articolo è stata superata! <br/> Vuoi cotinuare comunque con il salvataggio?]]>\</string>
<string name="confirm_order_unlisted_item"><![CDATA[L\'articolo selezionato non è presente nel piano logistico!<br>Vuoi provare a cercarlo comunque nel sistema?]]></string>
<string name="invalid_product_ordered">L\'ordine presenta un articolo non valido per la lista selezionata!</string>
<string name="expired_list_session"><![CDATA[La lista di prodotti è stata caricata troppo tempo fa!.]]></string>
<string name="expired_list_session"><![CDATA[La lista di prodotti è stata caricata troppo tempo fa!]]></string>
</resources>