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:
Fabio Narracci
2024-09-12 12:20:54 +02:00
parent b1f28f9462 3e14bafe61
commit 40557913ba
7 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240806101405.java
View File

@@ -58,8 +58,8 @@ public class Migration_20240806101405 extends BaseMigration implements Migration
" ELSE 0 END AS BIT) AS ricorsione,\n" +
" jtb_dist_mate.perc_sfrido,\n" +
" jtb_dist_mate.num_fase, \n" +
" jtb_dist_mate.flag_pri, \n" +
" jtb_dist_mate.note\n" +
" Convert(varchar(1), jtb_dist_mate.flag_pri) as flag_pri, \n" +
" convert(varchar(1024), jtb_dist_mate.note ) as note \n" +
" FROM jtb_dist_mate\n" +
" INNER JOIN distinta ON jtb_dist_mate.cod_prod = distinta.cod_mart\n" +
" INNER JOIN jtb_cicl ON jtb_dist_mate.cod_prod = jtb_cicl.cod_mart\n" +

4
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240806192343.java
View File

@@ -60,8 +60,8 @@ public class Migration_20240806192343 extends BaseMigration implements Migration
" ELSE 0 END AS BIT) AS ricorsione,\n" +
" jtb_dist_mate.perc_sfrido,\n" +
" jtb_dist_mate.num_fase, \n" +
" jtb_dist_mate.flag_pri, \n" +
" jtb_dist_mate.note,\n" +
" convert(varchar(1), jtb_dist_mate.flag_pri) as flag_pri, \n" +
" convert(varchar(1024), jtb_dist_mate.note) as note,\n" +
" cast(0 as bit) as is_root,\n" +
" cast(IIF(jtb_dist_mate.flag_pri = 's',0,1) as bit) as is_foglia\n" +
" FROM jtb_dist_mate\n" +

4
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240807132811.java
View File

@@ -60,8 +60,8 @@ public class Migration_20240807132811 extends BaseMigration implements Migration
" ELSE 0 END AS BIT) AS ricorsione,\n" +
" jtb_dist_mate.perc_sfrido,\n" +
" jtb_dist_mate.num_fase, \n" +
" jtb_dist_mate.flag_pri, \n" +
" jtb_dist_mate.note,\n" +
" convert(varchar(1), jtb_dist_mate.flag_pri) as flag_pri, \n" +
" convert(varchar(1024), jtb_dist_mate.note) as note,\n" +
" cast(0 as bit) as is_root,\n" +
" cast(IIF(jtb_dist_mate.flag_pri = 's',0,1) as bit) as is_foglia\n" +
" FROM jtb_dist_mate\n" +

4
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240807142956.java
View File

@@ -58,8 +58,8 @@ public class Migration_20240807142956 extends BaseMigration implements Migration
" ELSE 0 END AS BIT) AS ricorsione,\n" +
" jtb_dist_mate.perc_sfrido,\n" +
" jtb_dist_mate.num_fase, \n" +
" jtb_dist_mate.flag_pri, \n" +
" jtb_dist_mate.note,\n" +
" convert(varchar(1), jtb_dist_mate.flag_pri) as flag_pri, \n" +
" convert(varchar(1024), jtb_dist_mate.note) as note,\n" +
" cast(0 as bit) as is_root,\n" +
" cast(IIF(jtb_dist_mate.flag_pri = 's',0,1) as bit) as is_foglia\n" +
" FROM jtb_dist_mate\n" +

4
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240807180842.java
View File

@@ -58,8 +58,8 @@ public class Migration_20240807180842 extends BaseMigration implements Migration
" ELSE 0 END AS BIT) AS ricorsione,\n" +
" jtb_dist_mate.perc_sfrido,\n" +
" jtb_dist_mate.num_fase, \n" +
" jtb_dist_mate.flag_pri, \n" +
" jtb_dist_mate.note,\n" +
" convert(varchar(1), jtb_dist_mate.flag_pri) as flag_pri, \n" +
" convert(varchar(1024), jtb_dist_mate.note) as note,\n" +
" cast(0 as bit) as is_root,\n" +
" cast(IIF(jtb_dist_mate.flag_pri = 's',0,1) as bit) as is_foglia\n" +
" FROM jtb_dist_mate\n" +

6
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240809145906.java
View File

@@ -57,14 +57,14 @@ public class Migration_20240809145906 extends BaseMigration implements Migration
" ELSE 0 END AS BIT) AS ricorsione,\n" +
" jtb_dist_mate.perc_sfrido,\n" +
" jtb_dist_mate.num_fase, \n" +
" jtb_dist_mate.flag_pri, \n" +
" jtb_dist_mate.note,\n" +
" convert(varchar(1), jtb_dist_mate.flag_pri) as flag_pri, \n" +
" convert(varchar(1024), jtb_dist_mate.note) as note,\n" +
" cast(0 as bit) as is_root,\n" +
" cast(IIF(jtb_dist_mate.flag_pri = 's',0,1) as bit) as is_foglia\n" +
" FROM jtb_dist_mate\n" +
" INNER JOIN distinta ON jtb_dist_mate.cod_prod = distinta.cod_mart\n" +
" INNER JOIN jtb_cicl ON jtb_dist_mate.cod_prod = jtb_cicl.cod_mart\n" +
" INNER JOIN mtb_aart ON mtb_aart.cod_mart = jtb_dist_mate.cod_mart \n" +
" INNER JOIN mtb_aart ON mtb_aart.cod_mart = jtb_dist_mate.cod_mart\n" +
" WHERE distinta.ricorsione = 0 and (distinta.is_root = 1 or distinta.flag_pri = 'S' or @explodeSemilavorati = 1))\n" +
"\n" +
" SELECT cod_prod,\n" +

6
ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneBollaService.java
View File

@@ -111,8 +111,10 @@ public class WMSAccettazioneBollaService {
// " Wdtb_docr.partita_mag,\n" +
" SUM(Wdtb_docr.qta_doc * Wdtb_docr.rap_conv) AS qta_doc,\n" +
" Wdtb_docr.cod_art_for\n" +
" FROM Wdtb_docr\n" +
" WHERE wdtb_docr.cod_art_for is not null\n" +
" FROM Wdtb_docr left outer join mtb_aart on Wdtb_docr.cod_mart = mtb_aart.cod_mart \n" +
" left outer join mtb_grup on mtb_aart.cod_mgrp = mtb_grup.cod_mgrp \n" +
" WHERE wdtb_docr.cod_art_for is not null AND \n" +
" ( mtb_grup.tipo_mgrp is null or mtb_grup.tipo_mgrp <> 'FTT') \n" +
" group by Wdtb_docr.num_doc,\n" +
" Wdtb_docr.data_doc,\n" +
" Wdtb_docr.ser_doc,\n" +