Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Finish Hotfix-51

Browse Source
This commit is contained in:
Mina Ruggiero
2024-03-04 10:59:51 +01:00
parent a2f169101b a4b297dc9d
commit a26a2ee44f
1 changed files with 46 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/GiacenzaService.java
View File

@@ -260,8 +260,8 @@ public class GiacenzaService {
if (mtbInvenrs == null || mtbInvenrs.size() == 0 ) if (mtbInvenrs == null || mtbInvenrs.size() == 0 )
continue; continue;
List<CarelliGiacenzaProg> giacDaInv = Stream.of(mtbInvenrs) List<CarelliGiacenzaProg> giacDaInv = new ArrayList<>();
.map(x -> { for (MtbInvenr x: mtbInvenrs) {
CarelliGiacenzaProg carelliGiacenzaProg = new CarelliGiacenzaProg() CarelliGiacenzaProg carelliGiacenzaProg = new CarelliGiacenzaProg()
.setCodMdep(codMdep) .setCodMdep(codMdep)
.setCodMart(x.getCodMart()) .setCodMart(x.getCodMart())
@@ -278,8 +278,9 @@ public class GiacenzaService {
carelliGiacenzaProg.setOperation(OperationType.INSERT); carelliGiacenzaProg.setOperation(OperationType.INSERT);
articoliSalvati.add(x.getCodMart()); articoliSalvati.add(x.getCodMart());
} }
return carelliGiacenzaProg;
}).toList(); giacDaInv.add(carelliGiacenzaProg);
}
entityBases.addAll(giacDaInv); entityBases.addAll(giacDaInv);
@@ -297,33 +298,36 @@ public class GiacenzaService {
sql = sql =
Query.format( Query.format(
"SELECT mtb_aart.cod_mart " + "SELECT art.cod_mart_mov as cod_mart " +
" FROM mtb_aart " + " FROM mtb_aart " +
" INNER JOIN (" + queryArt + ") art on mtb_aart.cod_mart = art.cod_mart\n" +
"WHERE exists(select * from mtb_sart where mtb_aart.cod_marT = mtb_sart.cod_mart and mtb_sart.cod_mdep = %s and \n" + "WHERE exists(select * from mtb_sart where mtb_aart.cod_marT = mtb_sart.cod_mart and mtb_sart.cod_mdep = %s and \n" +
"(qta_iniz <> 0 or qta_car <> 0 or qta_scar <> 0 ))", codMdep); "(qta_iniz <> 0 or qta_car <> 0 or qta_scar <> 0 ))", codMdep);
sql = UtilityDB.addwhereCond(sql, whereCondFiltro, true); sql = UtilityDB.addwhereCond(sql, whereCondFiltro, true);
List<String> datiArt = UtilityDB.executeSimpleQueryOnlyFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql); List<String> datiArt = UtilityDB.executeSimpleQueryOnlyFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
giacDaInv = datiArt = Stream.of(datiArt).filterNot(x -> elencoArt.contains(x)).toList();
Stream.of(datiArt)
.filterNot(x-> elencoArt.contains(x)) giacDaInv = new ArrayList<>();
.map(x -> { for(String codMart: datiArt) {
CarelliGiacenzaProg carelliGiacenzaProg = new CarelliGiacenzaProg() CarelliGiacenzaProg carelliGiacenzaProg = new CarelliGiacenzaProg()
.setCodMdep(codMdep) .setCodMdep(codMdep)
.setCodMart(x) .setCodMart(codMart)
.setQtaCar(BigDecimal.ZERO) .setQtaCar(BigDecimal.ZERO)
.setQtaScar(BigDecimal.ZERO) .setQtaScar(BigDecimal.ZERO)
.setQtaIniz(BigDecimal.ZERO)
.setDataReg(dataInv) .setDataReg(dataInv)
.setDataIns(dataInv) .setDataIns(dataInv)
.setTipoCar("I") .setTipoCar("I")
.setIdInventario(idInventario); .setIdInventario(idInventario);
if (articoliSalvati.contains(x)) if (articoliSalvati.contains(codMart))
carelliGiacenzaProg.setOperation(OperationType.UPDATE); carelliGiacenzaProg.setOperation(OperationType.UPDATE);
else { else {
carelliGiacenzaProg.setOperation(OperationType.INSERT); carelliGiacenzaProg.setOperation(OperationType.INSERT);
articoliSalvati.add(x); articoliSalvati.add(codMart);
} }
return carelliGiacenzaProg; giacDaInv.add(carelliGiacenzaProg);
}).toList(); }
entityBases.addAll(giacDaInv); entityBases.addAll(giacDaInv);
} }