diff --git a/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/dto/OrdineInevasoGroupMercDTO.java b/ems-core/src/main/java/it/integry/ems/service/dto/production/OrdineInevasoGroupMercDTO.java similarity index 97% rename from ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/dto/OrdineInevasoGroupMercDTO.java rename to ems-core/src/main/java/it/integry/ems/service/dto/production/OrdineInevasoGroupMercDTO.java index ad87ca8d15..d06feeb800 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/dto/OrdineInevasoGroupMercDTO.java +++ b/ems-core/src/main/java/it/integry/ems/service/dto/production/OrdineInevasoGroupMercDTO.java @@ -1,4 +1,4 @@ -package it.integry.ems.retail.pvmRetail.dto; +package it.integry.ems.service.dto.production; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/ems-engine/src/main/java/it/integry/ems/production/dto/OrdineLavorazioneDTO.java b/ems-core/src/main/java/it/integry/ems/service/dto/production/OrdineLavorazioneDTO.java similarity index 99% rename from ems-engine/src/main/java/it/integry/ems/production/dto/OrdineLavorazioneDTO.java rename to ems-core/src/main/java/it/integry/ems/service/dto/production/OrdineLavorazioneDTO.java index c423a57edb..e69ba253ef 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/dto/OrdineLavorazioneDTO.java +++ b/ems-core/src/main/java/it/integry/ems/service/dto/production/OrdineLavorazioneDTO.java @@ -1,4 +1,4 @@ -package it.integry.ems.production.dto; +package it.integry.ems.service.dto.production; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/ems-core/src/main/java/it/integry/ems/service/production/ProductionOrderDataHandlerService.java b/ems-core/src/main/java/it/integry/ems/service/production/ProductionOrderDataHandlerService.java index 5dd3974fc4..350e145565 100644 --- a/ems-core/src/main/java/it/integry/ems/service/production/ProductionOrderDataHandlerService.java +++ b/ems-core/src/main/java/it/integry/ems/service/production/ProductionOrderDataHandlerService.java @@ -2,8 +2,8 @@ package it.integry.ems.service.production; import com.annimon.stream.Stream; import it.integry.common.var.CommonConstants; -import it.integry.ems.production.dto.OrdineLavorazioneDTO; -import it.integry.ems.retail.pvmRetail.dto.OrdineInevasoGroupMercDTO; +import it.integry.ems.service.dto.production.OrdineInevasoGroupMercDTO; +import it.integry.ems.service.dto.production.OrdineLavorazioneDTO; import it.integry.ems.settings.Model.AvailableConnectionsModel; import it.integry.ems.settings.Model.SettingsModel; import it.integry.ems.settings.SettingsController; diff --git a/ems-engine/src/main/java/it/integry/ems/production/controller/MesProductionControllerV2.java b/ems-engine/src/main/java/it/integry/ems/production/controller/MesProductionControllerV2.java index c620f5d81c..58e15a718e 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/controller/MesProductionControllerV2.java +++ b/ems-engine/src/main/java/it/integry/ems/production/controller/MesProductionControllerV2.java @@ -8,6 +8,7 @@ import it.integry.ems.javabeans.RequestDataDTO; import it.integry.ems.production.dto.*; import it.integry.ems.production.service.MesProductionServiceV2; import it.integry.ems.production.service.ProductionLineService; +import it.integry.ems.service.dto.production.OrdineLavorazioneDTO; import it.integry.ems.service.production.ProductionOrderDataHandlerService; import it.integry.ems.response.EsitoType; import it.integry.ems.response.ServiceRestResponse; diff --git a/ems-engine/src/main/java/it/integry/ems/production/dto/UpdateQtaImmesseStepRequestDTO.java b/ems-engine/src/main/java/it/integry/ems/production/dto/UpdateQtaImmesseStepRequestDTO.java index 8ee03d4541..593f8fc795 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/dto/UpdateQtaImmesseStepRequestDTO.java +++ b/ems-engine/src/main/java/it/integry/ems/production/dto/UpdateQtaImmesseStepRequestDTO.java @@ -1,5 +1,7 @@ package it.integry.ems.production.dto; +import it.integry.ems.service.dto.production.OrdineLavorazioneDTO; + public class UpdateQtaImmesseStepRequestDTO { private OrdineLavorazioneDTO ordineLavorazione; diff --git a/ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java b/ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java index b1d86848ed..f183f6330d 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java +++ b/ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java @@ -27,6 +27,7 @@ import it.integry.ems.retail.wms.lavorazione.service.WMSLavorazioneService; import it.integry.ems.rules.completing.DocumentRules; import it.integry.ems.service.*; import it.integry.ems.service.dto.GenericComunicationMailTemplateDataDTO; +import it.integry.ems.service.dto.production.OrdineLavorazioneDTO; import it.integry.ems.service.exception.EmptyReportException; import it.integry.ems.service.production.ProductionOrderDataHandlerService; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; diff --git a/ems-engine/src/main/java/it/integry/ems/production/service/ProductionLineService.java b/ems-engine/src/main/java/it/integry/ems/production/service/ProductionLineService.java index 3d793dc947..aa475b8853 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/service/ProductionLineService.java +++ b/ems-engine/src/main/java/it/integry/ems/production/service/ProductionLineService.java @@ -1,7 +1,7 @@ package it.integry.ems.production.service; import com.annimon.stream.Stream; -import it.integry.ems.production.dto.OrdineLavorazioneDTO; +import it.integry.ems.service.dto.production.OrdineLavorazioneDTO; import it.integry.ems.production.dto.ProdLineStatusDTO; import it.integry.ems.service.EntityProcessor; import it.integry.ems.service.production.ProductionOrderDataHandlerService; diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java index ef3870f8ed..ae6f84be01 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java @@ -14,7 +14,7 @@ import it.integry.ems.report.dto.ReportTypeDTO; import it.integry.ems.retail.dto.PrintOrderCloseDTO; import it.integry.ems.retail.pvmRetail.dto.GiacenzaColliInMagDTO; import it.integry.ems.retail.pvmRetail.dto.OrdineInevasoDTO; -import it.integry.ems.retail.pvmRetail.dto.OrdineInevasoGroupMercDTO; +import it.integry.ems.service.dto.production.OrdineInevasoGroupMercDTO; import it.integry.ems.retail.pvmRetail.dto.PickingObjectDTO; import it.integry.ems.retail.wms.Utility.WMSUtility; import it.integry.ems.retail.wms.dto.*; diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java index a353ab02bb..f21fa9dca0 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java @@ -4,7 +4,7 @@ import com.annimon.stream.Stream; import it.integry.ems.javabeans.RequestDataDTO; import it.integry.ems.logistic.dto.sm2.FiltroDistribuzioneColloDTO; import it.integry.ems.product.importaz.service.ProductServices; -import it.integry.ems.production.dto.OrdineLavorazioneDTO; +import it.integry.ems.service.dto.production.OrdineLavorazioneDTO; import it.integry.ems.service.production.ProductionOrderDataHandlerService; import it.integry.ems.retail.wms.Utility.WMSUtility; import it.integry.ems.retail.wms.colli.service.WMSColliService;