Merge remote-tracking branch 'origin/develop' into develop

ems-core/pom.xml

@@ -60,49 +60,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>cz.habarta.typescript-generator</groupId>
-                <artifactId>typescript-generator-maven-plugin</artifactId>
-                <version>3.2.1263</version>
-                <executions>
-                    <execution>
-                        <id>generate</id>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                        <phase>process-classes</phase>
-                    </execution>
-                </executions>
-                <configuration>
-                    <jsonLibrary>jackson2</jsonLibrary>
-                    <classPatterns>it.integry.ems_model.entity.*</classPatterns>
-                    <classes>
-                        <class>it.integry.ems.response.ServiceRestResponse</class>
-                    </classes>
-                    <excludeClasses>
-                        <excludeClass>it.integry.ems_model.base.EntityInterface</excludeClass>
-                    </excludeClasses>
-                    <outputFile>../ts/ems-core.module.ts</outputFile>
-                    <outputKind>module</outputKind>
-                    <outputFileType>implementationFile</outputFileType>
-                    <customTypeNaming>
-                        <naming>it.integry.ems_model.entity.AtbOfft$StatoOfferta:AtbOfftStatoOfferta</naming>
-                        <naming>it.integry.ems_model.entity.VtbOfft$StatoOfferta:VtbOfftStatoOfferta</naming>
-                        <naming>it.integry.ems_model.entity.GrlAnagJrept$Tipo:GrlAnagJreptTipo</naming>
-                        <naming>it.integry.ems_model.entity.WtbJreptSetup$Tipo:WtbJreptSetupTipo</naming>
-                        <naming>it.integry.ems_model.entity.MtbColr$Causale:MtbColrCausale</naming>
-                        <naming>it.integry.ems_model.entity.MtbCols$Causale:MtbColsCausale</naming>
-                    </customTypeNaming>
-                    <generateConstructors>true</generateConstructors>
-                    <mapClasses>asClasses</mapClasses>
-                    <mapEnum>asEnum</mapEnum>
-                    <optionalProperties>useLibraryDefinition</optionalProperties>
-                    <optionalPropertiesDeclaration>questionMarkAndNullableType</optionalPropertiesDeclaration>
-                    <sortDeclarations>true</sortDeclarations>
-                    <sortTypeDeclarations>true</sortTypeDeclarations>
-                    <tsNoCheck>true</tsNoCheck>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250603104115.java

@@ -0,0 +1,19 @@
+package it.integry.ems.migration.model;
+
+import it.integry.ems.migration._base.BaseMigration;
+import it.integry.ems.migration._base.MigrationModelInterface;
+
+public class Migration_20250603104115 extends BaseMigration implements MigrationModelInterface {
+
+    @Override
+    public void up() throws Exception {
+        if (isHistoryDB())
+            return;
+
+        enableSaveToRest("dtipi");
+    }
+
+    @Override
+    public void down() throws Exception {
+    }
+}

ems-core/src/main/java/it/integry/ems/rules/completing/dto/CostiDTO.java

