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

Finish v1.24.5(273)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2022-03-24 17:26:55 +01:00
commit 4cf8b6167f
4 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 272 def appVersionCode = 273
def appVersionName = '1.24.4' def appVersionName = '1.24.5'
signingConfigs { signingConfigs {
release { release {

17
app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java
View File

@ -93,7 +93,8 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
&& (!UtilityString.isNullOrEmpty(x.getPartitaMag()) && x.getPartitaMag().equalsIgnoreCase(mtbColr.getPartitaMag()))) && (!UtilityString.isNullOrEmpty(x.getPartitaMag()) && x.getPartitaMag().equalsIgnoreCase(mtbColr.getPartitaMag())))
.findFirst(); .findFirst();
if (optionalMtbPartitaMag.isPresent()) mtbColr.setMtbPartitaMag(optionalMtbPartitaMag.get()); if (optionalMtbPartitaMag.isPresent())
mtbColr.setMtbPartitaMag(optionalMtbPartitaMag.get());
} }
} }
} }
@ -182,13 +183,13 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
} }
String baseSql = "SELECT DISTINCT mtb_colt.* " + String baseSql = "SELECT DISTINCT mtb_colt.* " +
"FROM mtb_colt, " + "FROM mtb_colt " +
" mtb_colr " + " INNER JOIN mtb_colr ON " +
"WHERE mtb_colt.gestione = mtb_colr.gestione " + " 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 " + whereCondGestione + " WHERE " + whereCondGestione +
" AND mtb_colt.segno = " + UtilityDB.valueToString(segno) + " " + " AND mtb_colt.segno = " + UtilityDB.valueToString(segno) + " " +
" AND mtb_colt.data_doc IS NULL AND "; " AND mtb_colt.data_doc IS NULL AND ";

10
app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
View File

@ -78,7 +78,7 @@ public class SpedizioneViewModel {
private GestioneEnum mDefaultGestioneOfUL = null; private GestioneEnum mDefaultGestioneOfUL = null;
private int mDefaultSegnoCol = -1; private int mDefaultSegnoCol = -1;
private String mDefaultCodMdep = null; private String mDefaultCodMdep = null;
private List<FiltroOrdineDTO> mDefaultFiltroOrdine = new ArrayList<>(); private final List<FiltroOrdineDTO> mDefaultFiltroOrdine = new ArrayList<>();
private String mDefaultCodAnagOfUL = null; private String mDefaultCodAnagOfUL = null;
private String mDefaultRagSocOfUL = null; private String mDefaultRagSocOfUL = null;
private String mDefaultRifOrdOfUL = null; private String mDefaultRifOrdOfUL = null;
@ -1749,13 +1749,17 @@ public class SpedizioneViewModel {
public void recoverLU(MtbColt mtbColt) { public void recoverLU(MtbColt mtbColt) {
this.sendOnLoadingStarted();
this.mCurrentMtbColt = mtbColt; this.mCurrentMtbColt = mtbColt;
mMtbColtSessionID = this.mColliDataRecoverService.startNewSession(mtbColt, mTestateOrdini); mMtbColtSessionID = this.mColliDataRecoverService.startNewSession(mtbColt, mTestateOrdini);
this.mCurrentMtbColt.generaFiltroOrdineFromDTO(mDefaultFiltroOrdine); this.mCurrentMtbColt.generaFiltroOrdineFromDTO(mDefaultFiltroOrdine);
this.resetMatchedRows(); this.mColliMagazzinoRESTConsumer.saveCollo(this.mCurrentMtbColt, savedMtbColt -> {
this.sendLUOpened(this.mCurrentMtbColt); this.resetMatchedRows();
this.sendLUOpened(this.mCurrentMtbColt);
this.sendOnLoadingEnded();
}, this::sendError);
} }
private void postCloseOperations(List<MtbColt> mtbColtList) { private void postCloseOperations(List<MtbColt> mtbColtList) {

10
app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
View File

@ -87,6 +87,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
private int mBarcodeScannerIstanceID; private int mBarcodeScannerIstanceID;
private boolean mFirstStart = true; private boolean mFirstStart = true;
private boolean mAbort = true;
public DialogInputQuantityV2View setDialogInputQuantityV2DTO(DialogInputQuantityV2DTO mDialogInputQuantityV2DTO) { public DialogInputQuantityV2View setDialogInputQuantityV2DTO(DialogInputQuantityV2DTO mDialogInputQuantityV2DTO) {
@ -184,22 +185,25 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
public void save() { public void save() {
if (this.mViewModel.validate()) { if (this.mViewModel.validate()) {
this.mOnComplete.run(this.mViewModel.getResult(), false); this.mAbort = false;
dismiss(); dismiss();
this.mOnComplete.run(this.mViewModel.getResult(), false);
} }
} }
public void saveAndCloseLU() { public void saveAndCloseLU() {
if (this.mViewModel.validate()) { if (this.mViewModel.validate()) {
this.mOnComplete.run(this.mViewModel.getResult(), true); this.mAbort = false;
dismiss(); dismiss();
this.mOnComplete.run(this.mViewModel.getResult(), true);
} }
} }
@Override @Override
public void onDismiss(@NonNull DialogInterface dialog) { public void onDismiss(@NonNull DialogInterface dialog) {
BarcodeManager.removeCallback(mBarcodeScannerIstanceID); BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
this.mOnAbort.run(); if(mAbort) this.mOnAbort.run();
super.onDismiss(dialog); super.onDismiss(dialog);
} }