IntegryManagementSystem

Author	SHA1	Message	Date
jenkins	3becbd01d5	20250513_190654	2025-05-13 19:06:55 +02:00
Valerio Castellana	46cd5cd716	Revert "Merge branch 'hotfix/Hotfix-1'" All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details This reverts commit `b3b8d917d8`, reversing changes made to `8b69787c64`.	2025-05-13 19:06:23 +02:00
Valerio Castellana	b3b8d917d8	Merge branch 'hotfix/Hotfix-1' Some checks failed IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit Details	2025-05-13 18:55:03 +02:00
Valerio Castellana	12f4241486	corretta publish su Azure per feature	2025-05-13 18:54:53 +02:00
Valerio Castellana	2ba2de8124	Merge branch 'feature/RefactoringGestioneColli' into hotfix/Hotfix-1	2025-05-13 18:53:09 +02:00
Valerio Castellana	f5ea90a0d0	-corretta pubblicazione su azure di branch non classici All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-13 18:47:53 +02:00
Valerio Castellana	8b69787c64	Merge branch 'hotfix/Hotfix-1' All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-13 18:40:27 +02:00
Valerio Castellana	b116492701	[GRAMM] - rimossa pezza temporeanea salvataggio ordini di lavorazione	2025-05-13 18:40:16 +02:00
Valerio Castellana	b833fc79e8	Merge branch 'master' into feature/RefactoringGestioneColli Some checks failed IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit Details	2025-05-13 18:39:00 +02:00
Valerio Castellana	f52aa4d837	Merge branch 'hotfix/Hotfix-1' Some checks failed IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit Details	2025-05-13 18:36:32 +02:00
Valerio Castellana	fff5faf3be	Merge branch 'master' into feature/RefactoringGestioneColli Some checks failed IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit Details	2025-05-13 18:30:37 +02:00
GiuseppeS	978b42d18a	Aggiunto barcode ul nella retrieveAlreadyRegisteredUDC All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-12 19:12:20 +02:00
GiuseppeS	c7c8b1be24	Aggiunto supporto procedura di versamento automatico con le nuove logiche dei colli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-12 18:45:20 +02:00
GiuseppeS	6034120f1f	Aggiunto CodJfas in create UDC All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-12 12:17:51 +02:00
GiuseppeS	c2b6d4ba69	Rimosso _peppe da rossogargano All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-12 10:37:04 +02:00
GiuseppeS	bc97f9a573	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-12 10:25:30 +02:00
GiuseppeS	595e04cea1	Migliorie sui confronti in Exchange Documenti/Colli/Ordini All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-12 10:25:15 +02:00
GiuseppeS	ce1f68deb2	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-12 09:41:02 +02:00
GiuseppeS	ef4676ed26	Fix su interpretazione enum FlagEvaso, non era gestita la stringa empty. All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-12 09:39:56 +02:00
GiuseppeS	45bf3d67d1	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-12 09:27:46 +02:00
Valerio Castellana	bf38dfe0d8	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-09 17:28:25 +02:00
Valerio Castellana	af68b892f3	aggiunto trasferimento automatico in versamento materia prima su ordine di lavorazione All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-09 16:20:44 +02:00
Valerio Castellana	af29eeba58	Merge branch 'develop' into feature/RefactoringGestioneColli # Conflicts: # ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java # ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java	2025-05-09 13:23:54 +02:00
GiuseppeS	5698329cc8	Fix su distribuzione colli. Quando si distribuiva un collo con 2 righe dello stesso articolo / partita la distribuzione attribuiva ad entrambe le righe gli stessi collo_rif. All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-09 10:58:48 +02:00
MinaR	d70efd3af2	aggiunti dati testata collo All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-08 18:52:52 +02:00
GiuseppeS	f99957eb41	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-08 16:52:15 +02:00
MarcoE	40104bcce7	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-05-06 10:39:46 +02:00
Valerio Castellana	edda81733d	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details # Conflicts: # ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java # ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java	2025-04-30 09:59:42 +02:00
Valerio Castellana	ceb11d3261	aggiunti riferimenti collo in movimenti di cambio posizione ul All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-23 15:14:44 +02:00
Valerio Castellana	a13671c51a	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-22 11:46:08 +02:00
Valerio Castellana	b94d9b1177	[TRASFERIMENTO UL] All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details corretto deposito testata movimento di scarico a PV aggiunto rollback in errore trasferimento	2025-04-22 11:42:57 +02:00
GiuseppeS	d027f3ff20	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-18 15:23:17 +02:00
Valerio Castellana	8601f4fd90	gestione documenti di trasferimento in emissione documenti di vendita All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-18 14:54:35 +02:00
Valerio Castellana	73ade8691d	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-18 10:39:28 +02:00
Valerio Castellana	df2a7d6e36	Merge branch 'develop' into feature/RefactoringGestioneColli Some checks failed IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit Details	2025-04-18 10:20:54 +02:00
GiuseppeS	c7c6affe3e	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details # Conflicts: # ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java # ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java # ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java	2025-04-17 15:32:22 +02:00
GiuseppeS	54fc28eb74	Fix su migration per nuova logica WMS All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-17 15:17:48 +02:00
GiuseppeS	ab1200ff84	Aggiunto tentativo di riconoscimento ean128 in createUDCFromArt All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-16 15:12:57 +02:00
Valerio Castellana	22f65037f4	aggiunto riavvio automatico cache utenti all' invalidate All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-16 10:26:03 +02:00
Valerio Castellana	ec2b83657a	corretto servizio trasferimento UL	2025-04-15 16:38:28 +02:00
GiuseppeS	2511aabbdb	Fix vari All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-11 17:04:19 +02:00
GiuseppeS	313fa6a8df	Aggiunti controlli in createUDC All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-11 16:29:35 +02:00
GiuseppeS	9bb8751e21	Implementate nuove logiche di barcode_ul in rettifica giacenze All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-11 10:51:23 +02:00
GiuseppeS	24c4935dad	Fix after merge All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-11 09:35:27 +02:00
GiuseppeS	61d76b03c4	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-11 09:33:25 +02:00
GiuseppeS	0f973c962a	Refactoring creazione UL da MES All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-10 20:08:38 +02:00
GiuseppeS	cffe9082db	Fix su qta in righe di rettifica	2025-04-10 19:14:38 +02:00
GiuseppeS	6c88b7b288	Fix barcode in versamento materiali MES All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-10 17:52:55 +02:00
GiuseppeS	ea2121e111	Fix vari All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-10 17:01:23 +02:00
GiuseppeS	1191f98485	Sistemato codice deposito e posizione durante la getColloByBarcode (ora vengono letti gli ultimi validi dalla giacenza) All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-10 13:27:12 +02:00
GiuseppeS	6c0e2d5259	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-10 12:52:49 +02:00
GiuseppeS	894da40182	Cambiato IntegryCustomerDB per puntare a Rossogargano_peppe	2025-04-10 12:52:09 +02:00
GiuseppeS	749a7e9750	Cambiato db RossoGargano in RossoGargano_peppe All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-10 12:27:17 +02:00
GiuseppeS	e5a66bfd15	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details # Conflicts: # ems-engine/src/main/java/it/integry/ems/production/service/OrtoFruttaProductionService.java # ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java # ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneBollaService.java # ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java # ems-engine/src/main/java/it/integry/ems/retail/wms/documenti/service/WMSDocumentService.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/inventario/service/WMSInventarioService.java # ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/dto/VersaMaterialiRequestDTO.java # ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java # ems-engine/src/main/java/it/integry/ems/retail/wms/vendita/service/WMSSpedizioneService.java	2025-04-10 12:03:36 +02:00
GiuseppeS	9761d05a8e	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-09 12:09:46 +02:00
GiuseppeS	050e8bd19e	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-09 12:06:25 +02:00
GiuseppeS	a0c3d3a6b3	Fix after merge All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-09 11:33:59 +02:00
GiuseppeS	f06117d5ef	Merge branch 'develop' into feature/RefactoringGestioneColli # Conflicts: # ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java # ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGiacenzaULService.java # ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/controller/WMSMaterialiController.java # ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/dto/VersaMaterialiRequestDTO.java # ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSMaterialiService.java	2025-04-09 11:32:45 +02:00
GiuseppeS	75262b5940	Fix in distribuzione colli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-09 10:53:12 +02:00
GiuseppeS	0b3f1ee9fc	Aggiornato ems-settings docker All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-08 11:52:55 +02:00
GiuseppeS	7c19c93814	Aggiornato ems-settings docker All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-08 11:45:55 +02:00
GiuseppeS	532c12dd22	Iniziato refactoring VersamentoMateriali All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-08 09:04:17 +02:00
GiuseppeS	e81c2ac6b9	Merge branch 'refs/heads/develop' into feature/RefactoringGestioneColli	2025-04-08 09:04:01 +02:00
GiuseppeS	161ea5e5dd	Fix Jenkinsfile All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-07 18:57:56 +02:00
GiuseppeS	260019d79f	Fix Jenkinsfile All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-07 18:48:04 +02:00
GiuseppeS	08b68781e9	Refactoring del servizio di versamento e rientro del materiale da MES Some checks failed IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit Details	2025-04-07 18:27:25 +02:00
GiuseppeS	760be03b18	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details # Conflicts: # ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java	2025-04-07 09:40:00 +02:00
GiuseppeS	148a4359b6	Fix null All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-07 09:39:15 +02:00
GiuseppeS	b65d35cfd6	Migliorato servizio di retrieve UL in posizione con relativo stato All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-05 12:14:11 +02:00
GiuseppeS	54eb75a420	Sistemato riposizionamento UL All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-04 19:28:50 +02:00
GiuseppeS	e9d28c6f63	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-04 12:50:52 +02:00
GiuseppeS	212f14db36	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-04 11:49:55 +02:00
GiuseppeS	b50e25a0ee	Aggiornate migration gramm All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-04 11:48:18 +02:00
GiuseppeS	0a49695d7c	Aggiornato servizio di SpostaArtsTraUl All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-04 10:49:20 +02:00
GiuseppeS	9e5a2e8400	Merge branch 'develop' into feature/RefactoringGestioneColli All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-03 18:13:58 +02:00
GiuseppeS	f0fb85e6db	Aggiunto servizio per il recupero dei barcode_ul in posizione e implementata migrazione per aggiornare i barcode_ul in mtb_colt e mtb_colr All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-03 17:44:59 +02:00
GiuseppeS	86081ec113	Refactoring servizio di retrieve colli in giacenza All checks were successful IntegryManagementSystem_Multi/pipeline/head This commit looks good Details	2025-04-02 19:04:50 +02:00

