Merge tag 'Carelli_Inventari_FixCodMdep' into develop

Finish Carelli_Inventari_FixCodMdep
This commit is contained in:
2024-05-27 12:02:00 +02:00

View File

@@ -3591,7 +3591,7 @@ public class PvmService {
if (userSession.getCurrentUser().getKeyGroup() == UserGroupENUM.PUNTO_VENDITA.getText()) {
profiles.add(multiDBTransactionManager.getPrimaryDatasource().getProfile());
whereCond = Query.format("cod_mdep = %s", userSession.getDefaultDepo().getCodMdep());
whereCond = Query.format("mtb_invent.cod_mdep = %s", userSession.getDefaultDepo().getCodMdep());
} else {
profiles = Stream.of(settingsModel.getAvailableConnections())
.filter(AvailableConnectionsModel::getInternalDb)
@@ -3606,7 +3606,7 @@ public class PvmService {
whereCond += " AND filtro is not null";
if (depositi != null && !depositi.isEmpty()) {
whereCond += String.format(" AND cod_mdep IN (%s)", UtilityQuery.concatStringFieldsWithSeparator(depositi, ", "));
whereCond += String.format(" AND mtb_invent.cod_mdep IN (%s)", UtilityQuery.concatStringFieldsWithSeparator(depositi, ", "));
}
}