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

Finish v1_0_44(47)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-04-11 12:01:24 +02:00
commit 6ca10dbc69
11 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

4
app/build.gradle
View File

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 46 def appVersionCode = 47
def appVersionName = '1.0.43' def appVersionName = '1.0.44'
signingConfigs { signingConfigs {
release { release {

7
app/src/main/java/it/integry/integrywmsnative/core/report/ReportManager.java
View File

@ -7,14 +7,15 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
public class ReportManager { public class ReportManager {
public static void getRightReportNameByMtbColt(MtbColt mtbColt, RunnableArgs<String> onComplete, RunnableArgs<Exception> onFailed) { public static void getRightReportNameByGestione(GestioneEnum gestione, RunnableArgs<String> onComplete, RunnableArgs<Exception> onFailed) {
if(mtbColt != null){ if(gestione != null){
GestioneEnum gestione = GestioneEnum.fromString(mtbColt.getGestione()); //GestioneEnum gestione = GestioneEnum.fromString(mtbColt.getGestione());
switch (gestione) { switch (gestione) {
case ACQUISTO: case ACQUISTO:
case PRODUZIONE:
onComplete.run("EtichettaBancale"); onComplete.run("EtichettaBancale");
break; break;

17
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/rest/OrdineAccettazioneInevasoRESTConsumerService.java
View File

@ -31,7 +31,8 @@ public class OrdineAccettazioneInevasoRESTConsumerService {
String dateString = UtilityDate.formatDate(date, "yyyy/MM/dd"); String dateString = UtilityDate.formatDate(date, "yyyy/MM/dd");
if (!colliWhereCond.contains(x.gestione + " " + dateString + " " + x.numero)) { if (!colliWhereCond.contains(x.gestione + " " + dateString + " " + x.numero)) {
colliWhereCond.add(x.gestione + " " + dateString + " " + x.numero); String gestione = x.gestione.equalsIgnoreCase("P") ? "L" : x.gestione;
colliWhereCond.add(gestione + " " + dateString + " " + x.numero);
} }
} catch (Exception ex){ } catch (Exception ex){
UtilityLogger.errorMe(ex); UtilityLogger.errorMe(ex);
@ -49,14 +50,14 @@ public class OrdineAccettazioneInevasoRESTConsumerService {
String sql = "select distinct mtb_colt.* " + String sql = "SELECT DISTINCT mtb_colt.* " +
"from mtb_colt, mtb_colr " + "FROM mtb_colt, mtb_colr " +
"where mtb_colt.gestione = mtb_colr.gestione and " + "WHERE mtb_colt.gestione = mtb_colr.gestione AND " +
"mtb_colt.ser_collo = mtb_colr.ser_collo and " + "mtb_colt.ser_collo = mtb_colr.ser_collo AND " +
"mtb_colt.data_collo = mtb_colr.data_collo and " + "mtb_colt.data_collo = mtb_colr.data_collo AND " +
"mtb_colt.num_collo = mtb_colr.num_collo AND " + "mtb_colt.num_collo = mtb_colr.num_collo AND " +
"mtb_colt.gestione + ' ' + convert(varchar(15), mtb_colr.data_ord, 111) + ' ' + convert(varchar, mtb_colr.num_ord) IN (" + colliINCondition + "mtb_colt.gestione + ' ' + CONVERT(VARCHAR(15), mtb_colr.data_ord, 111) + ' ' + CONVERT(VARCHAR, mtb_colr.num_ord) IN (" + colliINCondition +
") and mtb_colt.data_doc is null "; ") AND mtb_colt.data_doc IS NULL ";
Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {}.getType(); Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {}.getType();

16
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java
View File

@ -611,7 +611,7 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl
try{ try{
ReportManager.getRightReportNameByMtbColt(currentMtbColt, reportName -> { ReportManager.getRightReportNameByGestione(GestioneEnum.ACQUISTO, reportName -> {
PrinterRESTConsumer.printCollo( PrinterRESTConsumer.printCollo(
value.get(0), value.get(0),
@ -796,16 +796,20 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl
final ProgressDialog progress = ProgressDialog.show(mActivity, mActivity.getText(R.string.waiting), final ProgressDialog progress = ProgressDialog.show(mActivity, mActivity.getText(R.string.waiting),
mActivity.getText(R.string.loading) + " ...", true); mActivity.getText(R.string.loading) + " ...", true);
String gestioneRif = item.getGestioneOrdEnum() == GestioneEnum.PRODUZIONE ? "L" : item.getGestioneOrd();
final MtbColr mtbColr = new MtbColr() final MtbColr mtbColr = new MtbColr()
.setCodMart(item.mtbAart.getCodMart()) .setCodMart(item.getMtbAart().getCodMart())
.setPartitaMag(quantityDTO.batchLot.get()) .setPartitaMag(quantityDTO.batchLot.get())
.setDataScadPartita(quantityDTO.expireDate) .setDataScadPartita(quantityDTO.expireDate)
.setQtaCol(quantityDTO.qtaTot.getBigDecimal()) .setQtaCol(quantityDTO.qtaTot.getBigDecimal())
.setDescrizione(item.descrizioneEstesa) .setDescrizione(item.getDescrizioneEstesa())
.setNumOrd(item.numOrd) .setNumOrd(item.getNumOrd())
.setDataOrd(item.getDataOrd()) .setDataOrd(item.getDataOrd())
.setCodJcom(item.codJcom) .setGestioneRif(gestioneRif)
.setRigaOrd(item.rigaOrd); .setCodJcom(item.getCodJcom())
.setRigaOrd(item.getRigaOrd());
mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);

2
app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java
View File

@ -107,7 +107,7 @@ public class ContenutoBancaleViewModel implements IRecyclerItemClicked<MtbColr>
if(value.size() > 0) { if(value.size() > 0) {
try { try {
ReportManager.getRightReportNameByMtbColt(mtbColt.get(), reportName -> { ReportManager.getRightReportNameByGestione(mtbColt.get().getGestioneEnum(), reportName -> {
PrinterRESTConsumer.printCollo(value.get(0), PrinterRESTConsumer.printCollo(value.get(0),
mtbColt.get(), mtbColt.get(),

2
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
View File

@ -686,7 +686,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
if (value.size() > 0) { if (value.size() > 0) {
try { try {
ReportManager.getRightReportNameByMtbColt(mtbColt.get(), reportName -> { ReportManager.getRightReportNameByGestione(mtbColt.get().getGestioneEnum(), reportName -> {
PrinterRESTConsumer.printCollo(value.get(0), PrinterRESTConsumer.printCollo(value.get(0),
mtbColt.get(), mtbColt.get(),

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

@ -913,7 +913,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
} }
private void singlePrint(MtbColt mtbColtToPrint, String printerName, Runnable onComplete, RunnableArgs<Exception> onAbort) { private void singlePrint(MtbColt mtbColtToPrint, String printerName, Runnable onComplete, RunnableArgs<Exception> onAbort) {
ReportManager.getRightReportNameByMtbColt(mtbColtToPrint, reportName -> { ReportManager.getRightReportNameByGestione(mtbColtToPrint.getGestioneEnum(), reportName -> {
PrinterRESTConsumer.printCollo( PrinterRESTConsumer.printCollo(
printerName, printerName,

8
app/src/main/res/layout/fragment_main_versamento_merce.xml
View File

@ -50,7 +50,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{viewmodel.mtbColt.get().getDataColloHumanLong()}" android:text="@{viewmodel.mtbColt.getDataColloHumanLong()}"
tools:text="22 ottobre 2018" tools:text="22 ottobre 2018"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textSize="16sp" android:textSize="16sp"
@ -72,7 +72,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{viewmodel.mtbColt.get().getPreparatoDa() != null ? viewmodel.mtbColt.get().getPreparatoDa() : `N/D`}" android:text="@{viewmodel.mtbColt.getPreparatoDa() != null ? viewmodel.mtbColt.getPreparatoDa() : `N/D`}"
tools:text="Vito Falagario" tools:text="Vito Falagario"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textSize="14sp" android:textSize="14sp"
@ -95,7 +95,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{viewmodel.mtbColt.get().getPosizione() != null ? viewmodel.mtbColt.get().getPosizione() : `N/D`}" android:text="@{viewmodel.mtbColt.getPosizione() != null ? viewmodel.mtbColt.getPosizione() : `N/D`}"
tools:text="A00F00C00L00" tools:text="A00F00C00L00"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textSize="14sp" android:textSize="14sp"
@ -117,7 +117,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{viewmodel.mtbColt.get().getCodMdep()}" android:text="@{viewmodel.mtbColt.getCodMdep()}"
tools:text="10" tools:text="10"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textSize="14sp" android:textSize="14sp"

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

@ -60,16 +60,16 @@
<item quantity="other">articoli</item> <item quantity="other">articoli</item>
</plurals> </plurals>
<plurals name="available_articles"> <plurals name="available_articles">
<item quantity="one">articolo disponibile</item> <item quantity="one">articolo ordinato</item>
<item quantity="other">articoli disponibili</item> <item quantity="other">articoli ordinati</item>
</plurals> </plurals>
<plurals name="already_registered_lu"> <plurals name="already_registered_lu">
<item quantity="one"><![CDATA[bancale già registrato]]></item> <item quantity="one"><![CDATA[UL già registrato]]></item>
<item quantity="other"><![CDATA[bancali già registrati]]></item> <item quantity="other"><![CDATA[UL già registrate]]></item>
</plurals> </plurals>
<plurals name="loaded_orders_message"> <plurals name="loaded_orders_message">
<item quantity="one"><![CDATA[&#200; stato caricato <b>%d</b> ordine]]></item> <item quantity="one"><![CDATA[&#200; stato selezionato <b>%d</b> ordine]]></item>
<item quantity="other"><![CDATA[Sono stati caricati <b>%d</b> ordini]]></item> <item quantity="other"><![CDATA[Sono stati selezionati <b>%d</b> ordini]]></item>
</plurals> </plurals>
<string name="action_close_ul">Chiudi UL</string> <string name="action_close_ul">Chiudi UL</string>
<string name="already_read_articles">Articoli presenti</string> <string name="already_read_articles">Articoli presenti</string>

8
app/src/main/res/values/strings.xml
View File

@ -62,16 +62,16 @@
<item quantity="other">items</item> <item quantity="other">items</item>
</plurals> </plurals>
<plurals name="available_articles"> <plurals name="available_articles">
<item quantity="one">available item</item> <item quantity="one">ordered item</item>
<item quantity="other">available items</item> <item quantity="other">ordered items</item>
</plurals> </plurals>
<plurals name="already_registered_lu"> <plurals name="already_registered_lu">
<item quantity="one">already registered LU</item> <item quantity="one">already registered LU</item>
<item quantity="other">already registered LUs</item> <item quantity="other">already registered LUs</item>
</plurals> </plurals>
<plurals name="loaded_orders_message"> <plurals name="loaded_orders_message">
<item quantity="one"><![CDATA[<b>%d</b> order loaded]]></item> <item quantity="one"><![CDATA[<b>%d</b> order selected]]></item>
<item quantity="other"><![CDATA[<b>%d</b> orders loaded]]></item> <item quantity="other"><![CDATA[<b>%d</b> orders selected]]></item>
</plurals> </plurals>
<string name="action_close_ul">Close LU</string> <string name="action_close_ul">Close LU</string>
<string name="already_read_articles">Submitted items</string> <string name="already_read_articles">Submitted items</string>