Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Giuseppe Scorrano 2020-05-12 11:47:32 +02:00
commit cff91c86fb

View File

@ -270,6 +270,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
.setPartitaMag(original.getPartitaMag()) .setPartitaMag(original.getPartitaMag())
.setOperation(CommonModelConsts.OPERATION.INSERT); .setOperation(CommonModelConsts.OPERATION.INSERT);
for (OrdineLavorazioneDTO ordLav : ordini) { for (OrdineLavorazioneDTO ordLav : ordini) {
if (ordLav.getQtaColVersamento().getBigDecimal().compareTo(BigDecimal.ZERO) > 0){
MtbColr ordColr = (MtbColr) mtbColrClone.clone(); MtbColr ordColr = (MtbColr) mtbColrClone.clone();
ordColr.setQtaCol(ordLav.getQtaColVersamento().getBigDecimal()); ordColr.setQtaCol(ordLav.getQtaColVersamento().getBigDecimal());
ordColr.setNumCnf(ordLav.getNumCnfVersamento().getBigDecimal()); ordColr.setNumCnf(ordLav.getNumCnfVersamento().getBigDecimal());
@ -277,6 +278,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
.setNumOrd(ordLav.getNumOrdProd()) .setNumOrd(ordLav.getNumOrdProd())
.setRigaOrd(ordLav.getRigaOrdProd()); .setRigaOrd(ordLav.getRigaOrdProd());
newMtbColt.getMtbColr().add(ordColr); newMtbColt.getMtbColr().add(ordColr);
}
} }