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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Mina Ruggiero
2024-04-18 10:10:35 +02:00
parent 47c0fadb40 baf5d9151f
commit eb02131482
3 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240418095955.java Normal file
View File

@@ -0,0 +1,25 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.IntegryCustomerDB;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20240418095955 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
createSetup("IMPORT_DOCUMENTI VENDITA", "GELORENT", "COD_ANAG", null, "codice anagrafico del fornitore", false, null, false, false, false, false, false, null, false, null);
if (isCustomerDb(IntegryCustomerDB.Carelli_Format))
updateSetupValue("IMPORT_DOCUMENTI VENDITA", "GELORENT", "COD_ANAG", "F7594");
}
@Override
public void down() throws Exception {
}
}

18
ems-engine/src/main/java/it/integry/ems/document/Import/service/DocumentiImportService.java
View File

@@ -229,6 +229,7 @@ public class DocumentiImportService {
String codDtip = setup.getOrDefault("COD_DTIP", "").toUpperCase();
if (UtilityString.isNullOrEmpty(codDtip))
throw new Exception("Codice tipo documento non configurato");
String codForn = setup.getOrDefault("COD_ANAG", "").toUpperCase();
boolean isCodMart = setup.getOrDefault("ARTICOLO", "COD_MART").equalsIgnoreCase("COD_MART");
@@ -253,11 +254,18 @@ public class DocumentiImportService {
dtbDoct.setCodDtip(codDtip);
dtbDoct.setDataCons(checkDataCons(UtilityDate.dateAdd(date, 1), ricorrenze));
sql = "select vtb_dest.cod_anag, vtb_dest.cod_vdes\n" +
"from vtb_clie inner join vtb_dest on vtb_clie.cod_anag = vtb_dest.cod_anag\n" +
"where vtb_dest.cod_affiliazione = " + UtilityDB.valueToString(dest) + " AND \n" +
"vtb_dest.flag_attivo ='S' AND \n" +
"vtb_clie.flag_stato ='A'";
sql =
Query.format(
"SELECT vtb_dest.cod_anag, vtb_dest.cod_vdes\n" +
"FROM vtb_clie\n" +
" INNER JOIN vtb_dest ON vtb_clie.cod_anag = vtb_dest.cod_anag\n" +
" LEFT OUTER JOIN vtb_dest_intercode ON vtb_dest.cod_anag = vtb_dest_intercode.cod_anag AND\n" +
" vtb_dest.cod_vdes = vtb_dest_intercode.cod_vdes AND\n" +
" vtb_dest_intercode.cod_forn = %s\n" +
"WHERE vtb_clie.flag_stato = 'A'\n" +
" AND vtb_dest.flag_attivo = 'S'\n" +
" AND (vtb_dest_intercode.intercode = %s OR vtb_dest.cod_affiliazione = %s)",
codForn, dest, dest);
HashMap<String, Object> result = UtilityDB.executeSimpleQueryOnlyFirstRow(multiDBTransactionManager.getPrimaryConnection(), sql);

7
ems-engine/src/main/java/it/integry/ems/document/service/CambioTipoDocPlanService.java
View File

@@ -16,10 +16,7 @@ import it.integry.ems_model.entity.DtbDoctCambioTipoDoc;
import it.integry.ems_model.entity.DtbOrdr;
import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.Query;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityInteger;
import it.integry.ems_model.utility.UtilityString;
import it.integry.ems_model.utility.*;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Service;
@@ -131,7 +128,7 @@ public class CambioTipoDocPlanService {
doc.getKey().setAllegati(listaAllegati);
}
doc.getKey().setDataCmov(UtilityDate.getTodayWithoutTime());
entityList = entityProcessor.processEntityList(cambioTipoDocService.getListaDoc(doc.getKey()), doc.getKey().getUserName(), true, true, true);
Optional<EntityBase> first = Stream.of(entityList).filter(x -> x.getException() != null).findFirst();