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

Finish v1_7_7(84)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-09-25 11:38:29 +02:00
commit e9c1371873
4 changed files with 3 additions and 40 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 = 83 def appVersionCode = 84
def appVersionName = '1.7.6' def appVersionName = '1.7.7'
signingConfigs { signingConfigs {
release { release {

2
app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java
View File

@ -57,7 +57,6 @@ public class ProdRecuperoMaterialeHelper {
"LEFT OUTER JOIN jtb_fasi ON mtb_colt.cod_jfas = jtb_fasi.cod_jfas " + "LEFT OUTER JOIN jtb_fasi ON mtb_colt.cod_jfas = jtb_fasi.cod_jfas " +
"WHERE jtb_fasi.cod_jfas IS NOT NULL " + "WHERE jtb_fasi.cod_jfas IS NOT NULL " +
"AND segno = -1 " + "AND segno = -1 " +
"AND qta_col > 0 " +
"GROUP BY jtb_fasi.cod_jfas, " + "GROUP BY jtb_fasi.cod_jfas, " +
"jtb_fasi.descrizione, " + "jtb_fasi.descrizione, " +
"mtb_colr.gestione, " + "mtb_colr.gestione, " +
@ -74,6 +73,7 @@ public class ProdRecuperoMaterialeHelper {
"mtb_aart.descrizione, " + "mtb_aart.descrizione, " +
"mtb_aart.unt_mis, " + "mtb_aart.unt_mis, " +
"mtb_colt.segno " + "mtb_colt.segno " +
"HAVING SUM(mtb_colr.qta_col) > 0 " +
"ORDER BY data_collo DESC"; "ORDER BY data_collo DESC";
Type typeOfObjectsList = new TypeToken<ArrayList<HistoryVersamentoProdUL>>() {}.getType(); Type typeOfObjectsList = new TypeToken<ArrayList<HistoryVersamentoProdUL>>() {}.getType();

37
app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java
View File

@ -72,43 +72,6 @@ public class ProdRecuperoMaterialeViewModel {
refreshAdapter(); refreshAdapter();
} }
public void openLU() {
DialogScanOrCreateLU.make(mContext, true, false, true, mtbColt -> {
if(mtbColt == null) {
((IPoppableActivity)mContext).pop();
} else if((mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(-1)){
if (!UtilityString.isNullOrEmpty(mtbColt.getPosizione()) && UtilityPosizione.isLineaProduzione(mtbColt.getPosizione())) {
if(mtbColt.getMtbColr() == null || mtbColt.getMtbColr().size() == 0) {
DialogSimpleMessageHelper.makeWarningDialog(mContext,
new SpannableString(Html.fromHtml("E' stata scansionata una UL già vuota")),
null, this::openLU).show();
} else {
setMtbColt(mtbColt);
// chooseQuantityToReturn();
}
} else {
DialogSimpleMessageHelper.makeWarningDialog(mContext,
new SpannableString(Html.fromHtml("Sono accettate solamente UL di provenienti da una linea di lavoro")),
null, this::openLU).show();
}
} else {
DialogSimpleMessageHelper.makeWarningDialog(mContext,
new SpannableString(Html.fromHtml("Sono accettate solamente UL di <b>Lavorazione</b> di <b>SCARICO</b>")),
null, this::openLU).show();
}
}).show();
}
private void chooseQuantityToReturn(MtbAart mtbAart, BigDecimal min, BigDecimal max) {
}
public void setMtbColt(MtbColt mtbColt) { public void setMtbColt(MtbColt mtbColt) {