@@ -1,87 +0,0 @@
-package it.integry.ems.rules.completing.dto;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class CostiDTO /*implements Comparable<CostiDTO> */ {
-    private String codCcon, codJcom, codJfas, codMtip, matricola;
-    private Date dataInizComp, dataFineComp;
-    private BigDecimal importo;
-
-    public String getCodCcon() {
-        return codCcon;
-    }
-
-    public void setCodCcon(String codCcon) {
-        this.codCcon = codCcon;
-    }
-
-    public String getCodJcom() {
-        return codJcom;
-    }
-
-    public void setCodJcom(String codJcom) {
-        this.codJcom = codJcom;
-    }
-
-    public String getCodJfas() {
-        return codJfas;
-    }
-
-    public void setCodJfas(String codJfas) {
-        this.codJfas = codJfas;
-    }
-
-    public String getCodMtip() {
-        return codMtip;
-    }
-
-    public void setCodMtip(String codMtip) {
-        this.codMtip = codMtip;
-    }
-
-    public String getMatricola() {
-        return matricola;
-    }
-
-    public void setMatricola(String matricola) {
-        this.matricola = matricola;
-    }
-
-    public Date getDataInizComp() {
-        return dataInizComp;
-    }
-
-    public void setDataInizComp(Date dataInizComp) {
-        this.dataInizComp = dataInizComp;
-    }
-
-    public Date getDataFineComp() {
-        return dataFineComp;
-    }
-
-    public void setDataFineComp(Date dataFineComp) {
-        this.dataFineComp = dataFineComp;
-    }
-
-    public BigDecimal getImporto() {
-        return importo;
-    }
-
-    public void setImporto(BigDecimal importo) {
-        this.importo = importo;
-    }
-
-
-    public boolean compare(CostiDTO object1, CostiDTO object2) {
-        return object1.getCodCcon().compareTo((object2.getCodCcon())) < 0;
-    }
-	/*
-	 @Override
-	 public int compareTo(CostiDTO o) {
-        CostiDTO k = (CostiDTO) o;
-        String codCcon = k.getCodCcon();
-        return this.getCodCcon().compareTo(codCcon);
-
-    } */
-}

ems-core/src/main/java/it/integry/ems/service/dto/production/AvailableClassMercDTO.java

@@ -0,0 +1,27 @@
+package it.integry.ems.service.dto.production;
+
+import java.util.List;
+
+public class AvailableClassMercDTO {
+
+    private String codMgrp;
+    private List<String> codMsgr;
+
+    public String getCodMgrp() {
+        return codMgrp;
+    }
+
+    public AvailableClassMercDTO setCodMgrp(String codMgrp) {
+        this.codMgrp = codMgrp;
+        return this;
+    }
+
+    public List<String> getCodMsgr() {
+        return codMsgr;
+    }
+
+    public AvailableClassMercDTO setCodMsgr(List<String> codMsgr) {
+        this.codMsgr = codMsgr;
+        return this;
+    }
+}

ems-core/src/main/java/it/integry/ems/service/dto/production/OrdineLavorazioneDTO.java

@@ -1076,28 +1076,4 @@ public class OrdineLavorazioneDTO {
         this.availableClassMerc = availableClassMerc;
         return this;
     }
-
-    public static class AvailableClassMercDTO {
-
-        private String codMgrp;
-        private List<String> codMsgr;
-
-        public String getCodMgrp() {
-            return codMgrp;
-        }
-
-        public AvailableClassMercDTO setCodMgrp(String codMgrp) {
-            this.codMgrp = codMgrp;
-            return this;
-        }
-
-        public List<String> getCodMsgr() {
-            return codMsgr;
-        }
-
-        public AvailableClassMercDTO setCodMsgr(List<String> codMsgr) {
-            this.codMsgr = codMsgr;
-            return this;
-        }
-    }
 }

ems-core/src/main/java/it/integry/ems/service/production/ProductionOrderDataHandlerService.java

@@ -1,6 +1,7 @@
 package it.integry.ems.service.production;
 
 import com.annimon.stream.Stream;
+import it.integry.ems.service.dto.production.AvailableClassMercDTO;
 import it.integry.ems.service.dto.production.OrdineInevasoGroupMercDTO;
 import it.integry.ems.service.dto.production.OrdineLavorazioneDTO;
 import it.integry.ems.settings.Model.AvailableConnectionsModel;
