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

Finish v1.30.11(329)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2023-02-08 17:29:03 +01:00
commit 50acee47e9
2 changed files with 10 additions and 14 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 {
def appVersionCode = 328
def appVersionName = '1.30.10'
def appVersionCode = 329
def appVersionName = '1.30.11'
signingConfigs {
release {

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

@ -611,15 +611,9 @@ public class SpedizioneViewModel {
.findFirst()
.orElse(null);
final List<MtbColr> mtbColrs = Stream.of(pickingObjectDTO.getMtbColts())
.filter(x -> x.getPosizione().equalsIgnoreCase(mtbDepoPosizione.getPosizione()))
.flatMap(x -> Stream.of(x.getMtbColr()))
.filter(x -> x.getCodMart().equalsIgnoreCase(selectedArt.getCodMart()))
.toList();
MagazzinoAutomaticoPickItemRequestDTO itemDto = new MagazzinoAutomaticoPickItemRequestDTO(selectedArt.getCodMart())
.setQtaTot(Stream.of(mtbColrs).map(MtbColr::getQtaCol).reduce(BigDecimal.ZERO, BigDecimal::add))
.setNumCnf(Stream.of(mtbColrs).map(MtbColr::getNumCnf).reduce(BigDecimal.ZERO, BigDecimal::add))
.setQtaTot(pickingObjectDTO.getSitArtOrdDTO().getQtaOrd())
.setNumCnf(pickingObjectDTO.getSitArtOrdDTO().getNumCnfOrd())
.setUntMis(selectedArt.getUntMis());
magazzinoAutomaticoPickItemRequestDTOList.add(itemDto);
@ -1200,13 +1194,13 @@ public class SpedizioneViewModel {
}
public void createNewLU(Integer customNumCollo, String customSerCollo, Runnable onComplete) {
final List<CreateUDSRequestOrderDTO> orders = this.mTestateOrdini.stream()
final List<CreateUDSRequestOrderDTO> orders = Stream.of(this.mTestateOrdini)
.map(x -> new CreateUDSRequestOrderDTO()
.setDataCons(UtilityDate.toLocalDate(x.getDataConsD()))
.setDataOrd(UtilityDate.toLocalDate(x.getDataOrdD()))
.setGestione(x.getGestione())
.setNumOrd(x.getNumOrd()))
.collect(Collectors.toList());
.toList();
final CreateUDSRequestDTO createUDSRequestDTO = new CreateUDSRequestDTO()
.setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep())
@ -1493,7 +1487,7 @@ public class SpedizioneViewModel {
positionedMtbColts -> {
this.askPrint(shouldPrint, positionedMtbColts, () -> {
positionedMtbColts.stream()
Stream.of(positionedMtbColts)
.filter(x -> !this.mColliRegistrati.contains(x))
.forEach(x -> this.mColliRegistrati.add(x));
@ -1728,7 +1722,7 @@ public class SpedizioneViewModel {
private void postCloseOperations(List<MtbColt> mtbColtList) {
if (mTestateOrdini != null) {
for (MtbColt mtbColt : mtbColtList) {
mTestateOrdini.stream()
Stream.of(mTestateOrdini)
.filter(x -> x.getNumOrd().equals(mtbColt.getNumOrd()) && x.getDataOrdD().equals(mtbColt.getDataOrdD()) && x.getGestioneEnum() == mtbColt.getGestioneEnum())
.forEach(x -> x.setExistColloBoolean(true));
}
@ -1764,6 +1758,8 @@ public class SpedizioneViewModel {
pickingObjectDTO.setWithdrawMtbColrs(new ArrayList<>());
}
}
this.mCurrentMtbColt = null;
}
public void resetMatchedRows() {