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

Finish v1_6_9(70)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-07-23 13:02:34 +02:00
commit 2844e5416b
11 changed files with 134 additions and 62 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.

2
.idea/runConfigurations/app.xml generated
View File

@ -6,7 +6,7 @@
<option name="DEPLOY_AS_INSTANT" value="false" />
<option name="ARTIFACT_NAME" value="" />
<option name="PM_INSTALL_OPTIONS" value="" />
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic_ime,dynamic_vgalimenti" />
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_ime" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" />
<option name="CLEAR_LOGCAT" value="true" />

4
app/build.gradle
View File

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 69
def appVersionName = '1.6.8'
def appVersionCode = 70
def appVersionName = '1.6.9'
signingConfigs {
release {

27
app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java
View File

@ -8,6 +8,7 @@ public class FiltroOrdineDTO {
private String gestioneOrd;
private String dataOrd;
private String dataCons;
private int numOrd;
public String getGestioneOrd() {
@ -39,6 +40,32 @@ public class FiltroOrdineDTO {
return this;
}
public String getDataConsS() {
return dataCons;
}
public Date getDataConsD() throws ParseException {
try {
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
return sdf.parse(getDataConsS());
} catch (Exception ex) {
return null;
}
}
public FiltroOrdineDTO setDataCons(String dataCons) {
this.dataCons = dataCons;
return this;
}
public FiltroOrdineDTO setDataCons(Date dataCons) {
if(dataCons != null) {
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
this.dataCons = sdf.format(dataCons);
}
return this;
}
public int getNumOrd() {
return numOrd;
}

11
app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
View File

@ -2,7 +2,6 @@ package it.integry.integrywmsnative.core.model;
import androidx.databinding.ObservableArrayList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.math.BigDecimal;
@ -16,6 +15,7 @@ import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityDB;
import it.integry.integrywmsnative.core.utility.UtilityDate;
import it.integry.integrywmsnative.core.utility.UtilityLogger;
import it.integry.integrywmsnative.core.utility.UtilityString;
/**
* Created by GiuseppeS on 06/03/2018.
@ -496,11 +496,18 @@ public class MtbColt extends EntityBase {
FiltroOrdineDTO x = filtroOrdineDtos.get(i);
try {
whereCond.append(String.format("(dtb_ordt.gestione = %s AND dtb_ordt.data_ord = %s and dtb_ordt.num_ord = %s)",
whereCond.append("(");
whereCond.append(String.format("dtb_ordt.gestione = %s AND dtb_ordt.data_ord = %s and dtb_ordt.num_ord = %s",
UtilityDB.valueToString(x.getGestioneOrd()),
UtilityDB.valueToString(UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH)),
UtilityDB.valueToString(x.getNumOrd())));
if(!UtilityString.isNullOrEmpty(x.getDataConsS())) {
whereCond.append(String.format(" AND dtb_ordr.data_cons = %s",
UtilityDB.valueToString(UtilityDate.formatDate(x.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH))));
}
whereCond.append(")");
if(i < filtroOrdineDtos.size()-1) {
whereCond.append(" OR ");
}

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

@ -50,14 +50,41 @@ public class OrdineAccettazioneInevasoRESTConsumerService {
String sql = "SELECT DISTINCT mtb_colt.* " +
"FROM mtb_colt, mtb_colr " +
"WHERE mtb_colt.gestione = mtb_colr.gestione AND " +
"mtb_colt.ser_collo = mtb_colr.ser_collo AND " +
"mtb_colt.data_collo = mtb_colr.data_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 +
") AND mtb_colt.data_doc IS NULL ";
String sql = "SELECT " +
"mtb_colt_lavorazione.gestione, " +
"mtb_colt_lavorazione.data_collo, " +
"mtb_colt_lavorazione.num_collo, " +
"mtb_colt_lavorazione.ser_collo, " +
"mtb_colt_lavorazione.posizione, " +
"mtb_colt_lavorazione.preparato_da, " +
"mtb_colt_lavorazione.cod_anag, " +
"mtb_colt_lavorazione.cod_mdep " +
"FROM mtb_colr mtb_colr_lavorazione " +
"INNER JOIN mtb_colt mtb_colt_lavorazione " +
"ON mtb_colt_lavorazione.gestione = mtb_colr_lavorazione.gestione " +
" AND mtb_colt_lavorazione.ser_collo = mtb_colr_lavorazione.ser_collo " +
" AND mtb_colt_lavorazione.data_collo = mtb_colr_lavorazione.data_collo " +
" AND mtb_colt_lavorazione.num_collo = mtb_colr_lavorazione.num_collo " +
"RIGHT OUTER JOIN mtb_colr mtb_colr_accettazione " +
"ON mtb_colr_lavorazione.gestione_rif = mtb_colr_accettazione.gestione " +
" AND mtb_colr_lavorazione.ser_collo_rif = mtb_colr_accettazione.ser_collo " +
" AND mtb_colr_lavorazione.data_collo_rif = mtb_colr_accettazione.data_collo " +
" AND mtb_colr_lavorazione.num_collo_rif = mtb_colr_accettazione.num_collo " +
" AND mtb_colr_lavorazione.riga = mtb_colr_accettazione.riga " +
"WHERE " +
"mtb_colr_lavorazione.gestione = 'L' " +
"AND mtb_colr_accettazione.gestione = 'A' " +
"AND mtb_colt_lavorazione.cod_anag IS NOT NULL " +
"AND mtb_colr_accettazione.gestione + ' ' + CONVERT(VARCHAR(15), mtb_colr_accettazione.data_ord, 111) + ' ' + CONVERT(VARCHAR, mtb_colr_accettazione.num_ord) IN (" + colliINCondition +
") GROUP BY " +
"mtb_colt_lavorazione.gestione, " +
"mtb_colt_lavorazione.data_collo, " +
"mtb_colt_lavorazione.num_collo, " +
"mtb_colt_lavorazione.ser_collo, " +
"mtb_colt_lavorazione.posizione, " +
"mtb_colt_lavorazione.preparato_da, " +
"mtb_colt_lavorazione.cod_anag, " +
"mtb_colt_lavorazione.cod_mdep";
Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {}.getType();

29
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java
View File

@ -437,9 +437,9 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
if(defaultPosAccettazioneDTO != null && !UtilityString.isNullOrEmpty(defaultPosAccettazioneDTO.value)) defaultPosAccettazione = defaultPosAccettazioneDTO.value;
MtbColt mtbColtOfBarode = new MtbColt();
mtbColtOfBarode.initDefaultFields();
mtbColtOfBarode
MtbColt mtbColtOfBarcode = new MtbColt();
mtbColtOfBarcode.initDefaultFields();
mtbColtOfBarcode
.setGestione(GestioneEnum.LAVORAZIONE)
.setAnnotazioni(noteString)
.setPosizione(defaultPosAccettazione)
@ -448,11 +448,11 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
if(customNumCollo != null) {
mtbColtOfBarode.setNumCollo(customNumCollo);
mtbColtOfBarcode.setNumCollo(customNumCollo);
}
if(!UtilityString.isNullOrEmpty(customSerCollo)) {
mtbColtOfBarode.setSerCollo(customSerCollo);
mtbColtOfBarcode.setSerCollo(customSerCollo);
}
@ -461,7 +461,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
MtbColt mtbColtAccettazione = null;
if(defaultGestioneOfUL == GestioneEnum.ACQUISTO){
mtbColtAccettazione = (MtbColt) mtbColtOfBarode.clone();
mtbColtAccettazione = (MtbColt) mtbColtOfBarcode.clone();
mtbColtAccettazione.setGestione(GestioneEnum.ACQUISTO);
mtbColtAccettazione
@ -470,7 +470,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
}
MtbColt mtbColtToAddRefs = mtbColtAccettazione != null ? mtbColtAccettazione : mtbColtOfBarode;
MtbColt mtbColtToAddRefs = mtbColtAccettazione != null ? mtbColtAccettazione : mtbColtOfBarcode;
List<String> codAnags =
@ -481,6 +481,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
if(codAnags != null && codAnags.size() == 1){
mtbColtToAddRefs.setCodAnag(codAnags.get(0));
mtbColtOfBarcode.setCodAnag(codAnags.get(0));
}
List<String> rifOrds =
@ -513,7 +514,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
Runnable saveColloOfBarcode = () -> ColliMagazzinoRESTConsumer.saveCollo(mtbColtOfBarode, new ISimpleOperationCallback<MtbColt>() {
Runnable saveColloOfBarcode = () -> ColliMagazzinoRESTConsumer.saveCollo(mtbColtOfBarcode, new ISimpleOperationCallback<MtbColt>() {
@Override
public void onSuccess(MtbColt value) {
@ -666,7 +667,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
private void printCollo(ProgressDialog progress, Runnable onComplete) {
MtbColt currentMtbColt = mArticoliInColloBottomSheetViewModel.mtbColt.get();
if(currentMtbColt.getDisablePrint() != null && currentMtbColt.getDisablePrint()){
if(currentMtbColt.getDisablePrint()){
postCloseOperations(onComplete);
progress.dismiss();
return;
@ -859,7 +860,11 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
if(ean128Model.Count != null && ean128Model.Count > 0) {
//if(!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
dto.setNumCnf(ean128Model.Count);
dto.setQtaTot(new BigDecimal(ean128Model.Count));
if(!item.getMtbAart().isFlagQtaCnfFissa()) {
dto.setQtaCnf(new BigDecimal(ean128Model.Count));
}
//} else {
// dto.setQtaTot(new BigDecimal(ean128Model.Count));
//}
@ -902,6 +907,10 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
.setCodJcom(item.getCodJcom())
.setRigaOrd(item.getRigaOrd());
if(!item.getMtbAart().isFlagQtaCnfFissa()) {
mtbColr.setQtaCnf(quantityDTO.qtaCnf.getBigDecimal());
}
mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
MtbColt cloneMtbColt = (MtbColt) mArticoliInColloBottomSheetViewModel.mtbColt.get().clone();

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

@ -112,7 +112,7 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter<HistoryU
holder.binding.getRoot().setOnClickListener(v -> {
// ordine.setSelected(!ordine.isSelected());
});

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

@ -202,7 +202,8 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
FiltroOrdineDTO filtro = new FiltroOrdineDTO()
.setDataOrd(x.getDataOrdD())
.setNumOrd(x.getNumOrd())
.setGestioneOrd(x.getGestione());
.setGestioneOrd(x.getGestione())
.setDataCons(x.getDataConsD());
if(!defaultFiltroOrdine.contains(filtro)) defaultFiltroOrdine.add(filtro);
});

3
app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java
View File

@ -273,7 +273,8 @@ public class VersamentoMerceViewModel {
//Se le gestioni sono uguali faccio uno storno sulla sorgente e non lavoro con
//i riferimenti
if(sourceMtbColt.getGestioneEnum() == destMtbColt.getGestioneEnum()){
if(sourceMtbColt.getGestioneEnum() == destMtbColt.getGestioneEnum() &&
(sourceMtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || sourceMtbColt.getGestioneEnum() == GestioneEnum.VENDITA)){
destroyMtbColrReferences = true;
MtbColr stornoSourceMtbColr = (MtbColr) destNewMtbColr.get(i).clone();

72
app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml
View File

@ -109,49 +109,49 @@
</RelativeLayout>
<!--<androidx.constraintlayout.widget.ConstraintLayout-->
<!--android:id="@+id/buttons"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginTop="8dp">-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp">
<!--<androidx.constraintlayout.widget.Guideline-->
<!--android:id="@+id/center_guideline"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:orientation="vertical"-->
<!--app:layout_constraintGuide_percent="0.5"/>-->
<androidx.constraintlayout.widget.Guideline
android:id="@+id/center_guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5"/>
<!--<com.google.android.material.button.MaterialButton-->
<!--android:id="@+id/negative_button"-->
<!--android:layout_width="0dp"-->
<!--android:layout_height="wrap_content"-->
<!--style="@style/Button.PrimaryOutline"-->
<!--android:layout_marginLeft="8dp"-->
<!--android:layout_marginRight="8dp"-->
<!--app:layout_constrainedHeight="true"-->
<!--app:layout_constraintTop_toTopOf="parent"-->
<!--app:layout_constraintStart_toStartOf="parent"-->
<!--app:layout_constraintEnd_toStartOf="@id/center_guideline"-->
<!--android:text="@string/abort"/>-->
<com.google.android.material.button.MaterialButton
android:id="@+id/negative_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
style="@style/Button.PrimaryOutline"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
app:layout_constrainedHeight="true"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/center_guideline"
android:text="@string/abort"/>
<!--<com.google.android.material.button.MaterialButton-->
<!--android:id="@+id/positive_button"-->
<!--android:layout_width="0dp"-->
<!--android:layout_height="wrap_content"-->
<!--style="@style/Button.PrimaryFull"-->
<!--android:layout_marginLeft="8dp"-->
<!--android:layout_marginRight="8dp"-->
<!--app:layout_constrainedHeight="true"-->
<!--app:layout_constraintTop_toTopOf="parent"-->
<!--app:layout_constraintStart_toStartOf="@id/center_guideline"-->
<!--app:layout_constraintEnd_toEndOf="parent"-->
<!--android:text="@string/confirm"/>-->
<com.google.android.material.button.MaterialButton
android:id="@+id/positive_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
style="@style/Button.PrimaryFull"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
app:layout_constrainedHeight="true"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="@id/center_guideline"
app:layout_constraintEnd_toEndOf="parent"
android:text="@string/confirm"/>
<!--</androidx.constraintlayout.widget.ConstraintLayout>-->
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>