@@ -267,7 +268,7 @@ public class ProductionOrderDataHandlerService {
 
                         for (Map.Entry<String, List<OrdineInevasoGroupMercDTO>> entry : groups.entrySet()) {
                             order.getAvailableClassMerc()
-                                    .add(new OrdineLavorazioneDTO.AvailableClassMercDTO()
+                                    .add(new AvailableClassMercDTO()
                                             .setCodMgrp(entry.getKey())
                                             .setCodMsgr(entry.getValue().stream()
                                                     .map(OrdineInevasoGroupMercDTO::getCodMsgr)

ems-engine/pom.xml

@@ -19,6 +19,7 @@
     </properties>
 
     <build>
+        <finalName>${ems.war.name}-api</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -35,14 +36,13 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <version>3.4.0</version>
                 <configuration>
-                    <warName>${ems.war.name}-api</warName>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>cz.habarta.typescript-generator</groupId>
                 <artifactId>typescript-generator-maven-plugin</artifactId>
-                <version>3.2.1263</version>
+                <version>2.37.1128</version>
                 <executions>
                     <execution>
                         <id>generate</id>
@@ -54,22 +54,61 @@
                 </executions>
                 <configuration>
                     <jsonLibrary>jackson2</jsonLibrary>
+                    <classes>
+                        <class>it.integry.ems.response.ServiceRestResponse</class>
+                    </classes>
                     <classPatterns>
-                        <classPattern>it.integry.ems.product.dto.*</classPattern>
-                        <classPattern>it.integry.ems.production.dto.*</classPattern>
-                        <classPattern>it.integry.ems.retail.wms.generic.dto.articolo.*</classPattern>
-                        <classPattern>it.integry.ems.logistic.conSegna.dto.*</classPattern>
+                        <classPattern>it.integry.**.dto.*</classPattern>
+                        <classPattern>it.integry.**DTO**</classPattern>
+                        <classPattern>it.integry.ems_model.entity.*</classPattern>
                     </classPatterns>
+                    <customTypeNaming>
+                        <naming>it.integry.ems_model.entity.AtbOfft$StatoOfferta:AtbOfftStatoOfferta</naming>
+                        <naming>it.integry.ems_model.entity.VtbOfft$StatoOfferta:VtbOfftStatoOfferta</naming>
+                        <naming>it.integry.ems_model.entity.GrlAnagJrept$Tipo:GrlAnagJreptTipo</naming>
+                        <naming>it.integry.ems_model.entity.WtbJreptSetup$Tipo:WtbJreptSetupTipo</naming>
+                        <naming>it.integry.ems_model.entity.MtbColr$Causale:MtbColrCausale</naming>
+                        <naming>it.integry.ems_model.entity.MtbCols$Causale:MtbColsCausale</naming>
+                        <naming>it.integry.ems.response.MessageDTO:ResponseMessageDTO</naming>
+                        <naming>it.integry.ems.Import.dto.AnomalieDTO$Type:AnomalieDTOType</naming>
+                        <naming>it.integry.ems.customizations.production.dto.CaricoLavorazioneDTO:ProdCaricoLavorazioneDTO</naming>
+                        <naming>it.integry.ems.document.dto.FilterDTO:DocFilterDTO</naming>
+                        <naming>it.integry.ems.document.farm_mes.dto.ImportLog:FarmMesImportLog</naming>
+                        <naming>it.integry.ems.order.puddy.dto.ImportLog:PuddyImportLog</naming>
+                        <naming>it.integry.ems.dto.EntityHierarchy$Field:EntityHierarchyField</naming>
+                        <naming>it.integry.ems.logistic.dto.ClienteDTO:LogisticClienteDTO</naming>
+                        <naming>it.integry.ems.order.conquist.dto.ClienteDTO:ConquistClienteDTO</naming>
+                        <naming>it.integry.ems.order.conquist.dto.OrdineDTO:ConquistOrdineDTO</naming>
+                        <naming>it.integry.ems.order.Import.dto.DialogoJsonDTO$AnagraficaDTO:DialogoJsonDTOAnagraficaDTO</naming>
+                        <naming>it.integry.ems.ordikids.dto.AnagraficaDTO:OrdikidsAnagraficaDTO</naming>
+                        <naming>it.integry.ems.ordikids.dto.ArticoliDTO:OrdikidsArticoliDTO</naming>
+                        <naming>it.integry.ems.retail.wms.ordini_acquisto.dto.OrdiniAcquistoGrigliaDTO$ArticoliDTO:OrdiniAcquistoGrigliaDTOArticoliDTO</naming>
+                        <naming>it.integry.ems.retail.wms.ordini_acquisto.dto.OrdiniAcquistoGrigliaDTO$ListiniDTO:OrdiniAcquistiGrigliaDTOListiniDTO</naming>
+                        <naming>it.integry.ems.production.dto.AttachmentDTO:ProdAttachmentDTO</naming>
+                        <naming>it.integry.ems.retail.pvmRetail.dto.AccettazioneDTO$Ordine:AccettazioneDTOOrdine</naming>
+                        <naming>it.integry.ems.retail.wms.lavorazione.dto.RecuperaMaterialiRequestDTO$Ordine:RecuperaMaterialiRequestDTOOrdine</naming>
+                        <naming>it.integry.ems.order.Import.dto.DialogoJsonDTO$IndirizzoDTO:DialogoJsonDTOIndirizzoDTO</naming>
+                        <naming>it.integry.ems.sync.MultiDBTransaction.Connection:MultiDBTransactionConnection</naming>
+                        <naming>it.integry.WooCommerce.dto.local.ArticoloDTO:WooCommerceArticoloDTO</naming>
+                        <naming>it.integry.ems.logistic.dto.ArticoloDTO:LogisticArticoloDTO</naming>
+                        <naming>it.integry.ems.document.export.dto.DocumentiDialogoDTO$Export:DocumentiDialogoDTOExport</naming>
+                        <naming>it.integry.ems.order.Import.dto.OrdiniDialogoDTO$Export:OrdiniDialogoDTOExport</naming>
+                        <naming>it.integry.ems.document.export.dto.DocumentiDialogoDTO$Import:DocumentiDialogoDTOImport</naming>
+                        <naming>it.integry.ems.order.Import.dto.OrdiniDialogoDTO$Import:OrdiniDialogoDTOImport</naming>
+                        <naming>it.integry.ems.logistic.dto.ColloDTO:LogisticColloDTO</naming>
+                        <naming>it.integry.ems.response.AttachmentDTO:ResponseAttachmentDTO</naming>
+                        <naming>it.integry.ems.system.imports.dto.OrdineDTO:ImportsOrdineDTO</naming>
+                    </customTypeNaming>
                     <excludeClasses>
                         <excludeClass>it.integry.ems_model.base.EntityInterface</excludeClass>
                     </excludeClasses>
+                    <excludeClassPatterns>
+                        <excludeClassPattern>it.integry.ems.contabil.**</excludeClassPattern>
+                        <excludeClassPattern>it.integry.ems.order.amazon.**</excludeClassPattern>
+                    </excludeClassPatterns>
                     <outputFile>../ts/ems-engine.module.ts</outputFile>
                     <outputKind>module</outputKind>
                     <outputFileType>implementationFile</outputFileType>
-                    <customTypeNaming>
-                        <naming>it.integry.ems_model.entity.MtbColr$Causale:MtbColrCausale</naming>
-                        <naming>it.integry.ems_model.entity.MtbCols$Causale:MtbColsCausale</naming>
-                    </customTypeNaming>
                     <generateConstructors>true</generateConstructors>
                     <mapClasses>asClasses</mapClasses>
                     <mapEnum>asEnum</mapEnum>

ems-engine/src/main/java/it/integry/ems/production/dto/CartellinoDTO.java

@@ -1,90 +0,0 @@
-package it.integry.ems.production.dto;
-
-public class CartellinoDTO {
-
-    private String cod_style, cod_col, cod_tagl, cod_mdep, cod_barre,
-            flag_saldi, flag_tipo_negozio;
-    private Double prz_vend, prz_vend_sug, perc_sco;
-
-    public String getCod_style() {
-        return cod_style;
-    }
-
-    public void setCod_style(String cod_style) {
-        this.cod_style = cod_style;
-    }
-
-    public String getCod_col() {
-        return cod_col;
-    }
-
-    public void setCod_col(String cod_col) {
-        this.cod_col = cod_col;
-    }
-
-    public String getCod_tagl() {
-        return cod_tagl;
-    }
-
-    public void setCod_tagl(String cod_tagl) {
-        this.cod_tagl = cod_tagl;
-    }
-
-    public String getCod_mdep() {
-        return cod_mdep;
-    }
-
-    public void setCod_mdep(String cod_mdep) {
-        this.cod_mdep = cod_mdep;
-    }
-
-    public String getCod_barre() {
-        return cod_barre;
-    }
-
-    public void setCod_barre(String cod_barre) {
-        this.cod_barre = cod_barre;
-    }
-
-    public String getFlag_saldi() {
-        return flag_saldi;
-    }
-
-    public void setFlag_saldi(String flag_saldi) {
-        this.flag_saldi = flag_saldi;
-    }
-
-    public String getFlag_tipo_negozio() {
-        return flag_tipo_negozio;
-    }
-
-    public void setFlag_tipo_negozio(String flag_tipo_negozio) {
-        this.flag_tipo_negozio = flag_tipo_negozio;
-    }
-
-    public Double getPrz_vend() {
-        return prz_vend;
-    }
-
-    public void setPrz_vend(Double prz_vend) {
-        this.prz_vend = prz_vend;
-    }
-
-    public Double getPrz_vend_sug() {
-        return prz_vend_sug;
-    }
-
-    public void setPrz_vend_sug(Double prz_vend_sug) {
-        this.prz_vend_sug = prz_vend_sug;
-    }
-
-    public Double getPerc_sco() {
-        return perc_sco;
-    }
-
-    public void setPerc_sco(Double perc_sco) {
-        this.perc_sco = perc_sco;
-    }
-
-
-}

ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/dto/OrdineInevasoDTO.java

@@ -3,6 +3,7 @@ package it.integry.ems.retail.pvmRetail.dto;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import it.integry.ems.adapter.JsonDateAdapterSerializer;
+import it.integry.ems.service.dto.production.AvailableClassMercDTO;
 import it.integry.ems_model.annotation.SqlField;
 
 import java.math.BigDecimal;
@@ -623,30 +624,6 @@ public class OrdineInevasoDTO {
         return this;
     }
 
-    public static class AvailableClassMercDTO {
-
-        private String codMgrp;
-        private List<String> codMsgr;
-
-        public String getCodMgrp() {
-            return codMgrp;
-        }
-
-        public AvailableClassMercDTO setCodMgrp(String codMgrp) {
-            this.codMgrp = codMgrp;
-            return this;
-        }
-
-        public List<String> getCodMsgr() {
-            return codMsgr;
-        }
-
-        public AvailableClassMercDTO setCodMsgr(List<String> codMsgr) {
-            this.codMsgr = codMsgr;
-            return this;
-        }
-    }
-
     public String getCodVdes() {
         return codVdes;
     }

ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/articolo/ArticoloDTO.java

@@ -1,8 +1,6 @@
 package it.integry.ems.retail.wms.generic.dto.articolo;
 
-import it.integry.common.var.CommonConstants;
 import it.integry.ems_model.annotation.SqlField;
-import it.integry.ems_model.config.EmsRestConstants;
 import it.integry.ems_model.entity.MtbAart;
 import it.integry.ems_model.utility.UtilityString;
 

ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java

@@ -30,6 +30,7 @@ import it.integry.ems.rules.completing.PackagesRules;
 import it.integry.ems.service.AziendaService;
 import it.integry.ems.service.EntityProcessor;
 import it.integry.ems.service.PrinterService;
+import it.integry.ems.service.dto.production.AvailableClassMercDTO;
 import it.integry.ems.service.dto.production.OrdineInevasoGroupMercDTO;
 import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
 import it.integry.ems.user.UserSession;
@@ -268,7 +269,7 @@ public class WMSGenericService {
 
                         for (Map.Entry<String, List<OrdineInevasoGroupMercDTO>> entry : groups.entrySet()) {
                             order.getAvailableClassMerc()
-                                    .add(new OrdineInevasoDTO.AvailableClassMercDTO()
+                                    .add(new AvailableClassMercDTO()
                                             .setCodMgrp(entry.getKey())
                                             .setCodMsgr(entry.getValue().stream()
                                                     .map(OrdineInevasoGroupMercDTO::getCodMsgr)

ems-engine/src/main/java/it/integry/ems/system/dto/syncronization/InsertPublicationGroupRequestDTO.java

@@ -1,15 +0,0 @@
-package it.integry.ems.system.dto.syncronization;
-
-public class InsertPublicationGroupRequestDTO {
-
-    private String description;
-
-    public String getDescription() {
-        return description;
-    }
-
-    public InsertPublicationGroupRequestDTO setDescription(String description) {
-        this.description = description;
-        return this;
-    }
-}

ems-engine/src/main/java/it/integry/ems/system/dto/syncronization/InsertPublicationGroupResponseDTO.java

@@ -1,15 +0,0 @@
-package it.integry.ems.system.dto.syncronization;
-
-public class InsertPublicationGroupResponseDTO {
-
-    private long id;
-
-    public long getId() {
-        return id;
-    }
-
-    public InsertPublicationGroupResponseDTO setId(long id) {
-        this.id = id;
-        return this;
-    }
-}

ems-engine/src/main/java/it/integry/ems/system/dto/syncronization/PublicationDTO.java

@@ -1,65 +0,0 @@
-package it.integry.ems.system.dto.syncronization;
-
-public class PublicationDTO {
-
-    private long id;
-    private String entityName;
-    private String whereCondSql;
-    private String recalcColumns;
-    private boolean syncronize;
-    private String whereCond;
-
-    public long getId() {
-        return id;
-    }
-
-    public PublicationDTO setId(long id) {
-        this.id = id;
-        return this;
-    }
-
-    public String getEntityName() {
-        return entityName;
-    }
-
-    public PublicationDTO setEntityName(String entityName) {
-        this.entityName = entityName;
-        return this;
-    }
-
-    public String getWhereCondSql() {
-        return whereCondSql;
-    }
-
-    public PublicationDTO setWhereCondSql(String whereCondSql) {
-        this.whereCondSql = whereCondSql;
-        return this;
-    }
-
-    public String getRecalcColumns() {
-        return recalcColumns;
-    }
-
-    public PublicationDTO setRecalcColumns(String recalcColumns) {
-        this.recalcColumns = recalcColumns;
-        return this;
-    }
-
-    public boolean isSyncronize() {
-        return syncronize;
-    }
-
-    public PublicationDTO setSyncronize(boolean syncronize) {
-        this.syncronize = syncronize;
-        return this;
-    }
-
-    public String getWhereCond() {
-        return whereCond;
-    }
-
-    public PublicationDTO setWhereCond(String whereCond) {
-        this.whereCond = whereCond;
-        return this;
-    }
-}

ems-engine/src/main/java/it/integry/ems/system/dto/syncronization/PublicationGroupDTO.java

@@ -1,39 +0,0 @@
-package it.integry.ems.system.dto.syncronization;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PublicationGroupDTO {
-
-    private long id;
-    private String description;
-
-    private List<PublicationDTO> publications = new ArrayList<>();
-
-    public long getId() {
-        return id;
-    }
-
-    public PublicationGroupDTO setId(long id) {
-        this.id = id;
-        return this;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public PublicationGroupDTO setDescription(String description) {
-        this.description = description;
-        return this;
-    }
-
-    public List<PublicationDTO> getPublications() {
-        return publications;
-    }
-
-    public PublicationGroupDTO setPublications(List<PublicationDTO> publications) {
-        this.publications = publications;
-        return this;
-    }
-}