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

Merge branch 'develop' into feature/Feature-ImportScontriniMMPOS

Browse Source
This commit is contained in:
Mina Ruggiero
2025-09-29 09:21:24 +02:00
parent eaf8e4779e 7dff05df5c
commit 7d831c59e7
7 changed files with 72 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250923113155.java
View File

@@ -13,6 +13,9 @@ public class Migration_20250923113155 extends BaseMigration implements Migration
if (!isTextiles())
return;
if (isDMS())
return;
createOrUpdateFunction("ftx_getDisponibilitaArticoli", "CREATE FUNCTION [dbo].[ftx_getDisponibilitaArticoli](@datavalidita DATETIME,\n" +
" @codmdep VARCHAR(8000),\n" +
" @annostag VARCHAR(10),\n" +

2
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250925145607.java
View File

@@ -10,6 +10,8 @@ public class Migration_20250925145607 extends BaseMigration implements Migration
if (isHistoryDB())
return;
if (isDMS())
return;
createOrUpdateFunction("f_GetCostoUltArt_depo", "CREATE FUNCTION [dbo].[f_GetCostoUltArt_depo](@dataReg datetime, @codMdep varchar(5), @codMart varchar(15))\n" +
"RETURNS numeric(20,5) AS\n" +

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

@@ -0,0 +1,23 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20250926113139 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
createSetup("w_mriassegna_costo_dlg", "LAVORAZIONE", "COSTO_DA_DISTINTA_SENZA_MDO", "N",
"Se impostato a S e l'azienda non gestisce il costo sul deposito allora dal costo totale che viene dalla funzione di DB f_explode_dist verrà sottratto il cost della manodopera, sia il costo associato al servizio di MDO della distinta, sia l'eventuale costo MDO specificato nel ciclo di produzione della distinta", false, null, false, false,
false, false, false, null, false, null);
}
@Override
public void down() throws Exception {
}
}

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

@@ -0,0 +1,41 @@
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_20250926130028 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
if (!isCustomerDb(IntegryCustomerDB.Maggio_MaggioSrl))
return;
updateSetupValue("w_mriassegna_costo_dlg", "LAVORAZIONE", "COSTO_DA_DISTINTA_SENZA_MDO", "S",
"Se impostato a S e l'azienda non gestisce il costo sul deposito allora dal costo totale che viene dalla funzione di DB f_explode_dist verrà sottratto il cost della manodopera, sia il costo associato al servizio di MDO della distinta, sia l'eventuale costo MDO specificato nel ciclo di produzione della distinta", false, null, false, false, false,
false, false, null, false, null);
executeStatement("DELETE\n" +
"FROM stb_gest_setup_depo\n" +
"WHERE gest_name = 'w_mriassegna_costo_dlg'\n" +
" AND section = 'LAVORAZIONE'\n" +
" AND key_section = 'COSTO_DA_DISTINTA_SENZA_MDO'"
);
executeStatement("DELETE\n" +
"FROM wtb_gest_setup_user\n" +
"WHERE gest_name = 'w_mriassegna_costo_dlg'\n" +
" AND section = 'LAVORAZIONE'\n" +
" AND key_section = 'COSTO_DA_DISTINTA_SENZA_MDO'"
);
}
@Override
public void down() throws Exception {
}
}

4
ems-engine/src/main/java/it/integry/core/report_javabean/model/scheda_costi/StampaSchedaCostiJavabean.java
View File

@@ -88,7 +88,7 @@ public class StampaSchedaCostiJavabean extends BaseReportJavabean implements IRe
" (1 - mtb_lisv_data.perc_sco3 / 100) * \n" +
" (1 - mtb_lisv_data.perc_sco4 / 100) * \n" +
" (1 - IsNull(vtb_clie.sconto1,0) / 100) *\n" +
" (1 - IsNull(vtb_clie.sconto2,0) / 100) ) / mtb_lisv_data.rap_conv) / mtb_aart.peso_kg AS prz_vend_kg,\n" +
" (1 - IsNull(vtb_clie.sconto2,0) / 100) ) / mtb_lisv_data.rap_conv) / NULLIF(mtb_aart.peso_kg,0) AS prz_vend_kg,\n" +
" vtb_list.descrizione AS descr_lisv\n" +
"FROM mtb_lisv_data\n" +
" INNER JOIN mtb_aart ON mtb_lisv_data.cod_mart = mtb_aart.cod_mart\n" +
@@ -118,7 +118,7 @@ public class StampaSchedaCostiJavabean extends BaseReportJavabean implements IRe
" vtb_offr.unt_mis_vend,\n" +
" vtb_offr.note,\n" +
" vtb_offr.prz_unt,\n" +
" (vtb_offr.prz_unt / vtb_offr.rap_conv) / mtb_aart.peso_kg AS prz_vend_kg,\n" +
" (vtb_offr.prz_unt / vtb_offr.rap_conv) / NULLIF(mtb_aart.peso_kg,0) AS prz_vend_kg,\n" +
" id_offerta\n" +
"FROM vtb_offr\n" +
" INNER JOIN mtb_aart ON vtb_offr.cod_mart = mtb_aart.cod_mart\n" +

1
ems-engine/src/main/java/it/integry/ems/document/dto/PrintDocumentRequestDTO.java
View File

@@ -91,7 +91,6 @@ public class PrintDocumentRequestDTO {
pairsDTOList.add(new PairsDTO("num_doc", numDoc));
pairsDTOList.add(new PairsDTO("data_doc", UtilityDate.formatDate(dataDoc, "yyyy/MM/dd")));
pairsDTOList.add(new PairsDTO("cod_dtip", codDtip));
pairsDTOList.add(new PairsDTO("cod_dtip", codDtip));
pairsDTOList.add(new PairsDTO("num_copia", Integer.toString(copy)));
return pairsDTOList;

1
ems-engine/src/main/java/it/integry/security/filter/RestLoggerBodyFilter.java
View File

@@ -127,6 +127,7 @@ public class RestLoggerBodyFilter extends AbstractRequestLoggingFilter {
!serviceName.endsWith("status") &&
!serviceName.contains("system/ok") &&
!serviceName.contains("system/login") &&
!serviceName.contains("auth/login") &&
!serviceName.contains("logs") &&
!serviceName.contains("getCurrentMachinesStatus") &&
!serviceName.contains("getOrdiniLavorazione") &&