Files
IntegryManagementSystem/docker
GiuseppeS 3eaa1218c5
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Merge branch 'master' into feature/RefactoringGestioneColli
# Conflicts:
#	.idea/structuralSearch.xml
#	docker/tomcat/conf/integry/ems_settings.json
#	ems-core/src/main/java/it/integry/common/var/CommonConstants.java
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251205111526.java
#	ems-core/src/main/java/it/integry/ems/rules/completing/DocumentCheckRules.java
#	ems-core/src/main/java/it/integry/ems/user/service/UserCacheService.java
#	ems-core/src/main/java/it/integry/ems_model/entity/Azienda.java
#	ems-core/src/main/java/it/integry/ems_model/utility/UtilityException.java
#	ems-engine/src/main/java/it/integry/ems/customizations/production/service/ToscaProductionService.java
#	ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java
#	ems-engine/src/main/java/it/integry/ems/logistic/Import/service/EuritmoImportService.java
#	ems-engine/src/main/java/it/integry/ems/logistic/controller/LogisticController.java
#	ems-engine/src/main/java/it/integry/ems/logistic/service/LogisticService.java
#	ems-engine/src/main/java/it/integry/ems/logistic/service/SmartLogisticService.java
#	ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportListiniAcquistoService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/controller/WMSGenericController.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/MvwSitArtUdcDetInventarioDTO.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java
#	ems-engine/src/main/java/it/integry/ems/system/controller/SystemController.java
2025-12-09 10:01:18 +01:00
..
2025-04-09 11:20:20 +02:00
2025-04-09 11:20:20 +02:00