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

Merge branch 'master' into feature/RefactoringGestioneColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Valerio Castellana
2025-05-13 18:30:37 +02:00
parent 978b42d18a 42c4048244
commit fff5faf3be
5 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build/Jenkinsfile.groovy
View File

@@ -101,6 +101,20 @@ sleep 10''', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaul
}
}
stage('Publish Branch') {
when {
expression {
return env.GIT_BRANCH != "master" && env.GIT_BRANCH != "develop"
}
}
stage('Publish on Azure') {
steps {
azureUpload fileShareName: 'storage-ci', filesPath: 'ems-engine/target/*.war*', removePrefixPath: 'ems-engine/target/', storageCredentialId: '83a86793-c1d6-4776-b20f-1ff652a57fee', storageType: 'filestorage', uploadArtifactsOnlyIfSuccessful: true, verbose: true, virtualPath: 'ems-api'
}
}
}
stage('Docker Build') {
steps {
node('server-build') {

2
ems-core/src/main/java/it/integry/ems/rules/completing/CommonRules.java
View File

@@ -902,6 +902,8 @@ public class CommonRules extends QueryRules {
String codMdep = entity.getCodMdep();
BigDecimal rapConv = entity.getRapConv();
if (entity instanceof DtbOrdr && entity.getGestione().equalsIgnoreCase("L"))
return BigDecimal.ZERO;
Date dataValidita = null;
if (entity instanceof DtbOrdr || entity instanceof WdtbOrdr) {

4
ems-core/src/main/java/it/integry/ems/rules/completing/SalesRules.java
View File

@@ -116,11 +116,11 @@ public class SalesRules extends QueryRules {
}
if (vtbListData.getCheckDataFine() != null && vtbListData.getCheckDataFine()) {
LocalDate dataFineOld = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(
Date dataFineOld = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(
conn,
Query.format("SELECT data_fine FROM vtb_list_data WHERE cod_vlis = %s AND versione = %S", vtbListData.getCodVlis(), vtbListData.getVersione()));
if (dataFineOld != null && dataFine.isAfter(dataFineOld))
if (dataFineOld != null && dataFine.isAfter(UtilityLocalDate.localDateFromDate(dataFineOld)))
throw new Exception("Impossibile posticipare la data fine di una promozione.");
}
return true;

2
ems-engine/src/main/java/it/integry/ems/contabil/service/RegCorrispettivoService.java
View File

@@ -114,7 +114,7 @@ public class RegCorrispettivoService {
" dtb_tipi.segno_qta_scar,\n" +
" SUM((CASE WHEN dtb_tipi.segno_qta_scar = 0 THEN -1 ELSE 1 END) * (dtb_doct.tot_imponib + dtb_doct.tot_iva))\n" +
" OVER (PARTITION BY dtb_doct.cod_mdep, dtb_doct.data_doc) AS tot_corr_gg,\n" +
" cast(IIF(dtb_doct.data_reg BETWEEN ISNULL(mtb_depo.data_iniz_vent, dtb_doct.data_reg) AND ISNULL(mtb_depo.data_fine_vent, CAST(GETDATE() AS DATE)), 1, 0) AS BIT) as ventilazione_attiva " +
" cast(IIF(dtb_doct.data_reg BETWEEN ISNULL(mtb_depo.data_iniz_vent, dtb_doct.data_reg) AND ISNULL(mtb_depo.data_fine_vent, CAST(GETDATE() AS DATE)) AND ctb_ireg.flag_iva_da_ventilare = 'S', 1, 0) AS BIT) as ventilazione_attiva " +
"FROM dtb_doct\n" +
" INNER JOIN dtb_tipi ON dtb_doct.cod_dtip = dtb_tipi.cod_dtip\n" +
" INNER JOIN ctb_ireg ON dtb_tipi.cod_ireg = ctb_ireg.cod_ireg\n" +

4
ems-engine/src/main/java/it/integry/ems/order/phpApp/OrderVerify.java
View File

@@ -844,7 +844,7 @@ public class OrderVerify {
flagTipoPromo) throws Exception {
String ls_query, ls_codAliq, ls_flagTipoPromo, ls_error;
double lc_qtaVend, lc_qtaOmaggio, lc_qtaOrd;
long ll_row;
int ll_row;
boolean lcl_return = true;
@@ -912,7 +912,7 @@ public class OrderVerify {
HashMap<String, Object> result = UtilityDB.executeSimpleQueryOnlyFirstRow(conn, ls_query);
Double percSco4 = (double) 0;
if (result != null){
ll_row = (Long) result.get("id");
ll_row = (int) result.get("id");
percSco4 = ((BigDecimal) result.get("perc_sco4")).doubleValue();
}
if (ll_row == 1) {