In accettazione aggiunta possibilità di far sparire le righe quando si evadono completamente gli ordini

This commit is contained in:
Marco Elefante 2024-02-15 10:14:29 +01:00
parent 9aa38b6fca
commit 7049552f16
4 changed files with 47 additions and 0 deletions

View File

@ -72,6 +72,7 @@ public class DBSettingsModel {
private boolean flagAllowULRecoverAccettazioneBolla = true; private boolean flagAllowULRecoverAccettazioneBolla = true;
private boolean flagOverflowQuantityWarning = false; private boolean flagOverflowQuantityWarning = false;
private String viewPosizioni; private String viewPosizioni;
private boolean flagDeleteRowOnClose = false;
public boolean isFlagSpedizioneEnableFakeGiacenza() { public boolean isFlagSpedizioneEnableFakeGiacenza() {
return flagSpedizioneEnableFakeGiacenza; return flagSpedizioneEnableFakeGiacenza;
@ -586,4 +587,13 @@ public class DBSettingsModel {
this.viewPosizioni = viewPosizioni; this.viewPosizioni = viewPosizioni;
return this; return this;
} }
public boolean isFlagDeleteRowOnClose() {
return flagDeleteRowOnClose;
}
public DBSettingsModel setFlagDeleteRowOnClose(boolean flagDeleteRowOnClose) {
this.flagDeleteRowOnClose = flagDeleteRowOnClose;
return this;
}
} }

View File

@ -242,6 +242,11 @@ public class SettingsManager {
.setSection("ACCETTAZIONE") .setSection("ACCETTAZIONE")
.setKeySection("FLAG_AUTO_OPEN_NEW_UL") .setKeySection("FLAG_AUTO_OPEN_NEW_UL")
.setSetter(dbSettingsModelIstance::setFlagCanAutoOpenNewULAccettazione)); .setSetter(dbSettingsModelIstance::setFlagCanAutoOpenNewULAccettazione));
stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
.setGestName("PICKING")
.setSection("ACCETTAZIONE")
.setKeySection("FLAG_DELETE_ROW_ON_CLOSE")
.setSetter(dbSettingsModelIstance::setFlagDeleteRowOnClose));
stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class) stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
.setGestName("PICKING") .setGestName("PICKING")
.setSection("SPEDIZIONE") .setSection("SPEDIZIONE")

View File

@ -929,6 +929,9 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
noLUPresent.set(true); noLUPresent.set(true);
this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null); this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null);
this.refreshList();
if (this.mShouldCloseActivity) super.onBackPressed(); if (this.mShouldCloseActivity) super.onBackPressed();
}); });
} }

View File

@ -782,11 +782,40 @@ public class AccettazioneOrdiniPickingViewModel {
} }
private void postCloseOperations() { private void postCloseOperations() {
this.calculateQtaDaEvadere();
this.mCurrentMtbColt = null; this.mCurrentMtbColt = null;
this.sendLUClosed(); this.sendLUClosed();
this.sendOnLoadingEnded(); this.sendOnLoadingEnded();
} }
private void calculateQtaDaEvadere(){
if (SettingsManager.iDB().isFlagDeleteRowOnClose()){
for (PickingObjectDTO pickingObjectDTO : this.mPickingList.getValue()) {
List<MtbColr> withdrawMtbColrs = pickingObjectDTO.getWithdrawMtbColrs();
BigDecimal qtaEvasa = BigDecimal.ZERO;
BigDecimal numCnf = BigDecimal.ZERO;
if (withdrawMtbColrs.size() > 0) {
qtaEvasa = Stream.of(withdrawMtbColrs)
.map(MtbColr::getQtaCol)
.reduce(BigDecimal.ZERO, BigDecimal::add);
numCnf = Stream.of(withdrawMtbColrs)
.map(MtbColr::getNumCnf)
.reduce(BigDecimal.ZERO, BigDecimal::add);
}
BigDecimal qtaDaEvadere = pickingObjectDTO.getSitArtOrdDTO().getQtaDaEvadere();
pickingObjectDTO.getSitArtOrdDTO().setQtaDaEvadere(qtaDaEvadere.subtract(qtaEvasa));
BigDecimal numCnfDaEvadere = pickingObjectDTO.getSitArtOrdDTO().getNumCnfDaEvadere();
pickingObjectDTO.getSitArtOrdDTO().setNumCnfDaEvadere(numCnfDaEvadere.subtract(numCnf));
pickingObjectDTO.setWithdrawMtbColrs(new ArrayList<>());
}
}
}
private void deleteLU(Runnable onComplete) { private void deleteLU(Runnable onComplete) {
DeleteULRequestDTO deleteULRequestDTO = new DeleteULRequestDTO() DeleteULRequestDTO deleteULRequestDTO = new DeleteULRequestDTO()
.setMtbColt(this.mCurrentMtbColt); .setMtbColt(this.mCurrentMtbColt);