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

Merge branch 'develop' into feature/MES_Smetar

Browse Source
This commit is contained in:
Anthony Santoro
2024-01-29 09:52:10 +01:00
parent c14f99fc3a 01ad4b1d12
commit b1bd3ac5ad
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ems-core/src/main/java/it/integry/ems/service/EmsServices.java
View File

@@ -44,6 +44,7 @@ import it.integry.ems_model.annotation.SqlField;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.base.EntityPropertyHolder;
import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.entity.Azienda;
import it.integry.ems_model.entity.MrlPartitaMagAttached;
import it.integry.ems_model.entity.StbFilesAttached;
import it.integry.ems_model.entity.WtbUsersInfo;
@@ -720,10 +721,13 @@ public class EmsServices {
Gson gson = new Gson();
if (arguments.containsKey("nomeAzienda")) arguments.remove("nomeAzienda");
final Azienda defaultAzienda = Azienda.getDefaultAzienda(multiDBTransactionManager.getPrimaryConnection());
if (arguments.containsKey("nomeAzienda")) arguments.remove("nomeAzienda");
arguments.put("nomeAzienda", settingsModel.getDefaultProfile());
arguments.put("partitaIva", defaultAzienda.getPartIva());
String jsonBody = gson.toJson(arguments);
StringBuilder srb = new StringBuilder();

23
ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniWebImportService.java
View File

@@ -24,10 +24,7 @@ import it.integry.ems_model.exception.EntityException;
import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.ApplicationName;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityHashMap;
import it.integry.ems_model.utility.UtilityStream;
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.beans.factory.annotation.Autowired;
@@ -723,6 +720,24 @@ public class OrdiniWebImportService {
}
if (countRow == 1) {
String sql = "select gg_cons\n" +
"from vtb_dest\n" +
"where cod_anag = " + UtilityDB.valueToString(codAnag) +
" and cod_vdes = " + UtilityDB.valueToString(codVdes);
String calcDataCons = importSetupSection.get("CALC_DATA_CONS");
String setDecorrenza = importSetupSection.get("SET_DECORRENZA");
int ggCons = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
if (dataConsRich == null && calcDataCons != null && calcDataCons.equalsIgnoreCase("S")) {
dataConsRich = UtilityDate.dateAdd(dataCons, ggCons);
}
if (dataConsRich != null && setDecorrenza != null && setDecorrenza.equalsIgnoreCase("S")){
dtbOrdt.setDataRifScad(dataConsRich);
}
dtbOrdt.setGestione("V");
dtbOrdt.setFlagAnnulla(flagAnnulla);
dtbOrdt.setEanFidelity(eanFidelity);