2 changed files with 1 additions and 3 deletions

									
										2

ems-core/src/main/java/it/integry/ems/rules/completing/CommonRules.java
									
												View File
												
				@@ -902,8 +902,6 @@ public class CommonRules extends QueryRules {

				        String codMdep = entity.getCodMdep();

				        BigDecimal rapConv = entity.getRapConv();

				        if (entity instanceof  DtbOrdr && entity.getGestione().equalsIgnoreCase("L"))

				            return BigDecimal.ZERO;

				        Date dataValidita = null;

				        if (entity instanceof DtbOrdr || entity instanceof WdtbOrdr) {

									
										2

ems-core/src/main/resources/configs/env.properties
									
												View File
												
				@@ -1,2 +1,2 @@

				#spring.profiles.active=@activatedProperties@ 

				project.version=20231119_074200 

				project.version=20250513_190654

Compare commits

77 Commits

feature/Fe ... 20250513_1

2

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

View File

2

ems-core/src/main/resources/configs/env.properties

View File

Compare commits

77 Commits feature/Fe ... 20250513_1

2 ems-core/src/main/java/it/integry/ems/rules/completing/CommonRules.java Unescape Escape View File

2 ems-core/src/main/resources/configs/env.properties Unescape Escape View File

77 Commits

feature/Fe ... 20250513_1

2

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

View File

2

ems-core/src/main/resources/configs/env.properties

View File