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

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

Browse Source
This commit is contained in:
Mina Ruggiero
2024-03-25 14:41:21 +01:00
parent d1638842e7 2ed0767515
commit ee37de67a2
2 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportAnagListiniService.java
View File

@@ -87,7 +87,7 @@ public class ImportAnagListiniService {
" flag_agg_anag," +
" flag_agg_peso," +
" flag_agg_qta_min_ord, " +
" flag_agg_qta_cnf, "+
" flag_agg_qta_cnf, " +
" flag_qta_cnf_fissa, " +
" flag_rap_conv_variabile, " +
" unt_mis2, " +
@@ -472,7 +472,7 @@ public class ImportAnagListiniService {
}
//for (EntityBase entityBase: entityList) {
while (entityList.size() > 0){
while (entityList.size() > 0) {
OperationType operationType = entityList.get(0).getOperation();
if ((entityList.get(0) instanceof MtbLisaData)) {
if ("L".equalsIgnoreCase(tipoImportListino)) {
@@ -562,13 +562,13 @@ public class ImportAnagListiniService {
if (confrontaPrezzi && ((MtbLisaData) entityList.get(0)).getDataFine() == null) {
String sql =
"SELECT Cast(case when count(*)>0 THEN 0 ELSE 1 END as bit) " +
" FROM dbo.getListinoAcquisto( "
" FROM dbo.getListinoAcquisto( "
+ UtilityDB.valueDateToString(((MtbLisaData) entityList.get(0)).getDataIniz(), CommonConstants.DATE_FORMAT_YMD) + " , "
+ UtilityDB.valueToString(((MtbLisaData) entityList.get(0)).getCodAlis()) + " , "
+ UtilityDB.valueToString(((MtbLisaData) entityList.get(0)).getCodArtFor()) + " , "
+ UtilityDB.valueToString(((MtbLisaData) entityList.get(0)).getCodMart()) + " , "
+ "'N', null ) lisa " +
" WHERE prz_acq = " + UtilityDB.valueToString(((MtbLisaData) entityList.get(0)).getPrzAcq()) + " AND " +
" WHERE prz_acq = " + UtilityDB.valueToString(((MtbLisaData) entityList.get(0)).getPrzAcq()) + " AND " +
"perc_1 = " + UtilityDB.valueToString(((MtbLisaData) entityList.get(0)).getPerc1()) + " AND " +
"perc_2 = " + UtilityDB.valueToString(((MtbLisaData) entityList.get(0)).getPerc2()) + " AND " +
"perc_3 = " + UtilityDB.valueToString(((MtbLisaData) entityList.get(0)).getPerc3()) + " AND " +
@@ -586,7 +586,7 @@ public class ImportAnagListiniService {
} else if ((entityList.get(0) instanceof MtbLisvData) || (entityList.get(0) instanceof MtbLisvDataSpese)) {
VtbListData vtbListData = getVtbListData( conn, entityList.get(0), entityList);
VtbListData vtbListData = getVtbListData(conn, entityList.get(0), entityList);
entitySave.add(vtbListData);
} else if ((entityList.get(0) instanceof MtbLisa)) {
codAlis = ((MtbLisa) entityList.get(0)).getCodAlis();
@@ -605,21 +605,21 @@ public class ImportAnagListiniService {
entityList.remove(entityList.get(0));
} else if ((entityList.get(0) instanceof AtbGriglieArt)) {
if ( Stream.of(entitySave).filter(x->x instanceof AtbGriglie).findFirst().isEmpty() ) {
if (Stream.of(entitySave).filter(x -> x instanceof AtbGriglie).findFirst().isEmpty()) {
List<AtbGriglie> atbGriglie = getAtbGriglie(entityList);
if (atbGriglie != null && atbGriglie.size() > 0) {
entitySave.addAll(atbGriglie);
}
}
} else if ((entityList.get(0) instanceof VtbGrigliaArt)) {
if ( Stream.of(entitySave).filter(x->x instanceof VtbGriglia).findFirst().isEmpty() ) {
if (Stream.of(entitySave).filter(x -> x instanceof VtbGriglia).findFirst().isEmpty()) {
List<VtbGriglia> vtbGriglia = getVtbGriglia(entityList);
if (vtbGriglia != null && vtbGriglia.size() > 0) {
entitySave.addAll(vtbGriglia);
}
}
} else if (entityList.get(0) instanceof VtbCompensiTdr) {
if ( Stream.of(entitySave).filter(x->x instanceof VtbCompensiTdt).findFirst().isEmpty() ) {
if (Stream.of(entitySave).filter(x -> x instanceof VtbCompensiTdt).findFirst().isEmpty()) {
List<VtbCompensiTdt> vtbCompensiTdt = getVtbCompensiTdt(entityList);
if (vtbCompensiTdt != null && vtbCompensiTdt.size() > 0) {
entitySave.addAll(vtbCompensiTdt);
@@ -801,15 +801,41 @@ public class ImportAnagListiniService {
}
private VtbListData getVtbListData(Connection conn, EntityBase entityBase, List<EntityBase> entityList) throws Exception {
VtbListData vtbListData =
new VtbListData()
.setCodVlis(((MtbLisvData) entityBase).getCodVlis())
.setDataIniz(((MtbLisvData) entityBase).getDataIniz())
.setDataFine(((MtbLisvData) entityBase).getDataFine())
.setCodPromo(((MtbLisvData) entityBase).getCodPromo())
.setVersione(((MtbLisvData) entityBase).getVersione())
.setNote(((MtbLisvData) entityBase).getNoteLisv())
.setDescrPromo(((MtbLisvData) entityBase).getDescrPromo());
VtbListData vtbListData;
if (entityBase instanceof MtbLisvData) {
vtbListData =
new VtbListData()
.setCodVlis(((MtbLisvData) entityBase).getCodVlis())
.setDataIniz(((MtbLisvData) entityBase).getDataIniz())
.setDataFine(((MtbLisvData) entityBase).getDataFine())
.setCodPromo(((MtbLisvData) entityBase).getCodPromo())
.setVersione(((MtbLisvData) entityBase).getVersione())
.setNote(((MtbLisvData) entityBase).getNoteLisv())
.setDescrPromo(((MtbLisvData) entityBase).getDescrPromo());
String queryLisvRif =
"SELECT cod_vlis, " +
UtilityDB.valueDateToString(((MtbLisvData) entityBase).getDataIniz(), CommonConstants.DATE_FORMAT_YMD) + " as data_iniz, " +
UtilityDB.valueDateToString(((MtbLisvData) entityBase).getDataFine(), CommonConstants.DATE_FORMAT_YMD) + " as data_fine, " +
"Cast(" + UtilityDB.valueToString(((MtbLisvData) entityBase).getCodPromo()) + " as varchar) as cod_promo, " +
"Cast(" + UtilityDB.valueToString(((MtbLisvData) entityBase).getNote()) + " as varchar) as note "
+ "FROM vtb_list "
+ "WHERE cod_vlis_rif = " + UtilityDB.valueToString(((MtbLisvData) entityBase).getCodVlis()) + " AND "
+ "flag_attivo = 'S'";
if (!UtilityString.isNullOrEmpty(((MtbLisvData) entityBase).getElencoLisvRif())) {
queryLisvRif += " AND vtb_list.cod_vlis in (" + ((MtbLisvData) entityBase).getElencoLisvRif() + ")";
}
List<VtbListData> listVtbLisvData = new ResultSetMapper()
.mapQuerySetToList(conn, queryLisvRif, VtbListData.class, OperationType.INSERT_OR_UPDATE);
vtbListData.setVtbListData(listVtbLisvData);
} else {
vtbListData = new VtbListData()
.setCodVlis(((MtbLisvDataSpese) entityBase).getCodVlis())
.setDataIniz(((MtbLisvDataSpese) entityBase).getDataIniz())
.setVersione(((MtbLisvDataSpese) entityBase).getVersione());
}
OperationType operationLisv = entityBase.getOperation();
if (operationLisv == null) {
@@ -819,23 +845,6 @@ public class ImportAnagListiniService {
}
vtbListData.setOperation(operationLisv);
String queryLisvRif =
"SELECT cod_vlis, " +
UtilityDB.valueDateToString(((MtbLisvData) entityBase).getDataIniz(), CommonConstants.DATE_FORMAT_YMD) + " as data_iniz, " +
UtilityDB.valueDateToString(((MtbLisvData) entityBase).getDataFine(), CommonConstants.DATE_FORMAT_YMD) + " as data_fine, " +
"Cast(" + UtilityDB.valueToString(((MtbLisvData) entityBase).getCodPromo()) + " as varchar) as cod_promo, " +
"Cast(" + UtilityDB.valueToString(((MtbLisvData) entityBase).getNote()) + " as varchar) as note "
+ "FROM vtb_list "
+ "WHERE cod_vlis_rif = " + UtilityDB.valueToString(((MtbLisvData) entityBase).getCodVlis()) + " AND "
+ "flag_attivo = 'S'";
if (!UtilityString.isNullOrEmpty(((MtbLisvData) entityBase).getElencoLisvRif())) {
queryLisvRif += " AND vtb_list.cod_vlis in (" + ((MtbLisvData) entityBase).getElencoLisvRif() + ")";
}
List<VtbListData> listVtbLisvData = new ResultSetMapper()
.mapQuerySetToList(conn, queryLisvRif, VtbListData.class, OperationType.INSERT_OR_UPDATE);
vtbListData.setVtbListData(listVtbLisvData);
if (entityBase instanceof MtbLisvData) {
List<MtbLisvData> mtbLisvData =

2
ems-engine/src/main/java/it/integry/ems/product/service/ListiniVenditaServices.java
View File

@@ -623,7 +623,7 @@ public class ListiniVenditaServices {
mtbLisvDataSpese.setOperation(OperationType.INSERT);
}
entitiesToSave.addAll(mtbLisvDataSpeseList);
vtbListData.setMtbLisvDataSpese(mtbLisvDataSpeseList);
}
return importAnagListiniService.importAnagListinoAcq(entitiesToSave, "V", null, null);