Compare commits

...

1989 Commits

Author SHA1 Message Date
db17e8c473 Rinominata classe AvailableConnectionModel
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-06 10:36:27 +01:00
c8b1a0ddfd Disattivato EuroforkDataSyncronizerService
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-06 10:17:46 +01:00
2ab3bb6043 Fix query di retrieve missioni
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-05 18:41:50 +01:00
29f6b7d2a4 [BIOLEVANTE - EUROFORK]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- aggiornata gestione missioni
2025-11-05 17:35:58 +01:00
2be30206ce Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli 2025-11-05 10:36:02 +01:00
3306423e0a Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-04 20:00:20 +01:00
23a70c266e Migliorata sync eurofork, adesso viene presa in considerazione la posizione nel canale 2025-11-04 20:00:14 +01:00
672a055e55 [Biolevante]
- MPS
2025-11-04 18:14:11 +01:00
c2f427387b Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-04 16:02:57 +01:00
08be0a6ad2 [EuroFork]
- fix retrieve impegni/arrivi
2025-11-04 16:02:49 +01:00
7a9a72f11a Migliorata gestione status missioni
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-04 12:33:12 +01:00
68075b89fa Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-04 12:25:45 +01:00
e9ec1d1a83 Fix nel salvataggio dei documenti diretti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-04 12:22:10 +01:00
9c4f8ff47e Merge branch 'master' into feature/RefactoringGestioneColli
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/rules/completing/ProductionsRules.java
#	ems-engine/src/main/java/it/integry/ems/document/fatture/services/PassiveInvoiceService.java
2025-11-04 12:22:06 +01:00
b0194e569a Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-04 10:53:02 +01:00
3339cf1c9d cambioto salvataggio idx 2025-11-04 10:52:57 +01:00
d635079e50 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-04 10:16:56 +01:00
e7082aef49 inserito rawcontent nella chiamata al servizio di import 2025-11-04 10:13:20 +01:00
09b28cccbe Migliorata gestione status missioni
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-03 18:26:54 +01:00
a25dc83d30 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-03 18:25:52 +01:00
7d0bc83b67 sistemato erroer null 2025-11-03 18:24:18 +01:00
67756553f3 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-03 17:32:31 +01:00
473c2e05b5 sistemata sulle regole il controllo sulle date nulle 2025-11-03 17:32:17 +01:00
9a35af5b20 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-03 15:14:44 +01:00
ba899f3309 aggiunto log 2025-11-03 15:08:36 +01:00
612bc1e3de Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-03 13:25:47 +01:00
6f198e7d5a correzione fatture elettroniche 2025-11-03 13:25:40 +01:00
19e709fc3d Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-03 12:54:39 +01:00
fd4636e6a6 sistemata conversione data 2025-11-03 12:54:33 +01:00
6d4a2bf31b [DOCUMENTI DIRETTI]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- corretto calcolo qtaCnf in fattura conto deposito
2025-11-03 12:16:22 +01:00
43efca4045 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-03 12:11:03 +01:00
3516a8c8de aggiunto log 2025-11-03 12:10:56 +01:00
db78ca0cc0 [BIOLEVANTE]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- gestione magazzino automatico
2025-11-03 10:22:02 +01:00
5db8172b3c Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/rules/completing/AccountingRules.java
#	ems-engine/src/main/java/it/integry/ems/document/fatture/base/PassiveInvoiceRecapObject.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
2025-11-03 09:30:11 +01:00
jenkins
e1b85b8879 Merge branch 'develop'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-11-02 07:41:47 +01:00
3f4a8b38eb Aggiunto controllo per aggiornamento data scadenza
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-31 17:37:36 +01:00
99047236fc Merge remote-tracking branch 'origin/develop' into develop 2025-10-31 17:37:27 +01:00
0f3c828c1f Aggiunto controllo per aggiornamento data scadenza 2025-10-31 17:37:20 +01:00
5a07e918a4 Fix query di retrieve barcodes in posizione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-31 15:56:59 +01:00
8ebac5dd33 Migliorata query di retrieve barcodes in posizione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-31 15:49:07 +01:00
6d950cee38 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-31 14:08:58 +01:00
2b426103cd modificata vista gramm OlapFermiMacchina 2025-10-31 14:08:45 +01:00
876daa7df4 Implementato log via email degli errori durante le method call pianificate
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-31 13:22:23 +01:00
cca26eb472 creato report personalizzato Conto economico di commessa sintetico per smetar
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-31 12:55:23 +01:00
ff81f2129b Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-31 12:26:37 +01:00
04eb85b190 Fix calcolo numCnf in riproporzionamento scarichi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-31 12:24:19 +01:00
db83ba4a3c Merge branch 'master' into feature/RefactoringGestioneColli
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/production/dto/CreateUDCProduzioneRequestDTO.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/dto/CreateUDCRequestDTO.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java
2025-10-31 12:23:38 +01:00
a1c7f63976 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-31 12:19:28 +01:00
e83e7f03c8 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-31 12:19:28 +01:00
e4b08b9a61 [ROSSOGARGANO]
- aggiunto controllo su funzione suggerimento ean13 per considerare solo gli altri ean13 nel calcolo del massimo disponibile
2025-10-31 12:18:56 +01:00
b4f8fa49da [ROSSOGARGANO]
- aggiunto controllo su funzione suggerimento ean13 per considerare solo gli altri ean13 nel calcolo del massimo disponibile
2025-10-31 12:18:40 +01:00
5842cf0048 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-31 11:51:03 +01:00
d75dd5ead7 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-10-31 11:51:03 +01:00
b6eed691d0 [MES]
- aggiunto parametro preparatoDa in Dto creazione UDC per permettere di definire l'utente responsabile della UDC creata (Levanplast)
2025-10-31 11:50:51 +01:00
59788d83d7 Disattivato temporaneamente EuroforkDataSyncronizerService
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-31 11:36:15 +01:00
5fb2be5da0 Cambiati servizi magazzino automatico
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-31 11:35:08 +01:00
0760905c4f Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-31 11:33:21 +01:00
3f27ec44f8 [BIOLEVANTE]
- gestione magazzino automatico
2025-10-31 11:33:15 +01:00
49626f4371 modificato nome campo dtb_tipi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-31 10:08:18 +01:00
6e1d889eb8 su db Rossogargano abilitato report Fatturato per Macrozona/Zona solo a chi ha attivo report Fatturato Agenti/Zone 2025-10-31 10:07:58 +01:00
0cf5dbd24b inserito campo flag_delete_plk nella dtb_tipi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-31 09:37:38 +01:00
19d4c6b929 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-30 17:46:03 +01:00
a040670c5b inserita nuovo voce menù report fatturato per macrozona/zona 2025-10-30 17:45:32 +01:00
69a938d076 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-30 17:42:05 +01:00
b9fd701098 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-10-30 17:41:07 +01:00
d39134c47e Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-30 17:41:07 +01:00
fa0b2e338b sistemata registrazione movimeto di reverse 2025-10-30 17:41:00 +01:00
e2a827f45a [ROSSOGARGANO]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- Corretti controlli in creazione documento da rettifica UL
2025-10-30 17:32:21 +01:00
0efc991231 modificata la vista wtb_user con stb_user
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-30 17:13:08 +01:00
965e9ee3b4 sistemato utente
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-10-30 17:12:37 +01:00
59aabd6a43 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-30 17:11:59 +01:00
40f5649a5f Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-10-30 17:11:57 +01:00
45d067673c sistemato close task 2025-10-30 17:11:51 +01:00
9634306d01 aggiunto metodo con localdate
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-30 16:55:07 +01:00
f8b636f23d sistemato localdate
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-30 16:51:55 +01:00
981f5e4d67 Merge branch 'master' into feature/RefactoringGestioneColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-30 16:13:46 +01:00
d8e24764dc Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-30 16:11:16 +01:00
5cd2151f6c Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-10-30 16:11:14 +01:00
449aa664ab sistemato doc finante rif import 2025-10-30 16:10:39 +01:00
91f7269af4 Gestito il tipo valore dropdownlist in controlli qualità
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-30 16:06:04 +01:00
29a8f6efc6 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-30 15:43:42 +01:00
be3b57b1c5 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-10-30 15:43:41 +01:00
cd5cfa88bc sistemata notifica 2025-10-30 15:43:34 +01:00
d9bc09e6f3 sistemata registrazione movimeto di reverse
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-30 15:34:40 +01:00
d28e3578e4 aggiunto controllo in steup
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-30 15:24:17 +01:00
af6b053215 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-10-30 13:22:37 +01:00
cd3468fd50 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-30 13:22:37 +01:00
ac5361b9a8 sistemato generazione del movimento di reverse 2025-10-30 13:22:31 +01:00
e7b3d65628 eliminato log
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-30 12:36:37 +01:00
164f105878 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-30 12:26:21 +01:00
605ec9a910 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-10-30 12:26:20 +01:00
8d83789356 sistemato serivizio di recuper e sistemati dati 2025-10-30 12:26:15 +01:00
623d9d316a sostituito date con localdate
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-30 12:19:50 +01:00
bba6ae5d9b Refactor Depositi and MovimentiContabili services and controllers; add migration for foreign key constraints
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-30 12:05:01 +01:00
db32ba0e15 modificate classi inserendo localDate 2025-10-30 11:59:32 +01:00
02e2e73259 modificate classi inserendo localDate
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-30 11:50:45 +01:00
1bc1caa528 sistemato serivizio di recuper e sistemati dati 2025-10-30 11:50:20 +01:00
1439050345 [ROSSOGARGANO]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- risolto problema in modifica scadenza partita di produzione dove la partitaMagProd diventava uguale alla partita stessa invece che restare quella originale
2025-10-30 11:26:41 +01:00
3637ba0048 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-29 17:11:19 +01:00
7409d15cce Modifica funzione acquisizione matricole MAGGIO 2025-10-29 17:11:14 +01:00
563902d29e aggiunti campi: vettore,Targa, num_prenotazione, container,sigillo,nave e id_viaggio nella vista vw_tracciabUDCVend
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-29 15:39:10 +01:00
c2994b8767 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-29 15:31:25 +01:00
7a9b1fba4d creata setup sulla mtb_aart che se abilitata blocca se codice a barre già assegnato ad altra referenza su tutti i db di carelli 2025-10-29 15:31:12 +01:00
88743f65c6 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-29 13:34:07 +01:00
61cf7b8601 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-10-29 13:34:05 +01:00
2663f039a0 elimintao filtro sbagliato su movimenti 2025-10-29 12:58:46 +01:00
0bac28fc98 Aggiunta setup in PICKING > PRODUZIONE per il versamento automatico
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-28 16:23:50 +01:00
9f696ec2cd Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-10-28 16:03:24 +01:00
8983748314 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-28 16:03:24 +01:00
bcb39b8829 eliminti flatrans rs 2025-10-28 16:03:18 +01:00
3abf35028f Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-28 14:51:32 +01:00
58c7d31fea Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-10-28 14:51:31 +01:00
68db2d9591 causale reso sistemata 2025-10-28 14:51:26 +01:00
d6d342ba42 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-28 12:56:15 +01:00
9b7ba6e6f4 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-10-28 12:56:14 +01:00
fc3fcaf80c cambiata logica di attribuzione data reg su articoli con solo scarichi 2025-10-28 12:56:06 +01:00
8a2029f396 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-28 11:56:26 +01:00
3b4d29d1c4 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-10-28 11:56:26 +01:00
952e1b22f2 sistemata recupero scontrini 2025-10-28 11:56:16 +01:00
75eb189a11 Fix su authentication
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-28 11:50:05 +01:00
3151755a1f Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-28 11:28:32 +01:00
2659bbdc83 Finish Hotfix-100
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-28 11:28:31 +01:00
d60ffea913 sistemata recupero scontrini 2025-10-28 11:28:02 +01:00
0144d6d7ef gestiti valori null 2025-10-28 11:24:49 +01:00
755132a1b9 Aggiunto controllo su posizione mono ul in fase di trasferimento del collo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-28 10:52:53 +01:00
0b1292ec55 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-28 10:38:22 +01:00
4b4ba7bc10 Finish FixPassValidation
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-10-28 10:38:21 +01:00
8f365e77be Corretto controllo lunghezza password se uguale ad 8 2025-10-28 10:38:13 +01:00
7eded8848f Fix vari
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-28 09:03:25 +01:00
42a9756d94 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-27 17:48:56 +01:00
41fbeb333f Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-10-27 17:48:56 +01:00
279257a35d aggiunto capelli monelli 2025-10-27 17:48:50 +01:00
87d377a83c modifiche a chiusura partite
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-27 16:59:21 +01:00
5d7d2cb99f Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-27 16:57:24 +01:00
9676b65be3 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-27 16:57:24 +01:00
27f28abb9b sistemata chiave 2025-10-27 16:56:29 +01:00
cbf7ec5cdb sistemata entity
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-27 14:33:22 +01:00
b3e390a634 rivista logica per salvataggio ctb_parr 2025-10-27 14:31:42 +01:00
2ae58205d8 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-27 12:58:24 +01:00
ea025c1f31 creata setup sulla mtb_aart che se abilitata blocca se codice a barre già assegnato ad altra referenza 2025-10-27 12:58:13 +01:00
ee83cd024e corretta formattazione data documento
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-27 12:36:42 +01:00
36a0a99755 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-27 12:32:07 +01:00
0a03b1d489 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-27 12:31:54 +01:00
9d14673771 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-27 12:31:53 +01:00
ee9f4b08ff corrette regole su calc peso colli 2025-10-27 12:31:42 +01:00
a0f72ee7b1 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-27 12:22:32 +01:00
cdc81c58e7 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-27 12:22:09 +01:00
4c4b364177 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-27 12:22:08 +01:00
0a46eda642 Hotfix cifre_dec in Bigdecimal 2025-10-27 12:21:54 +01:00
c633d7c97e Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/rules/completing/AccountingRules.java
#	ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdRules.java
#	ems-core/src/main/java/it/integry/ems/rules/completing/DocumentRules.java
#	ems-core/src/main/java/it/integry/ems/rules/completing/OrderRules.java
#	ems-core/src/main/java/it/integry/ems_model/business_logic/GeneraOrdLav.java
#	ems-core/src/main/java/it/integry/ems_model/entity/CtbAmac.java
#	ems-core/src/main/java/it/integry/ems_model/entity/DtbOrdLogImport.java
#	ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniWebImportService.java
2025-10-27 11:45:02 +01:00
53fb1cb58e rivista logica per salvataggio ctb_parr 2025-10-27 11:30:40 +01:00
44e48527c6 Fix errore query getOrderLastStep
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-27 09:58:54 +01:00
74dcedeba9 Fix ricalcolo peso netto e lordo mtb_colr se modificate le qta col
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-24 19:37:52 +02:00
1faf5dd713 Fix null pointer se data cons null in CreateUDSRequestOrderDTO
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-24 19:26:54 +02:00
5848f82e4a Refactor Depositi and MovimentiContabili services and controllers; add migration for foreign key constraints
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-24 19:22:22 +02:00
797c5c7736 Refactor Depositi and MovimentiContabili services and controllers; add migration for foreign key constraints
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-24 19:19:54 +02:00
59a21796b8 Fix su login
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-24 18:26:22 +02:00
b666064d15 Condizione per Florapulia di gestione esenzione articolo prima del cliente (DA CANCELLARE QUANDO NON SARANNO PIU' NOSTRTI CLIENTI)
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-24 18:12:04 +02:00
8457bfbc75 [BIOLEVANTE]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- risolto problema in Mapping di LocalDate e LocalDate time presi dall getOldPK()
2025-10-24 17:40:36 +02:00
5541742c0d [BIOLEVANTE]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- risolto problema in Mapping di valori null in LocalDateTime
2025-10-24 16:48:33 +02:00
532aa91b23 Aggiunti campi su CtbAmac
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-24 16:14:23 +02:00
6630e42024 Implementazioni varie per magazzino automatico
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-24 15:58:36 +02:00
50c41e9de2 Implementazioni varie per magazzino automatico
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-24 15:38:25 +02:00
6aae376098 Implementazioni varie per magazzino automatico
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-24 15:37:09 +02:00
7ee6e8d64a Implementazioni varie per magazzino automatico
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-24 13:20:44 +02:00
7f2c83ea69 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-24 11:39:44 +02:00
307840c236 moifiche a registrazione movimenti doc finance
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-23 18:18:09 +02:00
3daf60767f Fix vari dataDoc
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-23 16:13:47 +02:00
5ba9035238 Fix vari dataDoc
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-23 15:24:10 +02:00
25321a9941 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-23 14:59:27 +02:00
dcbf627840 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-23 14:59:26 +02:00
3e069d1c39 Fix check licenza 2025-10-23 14:59:20 +02:00
988712b234 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-23 13:36:23 +02:00
123c7835d6 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-10-23 13:36:22 +02:00
d9d2b5bef7 Fix check licenza 2025-10-23 13:36:09 +02:00
a0035ad573 Fix vari dataDoc
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-23 12:48:31 +02:00
203a36cdba Fix dataDoc su entity child
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-23 12:41:12 +02:00
99740104b9 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-23 12:13:59 +02:00
3606aa99d9 aggiornata vista gramm olapfermimacchina con controllo che le date non siano nulle 2025-10-23 12:13:48 +02:00
673de9d9b1 aggiungo campo id pk nella tabella gramm_simulatore_coan 2025-10-23 12:12:21 +02:00
0bebf87fa4 Rimosso default PVM ad integryApplication
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-23 11:59:09 +02:00
87cb0f8302 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-23 11:34:17 +02:00
6b80520d8d modificata la regola che assegna la versione e eliminta regola non usata 2025-10-23 11:33:40 +02:00
c18551d630 Fix vari dataDoc
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-23 11:21:45 +02:00
939cfde0c5 Fix vari dataDoc
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-23 11:08:05 +02:00
4231f7b6ae Fix vari dataDoc
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-23 10:42:29 +02:00
ab956b4a6e Sistemata Migration_20250827151739 2025-10-23 10:36:57 +02:00
b7b60491d4 Fix vari dataDoc
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-23 10:25:36 +02:00
84e46ce609 Fix vari dataDoc
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2025-10-23 10:23:55 +02:00
2831137dac aggiunto id_art_equi in getListinoVendita 2025-10-23 10:22:53 +02:00
f49c622df0 Fix regola completeActivityIdOrdine
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-23 09:30:01 +02:00
f7f8bee8d0 Cambiato field dataDoc e dataOrd in LocalDate
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-22 17:53:12 +02:00
dabf6a0a54 Creata setup per disabilitare controllo su tutti i range di un colore in ordikids
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-22 17:29:22 +02:00
41e7c24b91 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-22 17:26:56 +02:00
7a6ddde702 Rimosso json property errato su cod divi in VtbListData
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-22 11:14:59 +02:00
17f4e1ad49 Merge tag 'Hotfix-2' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Finish Hotfix-2
2025-10-21 17:38:24 +02:00
74227e6bf1 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-21 17:38:23 +02:00
fc2eee29a6 Corretto controllo su codice pagamento 2025-10-21 17:37:47 +02:00
5a6fa368e4 Fix after merge
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-21 17:16:26 +02:00
8cf75f9497 Merge remote-tracking branch 'origin/develop' into develop 2025-10-21 16:54:35 +02:00
5b40bd4780 Modifica per DMS 2025-10-21 16:54:30 +02:00
9899944a04 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-21 15:14:27 +02:00
58335a5102 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-21 15:14:25 +02:00
3507bc531c aggiunto cotrnollo su null in parselocaldate 2025-10-21 15:14:20 +02:00
07fdd0a5df [MES]
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
- destinazione out
2025-10-21 14:55:09 +02:00
fd4901c294 Aggiunta colonna priorità nelle missioni ed impostata priorità 1 per le missioni di carico
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-21 12:04:45 +02:00
6e65992b90 Rimosso ordinamento missioni magazzino automatico
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-21 11:33:53 +02:00
64399d4803 Creato metodo assegnaPosizioniOrdineLav
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-21 11:17:28 +02:00
c6c4f52e93 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-21 10:03:08 +02:00
4bb4a6b34b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-21 10:02:23 +02:00
fe0927c0eb Finish FixDuplicaLisv
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-21 10:02:22 +02:00
0d93dd2b1c Corretta duplicazione listino di vendita, prima usava solo l'ultima versione 2025-10-21 10:02:14 +02:00
ab70242ebf Merge branch 'feature/GestioneMissioniMag' into feature/RefactoringGestioneColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-21 09:49:53 +02:00
cf078ced9c Aggiunti servizi per gestione magazzino automatico
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-21 09:49:33 +02:00
dad53637e8 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 18:22:44 +02:00
853470701b Add ScontriniController and update ScontriniService for delete functionality 2025-10-20 18:22:32 +02:00
b1ee861a5c Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 18:15:32 +02:00
05857e2b11 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 18:15:32 +02:00
60fb37ad8b Gestione formato CSV e EXCEL su export ANAGRAFICHE ARTICOLI
(cherry picked from commit dae03dc91f)
2025-10-20 18:14:38 +02:00
dae03dc91f Gestione formato CSV e EXCEL su export ANAGRAFICHE ARTICOLI
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 18:06:17 +02:00
5c81248472 Finish Feature-revisione_ordiniWeb
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 17:18:26 +02:00
7184c24f16 Merge branch 'develop' into feature/Feature-revisione_ordiniWeb
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-10-20 17:18:09 +02:00
a2be331295 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 17:17:01 +02:00
18403554e7 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 17:17:00 +02:00
b1e189321c visualizzare come pianificate le attività con scadenza - tornare indietro 2025-10-20 17:16:53 +02:00
e61b2532b1 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 17:01:15 +02:00
db56575b8f Finish Hotfix-100
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-20 17:01:14 +02:00
7832095b86 visualizzare come pianificate le attività con scadenza 2025-10-20 17:01:07 +02:00
6290c18046 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 16:03:31 +02:00
2bd8b6392c Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-20 16:03:17 +02:00
442af631aa Finish FlagInDuplicaListinoVend
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 16:03:17 +02:00
2666e9a7ef Gestiti flag da mtb_lisv in duplicazione listino di vendita 2025-10-20 16:02:38 +02:00
7b3395dec8 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 15:55:55 +02:00
7a15a94b38 Tolto controllo su per_aliq<>0 anche quando è presente il destinatario e non ha una sua aliquota 2025-10-20 15:55:32 +02:00
da8884dcdc Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 15:46:31 +02:00
54a09c2300 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 15:46:31 +02:00
8818a42457 regola per la valorizzazione del cod paga 2025-10-20 15:46:24 +02:00
d4a035fc0e Merge branch 'develop' into feature/Feature-revisione_ordiniWeb
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 14:50:18 +02:00
3c5a0ba1f1 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 13:06:31 +02:00
c49f135e49 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 13:06:31 +02:00
a4d7d09c0b modificata creazione file integretail 2025-10-20 13:06:24 +02:00
73b26249eb Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 13:03:04 +02:00
2581f537b1 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 13:03:04 +02:00
8c14cd1937 modificata creazione file integretail 2025-10-20 13:02:57 +02:00
597c2fe2a2 elimintato metodo non usato
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 12:42:02 +02:00
785b03455e Aggiunto completamento automatico del codice pagamento per documenti di tipo V
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 10:31:20 +02:00
c544679f1b Merge branch 'feature/RefactoringGestioneColli' into feature/GestioneMissioniMag
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 09:38:34 +02:00
95bc10950a Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSArticoloService.java
2025-10-20 09:37:25 +02:00
e7a581f326 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 09:35:26 +02:00
db85805afd Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 09:35:26 +02:00
3350677b23 Implementato login statico per app 2025-10-20 09:35:10 +02:00
8413be30a0 Aggiunto controllo su email valida nelle persone di riferimento.
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 09:20:31 +02:00
9033da0bf2 modificata vista: inserito progressivo_ul della materia prima
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-20 09:07:33 +02:00
a6415486c3 Aggiunta application Connettore Eurofork
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-17 15:41:57 +02:00
6dfd56c58e Modifica per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-17 15:33:01 +02:00
98e251478c Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-17 13:14:28 +02:00
d31a28d3b5 Add migration script for setup configuration in W_SUPTABLE 2025-10-17 13:14:14 +02:00
fd5867e5f1 [loginWeb]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- corretta login con md5 ma senza profilo
2025-10-17 11:15:11 +02:00
13311f191e Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-16 17:07:12 +02:00
1f2ace8258 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-16 17:07:11 +02:00
0aaba82e57 cambiato nome file zucchetti 2025-10-16 17:07:02 +02:00
f68f76e5ea Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-16 16:14:31 +02:00
3888c1ce25 Merge branch 'hotfix/Hotfix-1' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-16 16:14:19 +02:00
954eb96a2a Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-16 16:14:18 +02:00
057e3ac3c1 [SUIT - FARMMES]
- aggiunto MArshaller per convertire localDateTime in XML
2025-10-16 16:14:07 +02:00
8e934b8a38 Cambiato ordinamento retrieveMissioni Magazzino automatico
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-16 15:27:41 +02:00
3e9793eb76 Aggiunto servizio di moveItem in Magazzino Automatico
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-16 15:22:07 +02:00
ea6cb1e9d7 Aggiunte annotazioni nel dto di moveItems per Magazzino Automatico
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-16 12:50:37 +02:00
49cad4a71a Aggiunto filtro per tipo_mgrp in retrieveArts WMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-16 12:39:24 +02:00
629cf3bf22 Aggiunto campo articolo in retrieveArts wms
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
(cherry picked from commit 5421cb12d2)
2025-10-15 18:32:06 +02:00
9e8b05cecf [ROSSOGARGANO - MES]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- aggiunto tipo pedana in clonazione ordine di lavorazione
2025-10-15 18:04:32 +02:00
8b593a3b21 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-15 17:45:30 +02:00
6072ab57c9 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-15 17:45:29 +02:00
120d85c1d3 sistemato calcolo tempi 2025-10-15 17:45:25 +02:00
13e2b1b3a4 Rename method and DTO for activity publication; add ActivityPublicationDTO class
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-15 16:43:18 +02:00
6c705ab96b Rename .groovy to .java 2025-10-15 16:43:18 +02:00
28e0c448f4 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-15 16:03:00 +02:00
0b22aa9764 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-15 16:02:59 +02:00
a1b813f051 sistemato storno scontrino totale 2025-10-15 15:55:59 +02:00
516874a6e5 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-15 14:38:28 +02:00
5b31befcec corretto DB non esecuzione migration 2025-10-15 14:38:14 +02:00
19335be66b aggiunto campo flag_abil nella srl_user_table e creata entity 2025-10-15 14:37:42 +02:00
b7c452d41f Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-15 13:21:38 +02:00
9ac451693b Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-15 13:19:01 +02:00
399f712024 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-15 13:19:01 +02:00
db38f84fca Add flagPrimario field to MtbLisv and MtbLisvData classes and update related logic 2025-10-15 13:18:29 +02:00
b3e5c78afb Aggiunto progressivo ul in mvw_sitart_udc_det_inventario
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-15 12:31:08 +02:00
fa94de4135 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-15 12:03:06 +02:00
81b01dd5a8 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-15 12:03:05 +02:00
085d6af657 Fix cast data query attività 2025-10-15 12:02:39 +02:00
5421cb12d2 Aggiunto campo articolo in retrieveArts wms
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-15 11:51:19 +02:00
cd98c3884f Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-15 10:45:23 +02:00
92e60c95e3 creati report persanalizzati Movimentazione di vendita per licor 2025-10-15 10:45:10 +02:00
227025b526 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-15 09:46:22 +02:00
4647125b61 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-15 09:46:21 +02:00
1217922b90 Refactor activity file attachment e aggiunta la possibilità di rimuovere gli allegati 2025-10-15 09:46:06 +02:00
731c28f382 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-14 18:39:25 +02:00
2c5deeceb6 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-14 18:39:25 +02:00
8e727aeb73 Gestione nazione in partita iva in invoic ED 2025-10-14 18:39:15 +02:00
273b76715a Gestione nazione in partita iva in invoic ED 2025-10-14 18:39:05 +02:00
7aa8c71b3f Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-14 18:18:34 +02:00
ac235c2b56 ampliato log loginRetail 2025-10-14 18:18:15 +02:00
b78ab2e308 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-14 16:56:09 +02:00
a44a307dd1 Aggiunta funzione per inserire pubblicazioni di attività e creazione del DTO corrispondente 2025-10-14 16:56:05 +02:00
c25d08c9ac Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-14 16:36:31 +02:00
695e784c73 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-14 16:36:31 +02:00
0c3415b7d6 [SUIT]
- aggiunto md5 in log per servizi che non usano le credenziali dirette in login
2025-10-14 16:36:20 +02:00
b412860f1f Aggiunta funzione per clonare tabelle nel database
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-14 15:00:59 +02:00
85f5129057 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-14 12:46:46 +02:00
74bfc38cd5 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-14 12:46:45 +02:00
3ec6deaec6 Fix su JSON deserialize di un LocalDateTime anche se si passa una date 2025-10-14 12:46:38 +02:00
7bd80d9e52 Vario magazzino automatico
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-14 12:36:22 +02:00
e2113d0660 aggiunti lotti multipli su kit
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-14 12:07:14 +02:00
8199b354d8 Finish FixRettificaNull
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2025-10-14 11:48:18 +02:00
4e795f6a0a Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-14 11:48:18 +02:00
5f8732299a Fix null in caso di nessun collo di rettifica in rettificaGiacenzaProduzione 2025-10-14 11:48:05 +02:00
8babc6acfb Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-13 12:37:39 +02:00
f193d21ffa Modifica per DMS 2025-10-13 12:37:35 +02:00
6361e790b2 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-13 10:57:47 +02:00
206927622a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-13 10:57:47 +02:00
b1ee82f0dc Aggiunta colonne extra_project e view_in_meeting nella tabella stb_activity e creazione della migrazione corrispondente 2025-10-13 10:57:34 +02:00
0019f03668 Merge branch 'feature/RefactoringGestioneColli' into feature/GestioneMissioniMag
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSMagazzinoAutomaticoService.java
2025-10-13 10:01:59 +02:00
d74661153a Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
2025-10-13 09:43:08 +02:00
2529660f3b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-13 09:27:30 +02:00
5c784a3f90 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-13 09:27:29 +02:00
d493749445 Fix servizi Task 2025-10-13 09:27:18 +02:00
7e9c36ab77 Effettuato arrotondamento a 2 cifre decimali
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-13 09:11:39 +02:00
904f5115b9 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-13 09:07:41 +02:00
4387c4d1c3 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-13 09:07:41 +02:00
9c481c5380 aggiunta integry 2025-10-13 09:07:31 +02:00
8eda08d060 Merge branch 'develop' into feature/Feature-revisione_ordiniWeb
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-13 08:41:53 +02:00
jenkins
ea493b3fa2 Merge branch 'develop'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-10-12 07:41:42 +02:00
a898ef24eb Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
2025-10-10 19:00:43 +02:00
e8bd3c0c99 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-10 18:59:07 +02:00
ac7bb55874 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-10 18:59:07 +02:00
626a728529 [RETTIFICA GIACENZE]
- aggiunto flag_sezione in rettifica collo
- aggiunto flag_sezione default in dtbDocr
2025-10-10 18:58:55 +02:00
a69466f5db Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-10 15:51:37 +02:00
cdcb1eb0b6 [WMS - Rettifica Collo]
- fix rettifica positiva su nuovo collo: il salvataggio avviene due volte (sia su nuovo collo come richieste che sul collo originale)
2025-10-10 15:51:31 +02:00
9f9e1ef12d aggiunta nazione su carico oli sfuso, modifiche a espotazione listini infragruppo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-10 14:06:31 +02:00
c6526f6574 Rimossi utilizzi di mvw_sitart_udc_det
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-10 12:17:13 +02:00
a919c323ae inserita descrizione tabella srl_user_table
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-10 10:53:27 +02:00
00cb459c66 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-10 10:36:54 +02:00
e1bee4b70f creata nuova tabella di relazione tra utenti e tabelle 2025-10-10 10:36:45 +02:00
bd706155f6 Aggiornate migration Mvw nuova
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-10 10:33:34 +02:00
cd81b92bfe Nella generazione della fattura conto deposito gestito inserimento modalità di pagamento e data decorrenza uguali a quelle del contratto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-10 10:23:41 +02:00
4120f20c5a elimintati thread
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-10 09:57:13 +02:00
d43345c5fc Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-10 09:07:46 +02:00
c0ad1f0770 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-10 09:07:45 +02:00
a2bd7bc9aa eliminati gruppi senza intercode 2025-10-10 09:07:40 +02:00
02eb94fdef aggiunte descrizioni tabelle
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-10 09:06:34 +02:00
c6380a9e05 In getSuggestedPickingList sostituita dipendenza da mvw_sitart_udc_det con mvw_sitart_udc_det_inventario
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-09 13:32:14 +02:00
a01025853c Implementato servizio di debug per sincronizzare le posizioni delle pedane con eurofork
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-09 12:50:02 +02:00
08b2cb3289 Corretta query in modo che metta il codice sdi ditta solo quando l'email pec è nulla
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-09 12:31:07 +02:00
884c051b18 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
2025-10-09 10:54:14 +02:00
65009a6693 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-09 10:53:32 +02:00
cb0f18eb0b Merge branch 'hotfix/Hotfix-1' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-09 10:53:32 +02:00
30108563a0 [MES]
- fix creazione collo carico prodotto finito
2025-10-09 10:53:20 +02:00
bec0430942 Gestione opzione di attivazione nuova versione resi vendita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-08 16:52:57 +02:00
ed9952d37d Fix su FK non aggiornate a seguito del rename di stb_activity in stb_activity_old
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-08 12:19:05 +02:00
a656c81373 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-08 09:39:02 +02:00
d6c0271129 importazione scontrini mmpos 2025-10-07 18:13:25 +02:00
d3ba9aae5f creata setup che se abilitata quando si va a variare un movimento contabile più vecchio di 30 gg parte la domanda di controllo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-07 15:32:09 +02:00
809a31ea87 sistemata migration
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-07 15:08:22 +02:00
63cf1920a9 sistemata migration
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-07 14:56:34 +02:00
3c79fb6745 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-07 12:31:24 +02:00
4a86118707 creata setup che se abilitata chiede la verifica del protocollo dopo la registrazione del documento di acquisto 2025-10-07 12:31:14 +02:00
9dfd8623a7 Finish Feature-Attivita
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-07 10:29:17 +02:00
7e8b8a8bc4 eliminati campi date nella stbactivity
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-07 10:28:50 +02:00
554a78e40f Merge branch 'develop' into feature/Feature-Attivita
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-07 09:49:37 +02:00
32022652b3 Aggiunti dati ttb_qta_min_ord in exportArticoliCodbarre ordikids
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-06 18:05:41 +02:00
3560f2a661 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-06 15:34:22 +02:00
63265571ac Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-06 15:34:22 +02:00
73049f32eb Aggiunta opzione di riassegnazione costo da distinta tramire formula 2025-10-06 15:34:05 +02:00
1e9b48811c inviati articoli variati in anagrafica
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-06 14:39:40 +02:00
2312323649 considerati solo i reparti con intercode
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-06 14:12:54 +02:00
9c634059ab Merge branch 'develop' into feature/Feature-revisione_ordiniWeb
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-06 13:02:52 +02:00
57892e22ee Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-06 13:01:13 +02:00
9d6dd2ff5f Finish Hotfix-100
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-06 13:01:12 +02:00
2d1d15da98 modificate evasione ordini in accettazione 2025-10-06 13:01:02 +02:00
08af6fddb2 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-06 12:55:55 +02:00
1a97940826 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-06 12:55:55 +02:00
b2e6b0bd87 modificate evasione ordini in accettazione 2025-10-06 12:55:48 +02:00
c161857422 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-06 12:04:44 +02:00
69343830a9 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-06 12:04:43 +02:00
f3644dcc3f sistemata entity ttbLine 2025-10-06 12:04:36 +02:00
20aea0c306 Merge branch 'feature/RefactoringGestioneColli' into feature/GestioneMissioniMag
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-06 10:06:18 +02:00
03e6db20b5 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-06 10:05:40 +02:00
e53add6f0d Rimossa commessa missioni magazzino automatico
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-06 10:05:13 +02:00
b8782a14c1 Finish Feature-ImportScontriniMMPOS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-06 09:38:52 +02:00
4825d59616 Merge branch 'develop' into feature/Feature-Attivita
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-06 09:34:55 +02:00
e10f2d3a0c importazione scontrini carelli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-06 09:23:37 +02:00
18f4f2770a Merge branch 'develop' into feature/Feature-ImportScontriniMMPOS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-06 09:09:58 +02:00
jenkins
fbf26157c1 Merge branch 'develop'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-05 07:41:50 +02:00
ee2e5c5938 Nella generazione della scheda tecnica gestiti colli_pedana e colli_strato senza decimali
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-03 16:57:38 +02:00
8602bbf09d Aggiunto activity/getAvgResolutionTime
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-03 16:39:40 +02:00
38ef2b297d Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-03 16:34:17 +02:00
452a2d2555 Aggiunto servizio per retrievePosition 2025-10-03 16:34:10 +02:00
d6794a904f [Salesbook] Sistemata query per retrieveJobProgress 2025-10-03 16:33:50 +02:00
18c2ae047e importazione scontrini carelli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-03 14:29:32 +02:00
2fc60c34c3 Merge branch 'feature/RefactoringGestioneColli' into feature/GestioneMissioniMag
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-03 12:47:01 +02:00
5581055f07 Merge branch 'develop' into feature/Feature-ImportScontriniMMPOS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-03 12:06:30 +02:00
fc0ac2ec4b gesione tabella ttb_qta_min_ord
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-03 12:05:18 +02:00
b64cd203eb Aggiornata procedura pianificata di import scontrini per evitare le internal call
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-03 11:13:14 +02:00
e436b9773e valore voucher
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-02 18:24:02 +02:00
37cb5d90f4 Creata tabella mrl_aart_clie_blacklist
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-02 16:05:43 +02:00
15e598df7e modificato parametro user_name nella processReport
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-02 14:33:58 +02:00
b2d2bd494a [ROSSOGARGANO - MES]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- fix in calcolo progressivo UL su UDC create alla mezzanotte
- aggiunto calcolo dataProd in base al lotto
2025-10-02 13:02:39 +02:00
b43b6be4ac Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-02 12:39:22 +02:00
4036d2a04f inserito parametro user_name nella processReport 2025-10-02 12:39:02 +02:00
58d900cc6b Merge branch 'master' into feature/RefactoringGestioneColli 2025-10-02 12:20:09 +02:00
90bc764e61 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-02 12:18:08 +02:00
37fcfba74e Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-02 12:18:08 +02:00
9e5bfc6655 [ROSSOGARGANO - MES]
aggiunta nuova funzione db per suggest data produzione partita
2025-10-02 12:17:56 +02:00
295fd59729 [ROSSOGARGANO - MES]
aggiunta nuova funzione db per suggest data produzione partita
2025-10-02 12:17:48 +02:00
8c2cf7d9fe Corretta funzione per estrazione articolo miscela
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-02 11:52:18 +02:00
efb786ed0d Corretta unique key in tabella ttb_qta_min_ord
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-02 11:45:49 +02:00
cc21e43bd4 Cambiata struttura MtbMissioneMagAuto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-02 11:05:48 +02:00
5acf3023b7 [ROSSOGARGANO]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- aggiunti riferimenti ordine in rettifica giacenze colli L+
2025-10-01 17:20:50 +02:00
514500de0b gestita wtbDepo come entity child in mtbDepo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 17:12:15 +02:00
304f0a53db Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 17:02:28 +02:00
645b269fc8 Modificato tipo default_depo in Boolean 2025-10-01 17:02:18 +02:00
94ceff0753 Merge branch 'develop' into feature/Feature-ImportScontriniMMPOS 2025-10-01 16:52:04 +02:00
7f16ca80f4 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-01 16:48:09 +02:00
14c57d6ab5 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 16:48:08 +02:00
ce56820405 cntrollo null 2025-10-01 16:48:03 +02:00
9d9ce1f3ac Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 16:13:43 +02:00
4e46f89440 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 16:12:56 +02:00
fa337ffb16 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 16:12:56 +02:00
bd3b915963 corretto tipo dato per la colonna default_Depo 2025-10-01 16:12:44 +02:00
032a4e3aca corretto tipo dato per la colonna default_Depo 2025-10-01 16:12:38 +02:00
3c4d62cde2 Passata in left la query sui colli per segnalazione fatta da Dulciar
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 15:48:06 +02:00
d1a7a166a8 Merge branch 'develop' into feature/Feature-ImportScontriniMMPOS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 15:38:41 +02:00
e0a3dbcea2 eliminati campi date nella stbactivity
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-01 15:38:25 +02:00
112f083c9a Creata entity MrlAartClieBlacklist e creata voce di menu blacklist articoli cliente
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 12:31:24 +02:00
adccf68c45 aggiunto modulo rimobrsi KM in menu
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 12:16:58 +02:00
f84a18b9b6 Modifica per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 11:50:54 +02:00
d7ef52f164 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 11:50:27 +02:00
5a91589ac6 Modifica per DMS 2025-10-01 11:50:14 +02:00
942dbeef5e eliminati campi date nella stbactivity
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-10-01 10:41:54 +02:00
7d6f11272f Merge branch 'feature/RefactoringGestioneColli' into feature/GestioneMissioniMag
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 10:15:20 +02:00
a18156014b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 10:00:39 +02:00
c5cbfd406f Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 10:00:38 +02:00
abc2a0bb1e Fix su clean directory 2025-10-01 10:00:31 +02:00
f9ab71462f Fix su clean directory
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 09:59:38 +02:00
3568b6b17e Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 09:59:09 +02:00
93261bdb87 Fix su clean directory 2025-10-01 09:59:03 +02:00
202261afc1 Visualizzazione flag in stampa riepilogo presenze per dipendente
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-10-01 08:48:57 +02:00
75d42d04ee eliminati campi date nella stbactivity
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-30 17:27:15 +02:00
f014e4b959 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-30 16:36:30 +02:00
6898cfc92c Finish FixDocDDTP
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-30 16:36:16 +02:00
e85b00c457 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-30 16:36:16 +02:00
ba1e8bb41c Fix creazione documento ddtp per documenti con costo acquirente 2025-09-30 16:36:05 +02:00
32ad423fc2 Fix controllo tipo documento save documenti diretti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-30 16:24:32 +02:00
bd2f7126a9 [ROSSOGARGANO - ACCETTAZIONE]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- tolti commit automatici alla closeUDC di lavorazione per evitare problemi alla rollback di procedure più ampie
2025-09-30 16:06:14 +02:00
1661d60b94 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-30 15:34:12 +02:00
438d62a362 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-30 15:34:11 +02:00
0bb2cf76bf Aggiornamento updordini 2025-09-30 15:33:59 +02:00
987a576bfd Aggiornamento updordini 2025-09-30 15:33:28 +02:00
91ea98d9f2 Merge tag 'Hotfix-100' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Finish Hotfix-100
2025-09-30 15:14:31 +02:00
b64c01e7ce Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-30 15:14:30 +02:00
be1ee50f32 mina: ottimizzazione getDatiProv 2025-09-30 15:13:53 +02:00
d2955085c5 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-30 15:11:59 +02:00
10ed26c023 creata setup che verifica o meno che la data decorrenza sia precedente alla data del documento 2025-09-30 15:11:52 +02:00
98cf6d5192 Sistemata UpdProgOrdini: era saltata la parte che aggironata la qta_evasa_prod
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-30 12:15:41 +02:00
9007eda560 Merge branch 'feature/RefactoringGestioneColli' into feature/GestioneMissioniMag
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 18:41:46 +02:00
139fc94ed5 Creato servizio di logError missione 2025-09-29 18:41:41 +02:00
7e0ee7192e Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 18:05:47 +02:00
f68690a01b Aumentate dimensioni campo cod_affiliazione destinatario 2025-09-29 18:05:42 +02:00
fcdbe8ab94 eliminati campi date nella stbactivity
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-29 17:42:05 +02:00
19568d1394 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 17:21:20 +02:00
425b4b544f Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 17:21:18 +02:00
5dc8949215 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 17:20:51 +02:00
b51fc95057 Merge branch 'develop' into feature/GestioneMissioniMag
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 17:02:26 +02:00
1497a55607 tolta commit da sincronizzazioni 2025-09-29 17:00:42 +02:00
0782d0206c Fix su query deposito utente errata
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
(cherry picked from commit eddd9ff8e7)
2025-09-29 16:54:09 +02:00
6f94a290ee AGGIUNTO CONTROLLO SU COD_ANAG NULLO 2025-09-29 16:40:25 +02:00
911271a6b1 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 16:39:56 +02:00
d955609d93 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 16:39:56 +02:00
eddd9ff8e7 Fix su query deposito utente errata 2025-09-29 16:39:51 +02:00
1eface5798 Merge branch 'develop' into feature/GestioneMissioniMag
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-29 15:58:41 +02:00
dcd3b0aace gestito log chiusura tagli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-29 15:48:30 +02:00
77a2fef606 Aggiunte logiche per documenti di integrazione durante la generazione dell'FPX
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-29 15:43:29 +02:00
d54da02dc0 Aumentate dimensioni campo cod_affiliazione destinatario
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 12:48:11 +02:00
7e4c36a785 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 10:46:54 +02:00
1bee7e59ab Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 10:46:53 +02:00
d629f0a21d aggiunti campi rapportini 2025-09-29 10:46:47 +02:00
eecadba27d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 10:13:05 +02:00
ab764a9a50 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 10:13:04 +02:00
6027df9ee5 risolta evasione ordini accettazione 2025-09-29 10:12:56 +02:00
3bc9e6629b Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 09:57:05 +02:00
f10e90bc9b [BIOLEVANTE - SERBATOI]
- aggiunta eccezione in funzione isGestisciColli se il tipo deposito non è specificato
2025-09-29 09:55:32 +02:00
997c667f1b Merge branch 'develop' into feature/GestioneMissioniMag
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 09:55:00 +02:00
6efa6e7293 [Magazzino Automatico] Aggiunti servizi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 09:21:27 +02:00
7d831c59e7 Merge branch 'develop' into feature/Feature-ImportScontriniMMPOS 2025-09-29 09:21:24 +02:00
eaf8e4779e aggiunto servizio in ascolto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 09:21:04 +02:00
84669f3929 gestito storno
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-29 08:43:24 +02:00
9b3184281c importazione scontrini new
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-26 17:07:03 +02:00
32229f7157 [Magazzino Automatico] Completato servizio di retrieve 2025-09-26 16:38:31 +02:00
7dff05df5c Modifiche migrations DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-26 13:04:42 +02:00
b88a5bface Modifiche migrations DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-26 13:04:25 +02:00
7b09900a1f [Magazzino Automatico] Create entity per le missioni e servizi base 2025-09-26 12:21:23 +02:00
48b87b7b48 gestito valore 0 nella divisione con il peso_kg
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-26 09:50:12 +02:00
bc512ab8f2 Rimosso parametro duplicato in getReportParams
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-25 18:11:29 +02:00
71cb4d0d88 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
# Conflicts:
#	build/Jenkinsfile.groovy
2025-09-25 16:08:39 +02:00
b73d2e9bac nascosto log della login per sicurezza e privacy
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-25 16:07:23 +02:00
bc18dc3231 Merge branch 'develop' into feature/Feature-ImportScontriniMMPOS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-25 15:53:31 +02:00
d660bb592b added TtbGrtg, TtbGrtgEl, and TtbQtaMinOrd entity classes
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-25 15:50:30 +02:00
a5478ef619 migration per textiles
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-25 15:44:46 +02:00
c8034042aa migration per textiles
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-25 15:36:10 +02:00
bff520b2ab Nel caso di kit con costo da composto valorizzato con funzione f_getPrzNettoAcqArt (stessa espressione prevista nel listino di acquisto)
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-25 14:58:59 +02:00
71eeba9091 Aggiunta migration per abilitare a tutti i clienti (eccetto Carelli) la login tramite servizi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-25 13:09:53 +02:00
f30284a30b Modificata regola per bloccare cancellazione solo se esiste un movimento di incasso - pagamento sulla partita contabile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-25 11:54:46 +02:00
0f42d5a2ba Aggiunto campo "backupAfterImport" utilizzato dalle importazioni da SFTP
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-24 17:36:52 +02:00
8932e3ac98 Aggiunto campo "backupAfterImport" utilizzato dalle importazioni da SFTP
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-24 17:36:27 +02:00
ebf9af7b8b Fix build command
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-24 11:48:19 +02:00
9476e99476 Fix build command 2025-09-24 11:48:17 +02:00
a338077542 Fix build command 2025-09-24 11:48:16 +02:00
db9a613fc9 Fix build command 2025-09-24 11:48:14 +02:00
0d4882b818 Prima build con podman 2025-09-24 11:48:12 +02:00
856b759acc Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-24 11:35:06 +02:00
c6271341b8 Modificata la query prendendo il codice del PDC quando il diacod è null 2025-09-24 11:34:58 +02:00
b68a7aebd4 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-24 11:29:33 +02:00
c682331a22 Fix build command
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build started...
2025-09-24 11:29:04 +02:00
af6bc8ebe9 Corretto rollback su salvataggio documenti in caso di errore e creazione doc imballo se cod forn trasp impostato
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2025-09-24 11:24:00 +02:00
cbbc0739c6 Merge branch 'develop' into feature/RefactoringGestioneColli 2025-09-24 11:20:02 +02:00
685fa64f46 bugfix: corretta creazione indice unico us deposito default utenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-24 11:19:37 +02:00
e12f00984d Merge branch 'develop' into feature/RefactoringGestioneColli 2025-09-24 11:18:42 +02:00
5dc20c4e3f Merge branch 'develop' into feature/RefactoringGestioneColli 2025-09-24 11:18:11 +02:00
1456749587 Fix build command
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-24 11:11:27 +02:00
dac957e5b0 Fix build command
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2025-09-24 11:10:54 +02:00
f8fd7820bc Fix build command
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-24 10:49:34 +02:00
db35c3d914 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-24 10:48:11 +02:00
fde32f2314 Prima build con podman 2025-09-24 10:48:05 +02:00
dee4485a89 WMS
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
- aggiunto flag deposito di default per utente
2025-09-24 10:01:57 +02:00
ef58f2e65c importazione scontrini nuova 2025-09-23 18:45:45 +02:00
d5763c1d03 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-23 18:32:57 +02:00
26d83ddabf Finish FixCrmCompleteOrder
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-23 18:32:57 +02:00
d0369d85c5 Fix cod anag mancante non associato ad ordine in caso di nuovo cliente 2025-09-23 18:32:50 +02:00
4a61a4b60c Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-23 17:25:31 +02:00
dbba2e3fb3 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-23 17:24:42 +02:00
6248e0da07 Finish FixCalcPeso
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-23 17:24:42 +02:00
c9fac89d16 Fix ricalcolo peso non salvato su ordini 2025-09-23 17:24:32 +02:00
11431e37c9 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-23 17:08:59 +02:00
827fc6836c Modifiche migrations DMS 2025-09-23 17:08:49 +02:00
262d6d0f08 Finish MaxiDataV2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-23 15:53:49 +02:00
ea5c880b0a Merge branch 'develop' into feature/MaxiDataV2
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-09-23 15:53:18 +02:00
182bd07d6c Ripristinata vecchia logica (in attesa di switch ufficiale) dell'importazione degli ordini di maxidata
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-23 15:52:48 +02:00
66a514468f [MaxiData] Completata implementazione API per creazione pedana, avvio, pausa e stop di ordine di lavoro 2025-09-23 15:52:22 +02:00
ff41b7e0dd Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-23 13:25:04 +02:00
de6e0865ac Gestione esenzione iva su spese trasporto da prospet 2025-09-23 13:24:58 +02:00
6b8a2fb4c0 Merge branch 'develop' into feature/Feature-ImportScontriniMMPOS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-23 12:05:36 +02:00
86e0750f03 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-23 11:55:23 +02:00
d0bb5e9342 Impostato ad 1 valore setup 2025-09-23 11:55:13 +02:00
9712d81a7d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-23 11:51:38 +02:00
cea2af9237 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-23 11:51:37 +02:00
6734cfdde2 sistemato controllo su updprogmaga 2025-09-23 11:51:32 +02:00
8f6ce309a2 Modifica funzione disponibilità TEXTILES
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-23 11:44:40 +02:00
d551f029a8 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-23 09:23:48 +02:00
87204b30bd Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-23 09:23:47 +02:00
28faad2491 Fix insert or update activity 2025-09-23 09:23:19 +02:00
839942ea40 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-22 15:44:17 +02:00
d24f5387dc Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-22 15:44:17 +02:00
521cc48e56 sistemata notifica 2025-09-22 15:44:11 +02:00
44a9d7dbd2 Modificato il nome utente nella notifica per l'attività
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-09-22 15:43:08 +02:00
74d3dc0a67 migratio per eliminare lettura setup per biolenvante
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-22 15:38:18 +02:00
acc35b8cc8 modifiche per nuova impostazione scontrini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-22 14:15:33 +02:00
b9b756a811 Merge branch 'develop' into feature/MaxiDataV2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-22 10:30:30 +02:00
b82a3dd227 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250917111031.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/dto/HistoryVersamentoULDTO.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSMaterialiService.java
2025-09-22 09:51:01 +02:00
c1e979391d merge
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-22 09:50:54 +02:00
5fd28fddd1 Merge branch 'develop' into feature/Feature-revisione_ordiniWeb
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-22 08:41:07 +02:00
8a1ef5c6cf Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-19 18:12:38 +02:00
da57dfed5b Eliminata disattivazione articoli disattivi nell'aggiornamento del listino di vendita in anagrafica 2025-09-19 18:12:33 +02:00
d60b57ff02 [CRM] Gestito in transferProspect la possibilità di passare il codAnag null
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-19 17:41:24 +02:00
9c85f5da3c Merge branch 'develop' into feature/MaxiDataV2
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-19 17:05:12 +02:00
8357a33df8 [MaxiData] Completata nuova importazione ordini produzione (To Be Tested)
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-19 17:00:59 +02:00
7a150516b4 aggiunto campo nella mtb_sgrp
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-19 13:20:56 +02:00
ddf518d11a Modificate funzioni per estrarre in numero documento del fornitore
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-19 10:46:59 +02:00
cf69cccbce Modificate funzioni per estrarre in numero documento del fornitore
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-19 10:30:05 +02:00
68c220b8a8 cancellata migration
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-19 10:01:24 +02:00
1b05d58049 aggiunta migrazione per la creazione delle funzioni f_getNumDoc4NumDocForn e getNumDoc4NumDocForn
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-19 10:00:34 +02:00
925e08ffc7 Modifica servizio orgcons DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-18 19:20:24 +02:00
ca9843f71a [RG]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- aggiunta dataProd nella partita di SL generata al cambio giornata
2025-09-18 19:03:12 +02:00
90f86858e9 Modifica migratons DMS 2025-09-18 18:52:32 +02:00
6c1652e955 Modifica migratons DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-18 18:47:38 +02:00
af364d4220 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-18 17:45:02 +02:00
b97bd848a8 [WMS] Aggiunta migration che allinea alcune setup del WMS che potrebbero mancare su alcuni clienti 2025-09-18 17:44:55 +02:00
4dedea79cf aggiunta migrazione per la funzione ftx_calcCostoProd aggiunti nuovi campi per slim2k
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-18 17:37:32 +02:00
29963759f2 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-18 16:10:14 +02:00
70c1723c5d aggiunta migrazione per la funzione ftx_calcCostoProd aggiunti nuovi campi per slim2k 2025-09-18 16:09:59 +02:00
41b95b9dcb Spostata voce menu tracciabilita pvm in magazzino
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
(cherry picked from commit 6177a4b3c4)
2025-09-18 11:35:14 +02:00
c0b67577a7 [MaxiData] Implementata prima parte di ImportProduzioni
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-18 10:39:11 +02:00
82a74cbf1c Modifica gernerazione report invio promozioni a negozio
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-18 10:16:46 +02:00
56fbc96d9a aggiunti gli sconti cliente
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-17 18:27:24 +02:00
7d629b5753 aggiunto sconto cliente e il listino è agganciato ad un solo cliente
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-17 18:18:38 +02:00
56d7876eb5 [MaxiData] Primi check autorizzazioni 2025-09-17 17:06:29 +02:00
af0f1e14b0 Merge branch 'develop' into feature/Feature-revisione_ordiniWeb
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-17 16:56:50 +02:00
20c6adc41f Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-17 16:54:56 +02:00
cfe0ae52e8 aggiunte notifiche su attività T0003 2025-09-17 16:54:52 +02:00
49cbc45ac0 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-17 16:52:53 +02:00
8672c7df11 riempita tabella drl_tipi_report a biolevante 2025-09-17 16:52:41 +02:00
6177a4b3c4 Spostata voce menu tracciabilita pvm in magazzino
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-17 16:37:52 +02:00
50c57d1977 attivazione servizi rest su gestione automezzi e nuova gestione documenti di lavorazione su carelli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-17 16:09:15 +02:00
1d16e2cc13 [WMS] Aggiunto servizio di retrieve ultimi versamenti merce per vecchia gestione colli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
(cherry picked from commit 7507ab834c)
2025-09-17 15:07:48 +02:00
79355eab19 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-17 15:06:48 +02:00
d4f2032aa7 aggiunto controllo 2025-09-17 15:06:04 +02:00
d1a1aad1d8 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-17 15:05:42 +02:00
d94f0f1a7e Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-17 15:05:42 +02:00
7507ab834c [WMS] Aggiunto servizio di retrieve ultimi versamenti merce per vecchia gestione colli 2025-09-17 15:05:37 +02:00
a2c007119b Refactor Giacenza handling and add new endpoint for populating Giacenza table
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-17 14:48:45 +02:00
7e421762d7 aggiunta tabella carelli_giacenza_prog_bck
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-17 12:27:14 +02:00
2abf8b55ac Creato menu tracciabilita su pvm, setup per report ed update viste
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
(cherry picked from commit a24e26b436)
2025-09-17 12:26:59 +02:00
a24e26b436 Creato menu tracciabilita su pvm, setup per report ed update viste
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-17 12:14:29 +02:00
1008229297 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-17 11:59:09 +02:00
cf492ee2a0 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-17 11:59:09 +02:00
dac93e9e30 Sistemata retrieve delle pvm info (era POST, convertita in GET) 2025-09-17 11:59:03 +02:00
aaac5bebb7 Merge branch 'develop' into feature/MaxiDataV2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-17 09:03:39 +02:00
46002e7580 Update endpoint path for generaCorrispettivi in DocumentController
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 17:21:43 +02:00
5982c8e966 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 17:09:32 +02:00
6889372e40 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 17:09:31 +02:00
158ccaa3ce aggiunto depostio nella descrizione 2025-09-16 17:09:26 +02:00
a0014d5ccd Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 16:47:04 +02:00
44091910ff Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 16:47:03 +02:00
b25dff5d48 Add rules to complete serDoc in CtbMovt and CtbMovr; create migration scripts 2025-09-16 16:46:52 +02:00
163613f836 Add rules to complete serDoc in CtbMovt and CtbMovr; create migration scripts
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 16:45:30 +02:00
82972a537e Aggiunti file in gitignore
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 16:26:07 +02:00
5d77838838 Creata regola personalizzata per la generazione dei barcodeUl di OlioLevante
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 15:58:57 +02:00
b163c74771 Refactor generaCorrispettivi method to return a single ServiceRestResponse
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 12:23:29 +02:00
9006da1383 Fix check tipo documento trasferimenti interni in spostaUl
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 11:46:52 +02:00
026f89d031 Fix migration biolevante
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 10:24:12 +02:00
8068110cf3 Vario
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 10:19:57 +02:00
78f91d2cfe Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 10:01:38 +02:00
b39f07414b Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 10:01:37 +02:00
e3be231990 Cambiata lettura profileDb in RequestDataDTO 2025-09-16 10:00:40 +02:00
3ee2272886 Merge branch 'develop' into feature/MaxiDataV2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 09:39:28 +02:00
6c58a19495 Aggiunti file in gitignore
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 09:39:05 +02:00
2d11f53330 Aggiunti file in gitignore
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-16 09:38:37 +02:00
ad7274fdbf Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 17:28:47 +02:00
fd2f4772ce Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-15 17:28:47 +02:00
2f649932b6 modifica json log 2025-09-15 17:28:41 +02:00
198e1d284b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 16:35:54 +02:00
5041244f63 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 16:35:53 +02:00
592c4f4b9a Add migration for function getNumDoc4NumDocForn 2025-09-15 16:35:39 +02:00
cb7a45d83e Aggiunte API MaxiData di produzione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 16:26:37 +02:00
6c95492412 Merge branch 'develop' into feature/MaxiDataV2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 16:16:31 +02:00
1dd6d8b3fa Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 16:03:48 +02:00
e026f9a0ea Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 16:03:29 +02:00
17c5b96c98 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 16:03:28 +02:00
eddad11630 Fix payloadLength nel logger 2025-09-15 16:03:06 +02:00
0f65aaffab Add migration for function getNumDoc4NumDocForn
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-09-15 16:03:01 +02:00
8723751f78 Merge branch 'develop' into feature/MaxiDataV2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 15:57:12 +02:00
67c1a8fba5 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 15:56:36 +02:00
24db8fbcec Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-15 15:56:17 +02:00
c687831f4f Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-09-15 15:56:16 +02:00
b878529840 Fix su lunghezza log 2025-09-15 15:56:11 +02:00
c4e8985642 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 15:47:24 +02:00
e6ee9c7090 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 15:46:10 +02:00
ab9672cae3 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 15:46:10 +02:00
3dc3aea47b Micro fix 2025-09-15 15:45:54 +02:00
c8fdf2634d Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-15 15:20:08 +02:00
295afc7acc Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 15:20:08 +02:00
450848b080 rivista query 2025-09-15 15:19:51 +02:00
d154ee9852 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 14:13:34 +02:00
ff2420c551 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 14:13:34 +02:00
096650b4f6 Commented out file import logic and set primary DB in transaction manager 2025-09-15 14:13:25 +02:00
b5a2d999e6 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 13:51:54 +02:00
92bc126e24 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 13:51:54 +02:00
966f73aef3 correzione procedura di importazione accettazione 2025-09-15 13:51:45 +02:00
d048ea1f9c Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 12:56:40 +02:00
77ff799dba Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 12:56:28 +02:00
4804ec24c1 Finish FixAgribookFields
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 12:56:27 +02:00
b1c3935457 Fix uso MultiDBTransactionManager diretto per profiledb della richiesta 2025-09-15 12:56:20 +02:00
6301305b1a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 12:13:26 +02:00
5d0b300e2a Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 12:13:26 +02:00
eac86126c2 eliminta condizione 2025-09-15 12:10:47 +02:00
a3552e0926 [CARELLI] Creati servizi per pagina sul portale scheda viaggi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 11:30:14 +02:00
6f2d485de7 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 10:42:15 +02:00
9f46505136 Merge branch 'develop' into feature/RefactoringGestioneColli 2025-09-15 10:41:51 +02:00
3bd6521967 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 10:41:31 +02:00
e189aa4f6c Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 10:41:31 +02:00
e318d8625b [biolevante]
- rimosso nome db in query update
2025-09-15 10:41:19 +02:00
4d2fbf610d Rimosso BiolevantePeppe
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 10:37:32 +02:00
0f91128b8e Aggiornato client MaxiData
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 10:36:55 +02:00
d5eb4c62f6 Merge branch 'develop' into feature/MaxiDataV2
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-15 10:04:46 +02:00
3ec8d6d0e1 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 09:24:48 +02:00
360fa9e59f Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 09:10:01 +02:00
a3df8d0822 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-15 09:10:01 +02:00
b902879a26 modifiche su slim 2025-09-15 09:09:54 +02:00
jenkins
e570b32e05 Merge branch 'develop'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-14 07:41:37 +02:00
c2612e40b4 [BIOLEVANTE - SERBATOI]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- nuova tabella gestione caratteristiche macchinari
2025-09-12 18:36:31 +02:00
c9ee41a1b1 Aggiornato client MaxiData
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-12 18:23:20 +02:00
cc8b20d065 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-12 17:48:08 +02:00
6cade2576e [CRM] Modificata query per chiusura pratica 2025-09-12 17:48:02 +02:00
a64e219632 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-12 17:26:44 +02:00
3884a6736f sistemate personalizzate report d_cscadfor_nobanca_rep 2025-09-12 17:26:35 +02:00
03664cd9a5 Aggiunti equals in SettingsModel in modo da evitare refresh inutili nel caso i dati non siano cambiati
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-12 15:44:30 +02:00
ee48302a0b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-12 13:17:54 +02:00
9d724911ad riempita tabella drl_tipi_report a rossogargano 2025-09-12 13:17:19 +02:00
3fcd649cce Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-12 12:53:07 +02:00
3a05e2c10d Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-12 12:53:07 +02:00
e02fe6c36c [CONNECTIONS]
- aggiunto destroy delle connessioni prima della reinizalizzazione post modifiche ad ems-settings
    - aggiunta eccezzione in getConnection se la connessione stabilita ha un db diverso da quello richiesto
2025-09-12 12:52:55 +02:00
eaf10604ef Merge branch 'develop' into feature/MaxiDataV2 2025-09-12 10:57:33 +02:00
26ca33258c Fix logger
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-12 10:57:11 +02:00
4a0382cafc Merge branch 'develop' into feature/MaxiDataV2
# Conflicts:
#	.idea/copilot.data.migration.agent.xml
2025-09-12 10:52:53 +02:00
450252ff24 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-12 09:39:47 +02:00
f399b1a4cf Modifica procedura chiusura commessa Maggio 2025-09-12 09:39:31 +02:00
aaed6e7e0a Cambiato log delle richieste
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-12 09:25:47 +02:00
9ef98b50e3 Modifica procedura chiusura commessa Maggio
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-11 19:17:05 +02:00
52b712ce32 Rimosse classi ed import/export di Amazon e SocialWare
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-11 16:47:33 +02:00
cd00a16aa3 Rimosse classi e servizi obsoleti che utilizzavano DataSource in maniera diretta.
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-11 15:44:08 +02:00
80429f1700 Creato metodo mapHashMapToCSV.
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Fix loading iniziale SettingsModel.
2025-09-11 15:15:24 +02:00
73d80ef2bc Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-11 15:13:16 +02:00
36a66ee50d [CRM] Implementate e migliorate logiche per le notifiche 2025-09-11 15:13:08 +02:00
4a954c5870 aggiunta data ispezione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-11 15:04:24 +02:00
9e4f099515 Fix return compileWordFile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-11 14:30:45 +02:00
bb21bc678e [Biolevante] fix creazione dataSheet: Cast string variabili e gestiti errori download minio
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-11 13:42:58 +02:00
8e3a4afb5b Esportazione report fatturato agente/clienti in Excel
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-11 11:36:13 +02:00
55975c45c9 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-11 11:33:14 +02:00
52adf80a2e Aggiunto bottone di esportazione in Excel 2025-09-11 11:33:06 +02:00
bc349742ef Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/webapp/index.html
2025-09-11 10:28:13 +02:00
9fdc1f6b0e Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-11 10:27:09 +02:00
5cfff0e143 Modifiche multidbtransaction manager.
Fix WebUI.
2025-09-11 10:27:04 +02:00
bfce428f2c Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-10 17:40:42 +02:00
1e8745fc31 Modifica servizio orgcons DMS 2025-09-10 17:40:24 +02:00
39ffb2ea49 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-10 17:27:17 +02:00
69cb18762a Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-10 17:27:16 +02:00
1ba5e25eba modificata condizione su date per estrazione ultima partia acquistata 2025-09-10 17:27:09 +02:00
fe6343f4e4 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-10 17:01:42 +02:00
772242fcae Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-10 17:01:41 +02:00
777c3e7aac profile 2025-09-10 17:01:31 +02:00
e799d0e577 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-10 15:54:58 +02:00
c3e8ccf0c2 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-10 15:54:57 +02:00
ce198e1da9 Finish Hotfix-100 2025-09-10 15:43:27 +02:00
17b821157e Personalizzato report D_TORIEPORDINI_COMP_REP per Two B.
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-10 15:25:08 +02:00
32c7424c89 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-10 15:17:33 +02:00
df4e76f05e Personalizzato report D_TORIEPORDINI_COMP_REP per Two B. 2025-09-10 15:17:25 +02:00
cce5fa85d3 Fix maxlength su porto non più effettuato
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-10 15:14:38 +02:00
f13b021fcd Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-10 13:21:17 +02:00
49499c1b91 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-10 13:21:16 +02:00
ea62524763 aggiunti log 2025-09-10 13:21:10 +02:00
0b0942b995 Autogenerato client maxidata utilizzando openapi-generator 2025-09-10 12:09:03 +02:00
b530ec1821 Aggiunti campi nuovi in contratti di vendita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-10 11:09:12 +02:00
bc502cbf74 creato report Schede movimentazioni articoli partita personalizzato per rossogargano
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-10 10:21:34 +02:00
811b686f17 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-10 10:05:17 +02:00
4fd2d5494e Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-10 10:05:16 +02:00
f857b2ed95 Migliorie DataSource 2025-09-10 10:04:53 +02:00
3a64d116e6 aggiunta setup
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-10 09:11:16 +02:00
b44f2bb2f9 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-09 17:05:42 +02:00
39d63497bb Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-09 17:05:41 +02:00
b2250bf3cf Fix check distributore null 2025-09-09 17:05:36 +02:00
54517ba92e Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-09 16:51:17 +02:00
3ae1d3cefe Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-09 16:51:16 +02:00
a3eade290e Fix su sincronizzazioni 2025-09-09 16:51:08 +02:00
d6ac2f00b6 Creato servizio downloadFileFromRefUuid
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-09 15:57:47 +02:00
63727411c4 [CRM] Modificati servizi di retrieve 2025-09-09 15:57:25 +02:00
4100c9cc03 Aggiunti file mancanti webapp
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-09 12:18:03 +02:00
f58282e73b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-09 10:27:53 +02:00
566f748fb3 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-09 10:17:00 +02:00
4630a53881 Modifiche migrations DMS 2025-09-09 10:16:56 +02:00
6fca8f90e6 Migliorato controllo di abilitazione dei contratti di acquisto/vendita 2025-09-09 10:11:23 +02:00
9700db0dbc Cambiato messaggio di compilazione riuscita su webhook MS Teams
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-09 09:29:42 +02:00
1fb09d1a41 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-08 22:32:44 +02:00
da8bc54f90 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-08 22:32:44 +02:00
4b823e3b82 Tolto valore assoluto su query di costi (dare - avere) e ricavi (Avere - dare) sulla ctb_movr_coan
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-08 16:02:08 +02:00
726aa7f080 rimossa eccezione in caso di errore e aggiunto commit per gestione transazioni 2025-09-08 15:56:03 +02:00
14062da824 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-08 15:31:01 +02:00
4bdf4ab779 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-08 15:31:00 +02:00
d454b4b8b1 sistemata wherecond tipo doc 2025-09-08 15:29:40 +02:00
b4e22ca7a4 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-08 15:09:27 +02:00
e7abca0cc0 Aggiunto codice SDI nella tabella azienda 2025-09-08 15:09:18 +02:00
6ad433488e Rimossa dichiarazione setupGest da alcune regole
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-08 13:10:35 +02:00
255de9a955 Fix su localDate in DocumentRules
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-08 12:01:29 +02:00
622c4c903c Merge branch 'master' into feature/RefactoringGestioneColli
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/datasource/DataSource.java
#	ems-core/src/main/java/it/integry/ems/rules/completing/DocumentRules.java
2025-09-08 11:59:49 +02:00
1c63622538 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-08 11:43:22 +02:00
55f05f0541 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-08 11:43:22 +02:00
192a45786d Rimossa validation query su datasource 2025-09-08 11:43:16 +02:00
79f3105797 modificata gestione della data di ricezione allegati per utilizzare LocalDateTime 2025-09-08 11:43:01 +02:00
70e5dad7c1 modificata gestione della data di ricezione allegati per utilizzare LocalDateTime
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-08 11:41:57 +02:00
63b46cd93f aggiunto controlo per textiles
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-06 07:39:32 +02:00
7872a82cc1 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-05 21:46:51 +02:00
05ea13b155 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-05 21:46:50 +02:00
bcc00e39da aggiunta commit 2025-09-05 21:46:43 +02:00
5d3a79827c sistemata syncronizzazione, migration per ftx_getDisponibilitaArticoli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-05 17:54:23 +02:00
e51fa4fa6b Fix su aggiornamento qta documenti diretti di vendita (il collo si sganciava e non veniva più riagganciato)
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-05 13:13:02 +02:00
6f04ea323c creato report "Scadenze Fornitori" personalizzato per gramm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-05 10:57:51 +02:00
eb7c41841b Fix su regola che completa dataIns nelle VtbOfft
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-05 10:45:20 +02:00
bbfcbeb906 aggiunti campi su contratti v
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-05 10:23:05 +02:00
36c0e3c9d1 rinominato servizio
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-05 10:19:57 +02:00
febe8be89e Ulteriori fix su Datasource
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
(cherry picked from commit 94add3ecde)
2025-09-05 09:38:01 +02:00
e3f2eab10b Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-05 09:30:59 +02:00
b81c7febbe inseriti nuovi campi nella vista w_tracciabUDCProd 2025-09-05 09:30:47 +02:00
97c7ac188c Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-05 09:30:12 +02:00
4d7a856ffb Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-05 09:30:12 +02:00
94add3ecde Ulteriori fix su Datasource 2025-09-05 09:30:05 +02:00
89ba0a60bf Modifiche migrations DMS
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-04 18:10:57 +02:00
3ad15c8457 Fix su connessioni del Connection Pool
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
(cherry picked from commit 1a76055a09)
2025-09-04 18:07:28 +02:00
be1480e2f0 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-04 18:07:07 +02:00
5e4ec2c630 Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-04 18:07:06 +02:00
1a76055a09 Fix su connessioni del Connection Pool 2025-09-04 18:07:01 +02:00
2b4e97d90d Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-04 16:11:31 +02:00
dfae26c49e Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-04 16:11:31 +02:00
d78010662a Fix su serializzazione JSON in callInternalExport 2025-09-04 16:11:10 +02:00
79df2c503f aggiunto tipo documento
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-04 16:11:04 +02:00
a42736bf91 preso cod_prod e descrizione_prod dalla testata dell ordine nella vista w_tracciabUDCProd
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-04 15:37:31 +02:00
e53bd108ba Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-04 14:40:00 +02:00
e9f47d4651 inserito progressivo_ul nella vista w_tracciabUDCProd 2025-09-04 14:39:51 +02:00
951f220626 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-04 13:28:24 +02:00
3106ce46d9 Sistemato problema aggiornamento progressivi ordini 2025-09-04 13:28:16 +02:00
f8f22ee3b3 Fix su pannello WEB
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-04 13:07:42 +02:00
79576c06f7 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-04 13:02:41 +02:00
7058231691 modificate viste vw_tracciabUDCVend e w_tracciabUDCProd 2025-09-04 13:02:32 +02:00
6f876edfa8 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-04 12:48:36 +02:00
6b2ca47a8a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-04 12:48:36 +02:00
92f5f7b290 sistemata espotazione excel 2025-09-04 12:48:27 +02:00
3ae1d499c2 Fix profileDb ROSSOGARGANO_EXCHANGE
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-04 12:11:37 +02:00
b10c6e837c E' stato disabilitata la valorizzazione dei campi barcode_ul_in, posizione_in e cod_mdep_in nella creazione di una UDS di lavorazione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-04 10:30:58 +02:00
1d07f15169 Rimossi comandi aggiuntivi nel DataSource
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
(cherry picked from commit 9f76fcfc72)
2025-09-04 09:22:04 +02:00
a6103e037d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-04 08:42:35 +02:00
b6299d6dd1 Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-04 08:42:35 +02:00
9f76fcfc72 Rimossi comandi aggiuntivi nel DataSource 2025-09-04 08:42:30 +02:00
08b5d93be3 Fix su connessioni nelle Sync
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-03 16:40:02 +02:00
77a1a965ca Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-03 16:39:42 +02:00
a4d78c740d Merge branch 'master' into develop
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-09-03 16:39:42 +02:00
65fb43f87a Fix su connessioni nelle Sync 2025-09-03 16:39:31 +02:00
9f27301e8b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/sync/SyncManager.java
2025-09-03 16:34:44 +02:00
ce583d2500 Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-03 16:33:50 +02:00
8c4430d68a Fix su connessioni nelle Sync 2025-09-03 16:33:39 +02:00
18e69f0195 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-03 16:33:28 +02:00
65c26a1f91 aggiunta notifica t0003
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-03 14:42:33 +02:00
653f3a023a export zucchetti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-03 13:05:17 +02:00
3c241ea168 export zucchetti 2025-09-03 13:05:04 +02:00
3f4735f953 Impostato cod_anag_comp su riga collo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-03 12:42:17 +02:00
edcd6ecf6b Impostato cod_anag_comp su riga collo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-03 12:38:01 +02:00
4f88d08a39 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-03 12:36:28 +02:00
1bcffcc36a modificati alias campi viste per report tracciabilità Rossogargano 2025-09-03 12:36:18 +02:00
6eeb10868d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-03 12:33:57 +02:00
4b1af00c23 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-03 12:33:56 +02:00
fd4d79c3be Rimosso limite di max prepared statement 2025-09-03 12:33:15 +02:00
4d4ca3917f Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-03 12:17:36 +02:00
f5f86985c9 create viste per report tracciabilità Rossogargano 2025-09-03 12:17:30 +02:00
b2ac734b5e Fix check certificato durante l'aggiornamento dei comuni
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-03 10:48:17 +02:00
e2f5b5b0a1 Fix check certificato durante l'aggiornamento dei comuni
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-03 10:47:32 +02:00
00405d67bb creato report "Riepilogo Documenti di vendita" personalizzato per rossogargano
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-02 17:20:24 +02:00
b3475b9fcb Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-02 12:26:50 +02:00
6fc946d817 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-02 12:26:50 +02:00
7893e6d808 modifiche per task 2025-09-02 12:26:31 +02:00
a205f222b0 modifiche per task 2025-09-02 11:09:48 +02:00
e99bf3403b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-02 10:18:43 +02:00
124a4fe04c elinitato errore se la lista delle migration è vuota 2025-09-02 10:18:23 +02:00
3a18dd2c71 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-02 09:52:08 +02:00
6e7167f0f2 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-02 09:52:07 +02:00
2188fa86a5 Fix su numero connessioni DataSource 2025-09-02 09:51:57 +02:00
481e8e35cc Fix su numero connessioni DataSource
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-02 09:50:39 +02:00
e41883bd73 Fix su numero connessioni DataSource
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-09-02 09:50:10 +02:00
eddaadc3ba Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-02 09:44:36 +02:00
7c08f0ed48 Aggiornata email di errore delle importazioni delle fatture passive (aggiornamento dei riferimenti non committati precedentemente) 2025-09-02 09:44:29 +02:00
77c8896de5 Aggiornamnto funzione esterna
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-02 09:41:37 +02:00
b078028c24 Aggiornata email di errore delle importazioni delle fatture passive
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-09-02 09:36:20 +02:00
b40e26fc5e Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-01 15:55:36 +02:00
5a2f5328b4 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-01 15:55:36 +02:00
33dc3129b3 modificato controllo su email controllo autofattura e pianificazione attività 2025-09-01 15:55:16 +02:00
725b93be81 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-09-01 09:27:24 +02:00
0dc6e9555f Fix importazione ACK
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-29 19:32:25 +02:00
6df7c809a2 Fix email in printDocument
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-08-29 19:32:05 +02:00
8c451e3996 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-29 19:29:31 +02:00
468a453b94 Fix servizi crm 2025-08-29 19:29:23 +02:00
6f52677301 Aggiornamenti pagina ems-api
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-29 19:04:11 +02:00
63a891d061 nuova procedura di importazione scontrini
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-08-29 11:34:31 +02:00
15b80239d1 Creato metodo per annullare ordine di lavorazione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-28 11:49:47 +02:00
044540ff10 Merge branch 'develop' into feature/Feature-revisione_ordiniWeb
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-27 16:57:56 +02:00
90f3a636db modifiche per importazione ordini web ed elimiazione trigger ordl
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-27 16:57:45 +02:00
592d8726d2 Aumentato max total in DataSource in debug
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-27 15:08:53 +02:00
048c639e72 Merge branch 'develop' into feature/Feature-revisione_ordiniWeb
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-26 13:15:54 +02:00
1111093b38 modificato date con LocalDate
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-26 13:15:45 +02:00
87461ce43a migration per sistemare ftx_getDisponibilitaArticoli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-26 13:15:13 +02:00
247ecb69a3 Gestita cancellazione della partita se non in uso per ordini lav e acq
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-26 11:55:40 +02:00
b414942de9 Sistemata esportazione lotti per gastronomia
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-26 10:44:11 +02:00
5b1b5c5cde merge
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-26 10:09:18 +02:00
b9a53ec7a2 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-25 18:15:53 +02:00
f1f779b436 migration smetar e correzioni per distinta incassi 2025-08-25 18:14:23 +02:00
06e9bb1c51 Corretto javadoc DataSource e gestita possibilità di tornare un valore fisso in isDebugExecution
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-25 18:04:18 +02:00
833d87f08d modificata vsvw_vendita per smetar
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-25 16:22:01 +02:00
7eac47b3b7 [rettifica colli]
- se la udc in rettifica ha subito già delle movimentazioni, è obbligatorio eseguire la rettifica in un nuovo movimento
2025-08-25 10:34:16 +02:00
3627c38df6 Gestita cancellazione della partita se non in uso per ordini lav e acq
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-25 10:19:48 +02:00
e5c64dc0fd Fix su lettura setup se stringa vuota e throw diretto exception in importOrdini 2025-08-25 10:17:30 +02:00
8abb7c2842 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-25 09:53:58 +02:00
4ca6e3e5e9 Fix naming in conflitto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-22 18:55:24 +02:00
ab0b17470e Aggiornata pagina EMS-API (Buon rientro dalle ferie 😉🎉)
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-08-22 18:49:07 +02:00
70e8857031 [SALESBOOK] Creato servizio per recuperare lo stato di avanzamento di una commessa
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-08-22 18:42:21 +02:00
db2b8214a4 Rimosso codice inutile in getSetupList, ignorato getConfigurationFile in SettingsModel
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-22 10:41:44 +02:00
bfd102a4a2 Fix parametri DataSource in Debug
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-21 15:54:14 +02:00
55e55bd64a Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-20 11:35:53 +02:00
7de563abf3 Aggiunto recupero del codMart da codArtFor per importazione sonoco
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-19 15:32:41 +02:00
12154ed089 [ROSSOGARGANO]
- corretto versamenti ribaltatori
- corretta gestione numeratore certficati pomodori
2025-08-19 14:44:49 +02:00
59780fef0c Merge branch 'feature/Feature-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-19 11:19:10 +02:00
aea6d9dc68 [MES]
- aggiunta possibilità di definire il report ordine lavorazione per linea prod
2025-08-19 11:19:02 +02:00
1454144502 [MES]
- aggiunta possibilità di definire il report ordine lavorazione per linea prod
2025-08-19 11:19:02 +02:00
98e518e295 Gestite anomalie e corretta l'importazione colli di eviosys
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-19 10:43:16 +02:00
ac997e5e52 Fix parametri DataSource in Debug
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-19 10:22:02 +02:00
2831f675f2 Tuning su DataSource
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-19 10:20:57 +02:00
214c6f6bf1 Migliorato BasicConnectionPool
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-19 09:45:06 +02:00
498ce2880e Corretta importazione colli vebad
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-18 17:58:09 +02:00
b828e5bfae Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/logistic/service/ColliEviosysImportService.java
2025-08-18 15:37:26 +02:00
2d109a57e6 Cambiato caricamento iniziale del SettingsModel e di BasicConnectionPool
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-18 15:25:45 +02:00
637fdca7ed Migliorata gestione dei colli di trasferimento verso i depositi che non gestiscono i colli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-14 17:23:27 +02:00
8778aecbeb Migliorata gestione dei colli di trasferimento verso i depositi che non gestiscono i colli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-14 16:42:23 +02:00
724bc750cf Risolti problemi riguardo il trasferimento delle pedane
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-13 14:48:09 +02:00
4c78c0cf37 Modifica segno_qta_car e segno_qta_scar
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-13 12:00:02 +02:00
c8c476f98c Modifica segno_qta_car e segno_qta_scar
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-13 11:48:55 +02:00
0c3cf9095f Aggiunto campo num_etich in fase di insertUdcRow e gestito segno in creazione documenti diretti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-13 11:35:19 +02:00
c9b98963ae Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-12 17:46:47 +02:00
945aeab210 Aggiunta procedura di importazione Sonoco 2025-08-12 17:46:40 +02:00
956acd02ad inserite get e set della entity child drlTipiReport
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-12 15:22:30 +02:00
ff84144dbf Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-11 12:56:34 +02:00
cfc60bb78d Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-11 12:56:34 +02:00
371ba4848c Mmodifica data validita griglia 2025-08-11 12:56:07 +02:00
1963825bf5 inseriti valori di default
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-11 10:47:11 +02:00
7421ebeea9 cancellata tabella drl_tipi_mod_stampa e creata nuova tabella di relazione drl_tipi_report tra le tabelle dtb_tipi e wtb_jrept
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-11 10:44:13 +02:00
f90688e969 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250807105039.java
#	ems-core/src/main/resources/rules/documenti.drl
2025-08-11 09:39:05 +02:00
edff5ae3ec Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-08 18:44:58 +02:00
d8ede199ed Creata procedura di importazione tassi di cambio da Banca d'Italia 2025-08-08 18:42:42 +02:00
c76417b917 Fix su utility WMS errata
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-08 17:39:38 +02:00
332b4fddd8 Creato servizio di createUdsWithRows
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-08 17:19:27 +02:00
5fdd9d447a Create nuove setup per chiusura tagli prezzo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-08 16:20:20 +02:00
a21c13f798 Gestito plu mancante come anomalie in importagione digi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-08 15:39:22 +02:00
94f21f78a8 controllo su proprietà confezionato null
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-08 12:58:06 +02:00
fa2bca9c99 Fix su group by durante il riproporzionamento degli scarichi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-08 12:56:23 +02:00
77549064f1 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-08 09:42:14 +02:00
565cbc9f30 Aggiunto in retrive giacenza by articolo il parametro di ricerca tramite cod_jcom
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-07 18:43:00 +02:00
febd5d7e7f Aggiunta condizione tra parenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-07 18:40:56 +02:00
05a092a664 Merge remote-tracking branch 'origin/master'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-07 17:19:42 +02:00
934463a2a4 aggiunto cod_paga nella dtb_tipi 2025-08-07 17:19:28 +02:00
057d7961f2 Modifica export documenti consegnati
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-07 16:13:42 +02:00
c62112e9d6 Modifca Migrations per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-07 16:03:25 +02:00
36b2d99f5a Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-07 15:46:45 +02:00
b828a31544 inserirta la descrozione dei depoisto sui trapv 2025-08-07 15:46:41 +02:00
8ead6d9fdb Gestito controllo data scadenza multipla in openStep MES
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
(cherry picked from commit 4656fbb61b)
2025-08-07 15:17:56 +02:00
4656fbb61b Gestito controllo data scadenza multipla in openStep MES
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-07 15:17:12 +02:00
08215fab9d Fix su registrazione datetime_row degli scarichi da collo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-07 13:21:09 +02:00
7e9e207b66 Creata procedura di importazione pesate da bilancia
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-07 12:51:35 +02:00
47755e2c56 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-08-07 12:25:44 +02:00
33582c62d4 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-07 12:25:44 +02:00
46ef9bd59e modifiche su utenti 2025-08-07 12:25:27 +02:00
73aed3e9d6 In fase di ridistribuzione degli scarichi a produzione è stata aggiunta la sum delle righe di scarico (le righe di rientro che erano negative creavano scarichi errati)
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-07 12:20:38 +02:00
1ae0ee3567 modifiche su utenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-07 11:57:24 +02:00
25d549f681 modifiche su utenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-07 11:54:53 +02:00
5cbede1c68 Personalizzazione report presenze per vinella
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-06 18:01:15 +02:00
5feea9ced0 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-06 17:36:31 +02:00
c77f212ca1 nuova opzione in aggiornamento listini divendita 2025-08-06 17:36:27 +02:00
7dcdb85ee0 creata setup che permetta di visualizzare tutte le versioni delle stampe o solo l'ultima
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-06 13:12:27 +02:00
49f6664874 Fix cancellazione annotazioni in cq pomodori
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-06 12:46:09 +02:00
402ddc0009 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-06 09:55:36 +02:00
aff3eaa959 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-06 09:55:35 +02:00
61de052e30 risolta regola 2025-08-06 09:55:29 +02:00
e838df2876 Creata setup per disattivare la proposta dell'ultimo valore inserito in creazione udc mes
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-05 18:02:57 +02:00
4f65d93a65 fare in modo che le procedura di esportaizone in excel posssano avere una query di base
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-05 16:21:06 +02:00
1f3517a10b aggiungi codice tipo bene
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-05 15:49:00 +02:00
03fe0c7279 migliorato check delle UDS da trasferire durante la creazione di un documento diretto di vendita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-05 15:23:13 +02:00
49b4fca63c Fix su sql server connection in menu configurator
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
(cherry picked from commit 6f3d8a7ef5)
2025-08-05 12:27:06 +02:00
3df0a0058d Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-05 11:14:51 +02:00
096c25955c Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-05 11:14:51 +02:00
6f3d8a7ef5 Fix su sql server connection in menu configurator 2025-08-05 11:14:45 +02:00
8448a8798d nella registrazione degli inventari considerare anche i casi che hanno qta = 0 e num_cnf <> 0 e qta_cnf fissa per allinearli.
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-05 10:51:59 +02:00
36c425941a Fix connection su DB Distributore
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
(cherry picked from commit 54804ec4d6)
2025-08-05 09:58:48 +02:00
36acbe175a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-05 09:55:07 +02:00
f08b5fe07e Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-05 09:55:05 +02:00
54804ec4d6 Fix connection su DB Distributore 2025-08-05 09:54:59 +02:00
269d0d4aff Aggiunto servizio che aggiorna endpoint portale Web
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-05 09:25:02 +02:00
5fa3dc538f Fix su connessioni del SyncManager
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
(cherry picked from commit d266c8c9e1)
2025-08-04 19:11:36 +02:00
f24ebd5cbc Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 19:11:05 +02:00
48070baf25 Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-08-04 19:11:05 +02:00
d266c8c9e1 Fix su connessioni del SyncManager 2025-08-04 19:11:00 +02:00
280474d038 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 17:29:05 +02:00
518263d955 Aggiunto servizio che aggiorna endpoint portale Web 2025-08-04 17:28:54 +02:00
0f298bcd05 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 17:28:12 +02:00
6c15210a22 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 17:27:44 +02:00
8eddffdc7c Finish FixTag
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 17:27:44 +02:00
0187c33730 Modificato formato tag versione 2025-08-04 17:26:57 +02:00
acb33cad0f Aggiunto servizio che aggiorna endpoint portale Web
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-08-04 17:26:27 +02:00
17fca32238 Rimosso dai log le export di FATTURE_FPR
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 17:25:10 +02:00
c8200f3690 riattivati trasferimenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 16:21:20 +02:00
08ff9e1940 SISTEMATA REGOLA
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 15:43:39 +02:00
165e81938c inibito traferimento
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 14:55:45 +02:00
c87404a4ee controllato deposito null
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 14:34:57 +02:00
92a9abf978 correzione su importazione docfinance
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 13:02:00 +02:00
8997e8187e Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-08-04 13:01:13 +02:00
0729d1c0b6 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 13:01:12 +02:00
a15bf9957a sistemato calcolo num colli 2025-08-04 13:01:07 +02:00
9c48a57743 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 12:41:04 +02:00
7a97a55df1 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 12:41:04 +02:00
ab7aa9e0bf correzione su importazione docfinance 2025-08-04 12:40:55 +02:00
71e99ed943 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	build/Jenkinsfile.groovy
#	build/create_build_tag.bat
2025-08-04 12:30:40 +02:00
a6a9a3cbd8 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 12:30:20 +02:00
122e56bfe7 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 12:30:20 +02:00
de9d870ef3 Aggiornato jenkinsfile per env.properties 2025-08-04 12:30:15 +02:00
274bb29f8f Aumentati timeout di connessione all'email legata alla fatturazione 2025-08-04 12:29:29 +02:00
b1c337a238 Aggiornato jenkinsfile per env.properties
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 12:14:26 +02:00
5e145dd854 Aumentati timeout di connessione all'email legata alla fatturazione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 10:27:51 +02:00
21fa20e94f Fix after merge
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-04 09:27:20 +02:00
bf1b78ccc0 Merge branch 'develop' into feature/RefactoringGestioneColli
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241213163759.java
#	ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java
#	ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java
2025-08-04 09:26:05 +02:00
6b9a0d7e3e Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-01 18:06:17 +02:00
625b715924 eliminata assegnazione iva sulle spese 2025-08-01 17:46:47 +02:00
d2bff17463 Gestito recupero dati da pvm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-01 16:36:29 +02:00
910ab51654 aggiunta regola per prevista ftturazione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-01 13:33:03 +02:00
70979f1509 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-01 11:51:00 +02:00
18ae32a815 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-08-01 11:50:59 +02:00
8fcc9a4bf8 correzione procedura di importazione promo apulia 2025-08-01 11:50:51 +02:00
cb221ce6f3 Aggiunta join di StbPosizioni in StbActivity
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-31 19:10:55 +02:00
db884eb487 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-07-31 18:15:07 +02:00
2faf943cb9 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-31 18:15:06 +02:00
5d1a052416 sisteamto controllo attività 2025-07-31 18:14:59 +02:00
e32099263d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-31 17:43:08 +02:00
27ef2e7e16 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-31 17:43:07 +02:00
0b94f3125c sisteamto controllo attività 2025-07-31 17:43:01 +02:00
71e075fe02 aggiunto controllo su concatenazione dei campi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-31 17:28:26 +02:00
0b8b1cb756 sistemato calcolo del valore unitario da ultimo costo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-31 17:16:50 +02:00
5325f3124a Implementate annotazioni durante il trasferimento pedane
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-31 16:53:14 +02:00
47be0ec2b8 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-31 13:30:07 +02:00
89f16ff2a3 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-31 13:30:06 +02:00
c4eced0d37 rivista query per merce in arrivo 2025-07-31 13:22:35 +02:00
fce976b2df Fix controllo SQLServerConnection in EntityBase
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-31 10:39:35 +02:00
8caa0c924b Rimosso SET NOCOUNT ON all'inizializzazione della connessione 2025-07-31 10:39:32 +02:00
4def90c387 Rimosso SET NOCOUNT ON all'inizializzazione della connessione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-31 10:39:04 +02:00
51dd49cc8f Fix controllo SQLServerConnection in EntityBase
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-31 10:08:43 +02:00
4af7155db9 Cambiati alcuni datasource
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-31 09:47:00 +02:00
04c5b8c849 Cambiati alcuni datasource
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-31 09:46:19 +02:00
ab682181ce Fix controllo SQLServerConnection in EntityBase
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
(cherry picked from commit 1d0fed90ae)
2025-07-30 18:59:22 +02:00
1d0fed90ae Fix controllo SQLServerConnection in EntityBase
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-30 18:58:04 +02:00
d6cda98855 Fix su connection pool size
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-30 17:51:43 +02:00
88a518d0ad Fix su connection pool size
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-30 17:50:46 +02:00
38c1c80abb [GIANT REFACTORING] Ristrutturazione sulla connection pool. Adesso la pool è gestita dal DataSource di Apache DBCP2.
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241213163759.java
#	ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java
2025-07-30 17:49:08 +02:00
fed416de15 Fix Refactoring google maps api 2025-07-30 17:43:10 +02:00
d5bf6aef92 Fix Refactoring google maps api 2025-07-30 17:43:08 +02:00
5a0cfd160f Refactoring google maps api 2025-07-30 17:43:04 +02:00
304abac5bb [GIANT REFACTORING] Ristrutturazione sulla connection pool. Adesso la pool è gestita dal DataSource di Apache DBCP2.
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-30 17:40:30 +02:00
ca323b87f6 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-30 16:25:18 +02:00
4e4cab2cbd Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-30 16:25:18 +02:00
a3130d68c2 salvate immagini senza zip 2025-07-30 16:23:08 +02:00
72c7a3a281 Aggiunto il cliente o prospect nella risposta di createContact
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-30 15:22:58 +02:00
5b78ac6a34 Fix Refactoring google maps api 2025-07-30 15:21:48 +02:00
62ba5f28a1 Fix Refactoring google maps api
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-30 15:20:10 +02:00
0d85a0b790 Refactoring google maps api
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-30 15:15:22 +02:00
e818130c1d Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-30 12:05:14 +02:00
add08fc985 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-30 12:05:14 +02:00
e762d706d9 sistemata funzione di esportazione dati tracciabilità sui kit 2025-07-30 12:04:25 +02:00
d94bd75770 revisione importazione ordini web
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-29 18:23:31 +02:00
376aaf7f28 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-29 17:21:34 +02:00
2a4ae878bb abilitata a Follie setup DELIMITED_IDENTIFIER in dati azienda 2025-07-29 17:21:25 +02:00
bea182eea9 Fix import mancante in DocumentiDirettiService
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-29 16:47:36 +02:00
ce6a102f45 revisione calcolo totali per ordni web e documenti
(cherry picked from commit a7c3163d84)
2025-07-29 16:44:30 +02:00
9e1a600087 sistemato controllo per documenti imballo
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-07-29 15:34:33 +02:00
b87f320664 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-29 15:32:41 +02:00
aca25727c0 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-29 15:32:41 +02:00
a9cbbed8e2 sistemato controllo per documenti imballo 2025-07-29 15:32:34 +02:00
32c38b85aa revisione importazione ordini web
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-29 15:24:50 +02:00
c7bd74553e Aumentate dimensioni campo taric come da specifiche doganali
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-29 15:11:40 +02:00
89a6a8c2f4 Creata setup per poter mostrare il pulsante configurazione permessi in pvm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
(cherry picked from commit 76972b00a1)
2025-07-29 12:47:44 +02:00
76972b00a1 Creata setup per poter mostrare il pulsante configurazione permessi in pvm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-29 12:43:14 +02:00
f5b812ebdf aggiunto flag_stampa_pkl nella gtb_anag_note
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-29 10:50:44 +02:00
9fca434612 Correzione get e set flag_stampa_docu_vend - controllo su modifica ed inserimento ultimi 7 gg
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-29 10:30:54 +02:00
7eddb4fe7c Correzione get e set flag_stampa_docu_vend - controllo su modifica ed inserimento ultimi 7 gg
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-29 10:14:31 +02:00
d675ce0e82 Fix calcolo progressivo in caso di partita diversa da quella dell'ordine
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-29 09:23:16 +02:00
c7a96834a2 revisione procedura di importazione ordini web
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-28 17:54:36 +02:00
a7c3163d84 revisione calcolo totali per ordni web e documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-28 15:46:21 +02:00
ef2f2a91b3 [ROSSOGARGANO ]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- aggiunto flag fornitore socio in tabella atb_tipi
- inserite setup report per pagina accettazione da campo
2025-07-28 13:28:58 +02:00
49ff0c839b Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java
2025-07-28 09:43:35 +02:00
bd4390c08b Aggiunto perc_prov in pvm_getassortimentoClientePedane
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-07-25 18:48:34 +02:00
85bd22feb3 riviesta per l'ennesima volta la gestione dei documenti ddtp
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-25 16:49:35 +02:00
bd5eb9c535 Fix su rollback del salvataggio dei trasferimenti. Fix su check imballi senza cod_mart.
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-25 15:55:37 +02:00
ecd0675c78 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-25 14:44:42 +02:00
0826bea857 aggiunta commit per deposito 2025-07-25 14:44:31 +02:00
a0983b0572 aggiunta suffisso per esportazione tracciabilità 2025-07-25 14:43:49 +02:00
8efceb6405 Impostata aliquota del cliente se è in esenzione togliendo il controllo sulla percentuale articolo diversa da 0
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-25 11:16:19 +02:00
ebc26db5f0 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-24 14:27:19 +02:00
6623837f39 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-24 14:27:18 +02:00
0da7cd4f65 aggiunto log erroru 2025-07-24 14:26:55 +02:00
0851fe8915 Aggiunto parametro withTestataCollo in servizio di availableItems
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-24 11:55:12 +02:00
b9fc94b383 Fix nome profile db in user cache
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-23 13:24:40 +02:00
3bcfc65dcb Aggiunta retrieve nazioni per crm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-22 17:04:01 +02:00
fa7e3a55ca Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-22 10:06:22 +02:00
611616e719 Sostituito hashmap per i metodi di login in favore di UserDTO
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-22 09:37:31 +02:00
c4455218dd Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-22 09:23:03 +02:00
2a61f05d2f Finish AgribookRagSocLegale
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-22 09:23:02 +02:00
625f61dcd4 Aggiunto ragSoc, partIva e codFisc legale in agribook destinatario dto 2025-07-22 09:22:56 +02:00
52d34fa810 [ROSSOGARGNAO - ACCETTAZIONE]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- corretta seleziona ora inizio versamento
- corretto annullamento versamento
- corretto salvataggio cq pomodori
2025-07-21 16:03:44 +02:00
59624c8c17 [ROSSOGARGANO]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- corretta retrocompatibilità con gestione documenti vendita non aggiornata
2025-07-21 12:22:07 +02:00
cd53eca2e8 Aggiunto controllo su passaggio ordini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-21 11:23:29 +02:00
a486b6102b Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/resources/menus/menu_config.json
2025-07-21 10:11:01 +02:00
jenkins
5471b75115 Merge branch 'develop'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-20 07:41:39 +02:00
c92c950f9c spostata voce menu report delle movimentazione delle unità logistiche in Unità Logistiche:colli, Bancali, carrelli etc...
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-18 17:10:30 +02:00
977087b011 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-18 15:52:21 +02:00
5304cf6bf4 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-18 15:52:21 +02:00
9a0322bea0 [CARELLI - TUIDI]
- sostituita inner join con left join per blocchi in retrieve giacenza su deposito TO
2025-07-18 15:52:10 +02:00
becfdab1a1 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-17 17:28:51 +02:00
e6605c2feb [ROSSOGARGANO - Documenti]
- aggiunta distribuzione automatica su ordini di ul inserite in packing list
2025-07-17 17:28:46 +02:00
305c79a558 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-17 12:20:53 +02:00
3d9bf7ebde Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-17 12:08:45 +02:00
0121e3ef47 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-17 12:08:45 +02:00
9a0c342c4d Modifica calcolo num_colli 2025-07-17 12:08:29 +02:00
edcc08c9da Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-16 19:30:29 +02:00
89d0f95834 Nella rettifica dei documenti diretti di vendita ora si possono cambiare le qta dei colli venduti e precedentemente trasferiti 2025-07-16 19:30:23 +02:00
112dc51ac7 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-16 19:05:38 +02:00
a93979c546 [ROSSOGARGANO - Accettazione]
- rimosso posizionamento pre-versamento sui ribaltatori
2025-07-16 19:05:32 +02:00
6b536b20c6 Completato delete UDS da un documento di vendita che ha dei colli trasferiti.
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-16 17:46:29 +02:00
17c832745f Disabilitato completeEntity in utility di deleteUL
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-16 11:09:18 +02:00
fcb62e3689 [ROSSOGARGANO - trasferimenti]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- gestito inserimento codAnag in collo di scarico verso P.V. per
2025-07-16 10:39:00 +02:00
bc88453914 Aggiunto servizio di availableItems
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-16 09:34:32 +02:00
a85173bc45 Cambiata delete UL in riproporzionamento scarichi lavorazione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-15 19:32:27 +02:00
ed0c117bac Aggiornati LocalDate dataDoc in MtbColt. Cambiata whereCondColli in LoadColliService.
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-15 19:21:44 +02:00
557159cf7f Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-15 18:41:34 +02:00
88cb4f1dc2 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-15 18:40:46 +02:00
662f670e3a create setup nella W_DCOLLI_RESO_DLG per impostare giorni e consegne
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-15 18:34:39 +02:00
46dcdd7745 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli 2025-07-15 18:34:10 +02:00
c30c7ec369 create setup nella W_DCOLLI_RESO_DLG per impostare giorni e consegne 2025-07-15 18:26:00 +02:00
8e99c0898d modificato controllo su gruppo merceologico in versamento materiale (presi i tipi SL & PF dalla tabella dei gruppi invece che dalla setup)
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-15 15:14:17 +02:00
b4ce3f8d27 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-07-15 14:15:12 +02:00
9549583c86 inserito deposito nel servizio resi 2025-07-15 14:15:03 +02:00
5b88fa632c Merge branch 'master' into feature/RefactoringGestioneColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-07-15 13:03:39 +02:00
1aad3f3bf8 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-15 13:03:21 +02:00
f25a3c9b80 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-15 13:03:20 +02:00
64425c2c4a inserito deposito nel servizio resi
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-07-15 12:56:23 +02:00
e9289c2ce4 [CARELLI - Variazioni PV]
- Aggiunta label in inserimento dati variazioni pv
2025-07-15 12:55:48 +02:00
e6d5df31dd Migliorie servizi resi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-15 11:48:14 +02:00
f9be1f4463 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-15 11:13:21 +02:00
1cfc7558ac Migliorie servizi resi 2025-07-15 11:13:13 +02:00
140c443030 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-15 11:12:08 +02:00
68e8d3234c Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-15 11:11:25 +02:00
cba0484c48 Finish SetupCodVmzo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-15 11:11:24 +02:00
266324fbb0 Aggiunta setup per cod_vmzo in previsioni raccolta 2025-07-15 11:11:18 +02:00
0bfa110d6c Fix class naming di ArticoloPartitaCommessaDTO in ArticoloPartitaCommessaOrdineDTO
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-15 10:33:05 +02:00
374d143090 Aggiunto replace del \n\r nelle causali delle fatture elettroniche
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-07-15 10:28:24 +02:00
32dc0b4f4c Merge branch 'master' into feature/RefactoringGestioneColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-07-15 10:15:58 +02:00
a508a816b1 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-15 10:15:35 +02:00
6eff18e1c2 Finish AggZonaNuovaProd
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-15 10:15:35 +02:00
ed9486ae87 Aggiunto fornitore in agribook order e codVzon in destinatario 2025-07-15 10:15:25 +02:00
75edd98223 Fix collisione classi ArticoloPartita
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-07-14 18:58:38 +02:00
d89ddb447c [ROSSOGARGANO - Accettazione]
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
- corretto completamento numero documento certificato per gestione numerazione proposta
2025-07-14 18:08:44 +02:00
a2b668ed96 Merge branch 'master' into feature/RefactoringGestioneColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-07-14 17:50:54 +02:00
ead82ceeb8 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-14 17:50:24 +02:00
2ea6f8f859 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-14 17:50:24 +02:00
f5aa3a300a piccoli fix funzione vecchia di chiusura lavorazioni 2025-07-14 17:48:48 +02:00
d7aef97ae0 Aggiunto nuovo servizio di retrieve dati resi cliente
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-07-14 17:45:09 +02:00
4f6eed564e Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-14 12:43:18 +02:00
7750d844f1 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-14 12:42:38 +02:00
723ca0a938 Finish AggStampaMovViaggio
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-14 12:42:38 +02:00
94bd7fddb0 Creazione setup per report movimentazione pedane viaggio 2025-07-14 12:42:19 +02:00
e3cf9aa115 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-14 12:14:52 +02:00
2585b87be6 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-14 12:14:20 +02:00
b402120ef1 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-14 12:14:20 +02:00
b2c83be809 Modifica fattura elettronica in caso di bio 2025-07-14 12:13:53 +02:00
2324f4efe8 Setup nuova gestione picking colli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-14 12:08:08 +02:00
766e6a18cc Fix su logica di trasferimento pedane in spostaUl
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-14 11:51:32 +02:00
45c507cfcc Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-14 09:30:05 +02:00
ebaee14167 Migliorato servizio di salvataggio documenti diretti: iniziata implementazione per cancellazione trasferimenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-14 09:29:38 +02:00
e12c484190 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-11 18:52:53 +02:00
831b0fc7c3 Aggiunto logger 2025-07-11 18:52:49 +02:00
0a56b9dd25 Migliorato servizio di salvataggio documenti diretti: iniziata implementazione per cancellazione trasferimenti
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-07-11 17:19:22 +02:00
038245c883 aggiunto controllo su partite incassete per importo maggiore
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2025-07-11 17:14:14 +02:00
d5f814350a sistemata chiusura partite
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-11 16:40:58 +02:00
51210cd8df [ROSSOGARGANO - Trasferimenti]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- gestito deposito dei colli di trasferimento in base al deposito del documento di arrivo
2025-07-11 16:04:15 +02:00
e80d8ee151 aggiunto flag_sezione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-11 15:26:28 +02:00
d46a496679 modificata operation
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-11 14:59:23 +02:00
b6e6e96b8d sistemato calcolo totale peso nel documento
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-11 12:10:33 +02:00
3b461350d5 sistemato calcolo totale peso nel documento
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-11 12:07:18 +02:00
5272683bf6 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-11 10:04:59 +02:00
789d48705b [Tosca - ordini V]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- corretta gestione anagrafiche vettori in importazione impegnato
2025-07-11 10:04:11 +02:00
5724dc53c9 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-11 10:02:09 +02:00
c0bb7957b1 Modifica migrations per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-10 18:28:35 +02:00
84ff15687e [WMS] Implementato servizio di stampa su Trasferimento Pedane
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-10 17:35:39 +02:00
b0eb4ea897 Finish FixCRM
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-10 17:03:55 +02:00
59528fe7ed Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-07-10 17:03:55 +02:00
23aac3c8b1 Fix in creazione nuova commessa crm 2025-07-10 17:03:43 +02:00
422e09b072 Cambiata logica dei documenti diretti: quando deve esserci un trasferimento merce lo intercetta e crea un trasferimento ad-hoc.
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-10 16:11:14 +02:00
ecee8a184b flag sezione dati viaggio
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-10 13:43:38 +02:00
91210ba643 salvataggio giornaliero giacenza progressiva
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-10 11:24:40 +02:00
2cbb3d3fdc Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-10 09:56:35 +02:00
ca39687b82 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-10 09:56:35 +02:00
d68f9347b5 valorizzata data registrazione quando ci sono dei nuovi carichi 2025-07-10 09:56:20 +02:00
1558dedb68 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-09 18:08:26 +02:00
6114c5c286 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-09 18:08:26 +02:00
47d6bd3bbc aggiustata giacenza di articoli non in griglia 2025-07-09 18:08:02 +02:00
1845b31fc0 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-09 17:56:28 +02:00
c893b6555e Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-09 17:56:27 +02:00
e7fafa3cb9 Fix creazione nuova attività in crm 2025-07-09 17:56:09 +02:00
8005b63241 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-09 16:29:38 +02:00
2aeab7b8f8 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-09 16:29:37 +02:00
de42e8f150 corretto errore null 2025-07-09 16:29:30 +02:00
4ab1c25d90 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-09 14:52:52 +02:00
06c46a8611 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-09 14:52:51 +02:00
9588b23fd1 sistemato calcolo della giacenza 2025-07-09 14:52:43 +02:00
fbfe0b297d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-09 12:51:52 +02:00
cc3df74666 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-09 12:51:51 +02:00
276dcee1dd gestire articoli a kg 2025-07-09 12:51:41 +02:00
3dd1cd60cb Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli 2025-07-08 19:54:44 +02:00
3827fd1fa6 sistemato generazione doc da viaggi, aggiunto num_cnf
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-08 17:48:32 +02:00
14cf0d60b5 Fix saveArticolo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-08 15:57:09 +02:00
7a0cbebdfb Importazione eviosys check codArtForn
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-08 12:27:50 +02:00
f5e208a973 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli 2025-07-08 10:36:00 +02:00
f4189b71e0 Piccolo refactoring ICONImportService
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-08 10:01:46 +02:00
0d8101ec05 In importazione bolle vebad e eviosys aggiunto controllo colli già esistenti senza documento associato
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-07 18:20:20 +02:00
7f42ee47ce Aggiunto tipo_mgrp in getArticoloFromEan128 e rinominati metodi createUDCFromArt
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-07 16:47:38 +02:00
0b1310646c Aggiunto servizio per creazione colli con righe già agganciate
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-07 12:13:44 +02:00
037d61d0ba Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-07 11:46:54 +02:00
f7e61b19ae Finish AggConvalida2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-07 11:46:53 +02:00
4caae9ef86 Creata nuova colonna convalidato_da2 e data_convalida2 in ctb_amac_manutenzioni 2025-07-07 11:46:45 +02:00
ebde200a73 [Tosca - ordini V]
- corretta gestione anagrafiche vettori in importazione impegnato
2025-07-07 10:38:16 +02:00
502dc5e7a9 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java
2025-07-07 09:39:50 +02:00
f68d5f0cb9 invio variazioni dopo chiusura tagli prezzo, popolamento giacenza
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-04 18:13:23 +02:00
25b01615d1 aggiunta setup per rossogargano
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-04 14:54:30 +02:00
2574e37e9a sistemata GetSaldoContoAnalitico
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-04 12:06:15 +02:00
a023f429a2 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-04 11:04:13 +02:00
fbbcc19abf Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-04 11:04:12 +02:00
09b607a3a2 CRM fix commessa in fase di creazione 2025-07-04 11:04:03 +02:00
4fca7a604b Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 17:28:58 +02:00
25355ad223 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 17:04:02 +02:00
b0bf6da843 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 17:04:01 +02:00
dae4d06c69 [SMETAR]
- corretta query ordini di lavorazione aggiungendo la commessa
2025-07-03 17:03:50 +02:00
80483d105b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 16:47:21 +02:00
7d02f3fb49 creata nuova tabella di relazione drlTipiModStampa tra dtb_tipi e dtb_mod_stampa 2025-07-03 16:46:43 +02:00
cefb4b4067 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 15:44:10 +02:00
8c5c5a3ac2 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 15:44:10 +02:00
cf352708dc [SMETAR]
- corretta query ordini di lavorazione evasi per ricerca su fasi errata
2025-07-03 15:39:28 +02:00
ee4cbebe3d Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 15:33:07 +02:00
1fc5164749 fix salvataggio drl_doc_attached 2025-07-03 15:31:32 +02:00
cba2b6d36d Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 15:15:39 +02:00
f7ae9ec98f Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 15:15:39 +02:00
611696a643 aggiunto controllo su flag evaso null in getOrdiniLavorazione 2025-07-03 15:15:28 +02:00
cfb26b3d7b tolto doppio ;
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 15:14:19 +02:00
f94294e3ea Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 15:01:41 +02:00
d620d0bd42 Merge branch 'hotfix/Hotfix-1' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-07-03 15:01:41 +02:00
ea1f9690c7 aggiunto controllo su flag evaso null in getOrdiniLavorazione 2025-07-03 15:01:29 +02:00
2b781e795a [ROSSOGARGANO - MES]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- rimosso criterio di calcolo progressivo pedane in base alla linea
2025-07-03 13:26:48 +02:00
cbfa2482da [ROSSOGARGANO - MES]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- aggiunto criterio di calcolo progressivo pedane in base alla linea
2025-07-03 13:13:17 +02:00
8084eb6f58 scadenze bloccate docfinance
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-07-03 12:37:23 +02:00
ef9bbe6198 scadenze bloccate docfinance
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 12:36:51 +02:00
237b4e4623 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-07-03 12:27:39 +02:00
5b7a3e0397 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 12:27:38 +02:00
fd8664f493 Piccolo fix barcode_ul per importazione bolle metalsistem smetar 2025-07-03 12:27:33 +02:00
4e78712c2f Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 11:59:34 +02:00
bcb23e8a42 [ROSSOGARGANO - MES]
- corretta salience regole progressivoUL per dare priorità alle regole custom di RG
2025-07-03 11:59:30 +02:00
4e9d2615b1 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 11:32:01 +02:00
8c5d5d19dd nuovo servizio salvataggio allegato documenti
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-07-03 11:20:43 +02:00
f8da37203c Rimosso valore N in bloccata nel tracciato docfinance
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 11:20:17 +02:00
29e67b3680 Risolto problema localDate 2025-07-03 11:19:20 +02:00
f4300415af Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 11:17:06 +02:00
b21674f976 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 11:17:05 +02:00
024f089b59 Rimosso valore N in bloccata nel tracciato docfinance 2025-07-03 11:16:55 +02:00
9a7508d05e rimossa eccezione in caso di suggerimento posizione ul che contiene più articoli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 11:05:47 +02:00
88b63564ab Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 09:16:12 +02:00
3665277ad4 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 09:16:12 +02:00
0929be9c11 Risolto problema localDate 2025-07-03 09:15:59 +02:00
d50c488d68 Risolto problema localDate
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-03 09:14:28 +02:00
0b2f6da75a Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-02 18:27:24 +02:00
80f8a21ca7 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-02 18:27:24 +02:00
a69e7c6382 sistemato controllo su diacod 2025-07-02 18:27:19 +02:00
88da287d33 Aggiunte migration per carelli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-02 18:13:32 +02:00
b924e018ab [ROSSOGARGANO - MES]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- corretto criterio di check sui barcode versati in produzione togliendo il controllo sulla data scadenza del SL
2025-07-02 17:37:11 +02:00
b9f2ed0509 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-02 17:16:37 +02:00
cecf45cc8f Cambiato SpostaUlRequestDTO, ora accetta una lista di barcode ul.
Creati servizi per trasferimento pedane.
2025-07-02 17:16:31 +02:00
2f6c642ef0 sistemato controllo su diacod
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-02 17:01:01 +02:00
39327b890e Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-02 16:50:55 +02:00
d853e37ad9 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-02 16:50:55 +02:00
b12c09cd63 sistemato controllo su diacod 2025-07-02 16:50:23 +02:00
771417958a Aggiunte note riga in contratti di vendita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-02 16:44:49 +02:00
f5fa467147 Query setup inserimento peso lordo su righe
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-02 15:58:48 +02:00
0aacbd4646 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-01 17:51:30 +02:00
7bb40cebcd Modifica migrations per DMS 2025-07-01 17:51:25 +02:00
383a44b752 Aggiunti servizi per verifica giacenza
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-01 15:41:02 +02:00
c38608d92b sistemato salvataggio imballaggi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-01 15:19:03 +02:00
a1c4ca30ff sistemato salvataggio imballaggi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-01 15:18:26 +02:00
08b91b91ef Fix su return null in retrieveArtsInGiacenzaByArticolo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-01 15:00:25 +02:00
25d266b0f8 [ROSSOGARGANO]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- impostata correttamente la partitaMagProd in generazione partita post versamento semi lavorato
2025-07-01 13:14:35 +02:00
d9287659d2 sistemata regola
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-01 13:05:45 +02:00
7fe8f70108 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-01 13:04:54 +02:00
5dee6b5218 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-01 13:04:53 +02:00
306942fc8c sistemata regola 2025-07-01 13:04:43 +02:00
9542465064 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-07-01 09:13:26 +02:00
7c3a703ee1 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-30 17:28:05 +02:00
9d09118ac1 invio variazione dopo chiusura tagli 2025-06-30 17:28:01 +02:00
61db4937fe Spostata setup da sottogruppo a gruppo in chiusura tagli prezzo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-30 17:23:02 +02:00
0e06c1f72b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-30 16:55:46 +02:00
cab6d145f5 Aggiunto campo flag_stato_pros su vista [pvw_clienti_prospect] 2025-06-30 16:55:40 +02:00
4901067c3f Aggiornata vista mvw_sitart_udc_det_inventario con raggruppamenti per migliorare il datetime_posizionamento
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-30 16:46:58 +02:00
35727ef0af Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-30 16:45:42 +02:00
6d9fdb90ff Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-30 16:41:07 +02:00
6acfd0ce3c Finish SetupReport
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-30 16:41:06 +02:00
f931b57fc3 Aggiunta setup per report materia accettazione rosso gargano 2025-06-30 16:40:32 +02:00
96fefe8c5f Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-30 16:18:17 +02:00
05878ec97d Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-30 16:18:16 +02:00
ca2ad8b0be aggiunta data sell out e sistemata lettura cod alis 2025-06-30 16:13:35 +02:00
9aa60b6464 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-30 15:39:46 +02:00
a107c68937 Aggiunta setup VIEW_SWITCH_DEPO_BUTTON
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-30 15:39:16 +02:00
6816e6c94e Aggiunto flag_stato_pros in tabella clienti\prospect
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-30 15:01:46 +02:00
ca5d62c0fa Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-30 15:01:31 +02:00
5884b95c96 Aggiunto flag_stato_pros in tabella clienti\prospect 2025-06-30 15:01:26 +02:00
25d872570d procedura di aggiornamento listini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-30 14:47:42 +02:00
01ee490657 Creata setup per chiusura tagli prezzo
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-30 12:51:55 +02:00
ef2601ff58 aggiunto controllo su inevasi per prodotti freschi
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-30 11:23:46 +02:00
c2d9ccf1b1 [ROSSOGARGANO]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- aggiunta gestione interfalde in trasferimenti
2025-06-30 10:33:39 +02:00
56764f5918 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-30 09:32:43 +02:00
c11ead2b49 [ROSSOGARGANO]
- nuovi servizi per la stampa di più report contemporanei
- migration per nuovi report controllo giacenze
2025-06-30 09:32:30 +02:00
219fd1989a Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/resources/menus/menu_config.json
#	ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java
2025-06-30 09:09:26 +02:00
ad691925ed Modifica migrations per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-27 18:15:17 +02:00
cae94ae363 Finish RefactoringCRM
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-27 18:12:04 +02:00
cb4c1adc83 Fix salvataggio attività
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-06-27 18:11:35 +02:00
8c2d6fec3e Merge branch 'develop' into feature/RefactoringCRM
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-27 18:09:57 +02:00
7b44b2de14 suggest cod codvvet
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-27 16:11:18 +02:00
e5ad2974f2 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-27 16:05:37 +02:00
b9368f0e53 create nuove entity TtbStyleDistCol e TtbStyleDistTagl 2025-06-27 16:05:28 +02:00
78137519ec Aggiunto token Winclock
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
(cherry picked from commit a1b9d39ea4)
2025-06-27 12:36:15 +02:00
3314ace16f Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/model/IntegryApplicationEnum.java
#	ems-core/src/main/java/it/integry/ems/user/service/UserCacheService.java
2025-06-27 12:35:42 +02:00
2301167478 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-27 12:35:15 +02:00
a1b9d39ea4 Aggiunto token Winclock 2025-06-27 12:35:09 +02:00
aa90913155 Rimesso default per errore winclock
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-27 12:07:46 +02:00
91bc662930 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-27 12:05:33 +02:00
05b1801ca7 creata nuova entity JtbClavInd 2025-06-27 12:05:22 +02:00
1cb8f15c14 Rimosso default PVM ad integryApplication e controllo app-token in auth/login
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-27 10:59:02 +02:00
2010782da4 Aggiornato menu e fix su profilo di lancio MenuStaticCreator
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-27 10:48:51 +02:00
a9718b5fbe creata nuova voce menu per WMS Trasferimento Pedane 2025-06-27 10:29:13 +02:00
39ebee61e6 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-27 09:54:03 +02:00
20038253a3 creata nuova voce menu per WMS Trasferimento Pedane 2025-06-27 09:53:55 +02:00
4670f3c1e9 Modifica migrations per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-27 09:27:11 +02:00
a1096f0d08 Creata env variable per filtrare i profili utilizzati
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-26 18:34:49 +02:00
c995d2334f Creati servizi per gestire il suggerimento di posizione di una UL
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-26 18:28:51 +02:00
579b6d7500 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-26 17:17:56 +02:00
436799e191 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-26 17:17:56 +02:00
3578a19d6d Modificare 2025-06-26 17:17:38 +02:00
0576383824 Gestione num_conf in importazione ordine di lavorazione da ordine WEB
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-06-26 17:11:13 +02:00
355bb8fc3f Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-26 17:08:38 +02:00
758c1573cc Gestione causale sul destinatario per DOLCE BONTA - COOP 2025-06-26 17:08:32 +02:00
68c8df103e Finish AggCreateField
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-26 15:59:37 +02:00
13a8cb5c0b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-26 15:59:37 +02:00
04c3e6688d Gestito inserimento num piante e superficie in createField agribook 2025-06-26 15:59:28 +02:00
0af1cf575e aggiunto flag_reso_tec nella mtb_aart
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-26 15:48:57 +02:00
7f8e5f18e8 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-26 12:07:39 +02:00
1cf01c2c0a Rinominate voci menu delle nuove gestioni documenti nel menu di rossogargano 2025-06-26 12:07:28 +02:00
4b96dbd100 Aggiunto profilo debug Smetar
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-26 11:41:22 +02:00
c0340b9863 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-26 11:09:22 +02:00
29f6a3d7b8 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-26 11:09:00 +02:00
7141bfbbae Finish ModifAgribookOrder
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-26 11:08:59 +02:00
9a96b6f3bb Gestito update VtbDest e valUnt Agribook 2025-06-26 11:08:52 +02:00
68ddee31e4 Fix crm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-26 09:19:46 +02:00
f198ea83ff Merge branch 'develop' into feature/RefactoringCRM 2025-06-26 09:19:32 +02:00
e8d8f7db1a Ripristinato maggio srl in ems_settings.json
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-25 16:51:45 +02:00
15e71a4749 Finish Feature-storicoOrdL
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-25 15:58:24 +02:00
f219b549c4 Merge branch 'develop' into feature/Feature-storicoOrdL
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-06-25 15:56:55 +02:00
34745d77b7 ripianifica
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-25 15:55:07 +02:00
3a32fe0a4b aggiunto uno spazio
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-25 15:17:06 +02:00
2c6e073a8c Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-25 14:40:02 +02:00
ed34939228 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-25 14:40:01 +02:00
4bd863bee8 aggiunto prezzo 2025-06-25 14:39:57 +02:00
d5cb1b44d2 getMateriali
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-25 13:42:23 +02:00
e22c467a15 Aggiunto GiovMaggio nelle migraton della Mvw
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-25 11:26:02 +02:00
7ba89d3cfa Rimosso Maggio Peppe
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-25 11:18:46 +02:00
5c817382cf Aggiunto tipo codice e tipo codice imballo in saveArticolo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-25 09:19:40 +02:00
2a6dc70996 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-24 17:40:40 +02:00
14344a3fff inserite le voci di menù delle nuovi gestioni documenti nella sezione "Movimenti di magazzino e controllo scorte" nel menù produzione_alimentare 2025-06-24 17:40:32 +02:00
baab24b9c6 aggiunta raggruppamento per deposito
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-24 17:20:02 +02:00
75d5025c09 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-24 16:43:51 +02:00
d9c4aa5a50 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-24 16:43:51 +02:00
f683d51b7a reimpostata la condizione di where 2025-06-24 16:43:46 +02:00
ae029bf493 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-24 16:40:27 +02:00
4e7456df6a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-24 16:40:27 +02:00
fd1c585edd reimpostata la condizione di where 2025-06-24 16:40:22 +02:00
023b6e0958 unificata la regola che imposta i dati del documento a valore
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-24 16:03:08 +02:00
df5d7e03ec inserie codie produttore su listino di apulia e sostituito date con localdate
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-24 15:41:06 +02:00
e3c330f8cc Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-24 12:10:07 +02:00
0a67f0d789 aggiunto messaggio di errore nell'importazione 2025-06-24 12:10:02 +02:00
b3a5701e59 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-24 12:00:36 +02:00
51262b49c3 inserito default = N nel campo flag_jflav_default della JrlFlavUsers 2025-06-24 12:00:25 +02:00
d042c06523 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-24 11:13:11 +02:00
d6bfabb6a2 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-24 11:13:10 +02:00
c12e1235c9 sistemata condizione di where 2025-06-24 11:12:55 +02:00
ac28224c97 impostato ad N il campo flag_jflav_default se null e reso not null, inserita relazione nella stbUser con JrlFlavUsers
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-24 11:05:44 +02:00
924ee5a19e Fix crm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-24 09:10:26 +02:00
5b7f2f3740 Merge branch 'develop' into feature/RefactoringCRM 2025-06-24 09:10:14 +02:00
d65965c06c Finish ModifCatastoTerreni
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-23 13:00:31 +02:00
b8154ff40a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-23 13:00:31 +02:00
ab9b24e511 Aggiunto lotto in paginatedRetrieveOrders agribook 2025-06-23 13:00:10 +02:00
eb098f345a Migration condifurazione TAMAI LICOR
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-23 12:52:43 +02:00
fbc13719db [ROSSOGARGANO - MES]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- corretta duplicazione ordini in versamento SL
2025-06-23 12:25:59 +02:00
bd9cb29821 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-23 12:12:29 +02:00
f3f8cdae13 Migration condifurazione TAMAI LICOR 2025-06-23 12:11:49 +02:00
365082edbd Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-23 11:57:36 +02:00
6cb0625690 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-23 11:57:36 +02:00
d4157c49eb gestito null se non trova il documento 2025-06-23 11:57:26 +02:00
5cbc6cce2e Fix su connection utilizzato in OrderRules.setRifOrd()
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-23 11:27:38 +02:00
b2179ae30b Merge branch 'develop' into feature/RefactoringCRM
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-23 09:37:51 +02:00
c3871083b1 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-23 09:22:17 +02:00
d7c310fb46 Modifica generazione giroconto matricola MAGGIO
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-20 18:07:34 +02:00
2835038d00 Modifica generazione giroconto matricola MAGGIO
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-20 17:58:35 +02:00
fc1a1a7f01 aggiunta codice pagamento su scadenze se sono null
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-20 17:36:46 +02:00
97d960b26c nuovi servizi crm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-20 17:15:40 +02:00
e2d4b47ca6 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-20 17:12:40 +02:00
78186b984c creati moduli di stampa ORDP e ORDCT 2025-06-20 17:12:31 +02:00
33c85e3a18 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	build/Jenkinsfile.groovy
#	ems-core/pom.xml
2025-06-20 16:49:10 +02:00
7f3213565f Merge branch 'develop' into feature/RefactoringCRM
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-20 16:12:34 +02:00
f6b29f195a Fix completeOrder 2025-06-20 16:12:27 +02:00
41cb351658 nuovi servizi crm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-20 15:44:58 +02:00
5eb0fad2b5 Creato servizio per paginazione dati agribook e creato menu catasto terreni
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-20 12:43:31 +02:00
e3863f5992 Rimosso slash nell'url dell'apk del WMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-20 12:11:28 +02:00
993314d773 Rimosso slash nell'url dell'apk del WMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-20 12:11:03 +02:00
c7ad5d9cb2 Merge branch 'develop' into feature/RefactoringCRM
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-20 10:59:14 +02:00
dec7858b4b Merge remote-tracking branch 'origin/feature/RefactoringCRM' into feature/RefactoringCRM
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-20 10:49:31 +02:00
446669d271 Fix crmUtility 2025-06-20 10:49:24 +02:00
c9eddc0590 Finish Feature-Iban
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-19 17:23:57 +02:00
93442e35f4 non salvare iban
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-06-19 17:23:49 +02:00
3639fdd3a1 Merge branch 'develop' into feature/Feature-Iban
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-19 17:06:18 +02:00
ec0804bf4c nuovi servizi crm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-19 17:03:59 +02:00
23830143dd Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-19 16:51:19 +02:00
aea09edd2b personalizzato datawindow Report Scadenze Clienti/Fornitori: Elenco Scadenze per Sabato 2025-06-19 16:50:38 +02:00
28a7778f35 inserito db sabato in IntegryCustomer 2025-06-19 16:49:30 +02:00
e8967501ee Fix null saveActivity
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-19 15:27:08 +02:00
cd9d7b6911 Merge branch 'develop' into feature/RefactoringCRM 2025-06-19 15:24:53 +02:00
fd3bccad15 nuovi servizi crm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-19 15:21:41 +02:00
2502542dc6 Piccole migliorie log4j
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-19 12:25:46 +02:00
1a04368005 non salvare iban
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-19 11:59:25 +02:00
3a5173a906 sistemata regola
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-19 11:58:09 +02:00
005f2655ff Implementato shutdown Log4j
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-19 10:58:16 +02:00
7d0cdf3d2a Aggiunta migration per abilitare i flag di DELIMITED_IDENTIFIER, FLAG_ANSI_PADDING, FLAG_CONCAT_NULL_YIELDS_NULL
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-19 10:39:22 +02:00
def18d5642 Rimossa dipendenza javax.servlet
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-19 10:24:26 +02:00
29ba885129 Rimosso import non utilizzato
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-19 10:04:05 +02:00
00d48cbe90 Aggiornato Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-19 09:47:30 +02:00
218f6b9306 Completati servizi per implementazione reso fornitore
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-19 09:46:31 +02:00
d428ab467b crm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-18 17:21:49 +02:00
9d7f95a3c6 inserita regola per valorizzare oramod su stb_activity
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-18 16:32:36 +02:00
dcc85817a9 Merge remote-tracking branch 'origin/feature/RefactoringCRM' into feature/RefactoringCRM
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-18 16:32:03 +02:00
666a32bfc1 Aggiunta retrieve impostazioni crm 2025-06-18 16:31:56 +02:00
ccbeff7f55 Merge branch 'develop' into feature/RefactoringCRM
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/order/crm/service/CrmService.java
2025-06-18 16:27:11 +02:00
a83c38526d inserita regola per valorizzare oramod su stb_activity
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-18 16:23:50 +02:00
cf215fae02 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-18 14:29:09 +02:00
10a08365c2 aggiunta selezione del listino nell'importazione delle promo apulia
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-18 13:11:29 +02:00
9d88aefdf7 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-18 12:31:12 +02:00
a04dc97b1c Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-18 12:31:11 +02:00
c0dc9f9f45 sistemata update colli 2025-06-18 12:30:32 +02:00
b8bec7d42a eliminata riga duplicata
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-18 12:19:41 +02:00
358064102e Completati servizi per implementazione reso fornitore
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-18 12:09:09 +02:00
523be40778 Modifica spostamento data produzione
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-18 12:06:54 +02:00
b34d746088 controllo codice fiscale
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-18 12:05:29 +02:00
998b63301d Completati servizi per implementazione reso fornitore
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-18 11:39:39 +02:00
3055139b83 Aggiunti servizi per retrieve lista resi fornitori
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-18 10:12:49 +02:00
cf766e190e Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli 2025-06-18 09:58:40 +02:00
d61cf134fb Aggiornato Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-17 18:09:14 +02:00
424604ea3a Aggiornato Jenkinsfile
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-17 18:08:50 +02:00
a329a7e0b9 Aggiornato servizio di updateWMSApp
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-17 18:07:11 +02:00
58724e30e3 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-17 17:16:44 +02:00
47c9db46e4 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-17 17:16:44 +02:00
d3de614b82 aggiunto commit in sincronizzazione remote subscription per ogni gruppo di transazioni 2025-06-17 17:16:33 +02:00
0187f23c5c varie:
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
rif_ord in ordini di vendita
rivisto servizio import documenti web
stampa per vgalimenti
2025-06-17 17:10:33 +02:00
68238f0d6e Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli 2025-06-17 12:10:05 +02:00
909f16b05b aggiunto stampa_doc_cons nella vtb_dest
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-17 10:38:55 +02:00
c4eb47a6b3 Merge branch 'develop' into feature/RefactoringCRM
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-17 08:57:52 +02:00
c3dd5fb59b sistemato aggiornamento contratti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-16 18:54:03 +02:00
1003f4e2d0 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-16 18:52:52 +02:00
01f8a0e84d Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-06-16 18:52:51 +02:00
a1505c43a3 sistemato aggiornamento contratti 2025-06-16 18:52:45 +02:00
2f94b2cc44 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-16 18:40:51 +02:00
681d3f6804 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-06-16 18:40:51 +02:00
c12409f926 sistemata query non filtrava su gestione 2025-06-16 18:40:44 +02:00
a1ad6fc86c Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-16 18:38:36 +02:00
2fc248b7ad Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-06-16 18:38:35 +02:00
518ab172ff sistemata query non filtrava su gestione 2025-06-16 18:38:26 +02:00
1b8b9d4b14 Nuovo storico ordini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-16 17:47:01 +02:00
96a4ab4b39 Merge branch 'master' into feature/RefactoringGestioneColli
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
2025-06-16 17:21:46 +02:00
1df4b46f62 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-16 17:19:36 +02:00
fd256e9722 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-16 17:19:36 +02:00
797d9e09a8 Migration ed Entity per aree di magazzino 2025-06-16 17:19:23 +02:00
e9411988d2 Aggiunti servizi di ricerca per udc nei resi da clienti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-16 12:29:33 +02:00
5e3cbc5b40 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-16 12:21:32 +02:00
5aeb27f719 aggiunto flag_attivo nella ctb_amac 2025-06-16 12:21:23 +02:00
857df1c265 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-16 11:56:07 +02:00
d9e1df95b3 Finish FixExecGroupStep
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-16 11:56:06 +02:00
847743b93e Fix confronto oggetti in executeGroupStep 2025-06-16 11:55:59 +02:00
db6319ad6c Migliorie su servizio di riproporzionamento scarichi produzione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-16 10:00:32 +02:00
8a61bc87bc Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-16 09:15:45 +02:00
1a0fb71404 protocolli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-13 18:05:51 +02:00
e580a12b0e Migliorie su servizio di riproporzionamento scarichi produzione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-13 17:20:30 +02:00
c2cbdd4578 Modifiche migrations per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-13 17:06:37 +02:00
5576834083 Migliorie su servizio di riproporzionamento scarichi produzione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-13 16:46:24 +02:00
4140c9314d Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-13 13:07:47 +02:00
9535500336 FATTURA ELETTRONICA: Modifica per escludere visualizzazione serie in numDocRif quando si tratta di autofattura 2025-06-13 13:07:43 +02:00
f2d8c06ec0 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-13 12:55:58 +02:00
145194efec aggiornata f_getSSCC 2025-06-13 12:55:52 +02:00
715e1fc6c3 Migliorie su servizio di riproporzionamento scarichi produzione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-12 17:04:09 +02:00
090828aa8a Impostato skipCommit su tutti i processEntity in WMSUtility
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
(cherry picked from commit 696b28e130)
2025-06-12 13:41:45 +02:00
696b28e130 Impostato skipCommit su tutti i processEntity in WMSUtility
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-12 13:41:15 +02:00
7c65f3a8f9 Impostato skipCommit in deleteUL
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
(cherry picked from commit cba813d062)
2025-06-12 13:37:19 +02:00
cba813d062 Impostato skipCommit in deleteUL
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-12 13:37:02 +02:00
376a1a0afa modifiche per aggiornamento listini di vendita da acquisto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-12 13:17:24 +02:00
8ec9959396 Merge branch 'develop' into feature/RefactoringCRM
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-12 13:01:15 +02:00
778141da66 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-12 13:00:36 +02:00
57ba03fc29 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-12 12:04:55 +02:00
fef869e91b Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-12 12:04:55 +02:00
6cb5932755 FATTURA ELETTRONICA: Modifica per escludere visualizzazione serie in numDocRif quando si tratta di autofattura 2025-06-12 12:04:21 +02:00
22bba4b76b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-11 18:02:24 +02:00
c900484a49 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-11 18:02:24 +02:00
be387fc0e0 Modifica importazione ordini ESSEGRANDE 2025-06-11 18:02:10 +02:00
ceb7deb79f Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java
2025-06-11 17:01:03 +02:00
0724f6ab83 -- fix vari 2025-06-11 17:00:07 +02:00
f910e6855f [ROSSOGARGANO - MES]
- recupero materiale su ordini in chiusura
2025-06-11 16:58:53 +02:00
acbd3e8ac2 [ROSSOGARGANO - MES]
- recupero materiale su ordini in chiusura
2025-06-11 16:57:41 +02:00
127f8858bc Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-11 16:40:15 +02:00
92855247b7 Modifiche migrations per DMS 2025-06-11 16:40:10 +02:00
93388bf841 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-11 15:49:18 +02:00
b06b21049e Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-11 15:49:17 +02:00
524dd39b15 cambiato controllo su data griglia 2025-06-11 15:49:10 +02:00
3fd3cb968a Merge remote-tracking branch 'origin/master'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-11 15:46:32 +02:00
c40c2b123a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-11 13:17:39 +02:00
a1511c6e26 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-11 13:17:38 +02:00
cf00744287 Gestione sconti testata documenti\ordini 2025-06-11 13:17:10 +02:00
5e7209f060 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-11 11:20:09 +02:00
81a39a4786 Merge branch 'hotfix/Hotfix-1' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-11 11:19:35 +02:00
b74cdbe3c0 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-11 11:19:35 +02:00
6b8089e18a aggiunto pattern di default sui parametri request di tipo date 2025-06-11 11:19:23 +02:00
5201b5b25d Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-11 10:26:30 +02:00
7126f9bf71 [ROSSOGARGANO]
allineamento accettazione da raccolta con nuova struttura colli
2025-06-11 10:26:26 +02:00
5a2ad13068 Fix su servizio di riproporzionamento scarichi produzione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-10 17:32:38 +02:00
c09945dd7e Gestione 2M_Holding in customerDB e modifica migrations per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-10 16:40:44 +02:00
348bc410f0 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-10 16:31:40 +02:00
a2000a0e37 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-10 16:31:40 +02:00
8d0b126568 Modifica procedura riassegnazione costi SMETAR 2025-06-10 16:31:28 +02:00
96369ecdb5 Modifica proecedura controllo fatture passive
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-06-10 16:30:26 +02:00
cfec5c8c3d aggiunta tabella storico contratti di vendita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-10 16:29:42 +02:00
aabab55f77 aggiunto cod_vdes nella vista vvw_sit_consegneXcommessa
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-10 15:31:48 +02:00
425d57453d Merge remote-tracking branch 'origin/develop' into develop
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-06-10 15:26:15 +02:00
0d7574e1b9 abilitazione mtb_depo con servizi rest 2025-06-10 15:26:05 +02:00
7a0132b00e Nuovo db Tenuta San Martino di Biolevante
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-10 15:25:09 +02:00
c0dc46935b Aggiornato servizio di cancellazione collo carico produzione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-10 12:16:45 +02:00
f1c5d7cd2e Aggiornato servizio di importColliDaProduzione (usato in Rientro Merce WMS).
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Sistemato servizio riproporzionaScarichiLavorazione utilizzando nuovi servizi di gestione UDC/UDS.
2025-06-10 10:30:04 +02:00
31e42d932d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java
2025-06-09 19:24:08 +02:00
d2ad1a88e0 Finish Hotfix-100 2025-06-09 19:20:31 +02:00
54468d1a38 cambiato controllo su data griglia 2025-06-09 19:20:23 +02:00
cc39751264 modifiche a variaizone data consegna su ordini di vendita, modificato controllo tagli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-09 19:00:31 +02:00
d351534f11 aggiunto cod_mgrp per gestione tolleranza scadenze
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-09 15:11:07 +02:00
c50d4c8b0f Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-09 14:44:36 +02:00
3f7a98efb7 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-09 14:44:35 +02:00
a49367fb80 aggiornamento griglie di vendita 2025-06-09 14:42:40 +02:00
7734d4aad7 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-09 14:09:07 +02:00
249d377c25 creta setup per visualizzare o meno tasto Azzera Giacenza nel report Giacenza per Partita 2025-06-09 14:08:56 +02:00
7827f7bdbf Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-09 09:36:44 +02:00
bc4b741007 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-09 09:36:43 +02:00
b25a40f085 Fix pianificazione attività 2025-06-09 09:36:33 +02:00
08c675b662 Fix gestione mtb_cols durante exchange colli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-09 09:20:03 +02:00
7d9ca973f5 Merge branch 'master' into feature/RefactoringGestioneColli
# Conflicts:
#	ts/ems-engine.module.ts
2025-06-09 09:19:44 +02:00
1e34e19956 Fix gestione mtb_cols durante exchange colli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-09 09:19:05 +02:00
75afa5c1c1 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-09 08:42:49 +02:00
5649ff88b4 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-09 08:42:48 +02:00
dbec19d78e aggiunto controllo su null 2025-06-09 08:42:41 +02:00
jenkins
be1ab493e3 Merge branch 'develop'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-08 07:41:35 +02:00
1af3ec4619 Gestite notifiche in modifica e pianifica attività
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-06 18:22:53 +02:00
5229f26208 modificata assegnazione data cmov
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-06 15:13:35 +02:00
70e995bca9 disabilitata setup per cod_sdi_obbligatiorio a dulciar
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-06 12:49:41 +02:00
39ed3ea3cd Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-06 12:20:18 +02:00
69685a5f2d creata nuova setup per rendere codice sdi obbligatiorio o meno 2025-06-06 12:20:06 +02:00
e12f14692e Gesto invio notifica per userDevice e AppName
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-06 11:36:17 +02:00
1b9df2c4bb Gestito recupero cod_ccon
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-06 11:35:20 +02:00
e3c3d3fdf8 Merge branch 'develop' into feature/RefactoringCRM 2025-06-06 11:30:59 +02:00
1b2a3c1203 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-06 10:51:11 +02:00
fc9e8f5c36 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-06 10:48:49 +02:00
6a2dd12977 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-06 10:48:49 +02:00
97ea3d0a3a corretto enum tipo concorrenza in jtb_fasi 2025-06-06 10:48:37 +02:00
ef7369c2a3 Fix condizione where cond nella vista WMS_OrdPrelievo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-06 10:48:24 +02:00
ef24dd1f7b controllata la gestione per la generaizone dei trasferimenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-06 10:29:15 +02:00
7b63eef054 Merge branch 'develop' into feature/RefactoringCRM 2025-06-06 09:40:10 +02:00
84e9213015 inserito controllo su aliquota nulla su righe con importo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-05 15:58:53 +02:00
37001b33e5 Modifica per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-05 15:24:02 +02:00
2a7222da7a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-05 13:12:40 +02:00
306397e713 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-05 13:12:39 +02:00
b61f3170a0 eliminate le righe dal castelletto le righe senza aliquita e imponibile = 0 2025-06-05 13:12:34 +02:00
1520d45609 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-05 10:35:30 +02:00
42fde56351 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-05 10:27:28 +02:00
5da7e3603c Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-05 10:27:28 +02:00
e78d8bc0b8 Merge branch 'master' into hotfix/Hotfix-1 2025-06-05 10:27:16 +02:00
7836f1530d aggiunto il tipo di concorrenza ordini multipli sulle linee di lavorazione 2025-06-05 10:26:59 +02:00
1d050d8b6c Merge branch 'develop' into feature/RefactoringCRM
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-05 09:30:14 +02:00
6d595a8564 nuovo servizio di ripianificazione dell'ordine di lavoro
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 18:32:12 +02:00
90e2890f7d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 17:36:40 +02:00
63a40866ed Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 17:36:39 +02:00
19b7031cbc [MES] Aggiornata lettura indirizzo IP del printer service 2025-06-04 17:36:32 +02:00
820ae30ab4 Migliorata vista WMS_OrdPrelievo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 17:27:15 +02:00
60683c0383 SISTEMATO ERRORE IN STAMPA DOCUMENTI
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 16:47:50 +02:00
402f3dd32e Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 16:46:48 +02:00
83422bb278 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 16:46:43 +02:00
0b9909b00d SISTEMATO ERRORE IN STAMPA DOCUMENTI 2025-06-04 16:46:10 +02:00
f137e88fd7 Merge branch 'develop' into feature/RefactoringCRM
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 16:33:51 +02:00
cf3a1ad946 Sistemato importColliEviosys
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 16:09:40 +02:00
0e9304b531 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 15:58:57 +02:00
5fa06f7bfd Aggiunta possibilità di leggere più fogli in un file excel 2025-06-04 15:57:42 +02:00
85f1f4f706 Farmmes scrofaie gestione trasferimento a sito 2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 15:57:13 +02:00
03b0fb1939 Servizio di generazione e controllo codice fiscale
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 15:45:16 +02:00
5d8915796c Refactor classi crm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 14:45:56 +02:00
90b955f6a4 Fix su clear internal sqlite db
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 13:01:10 +02:00
eb6b014e80 Fix su clear internal sqlite db
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 13:00:05 +02:00
02c5bf180d Fix su clear internal sqlite db
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 12:52:23 +02:00
f7b1519e82 Fix su clear internal sqlite db
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 12:36:31 +02:00
d739d19b3f modificato nome del campo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 12:19:37 +02:00
39bcb14b04 Creati primi servizi per app crm smetar
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-04 10:02:04 +02:00
57ea722668 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-03 16:33:40 +02:00
461d2f7d0d Creato servizio di generazione codice fiscale 2025-06-03 16:33:30 +02:00
0a105eb6e7 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-03 16:33:07 +02:00
8c720196ec Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-03 16:33:06 +02:00
a6fe088845 Sistemato AckIntesaDTO 2025-06-03 16:32:54 +02:00
e4185ff744 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-03 16:29:04 +02:00
f1b8a89676 Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-03 16:29:03 +02:00
f3ee326ab6 Fix esportazione doc e importazione ack Intesa 2025-06-03 16:28:52 +02:00
a020eb2881 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-03 15:14:25 +02:00
2a8b95910f Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-03 15:14:24 +02:00
ec1ce5cf3b aggiunto messaggio di errore se l'articolo non esiste 2025-06-03 15:14:13 +02:00
81c7454066 creata nuova tabella dtb_docp
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-03 12:55:23 +02:00
403e1c6a76 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-03 11:04:20 +02:00
03297be35a aggiunto flag_set_pro nella dtb_tipi 2025-06-03 11:04:12 +02:00
9657e26a39 Downgrade versione typescript generator, spostata definizione ts in ems-engine e rimosse classi duplicate
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-03 10:52:01 +02:00
58fdad32e2 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-06-03 10:44:28 +02:00
ac363ba5e8 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-03 10:44:27 +02:00
b83520b9dc abilitazione dtb_tipi con servizi rest 2025-06-03 10:44:23 +02:00
ce92291f9c abilitazione dtipi 2025-06-03 10:43:56 +02:00
e0d63d5c44 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-06-03 09:40:38 +02:00
789aef1a60 Creato timeDiff
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-30 18:55:59 +02:00
34028ba3db Aggiunto retrieveUserName in UserService 2025-05-30 18:55:44 +02:00
e228b30d13 Fix full name in modifyAbsence 2025-05-30 18:55:07 +02:00
5223f3cfdc Aggiunto tipo_indirizzo in getPersoneRif 2025-05-30 18:51:09 +02:00
8074343019 Modifica SUIT
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-30 18:38:02 +02:00
d54401cd9e Rimossa dipendenza errata
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-30 17:36:38 +02:00
6f6232be13 Aggiunto controllo per evitare importazioni che exchange importi tabelle vuote (che cancellano tutto).
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Aggiunti campi partita_mag_prod e data_scad_prod in equals di MtbPartitaMag
2025-05-30 17:31:46 +02:00
470f85fa2c Mostrati contratti con qta_residua = 0 in pvm_getAssortimentoClientePedane
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-30 16:30:41 +02:00
850c9465e3 aggiunto inserimento attività per la trasferta
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-30 13:34:41 +02:00
872503afb5 [WMS] Aggiunto ordine nella riga di rettifica del documento di scarico
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-30 12:28:39 +02:00
edd50bed65 [WMS] Aggiunta commessa ordine durante il recupero dei materiali versati
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-30 11:58:53 +02:00
d5af8cae77 Modificato controllo null su note incoterms in completePortoOrd
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-29 16:49:43 +02:00
7578a187ca Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-29 16:20:21 +02:00
32f24840b7 aggiunta descrizione_estera nella tabella gtb_porto 2025-05-29 16:20:13 +02:00
aac8b151dc Creato anonimizzatore utenti stb_users
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-29 16:11:24 +02:00
48e07386af aggiunta regola per aggiornare num file prev
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-29 15:59:02 +02:00
76785b22fe Cambiata connessione biolevante con biolevante_peppe
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-29 15:08:16 +02:00
7e95e4065e stampa documento
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-29 15:01:20 +02:00
46e967d6c0 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-29 13:36:43 +02:00
a4cd2923b8 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-29 13:36:42 +02:00
580c7d450b disattivata cache e sistemato controllo su cancellazione e modifica attività nel periodo fatturato 2025-05-29 13:36:37 +02:00
bebf48f6c5 Aggiornate migration per nuova MVW
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-29 13:19:07 +02:00
e2650e7eeb Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-29 13:11:46 +02:00
75474632b1 Modifica per DMS 2025-05-29 13:11:41 +02:00
aea261e1fa Creata setup VARIETA_EDITABLE in previsioni raccolta pvm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-29 12:35:18 +02:00
5520cd4f1f Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-29 10:54:40 +02:00
23d3b620db Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-29 10:54:39 +02:00
660d7f28a9 abilitata cache su gramm 2025-05-29 10:54:34 +02:00
7cbfc3208d modifica inserimento attività pianificata
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-29 10:50:14 +02:00
79d0ea1967 Rimossa cartella TS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-29 10:01:36 +02:00
469221be36 Rinominato report Movimentazione Unità Logistiche
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-29 09:49:43 +02:00
069b652035 Fix su aggiornamento valori StbExchangeConfig
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-28 18:29:24 +02:00
0b9d6198ed Modifica per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-28 17:41:40 +02:00
0e6f81aad7 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-28 17:12:40 +02:00
56cd2eb100 modificghe per importazione listini 2025-05-28 17:12:30 +02:00
3f9fc93bd0 Aggiornato Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-28 17:05:19 +02:00
6b3d579803 Aggiornato Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-28 17:04:55 +02:00
9e4dea4e3c Fix num copie in generazione stampa
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-28 16:34:47 +02:00
347e285cd4 Fix merge pdf
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-28 11:27:47 +02:00
04c3e8fe92 variazioni per import listini acquisto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-28 11:02:54 +02:00
42a2d7cc20 aggLisv
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-28 10:57:51 +02:00
c09fe5b65a modifiche a stampa documento
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-28 10:55:26 +02:00
a9725f6605 Creato metodo per mergePdf
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-28 10:43:11 +02:00
ab311c44ac Modifica generazione xml FE: aggiunto sezionale a rif_doc agganciati
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-27 18:57:39 +02:00
e0512c5e9d Finish FixCheckExistOrdW
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-27 17:27:17 +02:00
66b5033348 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-27 17:27:17 +02:00
2ad24a9cd0 Fix importazione ordini web textiles 2025-05-27 17:27:10 +02:00
8c9019caae Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-27 16:47:00 +02:00
e128052779 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-27 16:47:00 +02:00
97e80a901f [CARELLI - Calendario PV]
- gestita modifica utenti pianificazione con sincronizzazione DB
2025-05-27 16:46:14 +02:00
dc629f45e8 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-27 16:44:44 +02:00
feb5dfb9d1 Sistemata configurazione object mapper per BaseEntityImporter 2025-05-27 16:44:40 +02:00
d8e6411df8 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-27 15:48:18 +02:00
148dc96d51 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-27 15:48:18 +02:00
05de6739d2 emai per obiettivi, risolto problema su movimenti 2025-05-27 15:48:12 +02:00
5acb744618 Gestito inserimento data collo e partita in createColloCaricoProdottoFinito
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-27 09:44:44 +02:00
f42395cf8f Finish FixRiepConsegne
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 17:54:43 +02:00
0e679727de Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-26 17:54:43 +02:00
d1ed137327 Aggiunta where per tipi doc in getDatiConsegne 2025-05-26 17:54:31 +02:00
0ee6c261e5 Aggiornati equals MtbColr
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 16:53:49 +02:00
0b6ad5d5dc Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 16:26:08 +02:00
e023dc3a92 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 16:24:25 +02:00
a1585daa60 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 16:24:24 +02:00
f5312e0982 [REPORT]
- aggiunto font Arial Rounded MT
2025-05-26 16:24:14 +02:00
19c8d1eee7 modificata selezione della partita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 14:13:39 +02:00
254e096cb6 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 14:12:20 +02:00
ac3b8fa29a Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 14:12:19 +02:00
c25eaf205a modificata selezione della partita 2025-05-26 14:12:09 +02:00
201996e4b5 Migliorie gestione exchange
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 13:03:56 +02:00
2bf4edeffe Migliorata update colli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 12:57:33 +02:00
11c133789a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 12:11:07 +02:00
9135b2ed6c Finish FixJenkins
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 12:11:07 +02:00
a865658cb9 Fix checkout branch TypeScript 2025-05-26 12:10:59 +02:00
42023e38b6 Modificato importo minimo debito iva
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-26 11:39:28 +02:00
dd38ed9985 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-26 11:38:21 +02:00
7f79e817cf Finish FixJenkins
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 11:38:20 +02:00
68cb00020c Fix cancellazione repo IntegryManagementSystemTSModules 2025-05-26 11:38:12 +02:00
a7332121f0 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-26 11:17:11 +02:00
3cdbd21bdf Finish FixJenkins
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-26 11:17:11 +02:00
2dc34cb62a Fix cancellazione repo IntegryManagementSystemTSModules 2025-05-26 11:17:05 +02:00
799c3be92d Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 10:51:08 +02:00
9f48b3da24 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-26 10:50:53 +02:00
25c33e39cd Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 10:50:53 +02:00
7a4659cd6e Fix su regola calcolo totali documenti/ordini 2025-05-26 10:50:48 +02:00
aa530618ea Aggiornato Jenkinsfile
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-26 10:16:20 +02:00
e0d0534c88 Aggiornato Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 10:08:44 +02:00
ae4975cc60 Aggiornato Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 09:59:57 +02:00
bc4ec92472 Aggiornato Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 09:52:37 +02:00
e6a3c95be1 Aggiornato Jenkinsfile
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-26 09:40:36 +02:00
d1f05caf67 Aggiornato Jenkinsfile 2025-05-26 09:40:36 +02:00
4f4c0a592c Aggiornato Jenkinsfile 2025-05-26 09:40:35 +02:00
beb4a61f02 Aggiornato Jenkinsfile 2025-05-26 09:39:54 +02:00
30a6f6b102 Aggiornato Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 09:39:21 +02:00
43d44f7230 Aggiornato Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 09:35:41 +02:00
5a2dabe15a Aggiornato Jenkinsfile
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-26 09:27:00 +02:00
6ccd9cfce8 Aggiornato Jenkinsfile
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2025-05-26 09:22:13 +02:00
96102328c1 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-26 09:19:16 +02:00
jenkins
826fc326d3 Merge branch 'develop'
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-25 07:42:43 +02:00
2d458e1836 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/looper/service/LooperService.java
2025-05-23 18:47:54 +02:00
3f2ad37ff9 Gestito parametro data collo in scarico da collo 2025-05-23 18:39:28 +02:00
9232910f2e allinea costi sistemata spese
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-23 17:53:43 +02:00
c343ec70ad Aggiornati servizi di recupera materiale con nuove logiche barcode
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-23 17:42:31 +02:00
fc40cd34f0 gestita delete the insert nell'update dei documenti
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-23 17:08:44 +02:00
ab45214989 gestione parametro giorno variazione 2025-05-23 17:08:11 +02:00
122967201d Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-23 17:01:08 +02:00
4e9080cddb modificato l'assegnazione del costo nei documenti di lavorazione che valorizzano il costo 2025-05-23 17:01:03 +02:00
074cd3a926 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-23 16:45:51 +02:00
339acbaac5 modificato join mtb_colt e mtb_colr 2025-05-23 16:45:44 +02:00
0b7ca7306d Rinominate voci menu delle gestioni documenti di lavorazione nel menu di rossogargano 2025-05-23 16:44:21 +02:00
b3675fe5ca Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-23 16:35:45 +02:00
f557ab05ee modificato l'assegnazione del costo nei documenti di lavorazione che valorizzano il costo 2025-05-23 16:35:40 +02:00
8209e18084 inserita testata del collo
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-23 16:30:50 +02:00
3dd3979630 modifche per esportazione zucchetti
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-23 16:07:01 +02:00
2651c267e2 varie migration 2025-05-23 16:06:42 +02:00
246495fdba Aggiunta publish dei moduli ts in post build Jenkins
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-23 10:59:21 +02:00
59fab0fb80 Aggiunta publish dei moduli ts in post build Jenkins
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-23 10:54:40 +02:00
6aa08d2006 Aggiunta publish dei moduli ts in post build Jenkins
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-23 10:41:03 +02:00
ef0933a809 Aggiunta publish dei moduli ts in post build Jenkins
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-23 10:34:52 +02:00
bfa751570c Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-23 10:13:28 +02:00
a85affbb15 modificata voce menu Report Movimentazione Colli 2025-05-23 10:13:20 +02:00
f128443b59 Aggiunta publish dei moduli ts in post build Jenkins
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-23 10:10:32 +02:00
a266cbc244 Aggiunta publish dei moduli ts in post build Jenkins
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-23 09:59:41 +02:00
057068cb73 Aggiunta publish dei moduli ts in post build Jenkins
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-23 09:55:38 +02:00
4bb59eee38 Gestita possibilità di indicare la data del trasferimento in sposta ul
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-23 09:37:39 +02:00
486a689f17 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-23 09:35:00 +02:00
25d41496e8 inserita voce menu Report Movimentazione Colli 2025-05-23 09:34:51 +02:00
af2956fc1e Modifica migrations per DMS e migrations gestione allegati per utente
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-23 09:26:21 +02:00
f87758c829 Modifica migrations per DMS e migrations gestione allegati per utente 2025-05-23 09:26:14 +02:00
615e90bfd4 Test subtree
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-23 09:11:41 +02:00
61e0d16e6a Reset 'ts/' to '80deffc5f113dbf849bd06a960b13badbcfe80ea'
git-subtree-dir: ts
git-subtree-mainline: a6597632d0
git-subtree-split: 80deffc5f1
2025-05-23 09:11:09 +02:00
a6597632d0 Split 'ts/' into commit '80deffc5f113dbf849bd06a960b13badbcfe80ea'
git-subtree-dir: ts
git-subtree-mainline: c390d81cfd
git-subtree-split: 80deffc5f1
2025-05-23 09:10:07 +02:00
c390d81cfd Test subtree
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-05-23 09:08:18 +02:00
80deffc5f1 Test subtree 2025-05-23 09:08:18 +02:00
adcfda0f82 Add 'ts/' from commit 'c8bc8d56dff1b7b8b075caf77ae2956d2fe9b936'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
git-subtree-dir: ts
git-subtree-mainline: fb7748859c
git-subtree-split: c8bc8d56df
2025-05-23 09:07:22 +02:00
fb7748859c Rimossa subrepo 2025-05-23 09:06:46 +02:00
07415be631 Fix importazione colli Eviosys
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-22 16:17:18 +02:00
aa54984d5e Gestito flag archiviazione_elettronica nella stampa documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-22 16:01:01 +02:00
fd8ee74d14 Aggiunta sottorepo per i moduli TS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-22 12:34:44 +02:00
c8bc8d56df First commit 2025-05-22 12:32:49 +02:00
e70fde3108 initial commit 2025-05-22 12:32:49 +02:00
585771cb2e Aggiornati plugin toolchain e Typescript generator
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-22 11:59:43 +02:00
51ad617bd3 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/utility/UtilityEntity.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/controller/WMSGenericController.java
2025-05-22 10:16:49 +02:00
ae4e1ee23d Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-22 10:15:46 +02:00
bce751556c Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-22 10:15:46 +02:00
63a2815977 Abbassato livello di warning sui metodi e variabili non utilizzati 2025-05-22 10:14:53 +02:00
7825379515 [Controllo giacenze]
- stampa sscc da distinta in stampa etichetta ul

# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/controller/WMSGenericController.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java
2025-05-22 10:13:42 +02:00
4c71015588 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-22 10:04:53 +02:00
065fb956d3 Migliorato shutdown BasicConnectionPool 2025-05-22 10:04:38 +02:00
4cd960ffc5 Migliorato shutdown BasicConnectionPool
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-22 10:03:56 +02:00
f096f72942 [Controllo giacenze]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- stampa sscc da distinta in stampa etichetta ul
2025-05-22 10:02:43 +02:00
8f2b71fc90 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-22 09:19:15 +02:00
9a2fbe8be6 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-22 09:19:13 +02:00
6cd5b411d9 Importo ordini PUDDY 2025-05-22 09:18:45 +02:00
1d1cbbf330 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-22 09:17:11 +02:00
e12f5fe762 Modifica funzione Plafond 2025-05-22 09:17:03 +02:00
cf0cb0c8b8 Modifica funzione Plafond 2025-05-22 09:16:55 +02:00
f61f8283f0 Rimpiazzato utilizzo di LooperService con @Scheduler
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-21 18:48:19 +02:00
2165732206 Rimpiazzato utilizzo di LooperService con @Scheduler
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-21 18:47:43 +02:00
c490661c1d Rimpiazzato utilizzo di LooperService con @Scheduler
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-21 18:07:26 +02:00
0682af0dee Migliorie allo shutdown di Tomcat
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-21 17:21:06 +02:00
2bb8c773ee Migliorie allo shutdown di Tomcat
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-21 17:20:48 +02:00
0a4ae28e17 Aggiornati plugin toolchain e Typescript generator
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-21 13:01:59 +02:00
fb09e637ee Convertito campo dataScad in LocalDate nel dto dell'ordine di lavoro (MES)
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-21 10:54:25 +02:00
be61adb5e7 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-21 10:53:47 +02:00
792693ad59 Convertito campo dataScad in LocalDate nel dto dell'ordine di lavoro (MES) 2025-05-21 10:53:34 +02:00
aa4619e323 [ROSSOGARGANO]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- Documenti di trasferimento Raggruppati se provenienti dal MES
- gestita possibilità di scegliere se creare i documenti in rettifica colli
2025-05-21 10:41:03 +02:00
5e30e340a2 [ROSSOGARGANO]
- Documenti di trasferimento Raggruppati se provenienti dal MES
- gestita possibilità di scegliere se creare i documenti in rettifica colli
2025-05-21 10:40:56 +02:00
0c13b16da3 aggiunto controllo per vettore obbligatorio
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 17:17:33 +02:00
f7ac81f033 fattura differita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 16:03:51 +02:00
ca8fba8d6f Implementato servizio di retrieve uds già registrate
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 15:26:49 +02:00
e6e42921c3 Implementato servizio di retrieve uds già registrate
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 15:25:31 +02:00
7012dca4a6 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 11:50:37 +02:00
5a8c5799a5 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 11:50:19 +02:00
654d4d5017 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 11:50:19 +02:00
874f9d4799 Aggiunto codJfas in createUDC 2025-05-20 11:50:13 +02:00
32413c0359 Aggiunto profilo tunneling di Lamonarca
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 11:49:38 +02:00
0dcf09d1a7 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 11:30:44 +02:00
e12dfb0fa6 Finish PermMES
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 11:30:43 +02:00
d860ca8fc2 Aggiunti permessi per pulsante di pausa nel MES 2025-05-20 11:30:36 +02:00
0159dc5d4f Sistemato controllo su conto setup distinta incassi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 10:28:10 +02:00
8256c1e0ce Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
2025-05-19 20:04:49 +02:00
38129b6bb7 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 20:01:47 +02:00
38a2259b4c Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 20:01:46 +02:00
73fd69905a Cambiati servizi che creano UDC dai collector 2025-05-19 20:01:41 +02:00
cba65774a2 modifiche per registrazione movimenti contabili
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 16:26:48 +02:00
90c0ec111c Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-19 16:22:20 +02:00
f3bae6449c modifiche per registrazione movimenti contabili 2025-05-19 16:21:58 +02:00
9e7ad50291 Controllo se flag_evaso_forzato è S se richiesti ordini evasi in MES_GetWorkOrders
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 15:45:07 +02:00
eabe183d35 modifiche per salvataggio dei movimenti contabili
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 14:17:49 +02:00
f92de927ff Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 12:22:57 +02:00
48255e9d63 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 12:22:42 +02:00
758fcd1dcb Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-19 12:22:42 +02:00
5edcfb38ee Sistemata gestione shutdown nel looper service 2025-05-19 12:22:34 +02:00
a7e2271216 inserito campo archiviazione_elettronica nella vtb_vett
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 09:50:42 +02:00
fe5dc1f55b Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java
2025-05-19 09:37:19 +02:00
a6b90aa9ca Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 08:42:45 +02:00
57af537e38 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 08:42:44 +02:00
07dce22d57 aggiunto controllo su campo esistete 2025-05-19 08:42:25 +02:00
04944298ce Aggiunti tutti i permessi per utenti con controllo_giacenze abilitata
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-05-16 18:35:11 +02:00
557ada2363 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 18:04:09 +02:00
819a5bc363 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 18:03:11 +02:00
c6d64201ac Merge remote-tracking branch 'origin/develop' into develop 2025-05-16 18:00:50 +02:00
bb52efea76 [CARELLI]
- gestione salvataggio activity_Types per calendario pv
2025-05-16 18:00:43 +02:00
c572e2017c Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 18:00:42 +02:00
975e545f44 Modifica import ordini SEVENBAR 2025-05-16 18:00:27 +02:00
6b30fea7b8 Aggiornata createULLavorazione nella sezione MES per supportare la nuova struttura
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 17:59:21 +02:00
22cbc5eeba Gestita riapertura ordine per id lotto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 17:45:44 +02:00
71df21c003 sistemato controlo su traferimento
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 15:17:27 +02:00
d73f607e21 Aggiornata vista di getPickingList per WMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 13:02:53 +02:00
1f10d162f5 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 12:05:10 +02:00
8c14fbf8c6 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 12:05:09 +02:00
afa7f701af errore nell'invio delle anomalie 2025-05-16 12:05:05 +02:00
2c592164f4 errore nell'invio delle anomalie 2025-05-16 12:04:35 +02:00
a2fd1322a4 errore nell'invio delle anomalie 2025-05-16 11:59:02 +02:00
2af6148398 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 11:29:34 +02:00
b6a76b7389 aggiunto lotto nelle variazioni 2025-05-16 11:27:35 +02:00
204542a160 Creato metodo per riapertura ordine di lavorazione MES
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 10:07:00 +02:00
960f74e7cd Fix posizione in spostaMerceTraUl
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 18:28:20 +02:00
68afe86f87 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 18:15:59 +02:00
caf6ffe38e Mmodifica per DMS 2025-05-15 18:15:51 +02:00
9e4a1a1749 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 17:27:51 +02:00
01688728be Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 17:27:51 +02:00
328d7f8067 correzione su accettazione 2025-05-15 17:27:46 +02:00
13698c9664 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 17:26:59 +02:00
ccad444ef6 Aggiornamento per invio variazioni 2025-05-15 17:26:52 +02:00
25693d6089 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 17:12:05 +02:00
b4733eda79 Modifica generazione XML per problema su destinatario merce con RIF 2025-05-15 17:12:01 +02:00
14590bbe4c update campi costi_art_obb e ricavi_art_obb nella mtb_grup per gramm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 15:41:10 +02:00
b10048e3cb Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 15:27:46 +02:00
a3f1c7d271 inseriti campi costi_art_obb e ricavi_art_obb nella mtb_grup 2025-05-15 15:27:37 +02:00
e1e9a3cbfc Rimosso Rossogargano_peppe da build docker
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 13:41:44 +02:00
56cea98c92 Aggiunta retrieve MtbAartBarCode in getArticoliByCodMarts
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 12:50:56 +02:00
48d5190586 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
2025-05-15 12:15:39 +02:00
0f2879cdcc Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 12:14:35 +02:00
2dcab245e4 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 12:14:35 +02:00
857c9d3489 [ROSSOGARGANO]
- recuperata sezione trasferimento automatico in versamento materiale su ordine
2025-05-15 12:14:24 +02:00
36c6ec6c64 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 10:19:47 +02:00
7f3c43f263 sistemato controllo per trasferimenti 2025-05-15 10:19:44 +02:00
748e9fe168 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 18:06:50 +02:00
11bf825b16 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 18:06:50 +02:00
d22e3f562b rimosso controllo su deposito collo diverso da documento in generazione CLAV 2025-05-14 18:06:37 +02:00
4d0dfc5341 rimosso controllo su deposito collo diverso da documento in generazione CLAV
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 18:06:04 +02:00
b08e1ef6bb Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 17:36:57 +02:00
e1aa08391b Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 17:36:37 +02:00
09b8d47c76 modifiche su creazione colli da documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 16:01:45 +02:00
315e85b0ca Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 15:34:14 +02:00
e1e96c1283 cancellazione migration e sistemato controllo su data fine 2025-05-14 15:34:11 +02:00
d44e51b8c5 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 12:09:38 +02:00
87732e1bba personalizzato datawindow report scadenze clienti (nuova versione) e report scadenze fornitori per Auricchio 2025-05-14 12:01:36 +02:00
dde2713528 Abilitata gestione oneri db Carelli e tipo_azienda DISTR_DETTAGLIO
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 10:01:39 +02:00
2290f46c3b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 09:51:15 +02:00
65656768bd Cambiata compilazione Jenkinsfile 2025-05-14 09:51:10 +02:00
08941e234b Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-14 09:48:26 +02:00
e755a3a8c4 invio tracciabilità gastronimia 2025-05-14 09:48:23 +02:00
2069e0afa6 Cambiata compilazione Jenkinsfile
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-14 09:38:24 +02:00
0963dd7360 invio tracciabilità gastronimia
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-14 09:31:48 +02:00
f5b606a0cd Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-14 09:24:53 +02:00
6f71ac7ddf Cambiata compilazione Jenkinsfile 2025-05-14 09:24:47 +02:00
dad0dd6a2b invio tracciabilità gastronimia
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 09:23:21 +02:00
a40c1d2ab9 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250512135039.java
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250512161113.java
2025-05-14 09:11:33 +02:00
2e70e1edc1 Modificate parentesi nella condizione di where con l'or 2025-05-14 09:09:55 +02:00
e0f31b670d Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250512135039.java
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250512161113.java
2025-05-14 09:04:13 +02:00
e3d76dd29e Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250512135039.java
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250512161113.java
2025-05-14 08:46:01 +02:00
43f59ccf3b Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 20:25:50 +02:00
42e5ab520d Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 20:25:35 +02:00
fee5320c37 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 20:18:54 +02:00
1d4bf6675a Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 20:17:50 +02:00
84c7876dcc [GRAMM]
- rimossa pezza temporeanea salvataggio ordini di lavorazione
2025-05-13 20:02:10 +02:00
a534c93546 invio tracciabilità gastronimia 2025-05-13 20:02:08 +02:00
c8256bed89 nuova procedura di allinemento costo per suddivisione 2025-05-13 20:02:05 +02:00
c02cf474c0 nuova migration 2025-05-13 20:02:03 +02:00
2c9e387927 Migrations IME 2025-05-13 20:01:42 +02:00
bb20c6d7e5 Migrations IME 2025-05-13 20:01:40 +02:00
2721e10075 migration per abilitare il menu da query ed non visualizzare sul menu le voci del portale 2025-05-13 20:01:38 +02:00
d4e0bf3419 modificata posizione voce menu Configurazione Tolleranza Giorni di Scadenza 2025-05-13 20:01:30 +02:00
521804f2d2 [carelli]
-  report personalizzato listini di acquisto
2025-05-13 20:01:28 +02:00
95d8986de0 varie listini 2025-05-13 20:01:25 +02:00
d2657e3531 riattivata cacenllazione variaziione 2025-05-13 20:01:20 +02:00
2513b93a75 Merge branch 'master' into develop 2025-05-13 20:00:36 +02:00
940ccfdb9f aggiunta migration 2025-05-13 19:59:11 +02:00
3a55dcdb58 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 19:51:20 +02:00
f5ea90a0d0 -corretta pubblicazione su azure di branch non classici
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 18:47:53 +02:00
b833fc79e8 Merge branch 'master' into feature/RefactoringGestioneColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-13 18:39:00 +02:00
e897535772 Merge remote-tracking branch 'origin/develop' into develop
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-05-13 18:36:43 +02:00
2091efe828 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 18:36:33 +02:00
f52aa4d837 Merge branch 'hotfix/Hotfix-1'
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-13 18:36:32 +02:00
3f9917355a aggiunta publish su Azure per feature 2025-05-13 18:36:22 +02:00
6b80297851 invio tracciabilità gastronimia 2025-05-13 18:36:05 +02:00
f7f3b1cc88 Merge branch 'hotfix/Hotfix-1' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-13 18:34:27 +02:00
fff5faf3be Merge branch 'master' into feature/RefactoringGestioneColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-13 18:30:37 +02:00
d8ea146bf6 Merge branch 'hotfix/Hotfix-1' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-13 18:27:54 +02:00
bba3f423fe Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 15:53:57 +02:00
a6238a443a nuova procedura di allinemento costo per suddivisione 2025-05-13 15:52:56 +02:00
ed7a7d57c8 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 14:44:43 +02:00
9895dc9bd5 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 12:37:03 +02:00
89e122664c nuova migration
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 12:28:44 +02:00
019eed8aa8 Migrations IME
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 11:04:40 +02:00
ce54af539b Migrations IME
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-05-13 11:04:30 +02:00
0b30b45e6a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 10:47:31 +02:00
328c2f8437 migration per abilitare il menu da query ed non visualizzare sul menu le voci del portale
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 10:24:11 +02:00
3ea1ceb057 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 09:43:45 +02:00
978b42d18a Aggiunto barcode ul nella retrieveAlreadyRegisteredUDC
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 19:12:20 +02:00
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
2025-05-12 18:45:20 +02:00
62db4ce0ed Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 17:20:30 +02:00
2caf6f985a modificata posizione voce menu Configurazione Tolleranza Giorni di Scadenza 2025-05-12 17:20:21 +02:00
ba52d480d9 [carelli]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
-  report personalizzato listini di acquisto
2025-05-12 17:08:43 +02:00
96cdac8df9 varie listini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 16:39:28 +02:00
dca15da646 riattivata cacenllazione variaziione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 14:24:35 +02:00
934095fa28 aggiunta migration
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 14:01:48 +02:00
6034120f1f Aggiunto CodJfas in create UDC
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 12:17:51 +02:00
c2b6d4ba69 Rimosso _peppe da rossogargano
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 10:37:04 +02:00
bc97f9a573 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 10:25:30 +02:00
595e04cea1 Migliorie sui confronti in Exchange Documenti/Colli/Ordini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 10:25:15 +02:00
ce1f68deb2 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 09:41:02 +02:00
ef4676ed26 Fix su interpretazione enum FlagEvaso, non era gestita la stringa empty.
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 09:39:56 +02:00
45bf3d67d1 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 09:27:46 +02:00
bf38dfe0d8 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-09 17:28:25 +02:00
af68b892f3 aggiunto trasferimento automatico in versamento materia prima su ordine di lavorazione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-09 16:20:44 +02:00
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
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
2025-05-09 10:58:48 +02:00
d70efd3af2 aggiunti dati testata collo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-08 18:52:52 +02:00
f99957eb41 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-08 16:52:15 +02:00
40104bcce7 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-06 10:39:46 +02:00
edda81733d Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# 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
ceb11d3261 aggiunti riferimenti collo in movimenti di cambio posizione ul
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-23 15:14:44 +02:00
a13671c51a Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-22 11:46:08 +02:00
b94d9b1177 [TRASFERIMENTO UL]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
corretto deposito testata movimento di scarico a PV
aggiunto rollback in errore trasferimento
2025-04-22 11:42:57 +02:00
d027f3ff20 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 15:23:17 +02:00
8601f4fd90 gestione documenti di trasferimento in emissione documenti di vendita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 14:54:35 +02:00
73ade8691d Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 10:39:28 +02:00
df2a7d6e36 Merge branch 'develop' into feature/RefactoringGestioneColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-18 10:20:54 +02:00
c7c6affe3e Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# 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
54fc28eb74 Fix su migration per nuova logica WMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-17 15:17:48 +02:00
ab1200ff84 Aggiunto tentativo di riconoscimento ean128 in createUDCFromArt
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-16 15:12:57 +02:00
22f65037f4 aggiunto riavvio automatico cache utenti all' invalidate
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-16 10:26:03 +02:00
ec2b83657a corretto servizio trasferimento UL 2025-04-15 16:38:28 +02:00
2511aabbdb Fix vari
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-11 17:04:19 +02:00
313fa6a8df Aggiunti controlli in createUDC
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-11 16:29:35 +02:00
9bb8751e21 Implementate nuove logiche di barcode_ul in rettifica giacenze
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-11 10:51:23 +02:00
24c4935dad Fix after merge
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-11 09:35:27 +02:00
61d76b03c4 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-11 09:33:25 +02:00
0f973c962a Refactoring creazione UL da MES
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 20:08:38 +02:00
cffe9082db Fix su qta in righe di rettifica 2025-04-10 19:14:38 +02:00
6c88b7b288 Fix barcode in versamento materiali MES
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 17:52:55 +02:00
ea2121e111 Fix vari
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 17:01:23 +02:00
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
2025-04-10 13:27:12 +02:00
6c0e2d5259 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 12:52:49 +02:00
894da40182 Cambiato IntegryCustomerDB per puntare a Rossogargano_peppe 2025-04-10 12:52:09 +02:00
749a7e9750 Cambiato db RossoGargano in RossoGargano_peppe
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 12:27:17 +02:00
e5a66bfd15 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# 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
9761d05a8e Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 12:09:46 +02:00
050e8bd19e Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 12:06:25 +02:00
a0c3d3a6b3 Fix after merge
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 11:33:59 +02:00
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
75262b5940 Fix in distribuzione colli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 10:53:12 +02:00
0b3f1ee9fc Aggiornato ems-settings docker
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 11:52:55 +02:00
7c19c93814 Aggiornato ems-settings docker
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 11:45:55 +02:00
532c12dd22 Iniziato refactoring VersamentoMateriali
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 09:04:17 +02:00
e81c2ac6b9 Merge branch 'refs/heads/develop' into feature/RefactoringGestioneColli 2025-04-08 09:04:01 +02:00
161ea5e5dd Fix Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-07 18:57:56 +02:00
260019d79f Fix Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-07 18:48:04 +02:00
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
2025-04-07 18:27:25 +02:00
760be03b18 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java
2025-04-07 09:40:00 +02:00
148a4359b6 Fix null
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-07 09:39:15 +02:00
b65d35cfd6 Migliorato servizio di retrieve UL in posizione con relativo stato
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-05 12:14:11 +02:00
54eb75a420 Sistemato riposizionamento UL
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-04 19:28:50 +02:00
e9d28c6f63 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-04 12:50:52 +02:00
212f14db36 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-04 11:49:55 +02:00
b50e25a0ee Aggiornate migration gramm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-04 11:48:18 +02:00
0a49695d7c Aggiornato servizio di SpostaArtsTraUl
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-04 10:49:20 +02:00
9e5a2e8400 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-03 18:13:58 +02:00
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
2025-04-03 17:44:59 +02:00
86081ec113 Refactoring servizio di retrieve colli in giacenza
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-02 19:04:50 +02:00
1645 changed files with 127744 additions and 81494 deletions

3
.gitignore vendored
View File

@@ -119,7 +119,8 @@ fabric.properties
# Integry
*/target/*
*.ckie
/ts
/temp
/docker/tomcat/conf/integry/logs.db
/docker/tomcat/conf/integry/logs.db-journal
copilot.*.xml
/.idea/dataSources.xml

0
.gitmodules vendored Normal file
View File

6
.idea/copilot.data.migration.edit.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EditMigrationStateService">
<option name="migrationStatus" value="COMPLETED" />
</component>
</project>

View File

@@ -4,5 +4,18 @@
<inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
<option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,java.lang.foreign.Arena,ofAuto,java.lang.foreign.Arena,global,com.annimon.stream.Stream,of" />
</inspection_tool>
<inspection_tool class="UnusedLabel" enabled="true" level="WEAK WARNING" enabled_by_default="true" editorAttributes="INFO_ATTRIBUTES" />
<inspection_tool class="unused" enabled="true" level="WEAK WARNING" enabled_by_default="true" editorAttributes="INFO_ATTRIBUTES" checkParameterExcludingHierarchy="false">
<option name="LOCAL_VARIABLE" value="true" />
<option name="FIELD" value="true" />
<option name="METHOD" value="true" />
<option name="CLASS" value="true" />
<option name="PARAMETER" value="true" />
<option name="REPORT_PARAMETER_FOR_PUBLIC_METHODS" value="true" />
<option name="ADD_MAINS_TO_ENTRIES" value="true" />
<option name="ADD_APPLET_TO_ENTRIES" value="true" />
<option name="ADD_SERVLET_TO_ENTRIES" value="true" />
<option name="ADD_NONJAVA_TO_ENTRIES" value="true" />
</inspection_tool>
</profile>
</component>

View File

@@ -2,6 +2,7 @@
<configuration default="false" name="MenuStaticCreator" type="Application" factoryName="Application" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="it.integry.ems.menu.MenuStaticCreator" />
<module name="ems-core" />
<shortenClasspath name="MANIFEST" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="it.integry.ems.menu.*" />

View File

@@ -16,12 +16,30 @@
<log_file alias="Tomcat Localhost Access Log" path="%IDEA_RUN:CATALINA_BASE%/logs/localhost_access_log.*" />
<predefined_log_file enabled="true" id="Tomcat" />
<predefined_log_file enabled="true" id="Tomcat Catalina" />
<RunnerSettings RunnerId="AppServerDebuggerRunner">
<option name="DEBUG_PORT" value="javadebug" />
</RunnerSettings>
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="javadebug" />
</RunnerSettings>
<RunnerSettings RunnerId="JProfiler">
<option name="jreHome" value="$USER_HOME$/.jdks/openjdk-21.0.2" />
</RunnerSettings>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="AppServerDebuggerRunner">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>

View File

@@ -4,7 +4,7 @@
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="192.168.1.7" />
<option name="HOST" value="localhost" />
<option name="PORT" value="8001" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">

View File

@@ -1,10 +1,10 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat 9 (RistoCash)" type="Remote">
<configuration default="false" name="Tomcat 9 (AnydeskTunnel)" type="Remote">
<module name="ems-engine" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="127.0.0.1" />
<option name="HOST" value="localhost" />
<option name="PORT" value="8001" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">

View File

@@ -1,14 +1,14 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat (AnydeskTunnel)" type="Remote">
<configuration default="false" name="Tomcat #1 (Smetar) [VPN]" type="Remote" folderName="Smetar">
<module name="ems-engine" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="servertomcat" />
<option name="PORT" value="8001" />
<option name="HOST" value="10.0.0.2" />
<option name="PORT" value="5005" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="8001" />
<option name="DEBUG_PORT" value="5005" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />

View File

@@ -16,12 +16,30 @@
<log_file alias="Tomcat Localhost Access Log" path="%IDEA_RUN:CATALINA_BASE%/logs/localhost_access_log.*" />
<predefined_log_file enabled="true" id="Tomcat" />
<predefined_log_file enabled="true" id="Tomcat Catalina" />
<RunnerSettings RunnerId="AppServerDebuggerRunner">
<option name="DEBUG_PORT" value="63868" />
</RunnerSettings>
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="javadebug" />
</RunnerSettings>
<RunnerSettings RunnerId="JProfiler">
<option name="jreHome" value="$PROJECT_DIR$/../../../Program Files/Java/jdk1.8.0_202" />
</RunnerSettings>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="AppServerDebuggerRunner">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>

6
.idea/sqldialects.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SqlDialectMappings">
<file url="file://$PROJECT_DIR$/ems-engine/src/main/java/it/integry/ems/document/farm_mes/service/FarmMesImportService.java" dialect="GenericSQL" />
</component>
</project>

18
Containerfile Normal file
View File

@@ -0,0 +1,18 @@
FROM tomcat:9-jre8-alpine
RUN apk add --no-cache fontconfig ttf-dejavu
ENV TZ="Europe/Rome"
ENV JAVA_OPTS="-DDISABLE_DROOLS_COMPILE=TRUE -Xms512M -Xmx1G -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"
ENV USERDOMAIN="STUDIO-ML"
COPY docker/tomcat/conf/integry/ems.properties /usr/local/tomcat/conf/integry/
COPY docker/tomcat/conf/integry/ems_automated_operations.json /usr/local/tomcat/conf/integry/
COPY docker/tomcat/conf/integry/ems_settings.json /usr/local/tomcat/conf/integry/
COPY ems-engine/target/ems-api.war /usr/local/tomcat/webapps/
#COPY docker/FontTest.class .
#ENTRYPOINT ["java","FontTest"]
EXPOSE 8080
EXPOSE 5005

View File

@@ -10,12 +10,29 @@ pipeline {
stage('PreBuild Steps (Master)') {
when {
expression {
return env.GIT_BRANCH == "master"
return env.GIT_BRANCH == "master" || env.GIT_BRANCH == "feature/RefactoringGestioneColli"
}
}
steps {
echo "Creo version tag su Git"
bat 'build\\create_build_tag.bat'
script {
def date = new Date()
def formattedDate = date.format('yyyyMMdd_HHmm')
def tagName = "${env.GIT_BRANCH.toLowerCase().replace('/', '-')}-${formattedDate}"
def tagMessage = "Build #${env.BUILD_NUMBER} - ${env.GIT_BRANCH}"
def envPropertiesText = "project.version=${formattedDate}"
writeFile(
'file': 'ems-core\\src\\main\\resources\\configs\\env.properties',
'text': envPropertiesText
)
bat "git add . -A"
bat "git tag -a ${tagName} -m \"${tagMessage}\""
bat "git push origin ${tagName}"
}
}
}
stage('Maven Build') {
@@ -25,7 +42,7 @@ pipeline {
bat(script: 'mvn clean install -t toolchains-jenkins.xml', returnStdout: true)
archiveArtifacts(artifacts: 'ems-engine/target/ems-api.war', onlyIfSuccessful: true)
}
stash includes: 'ems-engine/target/ems-api.war,docker/**,Dockerfile', name: 'docker-files'
stash includes: 'ems-engine/target/ems-api.war,docker/**,Containerfile', name: 'container-files'
}
}
@@ -49,8 +66,8 @@ pipeline {
steps {
echo "Updating Tomcat9 from ${WORKSPACE}"
powershell returnStdout: true, script: "build\\update_tomcat.ps1 -serviceName \"Tomcat9Backup\" -httpPort \"8082\" -updatedArtifactPath \"${WORKSPACE}\\ems-engine\\target\\ems-api.war\""
bat 'curl -k https://devservices.studioml.it/ems-api/updateWMSApp'
bat 'curl -k https://devservices.studioml.it/ems-api/updateWMSApp?suffix=beta'
bat 'curl -k "https://devservices.studioml.it/ems-api/updateWMSApp?overrideForced=false"'
bat 'curl -k "https://devservices.studioml.it/ems-api/updateWMSApp?overrideForced=false&suffix=beta"'
}
}
}
@@ -83,8 +100,8 @@ sudo /usr/bin/systemctl start tomcat9backup
/home/studioml/./wait_tomcat_startup.sh 8082
sleep 10''', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/tomcat9backup/webapps', remoteDirectorySDF: false, removePrefix: 'ems-engine/target/', sourceFiles: 'ems-engine/target/*.war*')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
bat 'curl -k https://services.studioml.it/ems-api/updateWMSApp'
bat 'curl -k https://services.studioml.it/ems-api/updateWMSApp?suffix=beta'
bat 'curl -k "https://services.studioml.it/ems-api/updateWMSApp?overrideForced=false"'
bat 'curl -k "https://services.studioml.it/ems-api/updateWMSApp?overrideForced=false&suffix=beta"'
}
}
}
@@ -101,7 +118,7 @@ sleep 10''', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaul
steps {
node('server-build') {
echo "Building Docker image"
unstash 'docker-files'
unstash 'container-files'
script {
def branchVersion = ""
@@ -110,13 +127,57 @@ sleep 10''', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaul
branchVersion = "-${env.GIT_BRANCH.toLowerCase().replace('/', '-')}"
}
bat "docker buildx build --platform linux/amd64,linux/arm64 --push -t \"git.studioml.it/integry/ems-api${branchVersion}:latest\" ."
// bat "docker buildx build --platform linux/amd64,linux/arm64 --push -t \"git.studioml.it/integry/ems-api${branchVersion}:latest\" ."
bat "podman build -f .\\Containerfile -t \"git.studioml.it/integry/ems-api${branchVersion}:latest\" ."
bat "podman push \"git.studioml.it/integry/ems-api${branchVersion}:latest\""
//containerImageLink "git.studioml.it/integry/ems-api-${env.GIT_BRANCH.toLowerCase().replace('/', '-')}:latest}"
}
}
}
}
stage('Publish TypeScript modules') {
when {
expression {
return env.GIT_BRANCH == "master" || env.GIT_BRANCH == "develop"
}
}
steps {
script {
bat "IF EXIST IntegryManagementSystemTSModules RMDIR IntegryManagementSystemTSModules /S /Q"
// Clona la repository di destinazione
echo "Clonazione della repository di destinazione..."
bat 'git clone https://git.studioml.it/Integry/IntegryManagementSystemTSModules.git'
// Entra nella directory della repository di destinazione
dir('IntegryManagementSystemTSModules') {
if(env.GIT_BRANCH != "master") {
// Crea un nuovo branch se non è master o develop
bat "git checkout -b ${env.GIT_BRANCH} origin/${env.GIT_BRANCH}"
} else {
// Altrimenti, torna al branch master o develop
bat "git checkout ${env.GIT_BRANCH}"
}
//bat "git checkout -b ${env.GIT_BRANCH}"
bat "git pull origin ${env.GIT_BRANCH}"
// Copia i file .ts nella repository di destinazione
echo "Copia dei file .ts nella repository di destinazione..."
bat 'copy ..\\ts\\*.ts .'
// Aggiungi i file modificati
bat 'git add *.ts'
// Commit e push
bat 'git commit -m "Aggiornamento file .ts"'
bat 'git push https://git.studioml.it/Integry/IntegryManagementSystemTSModules.git --all'
}
}
}
}
}
}
@@ -127,14 +188,14 @@ sleep 10''', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaul
success {
script {
if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "develop") {
office365ConnectorSend adaptiveCards: true, color: '#008000', message: 'EMS-API &grave; stato compilato con successo', status: 'SUCCESS', webhookUrl: 'https://prod-197.westeurope.logic.azure.com:443/workflows/69a7b8ee3c284175bd6da7127c7eb3cf/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=_-eMfvsQGkIidHWzzlhGFgiZG28ujHZ41QqzuqD9YGw'
office365ConnectorSend adaptiveCards: true, color: '#008000', message: 'EMS-API è stato compilato con successo', status: 'SUCCESS', webhookUrl: 'https://prod-197.westeurope.logic.azure.com:443/workflows/69a7b8ee3c284175bd6da7127c7eb3cf/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=_-eMfvsQGkIidHWzzlhGFgiZG28ujHZ41QqzuqD9YGw'
}
}
}
unstable {
script {
if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "develop") {
office365ConnectorSend adaptiveCards: true, color: '#FFDE21', message: 'EMS-API &grave; INSTABILE', status: 'UNSTABLE', webhookUrl: 'https://prod-197.westeurope.logic.azure.com:443/workflows/69a7b8ee3c284175bd6da7127c7eb3cf/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=_-eMfvsQGkIidHWzzlhGFgiZG28ujHZ41QqzuqD9YGw'
office365ConnectorSend adaptiveCards: true, color: '#FFDE21', message: 'EMS-API è INSTABILE', status: 'UNSTABLE', webhookUrl: 'https://prod-197.westeurope.logic.azure.com:443/workflows/69a7b8ee3c284175bd6da7127c7eb3cf/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=_-eMfvsQGkIidHWzzlhGFgiZG28ujHZ41QqzuqD9YGw'
}
}
}
@@ -144,7 +205,6 @@ sleep 10''', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaul
office365ConnectorSend adaptiveCards: true, color: '#FF2C2C', message: 'Errore di compilazione su EMS-API', status: 'FAILURE', webhookUrl: 'https://prod-197.westeurope.logic.azure.com:443/workflows/69a7b8ee3c284175bd6da7127c7eb3cf/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=_-eMfvsQGkIidHWzzlhGFgiZG28ujHZ41QqzuqD9YGw'
}
}
}
}
}

View File

@@ -1,43 +0,0 @@
REM SET YEAR
set YEAR=%date:~6,4%
REM SET MONTH
set MONTH=%date:~3,2%
if %MONTH% LSS 10 set MONTH=%MONTH:~1,2%
if %MONTH% LSS 10 set MONTH=0%MONTH%
REM SET DAY
set DAY=%date:~0,2%
if %DAY% LSS 10 set DAY=%DAY:~1,2%
if %DAY% LSS 10 set DAY=0%DAY%
REM SET HOUR
set HOUR=%time:~0,2%
if %HOUR% LSS 10 set HOUR=%HOUR:~1,2%
if %HOUR% LSS 10 set HOUR=0%HOUR%
REM SET MINUTE
set MINUTE=%time:~3,2%
if %MINUTE% LSS 10 set MINUTE=%MINUTE:~1,2%
if %MINUTE% LSS 10 set MINUTE=0%MINUTE%
REM SET SECOND
set SECOND=%time:~6,2%
if %SECOND% LSS 10 set SECOND=%SECOND:~1,2%
if %SECOND% LSS 10 set SECOND=0%SECOND%
set mydate=%YEAR%%MONTH%%DAY%_%HOUR%%MINUTE%%SECOND%
echo #spring.profiles.active=@activatedProperties@ > ems-core\src\main\resources\configs\env.properties
echo project.version=%mydate% >> ems-core\src\main\resources\configs\env.properties
git add . -A
git commit -m "%mydate%"
git tag "%mydate%"
git push https://git.studioml.it/Integry/IntegryManagementSystem.git --tags
git push https://git.studioml.it/Integry/IntegryManagementSystem.git --all

View File

@@ -11,7 +11,7 @@ $webappsPath = "C:\Program Files\$serviceName\webapps"
# Funzione per eseguire la chiamata GET e controllare lo status code
function Check-Status {
try {
$request = Invoke-WebRequest -Uri "http://localhost:$httpPort/ems-api/system/ok" -Method Get -ErrorAction Stop
$request = Invoke-WebRequest -Uri "http://localhost:$httpPort/ems-api/system/ok" -Method Get -ErrorAction Stop -UseBasicParsing
$statusCode = $request.StatusCode
if ($statusCode -eq 200) {
Write-Host "Status code 200 ricevuto, processo completato."

View File

@@ -5,16 +5,7 @@
"primaryInstance" : true,
"enableTokenCaching" : false,
"systemPassword" : "?MF!jbI+&OkA",
"availableConnections" : [ {
"profileName" : "MAGGIOSRL",
"connectionType" : "MSSQL",
"dbName" : "MaggioSRL",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"availableConnections" : [{
"profileName" : "AGRICOPER",
"connectionType" : "MSSQL",
"dbName" : "agricoper",
@@ -33,18 +24,18 @@
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "COAP",
"profileName" : "RESINA_COLOR",
"connectionType" : "MSSQL",
"dbName" : "COAP",
"dbName" : "RESINACOLOR",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "RESINA_COLOR",
"profileName" : "RESINA_COLOR_PASQUALE",
"connectionType" : "MSSQL",
"dbName" : "RESINACOLOR",
"dbName" : "RESINACOLOR_PASQUALE",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
@@ -242,12 +233,21 @@
}, {
"profileName" : "GRAMM",
"connectionType" : "MSSQL",
"dbName" : "gramm",
"dbName" : "gramm_peppe",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "MAGGIOSRL",
"connectionType" : "MSSQL",
"dbName" : "MaggioSRL",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "IDROTECNICA",
"connectionType" : "MSSQL",
@@ -278,7 +278,7 @@
}, {
"profileName" : "IME_TE",
"connectionType" : "MSSQL",
"dbName" : "IME_TE",
"dbName" : "IME_TE_peppe",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
@@ -692,7 +692,7 @@
}, {
"profileName" : "BIOLEVANTE",
"connectionType" : "MSSQL",
"dbName" : "biolevante",
"dbName": "biolevante",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.220",

View File

@@ -60,49 +60,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>cz.habarta.typescript-generator</groupId>
<artifactId>typescript-generator-maven-plugin</artifactId>
<version>2.37.1128</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>
@@ -111,7 +68,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
<version>2.24.3</version>
<version>2.25.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -198,12 +155,6 @@
<version>20200518</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
@@ -273,6 +224,11 @@
<artifactId>Tahoma</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>it.integry.font</groupId>
<artifactId>arial-rounded</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
@@ -399,11 +355,6 @@
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-csv</artifactId>
@@ -412,6 +363,11 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.20</version> <!-- Versione scritta a mano perché qui non hanno usato lo 0 finale -->
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>
@@ -488,6 +444,7 @@
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
<version>3.4.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -610,7 +567,7 @@
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
<version>0.11.5</version>
<scope>runtime</scope>
<scope>compile</scope>
</dependency>
<!--Expiring Map-->

View File

@@ -19,6 +19,7 @@ import it.integry.WooCommerce.dto.product.variation.WooCommerceProductVariationD
import it.integry.WooCommerce.enums.ArticoloException;
import it.integry.WooCommerce.enums.StockStatus;
import it.integry.WooCommerce.enums.SyncOrigin;
import it.integry.common.var.CommonConstants;
import it.integry.ems.Import.dto.AnomalieDTO;
import it.integry.ems.service.EntityProcessor;
import it.integry.ems.service.MailService;
@@ -29,7 +30,6 @@ import it.integry.ems_model.entity.WdtbOrds;
import it.integry.ems_model.entity.WdtbOrdt;
import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.UtilityDate;
import it.integry.ems_model.utility.UtilityStream;
import it.integry.ems_model.utility.UtilityString;
import org.apache.commons.text.StringEscapeUtils;
@@ -41,7 +41,7 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
@@ -445,7 +445,8 @@ public class WooCommerceService {
}
//CHIAVE ORDINE
Date dataOrd = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").parse(orderDTO.getDateCreated());
LocalDate dataOrd = UtilityString.parseLocalDateTime(orderDTO.getDateCreated(), "yyyy-MM-dd'T'HH:mm:ss")
.toLocalDate();
ordineWeb
.setGestione("V")
@@ -453,7 +454,7 @@ public class WooCommerceService {
.setNumOrd(Integer.parseInt(orderDTO.getNumber()))
//CHIAVE RIFERIMENTO ORDINE WOOCOMMERCE
.setSerie(dataManager.getSetup("SERIE"))
.setRifOrd(UtilityString.left("RIF N." + orderDTO.getNumber() + " DEL " + UtilityDate.formatDate(dataOrd, "dd-MM-yy") + " " + orderDTO.getOrderKey(), 40))
.setRifOrd(UtilityString.left("RIF N." + orderDTO.getNumber() + " DEL " + CommonConstants.DATE_DMY_DASHED_FORMATTER.format(dataOrd) + " " + orderDTO.getOrderKey(), 40))
.setDataOrdRif(dataOrd)
.setNumOrdRif(Integer.parseInt(orderDTO.getNumber()))
.setListino(dataManager.getSetup("LISTINO"));
@@ -768,7 +769,7 @@ public class WooCommerceService {
private void sendErrorMail(String errorMsg, String service, byte[] content, String filename, List<AnomalieDTO> anomalie) {
try {
mailService.sendErrorMailByGestNameSection(multiDBTransactionManager, service, "WOOCOMMERCE", "Errore WooCommerce",
mailService.sendErrorMailByGestNameSection(multiDBTransactionManager.getPrimaryConnection(), service, "WOOCOMMERCE", "Errore WooCommerce",
null, content, filename, anomalie);
} catch (Exception exception) {
logger.error(service, exception);

View File

@@ -0,0 +1,14 @@
package it.integry.annotations;
import it.integry.ems.migration._base.IntegryCustomer;
import org.springframework.stereotype.Indexed;
import java.lang.annotation.*;
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Indexed
public @interface CustomerComponent {
IntegryCustomer value();
}

View File

@@ -0,0 +1,17 @@
package it.integry.annotations;
import it.integry.ems.migration._base.IntegryCustomer;
import org.springframework.core.annotation.AliasFor;
import java.lang.annotation.*;
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Documented
@CustomerComponent(IntegryCustomer.Integry) // Valore di default, verrà sovrascritto
public @interface CustomerService {
@AliasFor(
annotation = CustomerComponent.class
)
IntegryCustomer value();
}

View File

@@ -20,16 +20,17 @@ public class CommonConstants {
public static final String TIMESTAMP = "timestamp";
public static final String DATE_FORMAT_YMD = "yyyy-MM-dd";
public static final String DATE_FORMAT_DMY = "dd/MM/yyyy";
public static final String DATE_FORMAT_YMD_SLASHED = "yyyy/MM/dd";
public static final String DATE_FORMAT_YMD_DASHED = "yyyy-MM-dd";
public static final String DATE_FORMAT_DMY_SLASHED = "dd/MM/yyyy";
public static final String DATE_FORMAT_DMY_DASHED = "dd-MM-yyyy";
public static final String DATE_FORMAT_DMYHMS_UNSPACED = "ddMMyyyyHHmmss";
public static final String TIME_FORMAT = "HH:mm:ss";
public static final String DATETIME_FORMAT_YMD = String.format("%s %s", DATE_FORMAT_YMD, TIME_FORMAT);
public static final String DATETIME_FORMAT_YMD = String.format("%s %s", DATE_FORMAT_YMD_DASHED, TIME_FORMAT);
public static final String DATETIME_FORMAT_DMY = String.format("%s %s", DATE_FORMAT_DMY_DASHED, TIME_FORMAT);
public static final String DATETIME_FORMAT_DMY_SLASHED = String.format("%s %s", DATE_FORMAT_DMY, TIME_FORMAT);
public static final String DATETIME_FORMAT_DMY_SLASHED = String.format("%s %s", DATE_FORMAT_DMY_SLASHED, TIME_FORMAT);
public static final String DATETIME_FORMAT_DMY_DASHED = String.format("%s %s", DATE_FORMAT_DMY_DASHED, TIME_FORMAT);
@@ -46,12 +47,17 @@ public class CommonConstants {
.withZone(ZoneId.systemDefault());
public static final DateTimeFormatter DATE_YMD_DASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATE_FORMAT_YMD)
public static final DateTimeFormatter DATE_YMD_SLASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATE_FORMAT_YMD_SLASHED)
.withZone(ZoneId.systemDefault());
public static final DateTimeFormatter DATE_YMD_DASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATE_FORMAT_YMD_DASHED)
.withZone(ZoneId.systemDefault());
public static final DateTimeFormatter DATETIME_YMD_DASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATETIME_FORMAT_YMD)
.withZone(ZoneId.systemDefault());
public static final DateTimeFormatter DATE_DMY_SLASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATE_FORMAT_DMY)
public static final DateTimeFormatter DATE_DMY_SLASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATE_FORMAT_DMY_SLASHED)
.withZone(ZoneId.systemDefault());
public static final DateTimeFormatter DATE_DMY_DASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATE_FORMAT_DMY_DASHED)
.withZone(ZoneId.systemDefault());
public static final DateTimeFormatter DATETIME_DMY_SLASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATETIME_FORMAT_DMY_SLASHED)
.withZone(ZoneId.systemDefault());

View File

@@ -2,8 +2,11 @@ package it.integry.ems.Import.base;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import it.integry.ems.Import.dto.AnomalieDTO;
import it.integry.ems.Import.dto.ImportRequestDTO;
import it.integry.ems.javabeans.RequestDataDTO;
import it.integry.ems.json.JsonObjectMapperConfig;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.service.SetupGest;
@@ -22,10 +25,20 @@ public abstract class BaseEntityImporter<T> implements IEntityImporter<T> {
protected String format;
protected boolean headless;
protected ImportRequestDTO requestDto;
protected RequestDataDTO requestDataDTO;
protected MultiDBTransactionManager multiDBTransactionManager;
protected List<AnomalieDTO> anomalie = new ArrayList<AnomalieDTO>();
private final ObjectMapper objectMapper = new ObjectMapper();
private final ObjectMapper objectMapper;
protected BaseEntityImporter() {
objectMapper = new ObjectMapper();
SimpleModule simpleModule = new SimpleModule();
JsonObjectMapperConfig.addDefaultAdapters(simpleModule);
objectMapper.registerModule(simpleModule);
}
public IEntityImporter<T> setSetupGest(SetupGest setupGest) {
this.setupGest = setupGest;
@@ -66,6 +79,12 @@ public abstract class BaseEntityImporter<T> implements IEntityImporter<T> {
return this;
}
@Override
public IEntityImporter<T> setRequestDataDTO(RequestDataDTO requestDataDTO) {
this.requestDataDTO = requestDataDTO;
return this;
}
public List<AnomalieDTO> getAnomalie() {
return anomalie;
}
@@ -89,4 +108,6 @@ public abstract class BaseEntityImporter<T> implements IEntityImporter<T> {
}
}

View File

@@ -2,6 +2,7 @@ package it.integry.ems.Import.base;
import it.integry.ems.Import.dto.AnomalieDTO;
import it.integry.ems.Import.dto.ImportRequestDTO;
import it.integry.ems.javabeans.RequestDataDTO;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.service.SetupGest;
@@ -26,10 +27,14 @@ public interface IEntityImporter<T> {
IEntityImporter<T> setRequestDTO(ImportRequestDTO requestDto);
IEntityImporter<T> setRequestDataDTO(RequestDataDTO requestDataDTO);
List<AnomalieDTO> getAnomalie();
T doImport() throws Exception;
String renameFile(String orginalFileName, List<EntityBase> entities) throws Exception;
}

View File

@@ -24,7 +24,9 @@ public enum EntityImportType {
MOVIMENTI_CONTABILI("MOVIMENTI CONTABILI"),
GRIGLIA_VENDITA("GRIGLIA VENDITA"),
GRIGLIA_ACQUISTO("GRIGLIA ACQUISTO"),
SCADENZE("SCADENZE");
SCADENZE("SCADENZE"),
BILANCE("BILANCE"),
BANCA("BANCA");
private String text;

View File

@@ -23,6 +23,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.sql.DriverManager;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutorService;
@@ -72,6 +73,22 @@ public class EmsCoreContext {
@PreDestroy
public void preDestroy() {
contextInitialized = false;
ClassLoader cl = Thread.currentThread().getContextClassLoader();
Enumeration<java.sql.Driver> drivers = DriverManager.getDrivers();
logger.info("Deregister DB Drivers");
while (drivers.hasMoreElements()) {
java.sql.Driver driver = drivers.nextElement();
if (driver.getClass().getClassLoader() == cl) {
try {
DriverManager.deregisterDriver(driver);
} catch (Exception ex) {
// log error
}
}
}
}
//@EventListener(ContextRefreshedEvent.class)

View File

@@ -2,12 +2,10 @@ package it.integry.ems._context;
import it.integry.annotations.PostContextConstruct;
import it.integry.common.var.EmsDBConst;
import it.integry.ems.datasource.DataSource;
import it.integry.ems.expansion.RunnableArgsThrowable;
import it.integry.ems.settings.Model.AvailableConnectionsModel;
import it.integry.ems.settings.Model.AvailableConnectionModel;
import it.integry.ems.settings.Model.SettingsModel;
import it.integry.ems.settings.SettingsController;
import it.integry.ems.sync.MultiDBTransaction.AdvancedDataSource;
import it.integry.ems.sync.MultiDBTransaction.BasicConnectionPool;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
@@ -15,7 +13,6 @@ import it.integry.ems.task.TaskExecutorService;
import it.integry.ems.user.service.UserCacheService;
import it.integry.ems_model.entity.Azienda;
import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityString;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -58,6 +55,8 @@ public class EmsCoreDBLoader {
public void init() throws Exception {
this.settingsController.addOnConfigUpdated(() -> {
try {
connectionPool.destroy();
connectionPool.init();
load(null);
} catch (Exception e) {
throw new RuntimeException(e);
@@ -66,8 +65,6 @@ public class EmsCoreDBLoader {
}
public void load(final RunnableArgsThrowable<MultiDBTransactionManager> onComplete) throws Exception {
connectionPool.init();
taskExecutorService.executeTask(() -> {
try (MultiDBTransactionManager multiDBTransactionManager = new MultiDBTransactionManager(connectionPool)){
discoverAllConnections(multiDBTransactionManager);
@@ -86,19 +83,13 @@ public class EmsCoreDBLoader {
private void discoverAllConnections(MultiDBTransactionManager multiDBTransactionManager) throws Exception {
ArrayList<Callable<Void>> futureTasks = new ArrayList<>();
for (AvailableConnectionsModel model : settingsModel.getAvailableConnectionsWithoutDuplicatedProfiles(true)) {
for (AvailableConnectionModel model : settingsModel.getAvailableConnectionsWithoutDuplicatedProfiles(true)) {
AtomicReference<AvailableConnectionsModel> modelAtomicReference = new AtomicReference<>(model);
AtomicReference<AvailableConnectionModel> modelAtomicReference = new AtomicReference<>(model);
futureTasks.add(() -> {
try {
final DataSource ds = connectionPool.getConnection(modelAtomicReference.get().getProfileName());
String sql = "SELECT db_distributore FROM azienda";
String dbDistributore = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(ds.getConnection(), sql);
multiDBTransactionManager.addConnection(modelAtomicReference.get().getProfileName(), ds, modelAtomicReference.get().getDbName().equalsIgnoreCase(dbDistributore));
multiDBTransactionManager.addConnection(modelAtomicReference.get());
return null;
} catch (Exception ex) {
throw new Exception("[" + modelAtomicReference.get().getProfileName() + "] " + ex.getMessage(), ex.getCause());
@@ -113,13 +104,11 @@ public class EmsCoreDBLoader {
ArrayList<Callable<Void>> futureTasks = new ArrayList<>();
for (final AdvancedDataSource advancedDataSource : multiDBTransactionManager.getActiveConnections()) {
AtomicReference<AdvancedDataSource> atomicAdvancedDataSource = new AtomicReference<>(advancedDataSource);
for (final Connection connection : multiDBTransactionManager.getActiveConnections()) {
futureTasks.add(() -> {
Connection conn = atomicAdvancedDataSource.get().getConnection();
Azienda azienda = Azienda.getDefaultAzienda(conn);
String dbName = atomicAdvancedDataSource.get().getDataSource().getDbName();
Azienda azienda = Azienda.getDefaultAzienda(connection);
String dbName = connection.getDbName();
try {
if (azienda != null) {
@@ -131,7 +120,7 @@ public class EmsCoreDBLoader {
}
HashMap<String, String> gestSetupValues =
setupGest.getSetupSection(conn, "DATI_AZIENDA", "FATTURAZIONE_ELETTRONICA");
setupGest.getSetupSection(connection, "DATI_AZIENDA", "FATTURAZIONE_ELETTRONICA");
emsDBConst.getConsts(dbName)
.setApplicationDbName(applicationDbName)
@@ -142,7 +131,7 @@ public class EmsCoreDBLoader {
throw new Exception("Non è stato possibile leggere i dati dalla tabella azienda");
}
} catch (Exception ex) {
throw new Exception("[" + atomicAdvancedDataSource.get().getProfileName() + "] " + ex.getMessage(), ex.getCause());
throw new Exception("[" + connection.getProfileName() + "] " + ex.getMessage(), ex.getCause());
}
return null;
});

View File

@@ -0,0 +1,34 @@
package it.integry.ems.adapter;
import it.integry.ems_model.utility.UtilityString;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
public class XmlLocalDateAdapter extends XmlAdapter<String, LocalDate> {
private DateTimeFormatter sdf;
public XmlLocalDateAdapter() {
sdf = DateTimeFormatter.ofPattern("dd-MM-yyyy");
}
public XmlLocalDateAdapter(String format) {
sdf = DateTimeFormatter.ofPattern(format);
}
@Override
public String marshal(LocalDate arg0) throws Exception {
return arg0.format(sdf);
}
@Override
public LocalDate unmarshal(String arg0) throws Exception {
String format = UtilityString.determineDateFormat(arg0);
if (format != null && !"dd-MM-yyyy".equals(format))
sdf = DateTimeFormatter.ofPattern(format);
return LocalDate.parse(arg0,sdf);
}
}

View File

@@ -0,0 +1,36 @@
package it.integry.ems.adapter;
import it.integry.ems_model.utility.UtilityString;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
public class XmlLocalDateTimeAdapter extends XmlAdapter<String, LocalDateTime> {
private DateTimeFormatter sdf;
public XmlLocalDateTimeAdapter() {
sdf = DateTimeFormatter.ofPattern("dd-MM-yyyy HH:mm:ss");
}
public XmlLocalDateTimeAdapter(String format) {
sdf = DateTimeFormatter.ofPattern(format);
}
@Override
public String marshal(LocalDateTime arg0) throws Exception {
return arg0.format(sdf);
}
@Override
public LocalDateTime unmarshal(String arg0) throws Exception {
String format = UtilityString.determineDateFormat(arg0);
if (format != null && !"dd-MM-yyyy HH:mm:ss".equals(format))
sdf = DateTimeFormatter.ofPattern(format);
return LocalDateTime.parse(arg0,sdf);
}
}

View File

@@ -0,0 +1,269 @@
package it.integry.ems.anonymizer;
import java.security.SecureRandom;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
/**
* Generatore di nomi e cognomi italiani per l'anonimizzazione dei dati.
* Mantiene la coerenza del sesso tra nome e genere.
*/
public class ItalianNameGenerator {
private final Random random;
// Nomi maschili italiani (200+ nomi)
public static final List<String> MALE_NAMES = Arrays.asList(
"Alessandro", "Andrea", "Antonio", "Francesco", "Marco", "Matteo", "Giuseppe", "Luca",
"Giovanni", "Roberto", "Stefano", "Paolo", "Davide", "Michele", "Simone", "Federico",
"Riccardo", "Fabio", "Daniele", "Massimo", "Claudio", "Nicola", "Gabriele", "Vincenzo",
"Lorenzo", "Salvatore", "Emanuele", "Alberto", "Diego", "Tommaso", "Alessio", "Filippo",
"Giorgio", "Mattia", "Franco", "Bruno", "Enrico", "Mario", "Carlo", "Gianluca",
"Cristian", "Domenico", "Raffaele", "Sergio", "Pasquale", "Gianni", "Carmine", "Gennaro",
"Antonino", "Gaetano", "Rocco", "Mauro", "Pierluigi", "Valerio", "Mirko", "Dario",
"Enzo", "Alfredo", "Renzo", "Giancarlo", "Giampaolo", "Pierpaolo", "Gianfranco", "Guido",
"Nino", "Piero", "Armando", "Luciano", "Renato", "Angelo", "Aldo", "Giulio",
"Marcello", "Rodolfo", "Umberto", "Silvano", "Ivano", "Giampiero", "Silvio", "Maurizio",
"Leonardo", "Adriano", "Ferdinando", "Bernardo", "Teodoro", "Edoardo", "Arturo", "Gino",
"Biagio", "Fabrizio", "Fausto", "Ettore", "Cesare", "Elio", "Amerigo", "Italo",
"Orlando", "Romeo", "Sandro", "Tiziano", "Ignazio", "Ciro", "Loris", "Orazio",
"Lino", "Nello", "Rino", "Primo", "Secondo", "Terzo", "Quarto", "Quinto",
"Sesto", "Settimo", "Ottavio", "Nono", "Decimo", "Benito", "Dante", "Virgilio",
"Omero", "Eugenio", "Aurelio", "Valentino", "Corrado", "Manlio", "Emilio", "Tullio",
"Attilio", "Marcello", "Romolo", "Remo", "Amedeo", "Cosimo", "Damiano", "Sebastiano",
"Cristoforo", "Bartolomeo", "Giacomo", "Simone", "Pietro", "Girolamo", "Leopoldo", "Gaspare",
"Melchiorre", "Baldassarre", "Epifanio", "Gerardo", "Ruggero", "Tancredi", "Arnaldo", "Osvaldo",
"Rinaldo", "Romualdo", "Ubaldo", "Raimondo", "Edmondo", "Redento", "Crescenzo", "Innocenzo",
"Fiorenzo", "Vincenzo", "Enzo", "Renzo", "Nunzio", "Maurizio", "Patrizio", "Orazio",
"Flavio", "Claudio", "Giuliano", "Adriano", "Emiliano", "Massimiliano", "Gianmarco", "Marcantonio",
"Gianbattista", "Giovanbattista", "Giammarco", "Gianluigi", "Giampiero", "Gianmaria", "Giandomenico", "Gianpaolo",
"Pierfrancesco", "Piergiorgio", "Pierangelo", "Piermario", "Piercarlo", "Piergiuseppe", "Gioacchino", "Bartolomeo",
"Benedetto", "Benvenuto", "Bonaventura", "Bonifacio", "Camillo", "Calogero", "Carmelo", "Demetrio",
"Dionisio", "Donato", "Egidio", "Eliseo", "Erminio", "Eustachio", "Evandro", "Ezio",
"Fermo", "Fernando", "Ferruccio", "Fortunato", "Fulvio", "Gaetano", "Germano", "Giosuè",
"Gregorio", "Guglielmo", "Lamberto", "Lanfranco", "Liborio", "Lucio", "Luigi", "Manfredo"
);
// Nomi femminili italiani (200+ nomi)
public static final List<String> FEMALE_NAMES = Arrays.asList(
"Giulia", "Francesca", "Chiara", "Federica", "Sara", "Martina", "Valentina", "Alessandra",
"Silvia", "Elisa", "Giorgia", "Elena", "Paola", "Laura", "Roberta", "Alice", "Serena",
"Barbara", "Anna", "Maria", "Simona", "Claudia", "Monica", "Cristina", "Elisabetta",
"Stefania", "Valeria", "Daniela", "Manuela", "Antonella", "Giovanna", "Sabrina", "Emanuela",
"Ilaria", "Cinzia", "Rosanna", "Patrizia", "Teresa", "Carmela", "Giuseppina", "Rosa",
"Antonietta", "Concetta", "Caterina", "Angela", "Raffaella", "Luisa", "Lucia", "Michela",
"Franceschina", "Graziella", "Isabella", "Benedetta", "Beatrice", "Margherita", "Alessia", "Andrea",
"Cristiana", "Fabiana", "Gabriella", "Gianna", "Lorena", "Marisa", "Nicoletta", "Ornella",
"Rosaria", "Silvana", "Susanna", "Tiziana", "Viviana", "Adriana", "Agnese", "Albina",
"Amelia", "Andreina", "Angelica", "Antonella", "Arianna", "Armida", "Augusta", "Aurora",
"Bruna", "Brunella", "Camilla", "Carla", "Carolina", "Cecilia", "Clara", "Clelia",
"Concettina", "Corinna", "Cosima", "Costanza", "Cristiana", "Delia", "Diana", "Dora",
"Donatella", "Edvige", "Eleonora", "Elvira", "Emma", "Enrichetta", "Ester", "Eugenia",
"Eva", "Fabia", "Fabiola", "Fernanda", "Fiorella", "Fiorenza", "Flora", "Franca",
"Gaia", "Gemma", "Gilda", "Gina", "Gloria", "Grazia", "Ida", "Ilda",
"Immacolata", "Ines", "Iolanda", "Irene", "Iris", "Ivana", "Ivanka", "Lara",
"Letizia", "Licia", "Lidia", "Liliana", "Lina", "Linda", "Lisa", "Livia",
"Loredana", "Lorella", "Lorenza", "Luana", "Luciana", "Lucilla", "Lucrezia", "Ludovica",
"Luigia", "Luna", "Maddalena", "Mafalda", "Marcella", "Marella", "Marilena", "Marina",
"Marisa", "Marta", "Matilde", "Maura", "Mirella", "Miriam", "Morena", "Nadia",
"Natalia", "Natalina", "Nella", "Nelly", "Nicole", "Noemi", "Norma", "Olga",
"Olimpia", "Orietta", "Palmira", "Pamela", "Pascale", "Pasqualina", "Pia", "Piera",
"Pierina", "Priscilla", "Raffaela", "Rebecca", "Regina", "Renata", "Rita", "Romina",
"Rosalba", "Rosalia", "Rosangela", "Rosanna", "Rosella", "Rosetta", "Rosina", "Rossana",
"Rossella", "Samanta", "Sandra", "Santina", "Sebastiana", "Serafina", "Sonia", "Stella",
"Tecla", "Tina", "Tosca", "Tullia", "Uberta", "Umberta", "Ursula", "Vera",
"Veronica", "Vincenza", "Viola", "Virginia", "Vittoria", "Wanda", "Yvonne", "Zaira",
"Zelda", "Zita", "Zoe", "Ambra", "Azzurra", "Bianca", "Celeste", "Diamante",
"Fiamma", "Giada", "Perla", "Sole", "Stella", "Alba", "Alma", "Anya"
);
// Cognomi italiani (300+ cognomi)
public static final List<String> SURNAMES = Arrays.asList(
"Rossi", "Ferrari", "Russo", "Bianchi", "Romano", "Gallo", "Costa", "Fontana",
"Esposito", "Ricci", "Bruno", "Moretti", "Marino", "Greco", "Barbieri", "Lombardi",
"Giordano", "Colombo", "Rizzo", "Benedetti", "Palumbo", "Pellegrini", "Caruso", "Ferretti",
"Galli", "Marchetti", "Villa", "Mancini", "Conte", "Serra", "Ferrero", "Martinelli",
"Mariani", "Giuliani", "Vitale", "Santoro", "Ferrara", "Leone", "Longo", "Gentile",
"Martino", "Fabbri", "Rinaldi", "Messina", "Riva", "Conti", "Silvestri", "Coppola",
"Negri", "Milani", "Parisi", "Sala", "Cattaneo", "Orlando", "Fiore", "Marini",
"Guerra", "Pagano", "Bernardi", "Valenti", "Farina", "Ruggiero", "Caputo", "Monti",
"Grassi", "Montanari", "Santini", "Morelli", "Amato", "Neri", "Donati", "Testa",
"Bianco", "Sorrentino", "Rossini", "Giuliano", "Sartori", "De Angelis", "De Rosa",
"Basile", "Costantini", "Rizzi", "Barone", "Martini", "De Santis", "Basso", "Pellegrino",
"Carbone", "Gatti", "Coppola", "Rossetto", "Piras", "Ricci", "Martinelli", "Sanna",
"Torrisi", "Scuderi", "Priolo", "Anastasi", "Puglisi", "La Rosa", "Catalano", "Garofalo",
"Aiello", "Trovato", "Pappalardo", "Pulvirenti", "Marletta", "Di Marco", "Biondi", "Ferri",
"Testa", "Marchi", "Baldini", "Benedetti", "Colombi", "Gasparini", "Orlandi", "Barbera",
"Damico", "Guerriero", "Napolitano", "Romano", "Mazza", "Caruso", "Ferraro", "Gaeta",
"Di Stefano", "Palma", "Carbone", "Morrone", "Milazzo", "Calabrese", "Ventura", "Palmieri",
"Martello", "Fico", "Pastore", "Arena", "Maggio", "Sciacca", "Pagliaro", "Lupo",
"Mangano", "Capra", "Finocchiaro", "Grasso", "Morabito", "Pellicano", "Castelli", "Castaldo",
"Mauro", "Piazza", "Battaglia", "D Amico", "Forte", "Antonelli", "Delia", "Marino",
"Cosentino", "Lazzaro", "Vitale", "Lombardo", "Crisafulli", "Nicolosi", "Bellomo", "Morreale",
"Messina", "Vaccaro", "Nicosia", "Fazio", "Spina", "Russo", "Parisi", "Zappala",
"Riccobono", "Camilleri", "Barbagallo", "Oliveri", "Pistone", "Gambino", "Cavallaro", "Burgio",
"Gentile", "Restivo", "Di Bella", "Genovese", "Ferrante", "Gianninoto", "Vitrano", "Gargano",
"Lombardi", "Milani", "Picci", "De Luca", "Foti", "Giardina", "Di Pietro", "Russo",
"La Spina", "Morello", "Moschetti", "Penna", "Ferretti", "Colombo", "Marra", "De Simone",
"Cozzi", "Grimaldi", "Pellegrini", "Galdi", "Paolini", "Ferrara", "Santangelo", "Di Giovanni",
"Iannone", "Lucchese", "Orsini", "Mastroianni", "Fiorentino", "Capasso", "Di Napoli", "Giannini",
"Romano", "Vitale", "Fontana", "Galdi", "Giuliani", "Barbieri", "Lombardo", "Martinelli",
"De Rosa", "Ferri", "Caputo", "Castaldi", "Mauro", "Monti", "Villa", "Marcello",
"Ricci", "Ferretti", "Gallo", "Fabbri", "Marini", "Grasso", "Carbone", "Bevilacqua",
"Giannone", "Perna", "Pellegrino", "Di Lorenzo", "Napoli", "Amato", "Donato", "Riccio",
"Giuliano", "Mancuso", "Bellotti", "Bianchini", "Rossetti", "Mazza", "Silvestri", "Baldini",
"Martinelli", "Galli", "Colombo", "Ferraro", "Palumbo", "Marchetti", "Ferrera", "Rossi",
"Caruso", "Serra", "Marchese", "Benedetti", "Franzese", "Basile", "Di Mauro", "Torrisi",
"Licata", "Scuderi", "Platania", "Priolo", "Marletta", "Biondi", "Grassi", "Fontana",
"Pagano", "Gentile", "Moretti", "Guerra", "Santoro", "Longo", "Giordano", "Fiore",
"Marchetti", "Parisi", "Milani", "Orlando", "Sala", "Costa", "Cattaneo", "Neri",
"Donati", "Mancini", "Montanari", "Caputo", "De Angelis", "Sartori", "De Santis", "Basso"
);
public enum Gender {
MALE, FEMALE
}
/**
* Costruttore con seed random sicuro
*/
public ItalianNameGenerator() {
this.random = new SecureRandom();
}
/**
* Costruttore con seed personalizzato per risultati riproducibili
* @param seed seed per il generatore random
*/
public ItalianNameGenerator(long seed) {
this.random = new Random(seed);
}
/**
* Genera un genere casuale
* @return Gender casuale (MALE o FEMALE)
*/
public Gender generateGender() {
return random.nextBoolean() ? Gender.MALE : Gender.FEMALE;
}
/**
* Genera un nome casuale in base al sesso specificato
* @param gender il sesso per cui generare il nome
* @return nome casuale del sesso specificato
*/
public String generateFirstName(Gender gender) {
List<String> names = (gender == Gender.MALE) ? MALE_NAMES : FEMALE_NAMES;
return names.get(random.nextInt(names.size()));
}
/**
* Genera un cognome casuale
* @return cognome casuale
*/
public String generateSurname() {
return SURNAMES.get(random.nextInt(SURNAMES.size()));
}
/**
* Genera un nome completo (nome + cognome) in base al sesso
* @param gender il sesso per cui generare il nome completo
* @return nome completo del sesso specificato
*/
public String generateFullName(Gender gender) {
return generateFirstName(gender) + " " + generateSurname();
}
/**
* Genera un nome completo con sesso casuale
* @return nome completo con sesso casuale
*/
public String generateRandomFullName() {
Gender randomGender = random.nextBoolean() ? Gender.MALE : Gender.FEMALE;
return generateFullName(randomGender);
}
/**
* Genera una persona completa con nome, cognome e sesso
* @return oggetto Person con i dati generati
*/
public Person generatePerson() {
Gender gender = random.nextBoolean() ? Gender.MALE : Gender.FEMALE;
return new Person(generateFirstName(gender), generateSurname(), gender);
}
/**
* Genera una persona mantenendo il sesso specificato
* @param gender il sesso da mantenere
* @return oggetto Person con i dati generati
*/
public Person generatePerson(Gender gender) {
return new Person(generateFirstName(gender), generateSurname(), gender);
}
/**
* Classe interna per rappresentare una persona generata
*/
public static class Person {
private final String firstName;
private final String surname;
private final Gender gender;
public Person(String firstName, String surname, Gender gender) {
this.firstName = firstName;
this.surname = surname;
this.gender = gender;
}
public String getFirstName() {
return firstName;
}
public String getSurname() {
return surname;
}
public Gender getGender() {
return gender;
}
public String getFullName() {
return firstName + " " + surname;
}
@Override
public String toString() {
return String.format("Person{firstName='%s', surname='%s', gender=%s}",
firstName, surname, gender);
}
}
/**
* Metodo di utilità per ottenere il sesso da una stringa
* @param genderString stringa rappresentante il sesso ("M", "F", "MALE", "FEMALE", etc.)
* @return enum Gender corrispondente
* @throws IllegalArgumentException se la stringa non è riconosciuta
*/
public static Gender parseGender(String genderString) {
if (genderString == null) {
throw new IllegalArgumentException("Gender string cannot be null");
}
String normalized = genderString.trim().toUpperCase();
switch (normalized) {
case "M":
case "MALE":
case "MASCHIO":
case "UOMO":
return Gender.MALE;
case "F":
case "FEMALE":
case "FEMMINA":
case "DONNA":
return Gender.FEMALE;
default:
throw new IllegalArgumentException("Unrecognized gender: " + genderString);
}
}
}

View File

@@ -0,0 +1,170 @@
package it.integry.ems.configuration;
import it.integry.annotations.CustomerComponent;
import it.integry.annotations.CustomerService;
import it.integry.ems.migration._base.IntegryCustomer;
import it.integry.ems.settings.Model.SettingsModel;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationListener;
import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.core.type.filter.AnnotationTypeFilter;
/**
* Configurazione per registrare gli scope personalizzati per customer specifici
*/
@Configuration
public class CustomerServicesConfig implements ApplicationListener<ContextRefreshedEvent> {
private final Logger logger = LogManager.getLogger();
@Autowired
private SettingsModel settingsModel;
@Autowired
private ApplicationContext applicationContext;
@Override
public void onApplicationEvent(ContextRefreshedEvent event) {
// Assicuriamoci che sia il context principale e non un sub-context
if (event.getApplicationContext() == applicationContext) {
registerCustomerBeans();
}
}
private void registerCustomerBeans() {
ClassPathScanningCandidateComponentProvider scanner =
new ClassPathScanningCandidateComponentProvider(false);
// Aggiungo filtri per le annotazioni custom
scanner.addIncludeFilter(new AnnotationTypeFilter(CustomerService.class));
scanner.addIncludeFilter(new AnnotationTypeFilter(CustomerComponent.class));
BeanDefinitionRegistry registry = (BeanDefinitionRegistry) applicationContext.getAutowireCapableBeanFactory();
// Scansiono tutti i package del progetto
for (BeanDefinition bd : scanner.findCandidateComponents("it.integry")) {
try {
Class<?> clazz = Class.forName(bd.getBeanClassName());
String beanName = generateBeanName(clazz);
IntegryCustomer customer = extractCustomer(clazz);
// Ora SettingsModel è completamente inizializzato con @PostConstruct chiamato
if (!settingsModel.getDefaultProfile().equalsIgnoreCase(customer.toString())) {
continue;
}
// Evito duplicati controllando se il bean esiste già
if (!registry.containsBeanDefinition(beanName)) {
logger.trace("Registering custom bean for customer: " + customer + " - Class: " + clazz.getSimpleName());
// Creo la definizione del bean
BeanDefinitionBuilder builder = BeanDefinitionBuilder
.genericBeanDefinition(clazz);
// Registro il bean nel registry di Spring
registry.registerBeanDefinition(beanName, builder.getBeanDefinition());
// Determino lo scope del bean per decidere se istanziarlo immediatamente
String beanScope = determineBeanScope(clazz);
if (shouldInstantiateImmediately(beanScope)) {
// Forzo l'istanziazione immediata solo per bean con scope appropriati
try {
Object beanInstance = applicationContext.getBean(beanName);
logger.info("Bean customer {} istanziato con successo: {} (scope: {})",
customer, beanInstance.getClass().getSimpleName(), beanScope);
} catch (Exception e) {
logger.error("Errore durante l'istanziazione del bean {} (scope: {}): {}",
beanName, beanScope, e.getMessage());
}
} else {
logger.info("Bean customer {} registrato ma non istanziato (scope: {}). " +
"Verrà istanziato quando richiesto", customer, beanScope);
}
}
} catch (ClassNotFoundException e) {
logger.error("Impossibile caricare la classe: " + bd.getBeanClassName(), e);
}
}
}
/**
* Genera il nome del bean basato sul nome della classe
*/
private String generateBeanName(Class<?> clazz) {
String simpleName = clazz.getSimpleName();
return Character.toLowerCase(simpleName.charAt(0)) + simpleName.substring(1);
}
private IntegryCustomer extractCustomer(Class<?> clazz) {
if (clazz.isAnnotationPresent(CustomerService.class)) {
CustomerService cs = clazz.getAnnotation(CustomerService.class);
return cs.value();
} else if (clazz.isAnnotationPresent(CustomerComponent.class)) {
CustomerComponent cc = clazz.getAnnotation(CustomerComponent.class);
return cc.value();
}
return IntegryCustomer.Integry; // Valore di default
}
/**
* Determina lo scope del bean analizzando le annotazioni della classe
*/
private String determineBeanScope(Class<?> clazz) {
// Controllo per @Scope
if (clazz.isAnnotationPresent(org.springframework.context.annotation.Scope.class)) {
org.springframework.context.annotation.Scope scopeAnnotation =
clazz.getAnnotation(org.springframework.context.annotation.Scope.class);
return scopeAnnotation.value();
}
// Controllo per @RequestScope
if (clazz.isAnnotationPresent(org.springframework.web.context.annotation.RequestScope.class)) {
return "request";
}
// Controllo per @SessionScope
if (clazz.isAnnotationPresent(org.springframework.web.context.annotation.SessionScope.class)) {
return "session";
}
// Controllo per @ApplicationScope
if (clazz.isAnnotationPresent(org.springframework.web.context.annotation.ApplicationScope.class)) {
return "application";
}
// Default è singleton
return "singleton";
}
/**
* Determina se il bean può essere istanziato immediatamente in base al suo scope
*/
private boolean shouldInstantiateImmediately(String scope) {
switch (scope.toLowerCase()) {
case "request":
case "session":
// I bean con scope request/session non possono essere istanziati
// al di fuori del contesto web
return false;
case "prototype":
// I bean prototype non vengono istanziati automaticamente
return false;
case "singleton":
case "application":
default:
// Singleton e application possono essere istanziati immediatamente
return true;
}
}
}

View File

@@ -21,7 +21,7 @@ public class ExecutorServiceConfig {
return new ThreadPoolExecutor(
corePoolSize,
maxPoolSize,
60L,
5,
TimeUnit.SECONDS,
new LinkedBlockingQueue<>(queueSize),
new ThreadFactoryBuilder()

View File

@@ -0,0 +1,21 @@
package it.integry.ems.configuration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
@Configuration
@EnableScheduling // Equivale a <task:annotation-driven/>
public class SchedulerConfig {
@Bean
public ThreadPoolTaskScheduler taskScheduler() {
ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
scheduler.setPoolSize(5); // Equivale a pool-size="5"
scheduler.setThreadNamePrefix("taskScheduler-");
scheduler.initialize();
return scheduler;
}
}

View File

@@ -39,7 +39,6 @@ import it.integry.ems_model.entity.*;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.Base64Utility;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityDate;
import it.integry.ems_model.utility.UtilityString;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.text.StringEscapeUtils;
@@ -69,10 +68,10 @@ import java.lang.reflect.ParameterizedType;
import java.math.BigDecimal;
import java.sql.*;
import java.text.SimpleDateFormat;
import java.time.LocalTime;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.*;
import java.util.Date;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -228,7 +227,7 @@ public class EmsController {
response = new ServiceRestResponse(EsitoType.OK);
} else {
response = new ServiceRestResponse(EsitoType.KO, multiDBTransactionManager.getPrimaryDatasource().getProfile(), new Exception("Il contenuto del file non è valido"));
response = new ServiceRestResponse(EsitoType.KO, multiDBTransactionManager.getPrimaryConnection().getProfileName(), new Exception("Il contenuto del file non è valido"));
}
}
@@ -299,11 +298,11 @@ public class EmsController {
sql = sql.replaceAll("select", "select TOP " + numResult + " ");
sql = sql.replaceAll("SELECT", "SELECT TOP " + numResult + " ");
}
objs = entityProcessor.selectRawData(sql, multiDBTransactionManager.getPrimaryDatasource());
objs = entityProcessor.selectRawData(sql, multiDBTransactionManager.getPrimaryConnection());
response = new ServiceRestResponse(EsitoType.OK, objs);
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, multiDBTransactionManager.getPrimaryDatasource().getProfile(), e);
response = new ServiceRestResponse(EsitoType.KO, multiDBTransactionManager.getPrimaryConnection().getProfileName(), e);
}
return response;
}
@@ -340,7 +339,7 @@ public class EmsController {
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, e, multiDBTransactionManager.getPrimaryDatasource().getProfile(), entity);
response = new ServiceRestResponse(EsitoType.KO, e, multiDBTransactionManager.getPrimaryConnection().getProfileName(), entity);
}
if (entity.getOperation() == OperationType.SELECT_OBJECT) {
@@ -387,7 +386,7 @@ public class EmsController {
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, e, multiDBTransactionManager.getPrimaryDatasource().getProfile(), entity);
response = new ServiceRestResponse(EsitoType.KO, e, multiDBTransactionManager.getPrimaryConnection().getProfileName(), entity);
}
if (entity.getOperation() == OperationType.SELECT_OBJECT) {
@@ -484,7 +483,7 @@ public class EmsController {
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, multiDBTransactionManager.getPrimaryDatasource().getProfile(), e);
response = new ServiceRestResponse(EsitoType.KO, multiDBTransactionManager.getPrimaryConnection().getProfileName(), e);
}
return response;
@@ -521,13 +520,13 @@ public class EmsController {
} else if (date2ts && metadata.getColumnType(i) == Types.TIMESTAMP) {
map.put(columnNameAltered, ((Timestamp) rs.getObject(columnName)).getTime() / 1000);
} else if (date2ts && metadata.getColumnType(i) == Types.TIME) {
map.put(columnNameAltered, ((java.sql.Time) rs.getObject(columnName)).getTime() / 1000);
map.put(columnNameAltered, ((Time) rs.getObject(columnName)).getTime() / 1000);
} else if (date2iso && metadata.getColumnType(i) == Types.DATE) {
map.put(columnNameAltered, ((java.sql.Date) rs.getObject(columnName)).toLocalDate().format(DateTimeFormatter.ISO_DATE));
} else if (date2iso && metadata.getColumnType(i) == Types.TIMESTAMP) {
map.put(columnNameAltered, ((Timestamp) rs.getObject(columnName)).toLocalDateTime().format(DateTimeFormatter.ISO_DATE_TIME));
} else if (date2iso && metadata.getColumnType(i) == Types.TIME) {
map.put(columnNameAltered, ((java.sql.Time) rs.getObject(columnName)).toLocalTime().format(DateTimeFormatter.ISO_LOCAL_TIME));
map.put(columnNameAltered, ((Time) rs.getObject(columnName)).toLocalTime().format(DateTimeFormatter.ISO_LOCAL_TIME));
} else {
map.put(columnNameAltered, rs.getObject(columnName));
}
@@ -553,7 +552,7 @@ public class EmsController {
@RequestParam(required = false, defaultValue = "true") boolean headless,
@RequestBody(required = false) JsonNode body) throws Exception {
EntityExportResponse<?> entityExportResponse = emsServices.export(typeExport, formatExport, body, headless);
EntityExportResponse<?> entityExportResponse = emsServices.export(multiDBTransactionManager, requestDataDTO, typeExport, formatExport, body, headless);
List<AnomalieDTO> anomalie = new ArrayList<>();
if (entityExportResponse != null && entityExportResponse.getAnomalie() != null && !entityExportResponse.getAnomalie().isEmpty())
@@ -609,7 +608,7 @@ public class EmsController {
@RequestParam(required = false, defaultValue = "true") boolean headless,
@RequestBody(required = false) ImportRequestDTO requestBody) throws Exception {
EntityImportResponse<List<EntityBase>> importResponse = emsServices.importEntity(importType, importFormat, requestBody, headless);
EntityImportResponse<List<EntityBase>> importResponse = emsServices.importEntity(multiDBTransactionManager, requestDataDTO, importType, importFormat, requestBody, headless);
List<EntityBase> entities = importResponse.getResponse();
@@ -688,7 +687,7 @@ public class EmsController {
} catch (Exception e) {
e.printStackTrace();
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, e, multiDBTransactionManager.getPrimaryDatasource().getProfile(), entity);
response = new ServiceRestResponse(EsitoType.KO, e, multiDBTransactionManager.getPrimaryConnection().getProfileName(), entity);
responseList.add(response);
if (forceTransaction) {
break;
@@ -701,16 +700,6 @@ public class EmsController {
logger.error(request.getRequestURI(), e);
ServiceRestResponse response = new ServiceRestResponse(EsitoType.KO, configuration, e);
responseList.add(response);
} finally {
if (multiDBTransactionManager != null) {
try {
multiDBTransactionManager.closeAll();
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
ServiceRestResponse response = new ServiceRestResponse(EsitoType.KO, configuration, e);
responseList.add(response);
}
}
}
return responseList;
@@ -744,7 +733,7 @@ public class EmsController {
@PathVariable String filename,
@RequestParam(name = "contentDisposition", defaultValue = "attachment") String contentDispositionType,
@RequestParam(defaultValue = "false") boolean requestThumbnail) throws Exception {
AttachmentDTO attachmentDTO = emsServices.downloadStbFileAttachment(idAttach, requestThumbnail);
AttachmentDTO attachmentDTO = emsServices.downloadStbFileAttachment(multiDBTransactionManager, idAttach, requestThumbnail);
if (attachmentDTO != null) {
return ResponseEntity.ok()
@@ -761,13 +750,31 @@ public class EmsController {
return ResponseEntity.notFound().build();
}
@GetMapping(value = "downloadFileFromRefUuid")
public ResponseEntity<byte[]> downloadFileFromRefUuid(@RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestParam() String refUuid,
@RequestParam() String fileName) throws Exception {
AttachmentDTO attached = emsServices.downloadFileFromRefUuid(multiDBTransactionManager, refUuid, fileName);
if (attached == null) return ResponseEntity.notFound().build();
return ResponseEntity.ok()
.contentType(MediaType.parseMediaType(attached.getMimeType()))
.contentLength(attached.getFileSize())
.header(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition
.attachment()
.filename(attached.getFileName())
.build()
.toString())
.body(attached.getFileContent());
}
@RequestMapping(value = EmsRestConstants.PATH_DOWNLOAD_STB_FILE_ATTACHMENT, method = RequestMethod.GET)
public ResponseEntity<byte[]> downloadStbFileAttachmentPath(
@RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestParam String idAttach,
@RequestParam(defaultValue = "false") boolean requestThumbnail) throws Exception {
AttachmentDTO attachmentDTO = emsServices.downloadStbFileAttachment(idAttach, requestThumbnail);
AttachmentDTO attachmentDTO = emsServices.downloadStbFileAttachment(multiDBTransactionManager, idAttach, requestThumbnail);
if (attachmentDTO != null) {
return ResponseEntity.ok()
@@ -833,7 +840,7 @@ public class EmsController {
@RequestParam Integer versione) throws Exception {
DtbDocPdf dtbDocPdf = new DtbDocPdf();
dtbDocPdf.setDataDoc(UtilityDate.RecognizeDate(dataDoc));
dtbDocPdf.setDataDoc(UtilityString.parseLocalDate(dataDoc));
dtbDocPdf.setSerDoc(serDoc);
dtbDocPdf.setNumDoc(numDoc);
dtbDocPdf.setCodAnag(codAnag);
@@ -885,7 +892,7 @@ public class EmsController {
@RequestParam Integer versione) throws Exception {
DtbOrdPdf dtbOrdPdf = new DtbOrdPdf();
dtbOrdPdf.setGestione(gestione);
dtbOrdPdf.setDataOrd(UtilityDate.RecognizeDate(dataOrd));
dtbOrdPdf.setDataOrd(UtilityString.parseLocalDate(dataOrd));
dtbOrdPdf.setNumOrd(numOrd);
dtbOrdPdf.setVersione(versione);
dtbOrdPdf.setOperation(OperationType.SELECT_OBJECT);
@@ -920,7 +927,7 @@ public class EmsController {
throw new Exception("Sono stati inviati più file del previsto");
}
StbFilesAttached stbFilesAttached = emsServices.uploadStbFilesAttached(idAttach,
StbFilesAttached stbFilesAttached = emsServices.uploadStbFilesAttached(multiDBTransactionManager, idAttach,
files[0].getOriginalFilename(),
files[0].getBytes(),
descrizione,
@@ -1036,7 +1043,7 @@ public class EmsController {
byte[] content = files[0].getBytes();
// content = UtilityZip.zlib_compress(content);
Date dataDoc = UtilityDate.RecognizeDate(dataDocStr);
LocalDate dataDoc = UtilityString.parseLocalDate(dataDocStr);
DtbDocPdf dtbDocPdf = new DtbDocPdf();
dtbDocPdf.setDataDoc(dataDoc);
@@ -1066,10 +1073,59 @@ public class EmsController {
}
}
@PostMapping(value = "uploadDtbDocFileContent")
public ServiceRestResponse uploadDtbDocFileContent(HttpServletRequest request, HttpServletResponse response,
@RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestParam("dataDoc") String dataDocStr,
@RequestParam String serDoc,
@RequestParam Integer numDoc,
@RequestParam String codAnag,
@RequestParam String codDtip,
@RequestParam String descrizione,
@RequestPart MultipartFile[] files
) {
try {
if (files == null || files.length == 0) {
throw new Exception("Nessun file è stato rilevato");
} else if (files.length > 1) {
throw new Exception("Sono stati inviati più file del previsto");
}
byte[] content = files[0].getBytes();
String idAttach = null;
StbFilesAttached.TypeAttach typeAttach = null;
LocalDate dataDoc = UtilityString.parseLocalDate(dataDocStr);
DrlDocAttached drlDocAttached =
new DrlDocAttached()
.setDataDoc(dataDoc)
.setSerDoc(serDoc)
.setNumDoc(numDoc)
.setCodAnag(codAnag)
.setCodDtip(codDtip);
drlDocAttached.setOperation(OperationType.INSERT);
StbFilesAttached stbFilesAttached = emsServices.uploadStbFilesAttached(multiDBTransactionManager, idAttach,
files[0].getOriginalFilename(),
files[0].getBytes(),
descrizione,
files[0].getContentType(),
typeAttach,
null, drlDocAttached, null);
return ServiceRestResponse.createPositiveResponse(stbFilesAttached);
} catch (Exception e) {
logger.error(e.getMessage(), e);
return new ServiceRestResponse(EsitoType.KO, config, e);
}
}
@RequestMapping(value = "createZipFromFiles", method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse createZipFromFiles(@RequestBody CreateZipDTO createZipDTO) throws Exception {
return ServiceRestResponse.createPositiveResponse(emsServices.createZipFromFiles(createZipDTO));
return ServiceRestResponse.createPositiveResponse(emsServices.createZipFromFiles(multiDBTransactionManager, createZipDTO));
}
// @RequestMapping(value = EmsRestConstants.PATH_UPLOAD_STB_EMAIL_CONTENT, method = RequestMethod.POST)
@@ -1115,22 +1171,10 @@ public class EmsController {
// }
@RequestMapping(value = EmsRestConstants.PATH_CLEAN_DIRECTORIES, method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse cleanDirectories(@RequestParam(CommonConstants.PROFILE_DB) String config) throws Exception {
try {
emsServices.cleanDirectories();
return ServiceRestResponse.createPositiveResponse();
} catch (Exception e) {
logger.error(e.getMessage(), e);
return new ServiceRestResponse(EsitoType.KO, multiDBTransactionManager.getPrimaryDatasource().getProfile(), e);
}
}
@RequestMapping(value = EmsRestConstants.PATH_EXPORT_SERVER_INFO_ISCC, method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse exportServerInfoISCC(@RequestParam(CommonConstants.PROFILE_DB) String config) throws Exception {
emsServices.checkServerVariables();
emsServices.checkServerVariables(multiDBTransactionManager);
return ServiceRestResponse.createPositiveResponse();
}
@@ -1142,7 +1186,7 @@ public class EmsController {
return ServiceRestResponse.createPositiveResponse(mapping);
} catch (Exception e) {
logger.error(e.getMessage(), e);
return new ServiceRestResponse(EsitoType.KO, multiDBTransactionManager.getPrimaryDatasource().getProfile(), e);
return new ServiceRestResponse(EsitoType.KO, multiDBTransactionManager.getPrimaryConnection().getProfileName(), e);
}
}
@@ -1154,7 +1198,7 @@ public class EmsController {
return ServiceRestResponse.createPositiveResponse(historyProfileDb);
} catch (Exception e) {
logger.error(e.getMessage(), e);
return new ServiceRestResponse(EsitoType.KO, multiDBTransactionManager.getPrimaryDatasource().getProfile(), e);
return new ServiceRestResponse(EsitoType.KO, multiDBTransactionManager.getPrimaryConnection().getProfileName(), e);
}
}
@@ -1171,7 +1215,7 @@ public class EmsController {
return ServiceRestResponse.createPositiveResponse(entityFields);
} catch (Exception e) {
logger.error(e.getMessage(), e);
return new ServiceRestResponse(EsitoType.KO, multiDBTransactionManager.getPrimaryDatasource().getProfile(), e);
return new ServiceRestResponse(EsitoType.KO, multiDBTransactionManager.getPrimaryConnection().getProfileName(), e);
}
}

View File

@@ -1,44 +0,0 @@
package it.integry.ems.controller;
import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems.service.MapService;
import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.types.LatLng;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@RestController
@Scope("request")
public class MapController {
private final Logger logger = LogManager.getLogger();
@Autowired
private MapService mapService;
@RequestMapping(value = EmsRestConstants.PATH_MAP_GETCOORDINATE_BY_CITY, method = RequestMethod.GET)
public @ResponseBody
ServiceRestResponse getCoordinateByCity(HttpServletRequest request,
@RequestParam String cityName) {
ServiceRestResponse resp;
try {
LatLng coordinates = mapService.getCoordinateByCity(cityName);
resp = ServiceRestResponse.createPositiveResponse(coordinates);
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
resp = ServiceRestResponse.createNegativeResponse();
}
return resp;
}
}

View File

@@ -1,140 +1,154 @@
package it.integry.ems.datasource;
import it.integry.ems.settings.Model.AvailableConnectionsModel;
import it.integry.ems.settings.Model.SettingsModel;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityHashMap;
import it.integry.ems_model.utility.UtilityString;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
import javax.annotation.PreDestroy;
import java.io.IOException;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
@Service
@Scope(value = "request")
public class DataSource {
private AvailableConnectionsModel connectionModel;
private String profile;
private Short sessionID;
private Connection connection = null;
private String applicationName;
public String getDbName() {
return connectionModel.getDbName();
}
public String getProfile() {
return profile;
}
public EmsRestConstants.DB_TYPE getTypeDB() {
return connectionModel.getConnectionType();
}
public String getApplicationName() {
return applicationName;
}
public int getSessionID() {
return sessionID;
}
public synchronized Connection getConnection() throws IOException, SQLException {
return connection;
}
public boolean isClosed() throws SQLException {
return !(connection != null && !connection.isClosed());
}
private void init(String applicationName) throws SQLException, IOException {
this.applicationName = applicationName;
connection = Connection.fromConnection(
DriverManager.getConnection(connectionModel.getDbConnectionString(applicationName), connectionModel.getUsername(), connectionModel.getPasswordDecrypted())
);
connection.setTransactionIsolation(java.sql.Connection.TRANSACTION_READ_UNCOMMITTED);
connection.setAutoCommit(false);
if (connectionModel.getConnectionType() == EmsRestConstants.DB_TYPE.MSSQL) {
try (final PreparedStatement setNocountOn = connection.prepareStatement("SET NOCOUNT ON")) {
boolean resultNoCount = setNocountOn.execute();
}
HashMap<String, Object> resultSessionData = UtilityDB.executeSimpleQueryOnlyFirstRow(connection, "select @@spid AS session_id," +
" user_name() AS [user_name]," +
" suser_name() AS [suser_name]," +
" current_user AS [current_user]," +
" system_user AS [system_user]," +
" session_user AS [session_user]," +
" user AS [user]");
this.sessionID = UtilityHashMap.getValueIfExists(resultSessionData, "session_id");
}
}
@PreDestroy
private void destroy() throws SQLException {
forceClose();
}
public synchronized void initialize(String profileDB, String connectionName, boolean autoOpenConnection) throws Exception {
if (UtilityString.isNullOrEmpty(profileDB)) {
throw new Exception("Profile DB non valorizzato - controllare la chiamata del servizio");
}
this.profile = profileDB;
this.sessionID = -1;
AvailableConnectionsModel connectionModel = null;
List<AvailableConnectionsModel> availableConnectionsModels = SettingsModel.getInstance().getAvailableConnections();
if (!UtilityString.isNullOrEmpty(profileDB)) {
for (AvailableConnectionsModel connectionsModel : availableConnectionsModels) {
if (connectionsModel.getProfileName().equalsIgnoreCase(profileDB)) {
connectionModel = connectionsModel;
}
}
}
if (connectionModel == null) {
throw new Exception(String.format("Configurazione DB non trovata o dati mancanti (%s)", profileDB));
}
this.connectionModel = connectionModel;
if (autoOpenConnection) {
init(connectionName);
}
}
public synchronized void initialize(String profileDB, boolean autoOpenConnection) throws Exception {
initialize(profileDB, "EMS Connection", autoOpenConnection);
}
public synchronized void initialize(String profileDB) throws Exception {
initialize(profileDB, "EMS Connection", true);
}
public void forceClose() throws SQLException {
if (connection != null) {
synchronized (connection) {
connection.close();
}
}
}
package it.integry.ems.datasource;
import it.integry.ems.settings.Model.AvailableConnectionModel;
import it.integry.ems.settings.Model.SettingsModel;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityHashMap;
import org.apache.commons.dbcp2.BasicDataSource;
import java.sql.SQLException;
import java.util.HashMap;
public class DataSource extends BasicDataSource {
private AvailableConnectionModel connectionModel;
/**
* Instanzia un nuovo datasource.
*
* @deprecated Il datasource non deve essere istanziato direttamente ma bisogna utilizzare il metodo
* {@link it.integry.ems.sync.MultiDBTransaction.BasicConnectionPool#getConnection(AvailableConnectionModel)} per ottenere una connessione.
*/
@Deprecated
public DataSource() {
super();
}
public EmsRestConstants.DB_TYPE getTypeDB() {
return connectionModel.getConnectionType();
}
/**
* Ottiene una connessione dal pool. La connessione è wrappata in it.integry.ems.sync.MultiDBTransaction.Connection.
* È responsabilità del chiamante chiudere la connessione per restituirla al pool.
*
* @return una connessione dal pool
* @throws SQLException se si verifica un errore di accesso al database
*/
public Connection getConnection() throws SQLException {
// Restituisce una nuova connessione dal pool di BasicDataSource, wrappata nel nostro tipo Connection
final Connection connection = Connection.fromConnection(super.getConnection());
// Prova a ottenere una connessione per verificare la configurazione e ottenere il sessionID
if (connectionModel.getConnectionType() == EmsRestConstants.DB_TYPE.MSSQL) {
HashMap<String, Object> resultSessionData = UtilityDB.executeSimpleQueryOnlyFirstRow(connection, "select CAST(@@spid AS BIGINT) AS session_id," +
" user_name() AS [user_name]," +
" suser_name() AS [suser_name]," +
" current_user AS [current_user]," +
" system_user AS [system_user]," +
" session_user AS [session_user]," +
" user AS [user]");
connection.setSessionId(UtilityHashMap.getValueIfExists(resultSessionData, "session_id"));
}
connection.setProfileName(connectionModel.getProfileName())
.setInternalDb(connectionModel.getInternalDb());
return connection;
}
public synchronized void initialize(String profileDB) throws Exception {
AvailableConnectionModel connectionsModel = SettingsModel.getInstance().findConnectionModel(profileDB);
initialize(connectionsModel);
}
public synchronized void initialize(AvailableConnectionModel connectionModel) throws Exception {
if (connectionModel == null) {
throw new Exception("Configurazione DB non trovata");
}
this.connectionModel = connectionModel;
this.setDriverClassName(connectionModel.getDriverClassName());
this.setUrl(connectionModel.getDbConnectionString("EMS Connection"));
this.setUsername(connectionModel.getUsername());
this.setPassword(connectionModel.getPasswordDecrypted());
this.setDefaultCatalog(connectionModel.getDbName());
this.setDefaultTransactionIsolation(java.sql.Connection.TRANSACTION_READ_UNCOMMITTED);
this.setDefaultAutoCommit(false);
// ===== OTTIMIZZAZIONI CRITICHE =====
// Pool sizing ottimizzato per READ_UNCOMMITTED (meno locking = più connessioni possibili)
this.setInitialSize(5); // Inizia con più connessioni
this.setMaxTotal(-1); // Aumentato il massimo
this.setMinIdle(5); // Non scendere sotto 5
this.setMaxIdle(-1); // Mantieni più connessioni idle
// Timeout ottimizzati per performance massime
// this.setMaxWaitMillis(-1L); // Infinito (DEFAULT)
// Validazione veloce ed efficiente
this.setValidationQuery("SELECT 1");
// this.setValidationQueryTimeout(60); // Ridotto a 1 secondo
// this.setTestWhileIdle(true); // Testa connessioni idle
// Eviction ottimizzata per READ_UNCOMMITTED
// this.setTimeBetweenEvictionRunsMillis(1 * 1000); // Ogni 30 secondi
// this.setMinEvictableIdleTimeMillis(1 * 60 * 1000); // 3 minuti (ridotto da 5)
// this.setNumTestsPerEvictionRun(5); // Testa più connessioni per volta
// Connection leak protection
this.setRemoveAbandonedOnBorrow(true);
this.setRemoveAbandonedOnMaintenance(true);
this.setRemoveAbandonedTimeout(3 * 60 * 10); // 3 minuti
this.setLogAbandoned(true); // Disabilita in produzione per performance
// Performance boosts massimi
// this.setPoolPreparedStatements(true);
// this.setMaxOpenPreparedStatements(200);
// this.setCacheState(true);
this.setFastFailValidation(true);
// Ottimizzazioni specifiche per SQL Server con READ_UNCOMMITTED
if (connectionModel.getConnectionType() == EmsRestConstants.DB_TYPE.MSSQL) {
// Impostazioni connection specifiche per SQL Server
//this.setConnectionInitSqls(java.util.Arrays.asList(
//"SET NOCOUNT ON",
//"SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED",
//"SET ARITHABORT ON"
//));
}
// Logging ottimizzato (disabilita in produzione)
this.setLogExpiredConnections(true);
// ==================== ULTERIORI OTTIMIZZAZIONI ====================
// Connection properties specifiche per performance
this.setDefaultReadOnly(false);
// Ottimizzazioni DBCP2 avanzate
// this.setLifo(false); // FIFO per distribuzione equa delle connessioni
// this.setSoftMinEvictableIdleTimeMillis(120000); // 2 minuti soft eviction
// if (!connectionModel.getInternalDb() ||
// UtilityDebug.isDebugExecution() ||
// UtilityDebug.isIntegryServerDev() ||
// !SettingsModel.getInstance().isPrimaryInstance()) {
// this.setInitialSize(0);
//// this.setMaxTotal(5);
// this.setMinIdle(0);
// this.setMaxIdle(1);
// }
}
}

View File

@@ -2,15 +2,16 @@ package it.integry.ems.directory;
import com.fasterxml.jackson.databind.node.ArrayNode;
import it.integry.common.var.CommonConstants;
import it.integry.ems.datasource.DataSource;
import it.integry.ems.json.ResponseJSONObjectMapper;
import it.integry.ems.properties.EmsProperties;
import it.integry.ems.response.EsitoType;
import it.integry.ems.response.FileItem;
import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.utility.UtilityHashMap;
import it.integry.ems_model.utility.UtilityString;
import it.integry.security.utility.RestUtil;
import org.apache.logging.log4j.LogManager;
@@ -30,17 +31,18 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Properties;
import java.util.TimerTask;
public class EmailWatcherListener extends TimerTask {
private Logger logger = LogManager.getLogger();
private final Logger logger = LogManager.getLogger();
private EmailListenerInfo emailListenerInfo;
private EmsProperties prop;
private SetupGest setupGest;
private ResponseJSONObjectMapper jsonObjectMapper;
private final EmailListenerInfo emailListenerInfo;
private final EmsProperties prop;
private final SetupGest setupGest;
private final ResponseJSONObjectMapper jsonObjectMapper;
public EmailWatcherListener(EmailListenerInfo emailListenerInfo, EmsProperties prop,
SetupGest setupGest, ResponseJSONObjectMapper jsonObjectMapper) {
@@ -53,42 +55,44 @@ public class EmailWatcherListener extends TimerTask {
@Override
public synchronized void run() {
try {
try (MultiDBTransactionManager multiDBTransactionManager = new MultiDBTransactionManager(emailListenerInfo.getDatabase())) {
Connection conn = multiDBTransactionManager.getPrimaryConnection();
String flagAttivo = null, username = null, password = null,
imap = null, pop3 = null, pop3Port = null, imapPort = null;
DataSource ds = new DataSource();
ds.initialize(emailListenerInfo.getDatabase());
String[] params = emailListenerInfo.getSetupGestBranch().split("\\|");
if (params.length >= 2) {
flagAttivo = setupGest.getSetup(ds.getConnection(), params[0], params[1], "ATTIVO");
username = setupGest.getSetup(ds.getConnection(), params[0], params[1], "USERNAME");
final HashMap<String, String> setupData = setupGest.getSetupSection(conn, params[0], params[1]);
flagAttivo = UtilityHashMap.getValueIfExists(setupData, "ATTIVO");
username = UtilityHashMap.getValueIfExists(setupData, "USERNAME");
if (UtilityString.isNullOrEmpty(username))
throw new Exception(params[0] + "/" + params[1] + "/USERNAME non configurato correttamente");
password = setupGest.getSetup(ds.getConnection(), params[0], params[1], "PASSWORD");
password = UtilityHashMap.getValueIfExists(setupData, "PASSWORD");
if (UtilityString.isNullOrEmpty(password))
throw new Exception(params[0] + "/" + params[1] + "/PASSWORD non configurato correttamente");
pop3 = setupGest.getSetup(ds.getConnection(), params[0], params[1], "POP3");
pop3 = UtilityHashMap.getValueIfExists(setupData, "POP3");
if (UtilityString.isNullOrEmpty(pop3))
throw new Exception(params[0] + "/" + params[1] + "/POP3 non configurato correttamente");
pop3Port = setupGest.getSetup(ds.getConnection(), params[0], params[1], "POP3_PORT");
pop3Port = UtilityHashMap.getValueIfExists(setupData, "POP3_PORT");
if (UtilityString.isNullOrEmpty(pop3Port))
throw new Exception(params[0] + "/" + params[1] + "/POP3_PORT non configurato correttamente");
imap = setupGest.getSetup(ds.getConnection(), params[0], params[1], "IMAP");
imap = UtilityHashMap.getValueIfExists(setupData, "IMAP");
if (UtilityString.isNullOrEmpty(imap))
throw new Exception(params[0] + "/" + params[1] + "/IMAP non configurato correttamente");
imapPort = setupGest.getSetup(ds.getConnection(), params[0], params[1], "IMAP_PORT");
imapPort = UtilityHashMap.getValueIfExists(setupData, "IMAP_PORT");
if (UtilityString.isNullOrEmpty(imapPort))
throw new Exception(params[0] + "/" + params[1] + "/IMAP_PORT non configurato correttamente");
}
ds.forceClose();
if (!UtilityString.isNullOrEmpty(flagAttivo) && "S".equals(flagAttivo)) {
Properties sysProperties = System.getProperties();
Session session = Session.getDefaultInstance(sysProperties);
@@ -160,7 +164,7 @@ public class EmailWatcherListener extends TimerTask {
String value = response.readEntity(String.class);
String emailDbg = setupGest.getSetup(ds.getConnection(), params[0], params[1], "EMAIL_DBG");
String emailDbg = setupGest.getSetup(conn, params[0], params[1], "EMAIL_DBG");
if (value.charAt(0) == '{') {
ServiceRestResponse respWra = jsonObjectMapper.readValue(value, ServiceRestResponse.class);
if (respWra.getEsito() == EsitoType.KO) {

View File

@@ -1,6 +1,5 @@
package it.integry.ems.download;
import it.integry.annotations.PostContextConstruct;
import it.integry.ems.download.dto.CachedFileDto;
import it.integry.ems.download.dto.DownloadFileDto;
import it.integry.ems.looper.service.LooperService;
@@ -25,13 +24,6 @@ public class DownloadFileHandlerService {
private final HashMap<String, CachedFileDto> mFileMap = new HashMap<>();
@PostContextConstruct
public void init() {
looperService.add(() -> {
UtilityFile.cleanDirectory(getTempPath(), 1, "");
}, 60 * 60 * 1000, DownloadFileHandlerService.class.getName());
}
public DownloadFileDto generateDownloadItem(File file) throws IOException {
return generateDownloadItem(file.getName(), FileUtils.readFileToByteArray(file), false);
}

View File

@@ -0,0 +1,30 @@
package it.integry.ems.dto;
import java.util.Objects;
public class ArticoloPartitaCommessaDTO extends ArticoloPartitaDTO {
private String codJcom;
@Override
public boolean equals(Object o) {
if (!(o instanceof ArticoloPartitaCommessaDTO)) return false;
if (!super.equals(o)) return false;
ArticoloPartitaCommessaDTO that = (ArticoloPartitaCommessaDTO) o;
return Objects.equals(getCodJcom(), that.getCodJcom());
}
@Override
public int hashCode() {
return Objects.hash(super.hashCode(), getCodJcom());
}
public String getCodJcom() {
return codJcom;
}
public ArticoloPartitaCommessaDTO setCodJcom(String codJcom) {
this.codJcom = codJcom;
return this;
}
}

View File

@@ -1,4 +1,4 @@
package it.integry.ems.document.dto;
package it.integry.ems.dto;
import java.util.Objects;

View File

@@ -1,5 +1,6 @@
package it.integry.ems.dto;
import java.time.LocalDateTime;
import java.util.Date;
public class ExtendedStbActivity {
@@ -14,11 +15,9 @@ public class ExtendedStbActivity {
private String userCreator;
private String note;
private String activityDescription;
private Date dataInsAct;
private int priorita;
private Date alarmDate;
private Date alarmTime;
private Date oraInsAct;
private LocalDateTime alarmTime;
private LocalDateTime oraInsAct;
private String activityTypeId;
private String parentActivityId;
private StbActivityEmailObject emailObject;
@@ -116,15 +115,6 @@ public class ExtendedStbActivity {
return this;
}
public Date getDataInsAct() {
return dataInsAct;
}
public ExtendedStbActivity setDataInsAct(Date dataInsAct) {
this.dataInsAct = dataInsAct;
return this;
}
public int getPriorita() {
return priorita;
}
@@ -134,29 +124,20 @@ public class ExtendedStbActivity {
return this;
}
public Date getAlarmDate() {
return alarmDate;
}
public ExtendedStbActivity setAlarmDate(Date alarmDate) {
this.alarmDate = alarmDate;
return this;
}
public Date getAlarmTime() {
public LocalDateTime getAlarmTime() {
return alarmTime;
}
public ExtendedStbActivity setAlarmTime(Date alarmTime) {
public ExtendedStbActivity setAlarmTime(LocalDateTime alarmTime) {
this.alarmTime = alarmTime;
return this;
}
public Date getOraInsAct() {
public LocalDateTime getOraInsAct() {
return oraInsAct;
}
public ExtendedStbActivity setOraInsAct(Date oraInsAct) {
public ExtendedStbActivity setOraInsAct(LocalDateTime oraInsAct) {
this.oraInsAct = oraInsAct;
return this;
}

View File

@@ -1,4 +1,4 @@
package it.integry.ems.dto;
package it.integry.ems.dto.info;
public class ApplicationInfoDTO {

View File

@@ -1,4 +1,4 @@
package it.integry.ems.dto;
package it.integry.ems.dto.info;
import java.util.List;

View File

@@ -1,4 +1,4 @@
package it.integry.ems.dto;
package it.integry.ems.dto.info;
public class DatabaseInfoDTO {

View File

@@ -0,0 +1,114 @@
package it.integry.ems.dto.info;
public class PvmInfoDTO {
private String phpVersion;
private String timezone;
private String imagick;
private boolean sodiumMissing;
private int maxExecutionTime;
private boolean magicQuotesGpc;
private String defaultCharset;
private String memoryLimit;
private String postMaxSize;
private String uploadMaxSize;
private int maxInputVars;
public String getPhpVersion() {
return phpVersion;
}
public PvmInfoDTO setPhpVersion(String phpVersion) {
this.phpVersion = phpVersion;
return this;
}
public String getTimezone() {
return timezone;
}
public PvmInfoDTO setTimezone(String timezone) {
this.timezone = timezone;
return this;
}
public String getImagick() {
return imagick;
}
public PvmInfoDTO setImagick(String imagick) {
this.imagick = imagick;
return this;
}
public boolean isSodiumMissing() {
return sodiumMissing;
}
public PvmInfoDTO setSodiumMissing(boolean sodiumMissing) {
this.sodiumMissing = sodiumMissing;
return this;
}
public int getMaxExecutionTime() {
return maxExecutionTime;
}
public PvmInfoDTO setMaxExecutionTime(int maxExecutionTime) {
this.maxExecutionTime = maxExecutionTime;
return this;
}
public boolean isMagicQuotesGpc() {
return magicQuotesGpc;
}
public PvmInfoDTO setMagicQuotesGpc(boolean magicQuotesGpc) {
this.magicQuotesGpc = magicQuotesGpc;
return this;
}
public String getDefaultCharset() {
return defaultCharset;
}
public PvmInfoDTO setDefaultCharset(String defaultCharset) {
this.defaultCharset = defaultCharset;
return this;
}
public String getMemoryLimit() {
return memoryLimit;
}
public PvmInfoDTO setMemoryLimit(String memoryLimit) {
this.memoryLimit = memoryLimit;
return this;
}
public String getPostMaxSize() {
return postMaxSize;
}
public PvmInfoDTO setPostMaxSize(String postMaxSize) {
this.postMaxSize = postMaxSize;
return this;
}
public String getUploadMaxSize() {
return uploadMaxSize;
}
public PvmInfoDTO setUploadMaxSize(String uploadMaxSize) {
this.uploadMaxSize = uploadMaxSize;
return this;
}
public int getMaxInputVars() {
return maxInputVars;
}
public PvmInfoDTO setMaxInputVars(int maxInputVars) {
this.maxInputVars = maxInputVars;
return this;
}
}

View File

@@ -3,7 +3,7 @@ package it.integry.ems.dynamic_cache;
import it.integry.ems.expansion.RunnableArgsWithReturn;
import it.integry.ems.expansion.RunnableWithReturn;
import it.integry.ems.looper.service.LooperService;
import it.integry.ems.settings.Model.AvailableConnectionsModel;
import it.integry.ems.settings.Model.AvailableConnectionModel;
import it.integry.ems.settings.Model.SettingsModel;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
@@ -51,11 +51,11 @@ public class DynamicCacheService {
List<String> finalDbNames = dbNames.stream().map(String::toLowerCase).collect(Collectors.toList());
RunnableWithReturn<Object> internalRefreshAction = () -> {
Map<String, List<AvailableConnectionsModel>> databases = settingsModel.getAvailableConnections()
Map<String, List<AvailableConnectionModel>> databases = settingsModel.getAvailableConnections()
.stream()
.filter(AvailableConnectionsModel::getInternalDb)
.filter(AvailableConnectionModel::getInternalDb)
.filter(x -> finalDbNames.contains(x.getDbName().toLowerCase()))
.collect(Collectors.groupingBy(AvailableConnectionsModel::getDbName));
.collect(Collectors.groupingBy(AvailableConnectionModel::getDbName));
final HashMap<String, T> cachedDataByDB = new HashMap<>();
@@ -83,11 +83,11 @@ public class DynamicCacheService {
RunnableWithReturn<Object> refreshAction = () -> {
Map<String, List<AvailableConnectionsModel>> databases = settingsModel.getAvailableConnections()
Map<String, List<AvailableConnectionModel>> databases = settingsModel.getAvailableConnections()
.stream()
.filter(AvailableConnectionsModel::getInternalDb)
.filter(AvailableConnectionModel::getInternalDb)
.filter(x -> finalDbNames.contains(x.getDbName().toLowerCase()))
.collect(Collectors.groupingBy(AvailableConnectionsModel::getDbName));
.collect(Collectors.groupingBy(AvailableConnectionModel::getDbName));
final HashMap<String, List<? extends EntityBase>> cachedEntitiesByDB = new HashMap<>();
@@ -138,11 +138,11 @@ public class DynamicCacheService {
RunnableWithReturn<Object> refreshAction = () -> {
Map<String, List<AvailableConnectionsModel>> databases = settingsModel.getAvailableConnections()
Map<String, List<AvailableConnectionModel>> databases = settingsModel.getAvailableConnections()
.stream()
.filter(AvailableConnectionsModel::getInternalDb)
.filter(AvailableConnectionModel::getInternalDb)
.filter(x -> finalDbNames.contains(x.getDbName().toLowerCase()))
.collect(Collectors.groupingBy(AvailableConnectionsModel::getDbName));
.collect(Collectors.groupingBy(AvailableConnectionModel::getDbName));
final HashMap<String, List<?>> cacheQueryByDB = new HashMap<>();

View File

@@ -0,0 +1,371 @@
package it.integry.ems.entity_logger.db_schema_manager.component;
import it.integry.ems.entity_logger.db_schema_manager.dto.ForeignKeyDependency;
import it.integry.ems.entity_logger.db_schema_manager.dto.ForeignKeyDependencyReport;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.sql.*;
import java.util.ArrayList;
import java.util.List;
public class SQLServerForeignKeyManager {
private final Logger logger = LogManager.getLogger();
private Connection connection;
private boolean disableForeignKeyChecks;
public SQLServerForeignKeyManager(Connection connection) {
this(connection, false);
}
public SQLServerForeignKeyManager(Connection connection, boolean disableForeignKeyChecks) {
this.connection = connection;
this.disableForeignKeyChecks = disableForeignKeyChecks;
}
/**
* Aggiorna una foreign key e tutte le sue dipendenze in un'unica transazione
*
* @param tableName Nome della tabella principale
* @param columnName Nome della colonna che contiene la chiave primaria
* @param oldValue Valore attuale della chiave
* @param newValue Nuovo valore della chiave
* @return true se l'operazione è completata con successo
* @throws SQLException in caso di errore
*/
public <T> boolean updateForeignKeyWithDependencies(String tableName, String columnName,
T oldValue, T newValue) throws SQLException {
boolean originalAutoCommit = connection.getAutoCommit();
List<String> disabledConstraints = new ArrayList<>();
try {
// Disabilita auto-commit per gestire la transazione manualmente
connection.setAutoCommit(false);
logger.info(String.format("Inizio aggiornamento FK: %s.%s da %s a %s",
tableName, columnName, oldValue, newValue));
// 1. Disabilita i vincoli foreign key se richiesto
if (disableForeignKeyChecks) {
disabledConstraints = disableForeignKeyConstraints(tableName, columnName);
logger.info(String.format("Disabilitati %d vincoli foreign key", disabledConstraints.size()));
}
// 2. Trova tutte le dipendenze
List<ForeignKeyDependency> dependencies = findAllDependencies(tableName, columnName);
logger.info(String.format("Trovate %d dipendenze da aggiornare", dependencies.size()));
if (disableForeignKeyChecks) {
// Se i vincoli sono disabilitati, possiamo aggiornare in qualsiasi ordine
// Aggiorniamo prima la tabella principale per semplicità
updateMainTable(tableName, columnName, oldValue, newValue);
// Poi aggiorniamo tutte le tabelle dipendenti
for (ForeignKeyDependency dependency : dependencies) {
updateDependentTable(dependency, oldValue, newValue);
}
} else {
// Ordine normale: prima le dipendenti, poi la principale
for (ForeignKeyDependency dependency : dependencies) {
updateDependentTable(dependency, oldValue, newValue);
}
updateMainTable(tableName, columnName, oldValue, newValue);
}
// 3. Riabilita i vincoli foreign key se erano stati disabilitati
if (disableForeignKeyChecks && !disabledConstraints.isEmpty()) {
enableForeignKeyConstraints(disabledConstraints);
logger.info("Vincoli foreign key riabilitati");
// 4. Verifica l'integrità dei dati dopo aver riabilitato i vincoli
if (!checkConstraintIntegrity(disabledConstraints)) {
throw new SQLException("Violazione dell'integrità referenziale dopo l'aggiornamento");
}
}
// Commit della transazione
connection.commit();
logger.info("Aggiornamento completato con successo");
return true;
} catch (SQLException e) {
// Rollback in caso di errore
try {
connection.rollback();
logger.error("Errore durante l'aggiornamento, rollback eseguito: " + e.getMessage(), e);
// Se i vincoli erano stati disabilitati, prova a riabilitarli anche dopo il rollback
if (disableForeignKeyChecks && !disabledConstraints.isEmpty()) {
try {
enableForeignKeyConstraints(disabledConstraints);
logger.info("Vincoli foreign key riabilitati dopo rollback");
} catch (SQLException enableEx) {
logger.error("ATTENZIONE: Impossibile riabilitare i vincoli dopo rollback: " + enableEx.getMessage(), enableEx);
}
}
} catch (SQLException rollbackEx) {
logger.error("Errore durante il rollback: " + rollbackEx.getMessage(), rollbackEx);
}
throw e;
} finally {
// Ripristina l'auto-commit originale
connection.setAutoCommit(originalAutoCommit);
}
}
/**
* Disabilita tutti i vincoli foreign key che referenziano la tabella/colonna specificata
*/
private List<String> disableForeignKeyConstraints(String tableName, String columnName) throws SQLException {
List<String> disabledConstraints = new ArrayList<>();
List<ForeignKeyDependency> dependencies = findAllDependencies(tableName, columnName);
for (ForeignKeyDependency dependency : dependencies) {
String disableQuery = String.format(
"ALTER TABLE [%s].[%s] NOCHECK CONSTRAINT [%s]",
dependency.getDependentSchema(),
dependency.getDependentTable(),
dependency.getConstraintName()
);
try (Statement stmt = connection.createStatement()) {
stmt.execute(disableQuery);
disabledConstraints.add(String.format("%s.%s.%s",
dependency.getDependentSchema(),
dependency.getDependentTable(),
dependency.getConstraintName()));
logger.trace(String.format("Disabilitato vincolo: %s", dependency.getConstraintName()));
}
}
return disabledConstraints;
}
/**
* Riabilita i vincoli foreign key precedentemente disabilitati
*/
private void enableForeignKeyConstraints(List<String> constraintIdentifiers) throws SQLException {
for (String constraintId : constraintIdentifiers) {
String[] parts = constraintId.split("\\.");
if (parts.length != 3) {
logger.warn("Formato constraint identifier non valido: " + constraintId);
continue;
}
String schema = parts[0];
String table = parts[1];
String constraint = parts[2];
String enableQuery = String.format(
"ALTER TABLE [%s].[%s] CHECK CONSTRAINT [%s]",
schema, table, constraint
);
try (Statement stmt = connection.createStatement()) {
stmt.execute(enableQuery);
logger.trace(String.format("Riabilitato vincolo: %s", constraint));
}
}
}
/**
* Verifica l'integrità dei vincoli dopo averli riabilitati
*/
private boolean checkConstraintIntegrity(List<String> constraintIdentifiers) throws SQLException {
boolean allValid = true;
for (String constraintId : constraintIdentifiers) {
String[] parts = constraintId.split("\\.");
if (parts.length != 3) continue;
String schema = parts[0];
String table = parts[1];
String constraint = parts[2];
// Verifica se ci sono violazioni del vincolo
String checkQuery = String.format("SELECT COUNT(*) as violations\n" +
" FROM [%s].[%s] child\n" +
" LEFT JOIN (\n" +
" SELECT fkc.referenced_object_id, fkc.referenced_column_id,\n" +
" fkc.parent_object_id, fkc.parent_column_id\n" +
" FROM sys.foreign_key_columns fkc\n" +
" INNER JOIN sys.foreign_keys fk ON fkc.constraint_object_id = fk.object_id\n" +
" WHERE fk.name = '%s'\n" +
" ) fk_info ON 1=1\n" +
" LEFT JOIN sys.tables ref_table ON fk_info.referenced_object_id = ref_table.object_id\n" +
" LEFT JOIN sys.schemas ref_schema ON ref_table.schema_id = ref_schema.schema_id\n" +
" WHERE child.[%s] IS NOT NULL\n" +
" AND NOT EXISTS (\n" +
" SELECT 1 FROM [%s].[%s] parent\n" +
" WHERE parent.[%s] = child.[%s]\n" +
" )", schema, table, constraint,
"temp_col", // Questo dovrebbe essere sostituito con la colonna effettiva
"temp_schema", "temp_table", "temp_parent_col", "temp_col");
// Query semplificata per il check di integrità
String simpleCheckQuery = String.format(
"DBCC CHECKCONSTRAINTS('[%s].[%s].[%s]') WITH ALL_CONSTRAINTS",
schema, table, constraint
);
try (Statement stmt = connection.createStatement()) {
try (ResultSet rs = stmt.executeQuery("SELECT 1")) {
// Se la query non solleva eccezioni, il vincolo è valido
logger.trace(String.format("Vincolo %s superato controllo integrità", constraint));
} catch (SQLException e) {
logger.warn(String.format("Violazione integrità per vincolo %s: %s", constraint, e.getMessage()));
allValid = false;
}
}
}
return allValid;
}
/**
* Trova tutte le dipendenze foreign key di una tabella/colonna
*/
private List<ForeignKeyDependency> findAllDependencies(String tableName, String columnName) throws SQLException {
List<ForeignKeyDependency> dependencies = new ArrayList<>();
String query = "SELECT \n" +
" fk.name AS constraint_name,\n" +
" OBJECT_SCHEMA_NAME(fk.parent_object_id) AS dependent_schema,\n" +
" OBJECT_NAME(fk.parent_object_id) AS dependent_table,\n" +
" COL_NAME(fkc.parent_object_id, fkc.parent_column_id) AS dependent_column,\n" +
" OBJECT_SCHEMA_NAME(fk.referenced_object_id) AS referenced_schema,\n" +
" OBJECT_NAME(fk.referenced_object_id) AS referenced_table,\n" +
" COL_NAME(fkc.referenced_object_id, fkc.referenced_column_id) AS referenced_column\n" +
" FROM sys.foreign_keys fk\n" +
" INNER JOIN sys.foreign_key_columns fkc ON fk.object_id = fkc.constraint_object_id\n" +
" WHERE OBJECT_NAME(fk.referenced_object_id) = ?\n" +
" AND COL_NAME(fkc.referenced_object_id, fkc.referenced_column_id) = ?\n" +
" ORDER BY dependent_table";
try (PreparedStatement stmt = connection.prepareStatement(query)) {
stmt.setString(1, tableName);
stmt.setString(2, columnName);
try (ResultSet rs = stmt.executeQuery()) {
while (rs.next()) {
ForeignKeyDependency dependency = new ForeignKeyDependency(
rs.getString("constraint_name"),
rs.getString("dependent_schema"),
rs.getString("dependent_table"),
rs.getString("dependent_column"),
rs.getString("referenced_schema"),
rs.getString("referenced_table"),
rs.getString("referenced_column")
);
dependencies.add(dependency);
}
}
}
return dependencies;
}
/**
* Aggiorna una tabella dipendente
*/
private void updateDependentTable(ForeignKeyDependency dependency, Object oldValue, Object newValue) throws SQLException {
String updateQuery = String.format(
"UPDATE [%s].[%s] SET [%s] = ? WHERE [%s] = ?",
dependency.getDependentSchema(),
dependency.getDependentTable(),
dependency.getDependentColumn(),
dependency.getDependentColumn()
);
try (PreparedStatement stmt = connection.prepareStatement(updateQuery)) {
stmt.setObject(1, newValue);
stmt.setObject(2, oldValue);
int rowsAffected = stmt.executeUpdate();
logger.info(String.format("Aggiornate %d righe in %s.%s",
rowsAffected, dependency.getDependentTable(), dependency.getDependentColumn()));
}
}
/**
* Aggiorna la tabella principale
*/
private void updateMainTable(String tableName, String columnName, Object oldValue, Object newValue) throws SQLException {
String updateQuery = String.format("UPDATE [%s] SET [%s] = ? WHERE [%s] = ?",
tableName, columnName, columnName);
try (PreparedStatement stmt = connection.prepareStatement(updateQuery)) {
stmt.setObject(1, newValue);
stmt.setObject(2, oldValue);
int rowsAffected = stmt.executeUpdate();
logger.info(String.format("Aggiornate %d righe nella tabella principale %s.%s",
rowsAffected, tableName, columnName));
}
}
/**
* Verifica se un valore esiste già come chiave primaria
*/
public boolean checkIfValueExists(String tableName, String columnName, Object value) throws SQLException {
String query = String.format("SELECT COUNT(*) FROM [%s] WHERE [%s] = ?", tableName, columnName);
try (PreparedStatement stmt = connection.prepareStatement(query)) {
stmt.setObject(1, value);
try (ResultSet rs = stmt.executeQuery()) {
if (rs.next()) {
return rs.getInt(1) > 0;
}
}
}
return false;
}
/**
* Ottiene un rapporto dettagliato delle dipendenze prima dell'aggiornamento
*/
public ForeignKeyDependencyReport getDependencyReport(String tableName, String columnName, Object value) throws SQLException {
List<ForeignKeyDependency> dependencies = findAllDependencies(tableName, columnName);
ForeignKeyDependencyReport report = new ForeignKeyDependencyReport();
for (ForeignKeyDependency dependency : dependencies) {
int count = countDependentRecords(dependency, value);
report.addDependency(dependency, count);
}
return report;
}
private int countDependentRecords(ForeignKeyDependency dependency, Object value) throws SQLException {
String countQuery = String.format(
"SELECT COUNT(*) FROM [%s].[%s] WHERE [%s] = ?",
dependency.getDependentSchema(),
dependency.getDependentTable(),
dependency.getDependentColumn()
);
try (PreparedStatement stmt = connection.prepareStatement(countQuery)) {
stmt.setObject(1, value);
try (ResultSet rs = stmt.executeQuery()) {
return rs.next() ? rs.getInt(1) : 0;
}
}
}
// Setter per modificare il comportamento sui vincoli FK
public void setDisableForeignKeyChecks(boolean disableForeignKeyChecks) {
this.disableForeignKeyChecks = disableForeignKeyChecks;
}
public boolean isDisableForeignKeyChecks() {
return disableForeignKeyChecks;
}
}

View File

@@ -0,0 +1,40 @@
package it.integry.ems.entity_logger.db_schema_manager.dto;
public class ForeignKeyDependency {
private final String constraintName;
private final String dependentSchema;
private final String dependentTable;
private final String dependentColumn;
private final String referencedSchema;
private final String referencedTable;
private final String referencedColumn;
public ForeignKeyDependency(String constraintName, String dependentSchema,
String dependentTable, String dependentColumn,
String referencedSchema, String referencedTable,
String referencedColumn) {
this.constraintName = constraintName;
this.dependentSchema = dependentSchema;
this.dependentTable = dependentTable;
this.dependentColumn = dependentColumn;
this.referencedSchema = referencedSchema;
this.referencedTable = referencedTable;
this.referencedColumn = referencedColumn;
}
// Getter methods
public String getConstraintName() { return constraintName; }
public String getDependentSchema() { return dependentSchema; }
public String getDependentTable() { return dependentTable; }
public String getDependentColumn() { return dependentColumn; }
public String getReferencedSchema() { return referencedSchema; }
public String getReferencedTable() { return referencedTable; }
public String getReferencedColumn() { return referencedColumn; }
@Override
public String toString() {
return String.format("%s.%s.%s -> %s.%s.%s",
dependentSchema, dependentTable, dependentColumn,
referencedSchema, referencedTable, referencedColumn);
}
}

View File

@@ -0,0 +1,37 @@
package it.integry.ems.entity_logger.db_schema_manager.dto;
import java.util.HashMap;
import java.util.Map;
public class ForeignKeyDependencyReport {
private final Map<ForeignKeyDependency, Integer> dependencyCount = new HashMap<>();
public void addDependency(ForeignKeyDependency dependency, int count) {
dependencyCount.put(dependency, count);
}
public Map<ForeignKeyDependency, Integer> getDependencies() {
return new HashMap<>(dependencyCount);
}
public int getTotalRecordsAffected() {
return dependencyCount.values().stream().mapToInt(Integer::intValue).sum();
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("=== RAPPORTO DIPENDENZE ===\n");
for (Map.Entry<ForeignKeyDependency, Integer> entry : dependencyCount.entrySet()) {
sb.append(String.format("Tabella: %s.%s, Colonna: %s, Record da aggiornare: %d\n",
entry.getKey().getDependentSchema(),
entry.getKey().getDependentTable(),
entry.getKey().getDependentColumn(),
entry.getValue()));
}
sb.append(String.format("TOTALE RECORD DA AGGIORNARE: %d\n", getTotalRecordsAffected()));
return sb.toString();
}
}

View File

@@ -6,7 +6,7 @@ import it.integry.annotations.PostContextConstruct;
import it.integry.ems.entity_logger.db_schema_manager.component.SQLServerDBSchemaManager;
import it.integry.ems.entity_logger.db_schema_manager.dto.*;
import it.integry.ems.looper.service.LooperService;
import it.integry.ems.settings.Model.AvailableConnectionsModel;
import it.integry.ems.settings.Model.AvailableConnectionModel;
import it.integry.ems.settings.Model.SettingsModel;
import it.integry.ems.settings.SettingsController;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
@@ -19,6 +19,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.sql.PreparedStatement;
@@ -26,6 +27,7 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.TimeUnit;
@Component
public class EntityLoggerComponent {
@@ -44,10 +46,8 @@ public class EntityLoggerComponent {
@PostContextConstruct(priority = 10)
private void init() {
try {
if (!UtilityDebug.isDebugExecution() || UtilityDebug.isIntegryServer()) {
if (!UtilityDebug.isDebugExecution()) {
this.syncDBScheme();
looperService.add(this::deleteOldlogs, 12 * 60 * 60 * 1000, EntityLoggerComponent.class.getName()); //Ogni 12 ore
}
} catch (Exception ex) {
logger.error(getClass().getName(), ex);
@@ -57,7 +57,7 @@ public class EntityLoggerComponent {
private void syncDBScheme() throws Exception {
AvailableConnectionsModel connectionsModel = settingsModel.getDefaultConnectionModel();
AvailableConnectionModel connectionsModel = settingsModel.getDefaultConnectionModel();
if (connectionsModel == null) {
throw new Exception("Impossibile ricavare la default connection");
@@ -107,7 +107,7 @@ public class EntityLoggerComponent {
}
if (settingsModel.getAvailableConnections().stream().noneMatch(x -> x.getDbName().equalsIgnoreCase(destDBName))) {
settingsModel.addAvailableConnection(new AvailableConnectionsModel()
settingsModel.addAvailableConnection(new AvailableConnectionModel()
.setInternalDb(false)
.setHost(dbHost)
.setUsername(dbUsername)
@@ -204,65 +204,53 @@ public class EntityLoggerComponent {
destDBSchema.close();
}
@Scheduled(fixedDelay = 12, timeUnit = TimeUnit.HOURS, zone = "Europe/Rome")
private void deleteOldlogs() {
MultiDBTransactionManager sourceMultiDB = null, historyMultiDB = null;
if (UtilityDebug.isDebugExecution())
return;
try {
List<AvailableConnectionsModel> connectionsModels = settingsModel.getAvailableConnections();
connectionsModels = Stream.of(connectionsModels)
.filter(AvailableConnectionsModel::getInternalDb)
.toList();
List<AvailableConnectionModel> connectionsModels = settingsModel.getAvailableConnectionsWithoutDuplicatedProfiles(true);
String historyProfileDB = settingsController.getHistoryProfileDb();
historyMultiDB = new MultiDBTransactionManager(historyProfileDB);
for (AvailableConnectionsModel sourceConnectionModel : connectionsModels) {
String sql = "SELECT * FROM stb_log_entity_setup" +
" WHERE entity_name <> " + UtilityDB.valueToString(StbLogEntitySetup.ENTITY);
try (MultiDBTransactionManager historyMultiDB = new MultiDBTransactionManager(historyProfileDB)) {
sourceMultiDB = new MultiDBTransactionManager(sourceConnectionModel.getProfileName());
List<HashMap<String, Object>> result = UtilityDB.executeSimpleQuery(sourceMultiDB.getPrimaryConnection(), sql);
sourceMultiDB.closeAll();
for (AvailableConnectionModel sourceConnectionModel : connectionsModels) {
String sql = "SELECT * FROM stb_log_entity_setup" +
" WHERE entity_name <> " + UtilityDB.valueToString(StbLogEntitySetup.ENTITY);
for (HashMap<String, Object> stbLogEntitySetup : result) {
String tableName = UtilityHashMap.getValueIfExists(stbLogEntitySetup, "entity_name");
int logDays = UtilityHashMap.getValueIfExists(stbLogEntitySetup, "log_days");
List<HashMap<String, Object>> result = null;
int i = 0;
try {
do {
String checkSql = String.format("DELETE TOP ( 1000 ) FROM %s WHERE log_created_at < DATEADD(DAY, %d, GETDATE()) AND log_created_profile = %s",
tableName, -1 * logDays, UtilityDB.valueToString(sourceConnectionModel.getProfileName()));
try (MultiDBTransactionManager sourceMultiDB = new MultiDBTransactionManager(sourceConnectionModel.getProfileName())) {
result = UtilityDB.executeSimpleQuery(sourceMultiDB.getPrimaryConnection(), sql);
}
PreparedStatement ps = historyMultiDB.prepareStatement(checkSql);
i = ps.executeUpdate();
ps.close();
historyMultiDB.commitAll();
} while (i > 0);
for (HashMap<String, Object> stbLogEntitySetup : result) {
String tableName = UtilityHashMap.getValueIfExists(stbLogEntitySetup, "entity_name");
int logDays = UtilityHashMap.getValueIfExists(stbLogEntitySetup, "log_days");
} catch (Exception ex) {
logger.error("EntityLogDeleter", "Errore durante la cancellazione dei vecchi record da " + tableName);
logger.error("EntityLogDeleter", ex);
int i = 0;
try {
do {
String checkSql = String.format("DELETE TOP ( 1000 ) FROM %s WHERE log_created_at < DATEADD(DAY, %d, GETDATE()) AND log_created_profile = %s",
tableName, -1 * logDays, UtilityDB.valueToString(sourceConnectionModel.getProfileName()));
PreparedStatement ps = historyMultiDB.prepareStatement(checkSql);
i = ps.executeUpdate();
ps.close();
historyMultiDB.commitAll();
} while (i > 0);
} catch (Exception ex) {
logger.error("EntityLogDeleter", "Errore durante la cancellazione dei vecchi record da " + tableName);
logger.error("EntityLogDeleter", ex);
}
}
}
}
historyMultiDB.closeAll();
} catch (Exception ex) {
logger.error("EntityLoggerComponent.deleteOldlogs", ex);
try {
if (sourceMultiDB != null) sourceMultiDB.closeAll();
if (historyMultiDB != null) historyMultiDB.closeAll();
} catch (Exception e) {
logger.error("EntityLoggerComponent.deleteOldlogs", e);
}
}
}

View File

@@ -0,0 +1,8 @@
package it.integry.ems.exception;
public class DistributoreDatabaseNotPresentException extends Exception {
public DistributoreDatabaseNotPresentException() {
super("Distributore database not present yet");
}
}

View File

@@ -1,9 +1,6 @@
package it.integry.ems.expansion;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Observable;
import java.util.Observer;
import java.util.*;
public class ObservableArrayList<T> extends Observable {
@@ -122,4 +119,16 @@ public class ObservableArrayList<T> extends Observable {
notifyObservers();
}
@Override
public boolean equals(Object o) {
if (!(o instanceof ObservableArrayList)) return false;
ObservableArrayList<?> that = (ObservableArrayList<?>) o;
return Objects.equals(value, that.value);
}
@Override
public int hashCode() {
return Objects.hashCode(value);
}
}

View File

@@ -1,5 +1,6 @@
package it.integry.ems.expansion;
import java.util.Objects;
import java.util.Observable;
public class ObservableField<T> extends Observable {
@@ -34,4 +35,16 @@ public class ObservableField<T> extends Observable {
super.addObserver((o, arg) -> observerCallback.run());
}
@Override
public boolean equals(Object o) {
if (!(o instanceof ObservableField)) return false;
ObservableField<?> that = (ObservableField<?>) o;
return Objects.equals(value, that.value);
}
@Override
public int hashCode() {
return Objects.hashCode(value);
}
}

View File

@@ -174,7 +174,7 @@ public abstract class BaseEntityExporter implements IEntityExporter {
.map(x -> (FileItem) x)
.toList();
String pathFile = UtilityDirs.getDirectoryExport(multiDBTransactionManager.getPrimaryDatasource().getDbName(), type, format).getAbsolutePath();
String pathFile = UtilityDirs.getDirectoryExport(multiDBTransactionManager.getPrimaryConnection().getDbName(), type, format).getAbsolutePath();
for (FileItem file : files) {
File tempFile = new File(pathFile + File.separator + file.getFileName());
@@ -369,7 +369,7 @@ public abstract class BaseEntityExporter implements IEntityExporter {
entityExportResponse.setMessageContent("Messaggio creato automaticamente: " + "INVIO " + type + " formato " + format);
}
fileSharerSettings = MailService.readParameter(multiDBTransactionManager, null);
fileSharerSettings = MailService.readParameter(multiDBTransactionManager.getPrimaryConnection(), null);
((EmailFileSharerSettings) fileSharerSettings)
.withSubject(entityExportResponse.getMessageSubject())
.withTextMessage(entityExportResponse.getMessageContent())
@@ -426,7 +426,7 @@ public abstract class BaseEntityExporter implements IEntityExporter {
try {
MailService mailService = ContextLoader.getCurrentWebApplicationContext().getBean(MailService.class);
mailService.sendInfoMail(multiDBTransactionManager, notificationEmail,
mailService.sendInfoMail(multiDBTransactionManager.getPrimaryConnection(), notificationEmail,
String.format("Esportazione di %s - %s", getType(), getFormat()),
String.format("come da accordi, l'esportazione %s - %s &egrave; stata completata.", getType(), getFormat()));

View File

@@ -4,6 +4,7 @@ import it.integry.ems.response.FileItem;
import it.integry.ems.service.EntityProcessor;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems_model.entity.WtbUsersInfo;
import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityResultSet;
@@ -27,8 +28,13 @@ public class ExportFromQuery {
@Autowired
private EntityProcessor entityProcessor;
@Autowired
private SetupGest setupGest;
public EntityExportResponse export (String userName, String type, String format, String whereCond) throws Exception {
String query = setupGest.getExportSetup(multiDBTransactionManager.getPrimaryConnection(), type, format, "QUERY");
WtbUsersInfo wtbUsersInfo =
new WtbUsersInfo()
.setUserName(userName)
@@ -38,18 +44,20 @@ public class ExportFromQuery {
entityProcessor.processEntity(wtbUsersInfo, multiDBTransactionManager);
String queryCustom = wtbUsersInfo.getQueryCustom();
if (UtilityString.isNullOrEmpty(queryCustom))
if (UtilityString.isNullOrEmpty(wtbUsersInfo.getQueryCustom()) && UtilityString.isNullOrEmpty(query))
throw new Exception(
String.format(
"Query non configurata per l'utente %s tipo %s formato %s",
"Query non configurata per l'utente %s tipo %s formato %s o per il formato.",
userName, type, format));
queryCustom = UtilityDB.addwhereCond(queryCustom, whereCond, true);
if (!UtilityString.isNullOrEmpty(wtbUsersInfo.getQueryCustom())) {
query = wtbUsersInfo.getQueryCustom();
}
query = UtilityDB.addwhereCond(query, whereCond, true);
PreparedStatement stm = multiDBTransactionManager
.getPrimaryConnection()
.prepareStatement(queryCustom,
.prepareStatement(query,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);

View File

@@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.dataformat.csv.CsvSchema;
import com.fasterxml.jackson.dataformat.csv.CsvSchema.Column;
import it.integry.common.var.CommonConstants;
import it.integry.ems_model.ImportExport.Interfaces.IExportFormat;
import it.integry.ems_model.ImportExport.Interfaces.IImportFormat;
import it.integry.ems_model.annotation.DtoField;
@@ -64,7 +63,7 @@ public class CsvMapper<T> {
builder.addColumn(new Column(i, columns[i]));
}
builder.setLineSeparator(System.getProperty("line.separator"));
builder.setLineSeparator(System.lineSeparator());
CsvSchema schema = builder.build().withoutQuoteChar();
mapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
@@ -74,6 +73,7 @@ public class CsvMapper<T> {
public List<T> deserialize(String csv, Class<T> dtoClass, String splitChar) throws Exception {
List<T> outputList = null;
String[] headers = null;
Integer rows = 0;
String delimiter = UtilityString.identifyLineDelimiter(csv);
ByteBuffer byteBuffer = ByteBuffer.wrap(csv.getBytes());
@@ -83,6 +83,7 @@ public class CsvMapper<T> {
for (int i = 0; i < byteBuffer.capacity(); i++) {
line.append((char) byteBuffer.get());
if (line.toString().endsWith(delimiter)) {
rows++;
if (firstLine) {
firstLine = false;
headers = line.toString().replace(delimiter, "").split(splitChar);
@@ -105,37 +106,44 @@ public class CsvMapper<T> {
line = new StringBuilder();
continue;
}
String[] datas = line.toString().replace(delimiter, "").split(splitChar);
T bean = (T) dtoClass.newInstance();
for (int j = 0; j < datas.length; j++) {
String header = headers[j].trim();
if (header.compareTo("") != 0) {
Field field = map.get(header.toLowerCase());
if (field != null) {
try {
String[] datas = line.toString().replace(delimiter, "").split(splitChar);
T bean = (T) dtoClass.newInstance();
for (int j = 0; j < datas.length; j++) {
String header = headers[j].trim();
if (header.compareTo("") != 0) {
Field field = map.get(header.toLowerCase());
DtoField dtoField = field.getAnnotation(DtoField.class);
if (field != null) {
field.setAccessible(true);
DtoField dtoField = field.getAnnotation(DtoField.class);
field.setAccessible(true);
Object columnValue;
if (field.getGenericType() != String.class && UtilityString.isNullOrEmpty(datas[j].trim())) {
columnValue = null;
} else {
columnValue = datas[j].trim();
}
Object o = SqlFieldHolder.applyConvert(columnValue, field.getGenericType());
field.set(bean, o);
Object columnValue;
if (field.getGenericType() != String.class && UtilityString.isNullOrEmpty(datas[j].trim())) {
columnValue = null;
} else {
columnValue = datas[j].trim();
}
Object o = SqlFieldHolder.applyConvert(columnValue, field.getGenericType());
field.set(bean, o);
}
}
line = new StringBuilder();
if (outputList == null) {
outputList = new ArrayList<T>();
}
outputList.add(bean);
} catch(Exception e) {
throw new Exception("ERRORE DI SINTASSI SU RIGA " + rows);
}
line = new StringBuilder();
if (outputList == null) {
outputList = new ArrayList<T>();
}
outputList.add(bean);
}
}
byteBuffer.clear();

View File

@@ -42,14 +42,14 @@ public class RequestDataDTO {
private String password;
private boolean includeNulls = false;
private IntegryApplicationEnum integryApplication = IntegryApplicationEnum.PVM;
private IntegryApplicationEnum integryApplication;
private UserDTO userDTO;
@PostConstruct
public void init() throws IOException, InterruptedException {
if (request != null && request.getQueryString() != null && request.getQueryString().contains(CommonConstants.PROFILE_DB)) {
if (request != null && request.getParameter(CommonConstants.PROFILE_DB) != null) {
profileDB = request.getParameter(CommonConstants.PROFILE_DB);
} else if (request != null && request.getHeader(CommonConstants.PROFILE_DB) != null) {
profileDB = request.getHeader(CommonConstants.PROFILE_DB);
@@ -98,6 +98,12 @@ public class RequestDataDTO {
.setPassword("sql");
}
public static RequestDataDTO scheduledOperationsMockupData() {
return new RequestDataDTO()
.setUsername("INTEGRY")
.setPassword("INTEGRY");
}
public boolean isValidProfileDB() {
return !UtilityString.isNullOrEmpty(profileDB);
}

View File

@@ -0,0 +1,46 @@
package it.integry.ems.json;
import com.fasterxml.jackson.databind.module.SimpleModule;
import it.integry.ems.adapter.*;
import it.integry.ems.response.EsitoType;
import it.integry.ems.schedule.new_cron_job.controller.AutomatedOperationController;
import it.integry.ems.schedule.new_cron_job.dto.operations.base_classes.BaseAutomatedOperationDTO;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.Date;
public class JsonObjectMapperConfig {
public static SimpleModule addDefaultAdapters(SimpleModule module) {
module.addSerializer(Date.class, new JsonDateAdapterSerializer());
module.addDeserializer(Date.class, new JsonDateAdapterDeserializer());
module.addSerializer(LocalDate.class, new JsonLocalDateAdapterSerializer());
module.addDeserializer(LocalDate.class, new JsonLocalDateAdapterDeserializer());
module.addSerializer(LocalDateTime.class, new JsonLocalDateTimeAdapterSerializer());
module.addDeserializer(LocalDateTime.class, new JsonLocalDateTimeAdapterDeserializer());
module.addSerializer(LocalTime.class, new JsonLocalTimeAdapterSerializer());
module.addDeserializer(LocalTime.class, new JsonLocalTimeAdapterDeserializer());
module.addSerializer(EsitoType.class, new EsitoSerialize());
module.addDeserializer(EsitoType.class, new EsitoDeserialize());
module.addDeserializer(BigDecimal.class, new BigDecimalDeserialize());
module.addDeserializer(Integer.class, new IntegerDeserializer());
module.addDeserializer(String.class, new StringUnicodeDeserialize());
module.addDeserializer(Boolean.class, new BooleanDeserializer());
module.addDeserializer(BaseAutomatedOperationDTO.class, new AutomatedOperationController.AutomatedOperationsDeserializer());
return module;
}
}

View File

@@ -13,10 +13,6 @@ import com.fasterxml.jackson.databind.ser.PropertyFilter;
import com.fasterxml.jackson.databind.ser.PropertyWriter;
import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
import it.integry.ems.adapter.*;
import it.integry.ems.response.EsitoType;
import it.integry.ems.schedule.new_cron_job.controller.AutomatedOperationController;
import it.integry.ems.schedule.new_cron_job.dto.operations.base_classes.BaseAutomatedOperationDTO;
import it.integry.ems_model.annotation.EntityChild;
import it.integry.ems_model.annotation.PK;
import it.integry.ems_model.annotation.SqlField;
@@ -28,12 +24,7 @@ import it.integry.ems_model.types.OperationType;
import org.reflections.Reflections;
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.AbstractMap;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -43,33 +34,7 @@ public class ResponseJSONObjectMapper extends ObjectMapper {
private static final long serialVersionUID = 1L;
public SimpleModule addDefaultAdapters(SimpleModule module) {
module.addSerializer(Date.class, new JsonDateAdapterSerializer());
module.addDeserializer(Date.class, new JsonDateAdapterDeserializer());
module.addSerializer(LocalDate.class, new JsonLocalDateAdapterSerializer());
module.addDeserializer(LocalDate.class, new JsonLocalDateAdapterDeserializer());
module.addSerializer(LocalDateTime.class, new JsonLocalDateTimeAdapterSerializer());
module.addDeserializer(LocalDateTime.class, new JsonLocalDateTimeAdapterDeserializer());
module.addSerializer(LocalTime.class, new JsonLocalTimeAdapterSerializer());
module.addDeserializer(LocalTime.class, new JsonLocalTimeAdapterDeserializer());
module.addSerializer(EsitoType.class, new EsitoSerialize());
module.addDeserializer(EsitoType.class, new EsitoDeserialize());
module.addDeserializer(BigDecimal.class, new BigDecimalDeserialize());
module.addDeserializer(Integer.class, new IntegerDeserializer());
module.addDeserializer(String.class, new StringUnicodeDeserialize());
module.addDeserializer(Boolean.class, new BooleanDeserializer());
module.addDeserializer(BaseAutomatedOperationDTO.class, new AutomatedOperationController.AutomatedOperationsDeserializer());
return module;
}
public ResponseJSONObjectMapper() {
@@ -141,7 +106,7 @@ public class ResponseJSONObjectMapper extends ObjectMapper {
SimpleModule simpleModule = new SimpleModule();
simpleModule = addDefaultAdapters(simpleModule);
JsonObjectMapperConfig.addDefaultAdapters(simpleModule);
setupEntityModules(simpleModule);
registerModule(simpleModule);

View File

@@ -1,7 +1,8 @@
package it.integry.ems.license;
import it.integry.common.var.CommonConstants;
import it.integry.ems.javabeans.RequestDataDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.context.ContextLoader;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import javax.servlet.http.HttpServletRequest;
@@ -11,7 +12,6 @@ import java.util.Random;
public class LicenseCheckInterceptor extends HandlerInterceptorAdapter {
@Autowired
private LicenseComponent licenseComponent;
@@ -19,13 +19,9 @@ public class LicenseCheckInterceptor extends HandlerInterceptorAdapter {
HttpServletRequest request,
HttpServletResponse response, Object handler) {
RequestDataDTO requestData = ContextLoader.getCurrentWebApplicationContext().getBean(RequestDataDTO.class);
String profileDB = null;
if (request != null && request.getQueryString() != null && request.getQueryString().contains(CommonConstants.PROFILE_DB)) {
profileDB = request.getParameter(CommonConstants.PROFILE_DB);
} else if (request != null && request.getHeader(CommonConstants.PROFILE_DB) != null) {
profileDB = request.getHeader(CommonConstants.PROFILE_DB);
}
String profileDB = requestData.getProfileDB();
LicenseStatusDTO licenseStatusDTO = null;
if (profileDB != null) licenseStatusDTO = licenseComponent.getLicenseStatus(profileDB);

View File

@@ -8,9 +8,9 @@ import it.integry.ems.json.ResponseJSONObjectMapper;
import it.integry.ems.response.EsitoType;
import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems.service.HttpRestWrapper;
import it.integry.ems.settings.Model.AvailableConnectionsModel;
import it.integry.ems.settings.Model.AvailableConnectionModel;
import it.integry.ems.settings.Model.SettingsModel;
import it.integry.ems.sync.MultiDBTransaction.AdvancedDataSource;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.utility.UtilityDebug;
import it.integry.ems_model.config.EmsRestConstants;
@@ -25,6 +25,7 @@ import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
@Component
@@ -59,11 +60,11 @@ public class LicenseComponent {
if (!canStart)
return;
List<AvailableConnectionsModel> availableConnectionsModels = settingsModel.getAvailableConnections(true);
List<AvailableConnectionModel> availableConnectionModels = settingsModel.getAvailableConnections(true);
try (MultiDBTransactionManager multiDBTransactionManager = new MultiDBTransactionManager()) {
for (AvailableConnectionsModel model : availableConnectionsModels) {
for (AvailableConnectionModel model : availableConnectionModels) {
multiDBTransactionManager.addConnection(model);
}
@@ -82,12 +83,12 @@ public class LicenseComponent {
final HashMap<String, String> listAziende = new HashMap<>();
for (AdvancedDataSource model : multiDBTransactionManager.getActiveConnections()) {
for (Connection connection : multiDBTransactionManager.getActiveConnections()) {
String sql = "SELECT part_iva FROM azienda WHERE part_iva is not null";
String partIva = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(model.getConnection(), sql);
String partIva = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);
if (!UtilityString.isNullOrEmpty(partIva))
listAziende.put(model.getProfileName(), partIva);
listAziende.put(connection.getProfileName(), partIva);
}
String jsonBody = jsonObjectMapper.writeValueAsString(listAziende.values());
@@ -105,14 +106,19 @@ public class LicenseComponent {
} else {
List<LicenseStatusDTO> licenses = response.getDTO(new TypeReference<List<LicenseStatusDTO>>() {
});
if (licenses == null) return;
if (licenses == null || licenses.isEmpty()) return;
listAziende.forEach((key, value) -> {
cachedLicenseStatus.remove(key);
licenses.stream().filter(x -> x.getPartIva().equalsIgnoreCase(value))
.findFirst()
.ifPresent(license -> cachedLicenseStatus.put(key, license));
final Optional<LicenseStatusDTO> licenseSearch = licenses.stream().filter(x -> x.getPartIva().equalsIgnoreCase(value))
.findFirst();
if (licenseSearch.isPresent()) {
cachedLicenseStatus.put(key, licenseSearch.get());
} else {
cachedLicenseStatus.put(key, licenses.get(0));
}
});
}

View File

@@ -10,10 +10,13 @@ import java.util.Date;
public class LicenseStatusDTO {
@SqlField("part_iva")
private String partIva;
@SqlField("classe_merito")
private Quality quality;
@SqlField
private Status status;
@SqlField("data_scad_license")
private Date expiringDate;

View File

@@ -0,0 +1,32 @@
package it.integry.ems.listener;
import org.apache.logging.log4j.LogManager;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
public class Log4jShutdownListener implements ServletContextListener {
@Override
public void contextInitialized(ServletContextEvent servletContextEvent) {
}
@Override
public void contextDestroyed(ServletContextEvent sce) {
try {
// Pulizia esplicita del ThreadLocal
// ContextAnchor.THREAD_CONTEXT.remove();
// Shutdown completo di Log4j
LogManager.shutdown();
// Attesa per completamento shutdown
Thread.sleep(500);
// Forza garbage collection
System.gc();
} catch (Exception e) {
System.err.println("Errore durante la pulizia dei ThreadLocal di Log4j: " + e.getMessage());
}
}
}

View File

@@ -15,6 +15,8 @@ public class TaskModel implements Runnable {
private final Logger logger = LogManager.getLogger();
private boolean mInterrupted = false;
public TaskModel(Runnable runnable, long delayTimeInMillis, String tagName) {
mRunnable = runnable;
mDelayTime = delayTimeInMillis;
@@ -28,14 +30,14 @@ public class TaskModel implements Runnable {
public void run() {
Date lastExecution = new Date(0L);
while (!mThread.isInterrupted()) {
while (!mInterrupted) {
try {
if (new Date().getTime() - lastExecution.getTime() > mDelayTime) {
mRunnable.run();
lastExecution = new Date();
}
Thread.sleep(10);
if(!mInterrupted) Thread.sleep(10);
} catch (InterruptedException iex) {
//Do nothing
} catch (Exception ex) {
@@ -46,7 +48,7 @@ public class TaskModel implements Runnable {
}
public void interrupt() {
this.mThread.interrupt();
mInterrupted = true;
}
public String getTagName() {

View File

@@ -1,10 +1,9 @@
package it.integry.ems.looper.service;
import com.annimon.stream.Stream;
import it.integry.ems.looper.dto.LoopDTO;
import it.integry.ems.looper.dto.TaskModel;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.annotation.Scope;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import javax.annotation.PreDestroy;
@@ -12,18 +11,12 @@ import java.util.ArrayList;
import java.util.Random;
@Component
@Scope(value = ConfigurableBeanFactory.SCOPE_SINGLETON)
public class LooperService {
private final ArrayList<LoopDTO> mLoopsHandler = new ArrayList<>();
private final ArrayList<TaskModel> mLoopsTask = new ArrayList<>();
private final Logger logger = LogManager.getLogger();
@PreDestroy
public void preDestroy() {
for (TaskModel taskModel : mLoopsTask) {
taskModel.interrupt();
}
}
public int add(Runnable runnable, int delayTimeInMillis, String tagName) {
int newId = -1;
@@ -32,7 +25,8 @@ public class LooperService {
do {
newId = new Random().nextInt(10240);
int finalNewId = newId;
exists = Stream.of(mLoopsHandler).anyMatch(x -> x.getId() == finalNewId);
exists = mLoopsHandler.stream()
.anyMatch(x -> x.getId() == finalNewId);
} while (exists);
this.mLoopsHandler.add(new LoopDTO()
@@ -47,5 +41,16 @@ public class LooperService {
return newId;
}
@PreDestroy
public void destroy() {
logger.info("Shutting down LooperService (" + mLoopsHandler.size() + " threads)");
for (int i = 0; i < mLoopsTask.size(); i++) {
TaskModel taskModel = mLoopsTask.get(i);
taskModel.interrupt();
logger.trace("Destroyed " + (i + 1) + " loop (" + taskModel.getTagName() + ")");
}
}
}

View File

@@ -1,6 +1,7 @@
package it.integry.ems.menu.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.microsoft.sqlserver.jdbc.SQLServerConnection;
import com.microsoft.sqlserver.jdbc.SQLServerPreparedStatement;
import it.integry.annotations.PostContextAutowired;
import it.integry.annotations.PostContextConstruct;
@@ -11,7 +12,6 @@ import it.integry.ems.menu.dto.StbMenuOpzDTO;
import it.integry.ems.menu.dto.StbTipoAziendaDTO;
import it.integry.ems.service.MailService;
import it.integry.ems.settings.SettingsController;
import it.integry.ems.sync.MultiDBTransaction.AdvancedDataSource;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.utility.UtilityDirs;
@@ -57,17 +57,17 @@ public class MenuConfigurationService {
final MenuConfigDTO menuConfig = loadMenuData();
for (AdvancedDataSource advancedDataSource : multiDBTransactionManager.getActiveConnections()) {
for (Connection connection : multiDBTransactionManager.getActiveConnections()) {
if (advancedDataSource.getDataSource().getDbName().equalsIgnoreCase("menu") || isHistoryDB(advancedDataSource))
if (connection.getDbName().equalsIgnoreCase("menu") || isHistoryDB(connection))
continue;
try {
//LocalDateTime startTime = UtilityLocalDate.getNowTime();
internalRefresh(advancedDataSource.getConnection(), menuConfig);
internalRefresh(connection, menuConfig);
//logger.debug("Menu refresh time: " + ChronoUnit.SECONDS.between(startTime, UtilityLocalDate.getNowTime()));
} catch (Exception ex) {
logger.error("Errore durante l'aggiornamento del menu di " + advancedDataSource.getProfileName(), ex);
logger.error("Errore durante l'aggiornamento del menu di " + connection.getProfileName(), ex);
throw ex;
}
}
@@ -75,9 +75,9 @@ public class MenuConfigurationService {
logger.debug(MenuConfigurationService.class.getSimpleName() + ": Fine refresh menu");
}
private boolean isHistoryDB(AdvancedDataSource advancedDataSource) throws Exception {
private boolean isHistoryDB(Connection connection) throws Exception {
String historyProfileDB = settingsController.getHistoryProfileDb();
return historyProfileDB.equalsIgnoreCase(advancedDataSource.getProfileName());
return historyProfileDB.equalsIgnoreCase(connection.getProfileName());
}
public void refresh(Connection connection, boolean forceRefresh) throws Exception {
@@ -101,6 +101,7 @@ public class MenuConfigurationService {
}
private void internalRefresh(Connection connection, MenuConfigDTO menuConfig, boolean forceRefresh) throws Exception {
SQLServerConnection sqlServerConnection = connection.unwrap(SQLServerConnection.class);
final Azienda azienda = Azienda.getDefaultAzienda(connection);
if (azienda.getTipoAzienda() == null)
@@ -121,7 +122,7 @@ public class MenuConfigurationService {
"descrizione, gest_name, entity_name, picture_menu, picture_select, object_type, flag_printer_setup, parameter, note, open_type, is_deprecated)" +
" VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
try (SQLServerPreparedStatement insertBulkPs = (SQLServerPreparedStatement) connection.prepareStatement(insertStbMenuOpzSQL)) {
try (SQLServerPreparedStatement insertBulkPs = (SQLServerPreparedStatement) sqlServerConnection.prepareStatement(insertStbMenuOpzSQL)) {
for (StbMenuOpzDTO stbMenuOpzDto : menuConfig.getStbMenuOpz()) {
insertBulkPs.setString(1, stbMenuOpzDto.getCodOpz());
@@ -169,7 +170,7 @@ public class MenuConfigurationService {
"pos_tipo_azienda, pos_cliente, descrizione_estesa) " +
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
try (SQLServerPreparedStatement insertBulkPs = (SQLServerPreparedStatement) connection.prepareStatement(insertStbMenuSql)) {
try (SQLServerPreparedStatement insertBulkPs = (SQLServerPreparedStatement) sqlServerConnection.prepareStatement(insertStbMenuSql)) {
for (StbMenuDTO stbMenuDto : stbMenus) {
insertBulkPs.setString(1, stbMenuDto.getCodOpz());

View File

@@ -7,7 +7,7 @@ import it.integry.ems.migration._base.MigrationModelInterface;
import it.integry.ems.service.MailService;
import it.integry.ems.settings.Model.SettingsModel;
import it.integry.ems.settings.SettingsController;
import it.integry.ems.sync.MultiDBTransaction.AdvancedDataSource;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.utility.UtilityDebug;
import it.integry.ems_model.config.EmsRestConstants;
@@ -25,7 +25,6 @@ import org.reflections.Reflections;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.io.IOException;
import java.lang.reflect.Modifier;
import java.sql.SQLException;
import java.util.*;
@@ -75,12 +74,12 @@ public class MigrationComponent {
}
public void startMigrationsGlobally(MultiDBTransactionManager multiDBTransactionManager) throws Exception {
List<AdvancedDataSource> advancedDataSources;
List<Connection> advancedDataSources;
try {
advancedDataSources = multiDBTransactionManager.getActiveConnections();
advancedDataSources = advancedDataSources.stream()
.filter(AdvancedDataSource::isInternalDb)
.filter(Connection::isInternalDb)
.collect(Collectors.toList());
} catch (SQLException e) {
advancedDataSources = new ArrayList<>();
@@ -89,7 +88,7 @@ public class MigrationComponent {
Exception firstException = null;
for (final AdvancedDataSource advancedDataSource : advancedDataSources) {
for (final Connection advancedDataSource : advancedDataSources) {
try {
executeMigrationGroup(advancedDataSource);
} catch (Exception e) {
@@ -102,9 +101,9 @@ public class MigrationComponent {
// throw firstException;
}
public void executeMigrationGroup(AdvancedDataSource advancedDataSource) throws Exception {
migrateStatus(advancedDataSource);
List<StbMigrationStatus> migrationStatuses = retrieveAllMigrationsStatus(advancedDataSource);
public void executeMigrationGroup(Connection connection) throws Exception {
migrateStatus(connection);
List<StbMigrationStatus> migrationStatuses = retrieveAllMigrationsStatus(connection);
for (Class<? extends MigrationModelInterface> migrationClass : allMigrationsList) {
long migrationNumber = Long.parseLong(migrationClass.getSimpleName().replace("Migration_", ""));
@@ -113,47 +112,47 @@ public class MigrationComponent {
continue;
try {
executeMigration(migrationClass, advancedDataSource, settingsController, settingsModel, droolsDataCompleting);
updateLastMigrationIntoDB(advancedDataSource, migrationNumber);
executeMigration(migrationClass, connection, settingsController, settingsModel, droolsDataCompleting);
updateLastMigrationIntoDB(connection, migrationNumber);
advancedDataSource.getConnection().commit();
connection.commit();
} catch (Exception e) {
try {
advancedDataSource.getConnection().rollback();
connection.rollback();
} catch (Exception ex) {
ex.printStackTrace();
logger.error("MigrationService - Rollback", ex);
}
trackMigrationError(advancedDataSource, migrationNumber, e);
trackMigrationError(connection, migrationNumber, e);
throw e;
}
}
migrationsErrorMapByProfiles.putIfAbsent(advancedDataSource.getProfileName(), false);
migrationsErrorMapByProfiles.replace(advancedDataSource.getProfileName(), false);
migrationsErrorMapByProfiles.putIfAbsent(connection.getProfileName(), false);
migrationsErrorMapByProfiles.replace(connection.getProfileName(), false);
}
private void executeMigration(Class<? extends MigrationModelInterface> migrationClass,
AdvancedDataSource advancedDataSource,
Connection connection,
SettingsController settingsController,
SettingsModel settingsModel,
DroolsDataCompleting droolsDataCompleting) throws Exception {
logger.info("Applico " + migrationClass.getSimpleName() + " " + advancedDataSource.getProfileName());
logger.info("Applico " + migrationClass.getSimpleName() + " " + connection.getProfileName());
MigrationModelInterface migrationInstance = migrationClass.newInstance();
migrationInstance.init(advancedDataSource, settingsController, settingsModel, droolsDataCompleting);
migrationInstance.init(connection, settingsController, settingsModel, droolsDataCompleting);
migrationInstance.up();
advancedDataSource.getConnection().commit();
connection.commit();
}
public void updateLastMigrationIntoDB(AdvancedDataSource advancedDataSource, long lastMigraton) throws Exception {
public void updateLastMigrationIntoDB(Connection connection, long lastMigraton) throws Exception {
String sql = "SELECT * FROM " + StbMigrationStatus.ENTITY + " WHERE migration_code = " + lastMigraton;
StbMigrationStatus stbMigrationStatus = UtilityDB.executeSimpleQueryOnlyFirstRowDTO(advancedDataSource.getConnection(), sql, StbMigrationStatus.class);
StbMigrationStatus stbMigrationStatus = UtilityDB.executeSimpleQueryOnlyFirstRowDTO(connection, sql, StbMigrationStatus.class);
if (stbMigrationStatus == null) {
stbMigrationStatus = new StbMigrationStatus()
@@ -171,9 +170,9 @@ public class MigrationComponent {
stbMigrationStatus.setOperation(OperationType.UPDATE);
}
stbMigrationStatus.manageWithParentConnection(advancedDataSource.getConnection());
stbMigrationStatus.manageWithParentConnection(connection);
advancedDataSource.getConnection().commit();
connection.commit();
}
@@ -185,9 +184,9 @@ public class MigrationComponent {
}
private void migrateStatus(AdvancedDataSource advancedDataSource) throws Exception {
final long lastMigrationNumber = getLastMigrationFromDB(advancedDataSource);
final List<Long> alreadyExecutedMigrations = retrieveAllMigrationsStatus(advancedDataSource)
private void migrateStatus(Connection connection) throws Exception {
final long lastMigrationNumber = getLastMigrationFromDB(connection);
final List<Long> alreadyExecutedMigrations = retrieveAllMigrationsStatus(connection)
.stream()
.map(StbMigrationStatus::getMigrationCode)
.collect(Collectors.toList());
@@ -205,25 +204,25 @@ public class MigrationComponent {
.collect(Collectors.toList());
for (StbMigrationStatus stbMigrationStatus : migrationStatusesToMigrate)
stbMigrationStatus.manageWithParentConnection(advancedDataSource.getConnection());
stbMigrationStatus.manageWithParentConnection(connection);
advancedDataSource.getConnection().commit();
connection.commit();
}
private Long getLastMigrationFromDB(AdvancedDataSource advancedDataSource) throws Exception {
private Long getLastMigrationFromDB(Connection connection) throws Exception {
String sql = "SELECT last_migration FROM azienda";
String lastMigration = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), sql);
String lastMigration = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);
lastMigration = UtilityString.isNullOrEmpty(lastMigration) ? "-1" : lastMigration;
return Long.parseLong(lastMigration);
}
private List<StbMigrationStatus> retrieveAllMigrationsStatus(AdvancedDataSource advancedDataSource) throws
SQLException, IOException, DataConverterNotFoundException, InstantiationException, IllegalAccessException {
private List<StbMigrationStatus> retrieveAllMigrationsStatus(Connection connection) throws
SQLException, DataConverterNotFoundException, InstantiationException, IllegalAccessException {
String sql = "SELECT * FROM " + StbMigrationStatus.ENTITY;
List<StbMigrationStatus> stbMigrationStatuses = UtilityDB.executeSimpleQueryDTO(advancedDataSource.getConnection(), sql, StbMigrationStatus.class);
List<StbMigrationStatus> stbMigrationStatuses = UtilityDB.executeSimpleQueryDTO(connection, sql, StbMigrationStatus.class);
if (stbMigrationStatuses == null) return new ArrayList<>();
@@ -234,14 +233,14 @@ public class MigrationComponent {
return stbMigrationStatuses;
}
private void trackMigrationError(AdvancedDataSource advancedDataSource, long migrationCode, Exception e) {
migrationsErrorMapByProfiles.putIfAbsent(advancedDataSource.getProfileName(), true);
migrationsErrorMapByProfiles.replace(advancedDataSource.getProfileName(), true);
private void trackMigrationError(Connection connection, long migrationCode, Exception e) {
migrationsErrorMapByProfiles.putIfAbsent(connection.getProfileName(), true);
migrationsErrorMapByProfiles.replace(connection.getProfileName(), true);
e.printStackTrace();
logger.error("MigrationService (" + advancedDataSource.getProfileName() + ")", e);
logger.error("MigrationService (" + connection.getProfileName() + ")", e);
try (MultiDBTransactionManager multiDBTransactionManager = new MultiDBTransactionManager(advancedDataSource.getProfileName())) {
try (MultiDBTransactionManager multiDBTransactionManager = new MultiDBTransactionManager(connection.getProfileName())) {
final String exceptionTraceAsString = GeneralUtils.getExceptionTraceAsString(e);
String sql = "SELECT * FROM " + StbMigrationStatus.ENTITY + " WHERE migration_code = " + migrationCode;
@@ -259,8 +258,8 @@ public class MigrationComponent {
.setCompleted(false)
.setSkipped(false)
.setErrorMessage(e.getMessage() + "\n" + exceptionTraceAsString);
stbMigrationStatus.manageWithParentConnection(advancedDataSource.getConnection());
advancedDataSource.getConnection().commit();
stbMigrationStatus.manageWithParentConnection(connection);
connection.commit();
if (UtilityDebug.isDebugExecution() || UtilityDebug.isIntegryServer()) return;
@@ -268,7 +267,7 @@ public class MigrationComponent {
mailService.sendSystemWarningLog("[" + azienda.getNomeDitta() + "][" + UtilityServer.getHostName() + "] Aggiornamento sistema",
"anomalia durante l'aggiornamento",
"La migrazione " + migrationCode + " non è andata a buon fine sul DB " + advancedDataSource.getProfileName() + ". Controllare il log per ulteriori dettagli.",
"La migrazione " + migrationCode + " non è andata a buon fine sul DB " + connection.getProfileName() + ". Controllare il log per ulteriori dettagli.",
e, new Date());
} catch (Exception ex) {
logger.error("MigrationService - Mail", ex);

View File

@@ -7,7 +7,6 @@ import it.integry.ems.schedule.new_cron_job.dto.operations.base_classes.BaseSche
import it.integry.ems.schedule.new_cron_job.service.AutomatedOperationHandlerComponent;
import it.integry.ems.settings.Model.SettingsModel;
import it.integry.ems.settings.SettingsController;
import it.integry.ems.sync.MultiDBTransaction.AdvancedDataSource;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems.utility.UtilityDebug;
import it.integry.ems_model.entity.Azienda;
@@ -18,6 +17,7 @@ import it.integry.ems_model.exception.DataConverterNotFoundException;
import it.integry.ems_model.rulescompleting.DroolsDataCompleting;
import it.integry.ems_model.types.ApplicationName;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.types.TypeDbObject;
import it.integry.ems_model.utility.Query;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityString;
@@ -38,7 +38,7 @@ import java.util.List;
public abstract class BaseMigration implements MigrationModelInterface {
protected AdvancedDataSource advancedDataSource;
protected Connection connection;
protected SettingsController settingsController;
protected SettingsModel settingsModel;
protected DroolsDataCompleting droolsDataCompleting;
@@ -46,8 +46,8 @@ public abstract class BaseMigration implements MigrationModelInterface {
protected final Logger logger = LogManager.getLogger();
@Override
public void init(AdvancedDataSource advancedDataSource, SettingsController settingsController, SettingsModel settingsModel, DroolsDataCompleting droolsDataCompleting) {
this.advancedDataSource = advancedDataSource;
public void init(Connection connection, SettingsController settingsController, SettingsModel settingsModel, DroolsDataCompleting droolsDataCompleting) {
this.connection = connection;
this.settingsController = settingsController;
this.settingsModel = settingsModel;
this.droolsDataCompleting = droolsDataCompleting;
@@ -59,7 +59,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
protected boolean isHistoryDB() throws Exception {
String historyProfileDB = settingsController.getHistoryProfileDb();
return historyProfileDB.equalsIgnoreCase(advancedDataSource.getProfileName());
return historyProfileDB.equalsIgnoreCase(connection.getProfileName());
}
protected boolean isDebug() {
@@ -67,16 +67,16 @@ public abstract class BaseMigration implements MigrationModelInterface {
}
protected @NotNull List<HashMap<String, Object>> executeQuery(String sql) throws SQLException, IOException {
return UtilityDB.executeSimpleQuery(advancedDataSource.getConnection(), sql);
protected @NotNull List<HashMap<String, Object>> executeQuery(String sql) throws SQLException {
return UtilityDB.executeSimpleQuery(connection, sql);
}
protected @NotNull <T> List<T> executeQueryDTO(String sql, Class<T> clazz) throws Exception {
return UtilityDB.executeSimpleQueryDTO(advancedDataSource.getConnection(), sql, clazz);
return UtilityDB.executeSimpleQueryDTO(connection, sql, clazz);
}
protected void executeStatement(String... sqls) throws SQLException, IOException {
executeStatement(advancedDataSource.getConnection(), sqls);
protected void executeStatement(String... sqls) throws SQLException {
executeStatement(connection, sqls);
}
protected void executeStatement(Connection connection, String... sqls) throws SQLException {
@@ -90,7 +90,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
protected long executeInsertStatement(String sql) throws SQLException {
long generatedId = -1;
try (PreparedStatement pstmt = advancedDataSource.getConnection().prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
try (PreparedStatement pstmt = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
int affectedRows = pstmt.executeUpdate();
@@ -102,8 +102,6 @@ public abstract class BaseMigration implements MigrationModelInterface {
}
}
}
} catch (IOException e) {
throw new RuntimeException(e);
}
return generatedId;
@@ -130,8 +128,8 @@ public abstract class BaseMigration implements MigrationModelInterface {
alterObject(SqlObjectTypeEnum.VIEW, objectName, createViewSql);
}
protected boolean existsView(String objectName) throws SQLException, IOException {
return UtilityDB.<Integer>executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), "SELECT COUNT(*) FROM SYSOBJECTS WHERE id = object_id('" + objectName + "')") > 0;
protected boolean existsView(String objectName) throws SQLException {
return UtilityDB.<Integer>executeSimpleQueryOnlyFirstRowFirstColumn(connection, "SELECT COUNT(*) FROM SYSOBJECTS WHERE id = object_id('" + objectName + "')") > 0;
}
protected void createOrUpdateProcedure(String objectName, String createProcedureSql) throws SQLException, IOException {
@@ -154,15 +152,20 @@ public abstract class BaseMigration implements MigrationModelInterface {
}
protected void createIndex(IndexTableDTO indexTableDTO) throws Exception {
UtilityDB.createIndex(advancedDataSource.getConnection(), indexTableDTO);
UtilityDB.createIndex(connection, indexTableDTO);
}
protected void cloneTable(String sourceTable, String newTable,boolean fillNewTable, boolean dropOldTable, boolean renameNewTable) throws Exception {
UtilityDB.cloneTable(connection, sourceTable, newTable, fillNewTable, dropOldTable, renameNewTable);
}
protected void dropIndex(String tableName, String indexName) throws Exception {
UtilityDB.dropIndex(advancedDataSource.getConnection(), tableName, indexName);
UtilityDB.dropIndex(connection, tableName, indexName);
}
protected boolean existsColumn(String tableName, String columnName) throws SQLException, IOException {
protected boolean existsColumn(String tableName, String columnName) throws SQLException {
String schema = null;
if (tableName.contains(".")) {
schema = tableName.substring(0, tableName.indexOf("."));
@@ -173,7 +176,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
" WHERE Name = N{}\n" +
" AND Object_ID = Object_ID(N{})", columnName, (schema != null ? schema : "dbo") + "." + tableName);
Integer val = UtilityDB.<Integer>executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), sql);
Integer val = UtilityDB.<Integer>executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);
return val != null && val == 1;
}
@@ -192,7 +195,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
}
protected <T> void addDefault(String tableName, String columnName, T defaultValue) throws SQLException, IOException {
boolean existDefault = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(),
boolean existDefault = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection,
Query.format("SELECT CAST(COUNT(*) AS BIT)\n" +
"FROM sys.syscolumns\n" +
"WHERE name = %s\n" +
@@ -203,7 +206,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
}
protected void dropDefault(String tableName, String columnName) throws SQLException, IOException {
boolean existDefault = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(),
boolean existDefault = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection,
Query.format("SELECT CAST(COUNT(*) AS BIT)\n" +
"FROM sys.syscolumns\n" +
"WHERE name = %s\n" +
@@ -216,7 +219,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
}
protected void dropChecks(String tableName, String columnName) throws SQLException, IOException {
boolean checkExists = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(),
boolean checkExists = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection,
Query.format("SELECT CAST(COUNT(*) AS BIT)\n" +
"FROM sys.objects obj_table\n" +
" JOIN sys.objects obj_Constraint\n" +
@@ -235,7 +238,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
}
}
protected boolean existsTable(String tableName) throws SQLException, IOException {
protected boolean existsTable(String tableName) throws SQLException {
String schema = null;
if (tableName.contains(".")) {
schema = tableName.substring(0, tableName.indexOf("."));
@@ -248,7 +251,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
if (schema != null)
sql += Query.format("AND TABLE_SCHEMA = N%s", schema);
return UtilityDB.<Boolean>executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), sql);
return UtilityDB.<Boolean>executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);
}
protected void dropTable(String tableName) throws SQLException, IOException {
@@ -264,7 +267,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
return;
}
String sql = Query.format("SELECT cast(count(*) as bit) FROM stb_gest_setup_query WHERE cod_query = %s", codQuery);
boolean existQuery = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), sql);
boolean existQuery = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);
if (existQuery)
executeStatement(Query.format("UPDATE stb_gest_setup_query SET query_default = %S, description = %S WHERE cod_query = %s ",
@@ -274,20 +277,20 @@ public abstract class BaseMigration implements MigrationModelInterface {
" VALUES (%s, %s, %s);", codQuery, query, name));
}
protected boolean existsSetup(String gestName, String section, String keySection) throws SQLException, IOException {
protected boolean existsSetup(String gestName, String section, String keySection) throws SQLException {
String sql = Query.format("SELECT CAST(COUNT(*) AS BIT) AS exist FROM " + StbGestSetup.ENTITY +
" WHERE gest_name = %s AND" +
" section = %s AND" +
" key_section = %s", gestName, section, keySection);
return UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), sql);
return UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);
}
protected boolean existsSetupQuery(String codQuery) throws SQLException, IOException {
protected boolean existsSetupQuery(String codQuery) throws SQLException {
String sql = Query.format("SELECT CAST(COUNT(*) AS BIT) AS exist FROM " + StbGestSetupQuery.ENTITY +
" WHERE cod_query = %s", codQuery);
return UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), sql);
return UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);
}
protected void createSetup(String gestName, String section, String keySection, String value, String description, String codQuery) throws Exception {
@@ -297,7 +300,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
String insertSql = "INSERT INTO " + StbGestSetup.ENTITY +
"(gest_name, section, key_section, value, description, query_default) VALUES (?, ?, ?, ?, ?, ?)";
try (PreparedStatement ps = advancedDataSource.getConnection().prepareStatement(insertSql)) {
try (PreparedStatement ps = connection.prepareStatement(insertSql)) {
ps.setString(1, gestName);
ps.setString(2, section);
ps.setString(3, keySection);
@@ -316,7 +319,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
String insertSql = "INSERT INTO " + StbGestSetup.ENTITY +
"(gest_name, section, key_section, value, description, query_default, flag_multi_value) VALUES (?, ?, ?, ?, ?, ?, ?)";
try (PreparedStatement ps = advancedDataSource.getConnection().prepareStatement(insertSql)) {
try (PreparedStatement ps = connection.prepareStatement(insertSql)) {
ps.setString(1, gestName);
ps.setString(2, section);
ps.setString(3, keySection);
@@ -336,7 +339,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
String insertSql = "INSERT INTO " + StbGestSetup.ENTITY +
"(gest_name, section, key_section, value, description, query_default, flag_multi_value, flag_setup_user_web) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
try (PreparedStatement ps = advancedDataSource.getConnection().prepareStatement(insertSql)) {
try (PreparedStatement ps = connection.prepareStatement(insertSql)) {
ps.setString(1, gestName);
ps.setString(2, section);
ps.setString(3, keySection);
@@ -366,7 +369,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
return;
if (!UtilityString.isNullOrEmpty(query) && UtilityString.isNullOrEmpty(codQuery)) {
codQuery = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(),
codQuery = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection,
Query.format("SELECT cod_query FROM stb_gest_setup_query WHERE query_default = %s", query));
}
@@ -375,7 +378,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
"flag_user_view, flag_setup_depo, flag_setup_user_web,\n" +
"flag_tipo_json, flag_tipo_colore, tipo_setup, flag_multi_value) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
try (PreparedStatement ps = advancedDataSource.getConnection().prepareStatement(insertSql)) {
try (PreparedStatement ps = connection.prepareStatement(insertSql)) {
ps.setString(1, gestName);
ps.setString(2, section);
ps.setString(3, keySection);
@@ -402,7 +405,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
.setKeySection(keySection);
stbGestSetup.setOperation(OperationType.DELETE);
stbGestSetup.manageWithParentConnection(advancedDataSource.getConnection());
stbGestSetup.manageWithParentConnection(connection);
}
protected void updateSetupValue(String gestName, String section, String keySection, String newValue) throws Exception {
@@ -422,7 +425,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
Boolean flagTipoJson, Boolean flagTipoColore, String tipoSetup, Boolean flagMultiValue,
String query) throws Exception {
if (!UtilityString.isNullOrEmpty(query) && UtilityString.isNullOrEmpty(codQuery)) {
codQuery = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(),
codQuery = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection,
Query.format("SELECT cod_query FROM stb_gest_setup_query WHERE query_default = %s", query));
}
@@ -457,13 +460,13 @@ public abstract class BaseMigration implements MigrationModelInterface {
stbGestSetup.setFlagMultiValue(flagMultiValue);
stbGestSetup.setOperation(OperationType.UPDATE);
stbGestSetup.manageWithParentConnection(advancedDataSource.getConnection());
stbGestSetup.manageWithParentConnection(connection);
}
protected void updateSetupQuery(String gestName, String section, String keySection,
String codQuery, String query) throws Exception {
if (!UtilityString.isNullOrEmpty(query) && UtilityString.isNullOrEmpty(codQuery)) {
codQuery = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(),
codQuery = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection,
Query.format("SELECT cod_query FROM stb_gest_setup_query WHERE query_default = %s", query));
}
@@ -474,7 +477,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
.setQueryDefault(codQuery);
stbGestSetup.setOperation(OperationType.UPDATE);
stbGestSetup.manageWithParentConnection(advancedDataSource.getConnection());
stbGestSetup.manageWithParentConnection(connection);
}
protected void addAutomatedOperation(BaseScheduledOperationDTO operation) {
@@ -508,7 +511,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
protected boolean isCustomer(IntegryCustomer... customers) {
String currentDbName = advancedDataSource.getDataSource().getDbName();
String currentDbName = connection.getDbName();
return Arrays.stream(customers)
.anyMatch(x ->
@@ -517,31 +520,31 @@ public abstract class BaseMigration implements MigrationModelInterface {
}
protected boolean isCustomerDb(IntegryCustomerDB... customersDbs) {
String currentDbName = advancedDataSource.getDataSource().getDbName();
String currentDbName = connection.getDbName();
return Arrays.stream(customersDbs)
.anyMatch(y -> y.getValue().equalsIgnoreCase(currentDbName));
}
protected boolean isWingest() throws SQLException, IOException, DataConverterNotFoundException, InstantiationException, IllegalAccessException {
Azienda currentAzienda = Azienda.getDefaultAzienda(advancedDataSource.getConnection());
protected boolean isWingest() throws SQLException, DataConverterNotFoundException, InstantiationException, IllegalAccessException {
Azienda currentAzienda = Azienda.getDefaultAzienda(connection);
return currentAzienda.getApplicationNameEnum() == ApplicationName.WINGEST;
}
protected boolean isTextiles() throws SQLException, IOException, DataConverterNotFoundException, InstantiationException, IllegalAccessException {
Azienda currentAzienda = Azienda.getDefaultAzienda(advancedDataSource.getConnection());
protected boolean isTextiles() throws SQLException, DataConverterNotFoundException, InstantiationException, IllegalAccessException {
Azienda currentAzienda = Azienda.getDefaultAzienda(connection);
return currentAzienda.getApplicationNameEnum() == ApplicationName.TEXTILES;
}
protected boolean isDMS() throws SQLException, IOException, DataConverterNotFoundException, InstantiationException, IllegalAccessException {
Azienda currentAzienda = Azienda.getDefaultAzienda(advancedDataSource.getConnection());
protected boolean isDMS() throws SQLException, DataConverterNotFoundException, InstantiationException, IllegalAccessException {
Azienda currentAzienda = Azienda.getDefaultAzienda(connection);
return currentAzienda.getApplicationNameEnum() == ApplicationName.DMS;
}
protected void enableSaveToRest(String gestName) throws Exception {
boolean existRow =
UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(),
UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection,
Query.format("SELECT cast(count(*) as bit) FROM stb_gest_sync WHERE gest_name = %s", gestName));
StbGestSync gestSync =
@@ -552,21 +555,21 @@ public abstract class BaseMigration implements MigrationModelInterface {
gestSync.setOperation(OperationType.UPDATE);
} else {
String entityName =
UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(),
UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection,
Query.format("SELECT entity_name FROM stb_menu_opz WHERE gest_name = %s", gestName));
gestSync.setEntityName(entityName);
gestSync.setOperation(OperationType.INSERT);
}
gestSync.manageWithParentConnection(advancedDataSource.getConnection());
gestSync.manageWithParentConnection(connection);
}
private DatabaseVersionEnum getSqlCompatibilityLevel() throws Exception {
short compatibilityLevel =
UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(),
Query.format("SELECT compatibility_level FROM sys.databases WHERE name = %s", advancedDataSource.getDataSource().getDbName()));
UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection,
Query.format("SELECT compatibility_level FROM sys.databases WHERE name = %s", connection.getDbName()));
return DatabaseVersionEnum.fromCode(compatibilityLevel);
@@ -597,4 +600,38 @@ public abstract class BaseMigration implements MigrationModelInterface {
protected boolean isSqlServer2022() throws Exception {
return getSqlCompatibilityLevel() == DatabaseVersionEnum.SQLServer2022;
}
protected void addDescriptionTable(String tableName, String description) throws SQLException {
if (existsTable(tableName)) {
addDescriptionObject(tableName, TypeDbObject.TABLE, description);
}
}
protected void addDescriptionView(String viewName, String description) throws SQLException {
if (existsView(viewName)) {
addDescriptionObject(viewName, TypeDbObject.VIEW, description);
}
}
private void addDescriptionObject(String objectName, TypeDbObject type, String description) throws SQLException {
String typeString = "TABLE";
if (type == TypeDbObject.VIEW) {
typeString = "VIEW";
}
executeStatement(
Query.format("EXEC sp_addextendedproperty " +
"@name = N'MS_Description', " +
"@value = %s, " +
"@level0type = N'SCHEMA', @level0name = 'dbo', " +
"@level1type = %s, @level1name = %s;", description, typeString, objectName));
}
private void addDescriptionColumn(String tableName, String columnName, String description) throws SQLException {
executeStatement(Query.format("EXEC sp_addextendedproperty 'MS_Description', %s, 'SCHEMA', 'dbo', 'TABLE',%s, 'COLUMN', %s)",
description, tableName, columnName));
}
}

View File

@@ -18,7 +18,9 @@ public enum IntegryCustomer {
IntegryCustomerDB.Auricchio_Ind05,
IntegryCustomerDB.Auricchio_AuricchioSons),
Biolevante(IntegryCustomerDB.Biolevante_Biolevante,
IntegryCustomerDB.Biolevante_BiolevanteStorico),
IntegryCustomerDB.Biolevante_BiolevanteStorico,
IntegryCustomerDB.Biolevante_TenutaSanMartino),
CapelliMonelli(IntegryCustomerDB.CapelliMonelli_CapelliMonelli),
Carelli(IntegryCustomerDB.Carelli_Carelli,
IntegryCustomerDB.Carelli_GestFood,
IntegryCustomerDB.Carelli_Chiuso,
@@ -68,7 +70,8 @@ public enum IntegryCustomer {
Frudis(IntegryCustomerDB.Frudis_Frudis),
Gramm(IntegryCustomerDB.Gramm_Gramm,
IntegryCustomerDB.Gramm_PrimeOlive,
IntegryCustomerDB.Gramm_ProveStage),
IntegryCustomerDB.Gramm_ProveStage,
IntegryCustomerDB.Gramm_2MHolding),
Idrotecnica(IntegryCustomerDB.Idrotecnica_Idrotecnica),
Igood(IntegryCustomerDB.Igood_Aida,
IntegryCustomerDB.Igood_Igood,
@@ -93,6 +96,7 @@ public enum IntegryCustomer {
ResinaColor(IntegryCustomerDB.ResinaColor_ResinaColor, IntegryCustomerDB.ResinaColor_ResinaColorPasquale),
RistoCash(IntegryCustomerDB.RistoCash_RistoCash),
RossoGargano(IntegryCustomerDB.RossoGargano_RossoGargano, IntegryCustomerDB.RossoGargano_RossoGarganoCont),
Sabato(IntegryCustomerDB.Sabato_Sabato),
Salpar(IntegryCustomerDB.Salpar_AlfaImmobiliare,
IntegryCustomerDB.Salpar_MasabaSrl,
IntegryCustomerDB.Salpar_Salpar,

View File

@@ -22,7 +22,9 @@ public enum IntegryCustomerDB {
Biolevante_Biolevante("biolevante"),
Biolevante_BiolevanteStorico("biolevante_storico"),
Biolevante_TenutaSanMartino("tenutasanmartino"),
CapelliMonelli_CapelliMonelli("capelli_monelli"),
Carelli_Carelli("carelli"),
Carelli_GestFood("gestfood"),
@@ -87,9 +89,10 @@ public enum IntegryCustomerDB {
Frudis_Frudis("frudis"),
Gramm_Gramm("gramm"),
Gramm_Gramm("gramm_peppe"),
Gramm_PrimeOlive("primeolive"),
Gramm_ProveStage("grammprovestage"),
Gramm_2MHolding("2M_HOLDING"),
Idrotecnica_Idrotecnica("idrotecnica"),
@@ -100,7 +103,7 @@ public enum IntegryCustomerDB {
Igood_ShopService("shop_service"),
Ime_ImeTe("ime_te"),
Ime_ImeTe("ime_te_peppe"),
Integry_Studioml("studioml"),
@@ -153,6 +156,8 @@ public enum IntegryCustomerDB {
RossoGargano_RossoGargano("rossogargano"),
RossoGargano_RossoGarganoCont("rossogarganocont"),
Sabato_Sabato("sabato"),
Salpar_VgAlimenti("vgalimenti"),
Salpar_Salpar("salpar"),

View File

@@ -2,12 +2,12 @@ package it.integry.ems.migration._base;
import it.integry.ems.settings.Model.SettingsModel;
import it.integry.ems.settings.SettingsController;
import it.integry.ems.sync.MultiDBTransaction.AdvancedDataSource;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems_model.rulescompleting.DroolsDataCompleting;
public interface MigrationModelInterface {
void init(AdvancedDataSource advancedDataSource,
void init(Connection connection,
SettingsController settingsController,
SettingsModel settingsModel,
DroolsDataCompleting droolsDataCompleting);

View File

@@ -0,0 +1,508 @@
package it.integry.ems.migration.dto.common;
import it.integry.ems.migration.dto.SqlObjectTypeEnum;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems_model.entity.MtbColt;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.Query;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityString;
import it.integry.ems_model.utility.dto.IndexTableDTO;
import java.io.IOException;
import java.sql.SQLException;
import java.sql.Statement;
import java.time.LocalDate;
import java.util.ArrayList;
public class MigrationMvwSitArtUdcDetInventarioDTO {
public static void apply(Connection connection) throws Exception {
//Aggiorno i campi barcode_ul_in, barcode_ul_out, posizione_in, posizione_out, cod_mdep_in, cod_mdep_out
updateNewFieldsInMtbColrs(connection);
//Migration di conversione aziende a nuova mvw_sitart_udc_det_inventario
createBackupOfOldView(connection);
dropView(connection, "mvw_sitart_udc_det_inventario");
createNewView(connection);
}
public static void updateNewFieldsInMtbColrs(Connection connection) throws Exception {
executeStatement(connection, "UPDATE mtb_colr\n" +
"SET barcode_ul_in = new_data.barcode_ul_in,\n" +
" barcode_ul_out = new_data.barcode_ul_out,\n" +
" posizione_in = new_data.posizione_in,\n" +
" posizione_out = new_data.posizione_out,\n" +
" cod_mdep_in = new_data.cod_mdep_in,\n" +
" cod_mdep_out = new_data.cod_mdep_out\n" +
"FROM mtb_colr\n" +
" INNER JOIN (SELECT mtb_colt.barcode_ul AS barcode_ul_in,\n" +
" IIF(num_collo_rif IS NOT NULL, mtb_colt_rif.barcode_ul, NULL) AS barcode_ul_out,\n" +
" mtb_colt.posizione AS posizione_in,\n" +
" IIF(num_collo_rif IS NOT NULL, mtb_colt_rif.posizione, NULL) AS posizione_out,\n" +
" mtb_colt.cod_mdep AS cod_mdep_in,\n" +
" IIF(num_collo_rif IS NOT NULL, mtb_colt_rif.cod_mdep, NULL) AS cod_mdep_out,\n" +
"\n" +
" mtb_colr.gestione,\n" +
" mtb_colr.data_collo,\n" +
" mtb_colr.ser_collo,\n" +
" mtb_colr.num_collo,\n" +
" mtb_colr.riga\n" +
"\n" +
" FROM dbo.mtb_colr\n" +
" INNER JOIN dbo.mtb_colt ON mtb_colr.gestione = mtb_colt.gestione AND\n" +
" mtb_colr.data_collo = mtb_colt.data_collo AND\n" +
" mtb_colr.ser_collo = mtb_colt.ser_collo AND\n" +
" mtb_colr.num_collo = mtb_colt.num_collo\n" +
"\n" +
" LEFT OUTER JOIN dbo.mtb_colt mtb_colt_rif\n" +
" ON mtb_colr.gestione_rif = mtb_colt_rif.gestione AND\n" +
" mtb_colr.data_collo_rif = mtb_colt_rif.data_collo AND\n" +
" mtb_colr.ser_collo_rif = mtb_colt_rif.ser_collo AND\n" +
" mtb_colr.num_collo_rif = mtb_colt_rif.num_collo) new_data\n" +
" ON mtb_colr.gestione = new_data.gestione AND\n" +
" mtb_colr.num_collo = new_data.num_collo AND\n" +
" mtb_colr.ser_collo = new_data.ser_collo AND\n" +
" mtb_colr.data_collo = new_data.data_collo AND\n" +
" mtb_colr.riga = new_data.riga");
}
public static void alignGiacenza(Connection connection) throws Exception {
//Creo un collo di scarico vuoto
MtbColt mtbColt = new MtbColt()
.setGestione("L")
.setSerCollo("RT")
.setSegno(-1)
.setDataCollo(LocalDate.now())
.setAnnotazioni("PASSAGGIO NUOVA MVW_SITART_UDC_DET_INVENTARIO")
.setCodMdep(getInternalCodMdep(connection));
mtbColt.setOperation(OperationType.INSERT);
mtbColt.dataCompleting(connection);
mtbColt.manageWithParentConnection(connection);
executeStatement(connection, Query.format(
"INSERT INTO mtb_colr (gestione, ser_collo, num_collo, data_collo, riga, cod_mart, cod_col, cod_tagl, partita_mag, gestione_rif, data_collo_rif, ser_collo_rif, num_collo_rif, datetime_row,\n" +
" cod_jcom, qta_col, num_cnf, qta_cnf, barcode_ul_out, cod_mdep_out, posizione_out)" +
" SELECT {} AS gestione,\n" +
" {} AS ser_collo,\n" +
" {} AS num_collo,\n" +
" CAST({} AS DATE) AS data_collo,\n" +
" ROW_NUMBER() OVER (PARTITION BY (SELECT NULL) ORDER BY v.data_collo) AS riga,\n" +
" v.cod_mart,\n" +
" v.cod_col,\n" +
" v.cod_tagl,\n" +
" v.partita_mag,\n" +
" v.gestione AS gestion_rif,\n" +
" v.data_collo AS data_collo_rif,\n" +
" v.ser_collo AS ser_collo_rif,\n" +
" v.num_collo AS num_collo_rif,\n" +
" GETDATE() AS datetime_row,\n" +
" v.cod_jcom,\n" +
" v.qta_col,\n" +
" v.num_cnf,\n" +
" v.qta_cnf,\n" +
" v.barcode_ul AS barcode_ul_out,\n" +
" v.cod_mdep AS cod_mdep_out,\n" +
" v.posizione AS posizione_out\n" +
"FROM mvw_sitart_udc_det_inventario v\n" +
" INNER JOIN (SELECT ser_collo,\n" +
" gestione,\n" +
" data_collo,\n" +
" num_collo,\n" +
" cod_mdep,\n" +
" posizione,\n" +
" cod_mart,\n" +
" partita_mag,\n" +
" cod_jcom-- Elenca tutte le colonne coinvolte\n" +
" FROM mvw_sitart_udc_det_inventario\n" +
"\n" +
" EXCEPT\n" +
"\n" +
" SELECT ser_collo,\n" +
" gestione,\n" +
" data_collo,\n" +
" num_collo,\n" +
" cod_mdep,\n" +
" posizione,\n" +
" cod_mart,\n" +
" partita_mag,\n" +
" cod_jcom -- Elenca le stesse colonne dalla vista vecchia\n" +
" FROM mvw_sitart_udc_det_inventario_old) t\n" +
" ON v.num_collo = t.num_collo AND v.data_collo = t.data_collo AND\n" +
" v.ser_collo = t.ser_collo AND v.gestione = t.gestione AND\n" +
" v.cod_mart = t.cod_mart AND v.cod_mdep = t.cod_mdep AND\n" +
" ISNULL(v.partita_mag, '') = ISNULL(t.partita_mag, '') AND\n" +
" ISNULL(v.posizione, '') = ISNULL(t.posizione, '') AND\n" +
" ISNULL(v.cod_jcom, '') = ISNULL(t.cod_jcom, '')" +
" WHERE qta_col > 0",
mtbColt.getGestione(), mtbColt.getSerCollo(), mtbColt.getNumCollo(), mtbColt.getDataCollo()));
}
private static String getInternalCodMdep(Connection connection) throws Exception {
String codMdepAz = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, "SELECT TOP 1 cod_mdep" +
" FROM mtb_depo" +
" INNER JOIN dbo.gtb_anag ga ON mtb_depo.cod_anag = ga.cod_anag" +
" inner join azienda on ga.part_iva = azienda.part_iva");
if(UtilityString.isNullOrEmpty(codMdepAz)) {
codMdepAz = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, "SELECT TOP 1 cod_mdep FROM mtb_depo");
}
return codMdepAz;
}
private static void createBackupOfOldView(Connection connection) throws Exception {
if (existsView(connection, "mvw_sitart_udc_det_inventario_old"))
return;
createOrUpdateView(connection, "mvw_sitart_udc_det_inventario_old", "CREATE VIEW [dbo].[mvw_sitart_udc_det_inventario_old] AS\n" +
"SELECT UL.gestione,\n" +
" data_collo,\n" +
" ser_collo,\n" +
" num_collo,\n" +
" segno,\n" +
" UL.cod_mdep,\n" +
" UL.posizione,\n" +
" mtb_depo_posizioni.priorita,\n" +
" mtb_aart.cod_mgrp AS codGruppo,\n" +
" mtb_grup.descrizione AS Gruppo,\n" +
" mtb_aart.cod_msgr AS CodSgruppo,\n" +
" mtb_sgrp.descrizione AS Sottogruppo,\n" +
" UL.cod_mart,\n" +
" diacod,\n" +
" mtb_aart.descrizione_estesa,\n" +
" partita_mag,\n" +
" UL.cod_jcom,\n" +
" jtb_comt.descrizione AS commessa,\n" +
" mtb_aart.unt_mis,\n" +
" qta_col,\n" +
" num_cnf,\n" +
" UL.qta_cnf,\n" +
" UL.peso_netto_kg,\n" +
" UL.peso_lordo_kg,\n" +
" UL.cod_jfas\n" +
"FROM [mvw_sitart_udc_det] UL\n" +
" LEFT OUTER JOIN jtb_comt ON UL.cod_jcom = jtb_comt.cod_jcom\n" +
" LEFT OUTER JOIN mtb_depo_posizioni\n" +
" ON UL.cod_mdep = mtb_depo_posizioni.cod_mdep AND UL.posizione = mtb_depo_posizioni.posizione,\n" +
" mtb_aart,\n" +
" mtb_grup,\n" +
" mtb_sgrp\n" +
"WHERE UL.cod_mart = mtb_aart.cod_mart\n" +
" AND mtb_aart.cod_mgrp = mtb_grup.cod_mgrp\n" +
" AND mtb_aart.cod_mgrp = mtb_sgrp.cod_mgrp\n" +
" AND mtb_aart.cod_msgr = mtb_sgrp.cod_msgr\n" +
" AND qta_col <> 0");
}
private static void createNewView(Connection connection) throws Exception {
if (!existsTable(connection, "stb_multiplier")) {
executeStatement(connection, "CREATE TABLE stb_multiplier\n" +
"(\n" +
" moltiplicatore INT NOT NULL\n" +
")",
"INSERT INTO stb_multiplier (moltiplicatore) VALUES (1)",
"INSERT INTO stb_multiplier (moltiplicatore) VALUES (-1)");
}
createOrUpdateView(connection, "mvw_mtb_colr_with_giacenza", "CREATE VIEW dbo.mvw_mtb_colr_with_giacenza\n" +
" WITH SCHEMABINDING\n" +
" AS\n" +
"SELECT COUNT_BIG(*) AS c,\n" +
" IIF(moltiplicatore = -1, mtb_colr.barcode_ul_out,\n" +
" mtb_colr.barcode_ul_in) AS barcode_ul,\n" +
" IIF(moltiplicatore = -1, mtb_colr.cod_mdep_out,\n" +
" mtb_colr.cod_mdep_in) AS cod_mdep,\n" +
" IIF(moltiplicatore = -1, mtb_colr.posizione_out,\n" +
" mtb_colr.posizione_in) AS posizione,\n" +
" SUM(mtb_colr.qta_col * moltiplicatore) AS qta_col,\n" +
" SUM(IIF(mtb_aart.flag_qta_cnf_fissa = 'S', mtb_colr.qta_col / mtb_aart.qta_cnf, mtb_colr.num_cnf) *\n" +
" moltiplicatore) AS num_cnf,\n" +
" mtb_colr.cod_mart,\n" +
" mtb_colr.cod_col,\n" +
" mtb_colr.cod_tagl,\n" +
" mtb_colr.partita_mag,\n" +
" SUM(mtb_colr.peso_netto_kg * moltiplicatore) AS peso_netto_kg,\n" +
" SUM(mtb_colr.peso_lordo_kg * moltiplicatore) AS peso_lordo_kg,\n" +
" IIF(mtb_colr.cod_jcom = 'MAG', NULL, mtb_colr.cod_jcom) AS cod_jcom,\n" +
" mtb_aart.flag_qta_cnf_fissa,\n" +
" mtb_aart.unt_mis,\n" +
" mtb_aart.diacod,\n" +
" mtb_aart.descrizione_estesa,\n" +
" mtb_aart.cod_mgrp,\n" +
" mtb_aart.cod_msgr,\n" +
" mtb_aart.cod_mtip,\n" +
" mtb_aart.cod_mstp,\n" +
" mtb_aart.cod_msfa,\n" +
" mtb_aart.qta_cnf AS qta_cnf_anag\n" +
"FROM dbo.mtb_colr\n" +
" INNER JOIN dbo.stb_multiplier ON (moltiplicatore = 1 AND mtb_colr.barcode_ul_in IS NOT NULL) OR\n" +
" (moltiplicatore = -1 AND mtb_colr.barcode_ul_out IS NOT NULL)\n" +
" INNER JOIN dbo.mtb_aart ON mtb_colr.cod_mart = mtb_aart.cod_mart\n" +
"GROUP BY mtb_colr.cod_mart,\n" +
" mtb_colr.cod_col,\n" +
" mtb_colr.cod_tagl,\n" +
" mtb_colr.partita_mag,\n" +
" IIF(moltiplicatore = -1, mtb_colr.barcode_ul_out,\n" +
" mtb_colr.barcode_ul_in),\n" +
" IIF(moltiplicatore = -1, mtb_colr.cod_mdep_out,\n" +
" mtb_colr.cod_mdep_in),\n" +
" IIF(moltiplicatore = -1, mtb_colr.posizione_out,\n" +
" mtb_colr.posizione_in),\n" +
" IIF(mtb_colr.cod_jcom = 'MAG', NULL, mtb_colr.cod_jcom),\n" +
" mtb_aart.flag_qta_cnf_fissa,\n" +
" mtb_aart.unt_mis,\n" +
" mtb_aart.diacod,\n" +
" mtb_aart.descrizione_estesa,\n" +
" mtb_aart.cod_mgrp,\n" +
" mtb_aart.cod_msgr,\n" +
" mtb_aart.cod_mtip,\n" +
" mtb_aart.cod_mstp,\n" +
" mtb_aart.cod_msfa,\n" +
" mtb_aart.qta_cnf");
dropIndex(connection, "mvw_mtb_colr_with_giacenza", "IDX_CLUSTERED_mvw_mtb_colr_with_giacenza");
createIndex(connection, new IndexTableDTO()
.setIndexName("IDX_CLUSTERED_mvw_mtb_colr_with_giacenza")
.setTableName("mvw_mtb_colr_with_giacenza")
.setUnique(true)
.setClustered(true)
.setMaxDop(1)
.setSortInTempDb(true)
.setColumnsIndex(new ArrayList<IndexTableDTO.ColumnIndex>() {{
add(new IndexTableDTO.ColumnIndex("barcode_ul"));
add(new IndexTableDTO.ColumnIndex("posizione"));
add(new IndexTableDTO.ColumnIndex("cod_mdep"));
add(new IndexTableDTO.ColumnIndex("cod_mart"));
add(new IndexTableDTO.ColumnIndex("partita_mag"));
add(new IndexTableDTO.ColumnIndex("cod_tagl"));
add(new IndexTableDTO.ColumnIndex("cod_col"));
add(new IndexTableDTO.ColumnIndex("cod_jcom"));
}}));
dropIndex(connection, "mvw_mtb_colr_with_giacenza", "IDX_mvw_qta_mtb_colr_with_giacenza");
createIndex(connection, new IndexTableDTO()
.setIndexName("IDX_mvw_qta_mtb_colr_with_giacenza")
.setTableName("mvw_mtb_colr_with_giacenza")
.setMaxDop(1)
.setSortInTempDb(true)
.setColumnsIndex(new ArrayList<IndexTableDTO.ColumnIndex>() {{
add(new IndexTableDTO.ColumnIndex("qta_col"));
add(new IndexTableDTO.ColumnIndex("num_cnf"));
}}));
dropIndex(connection, "mvw_mtb_colr_with_giacenza", "IDX_mvw_articolo_mtb_colr_with_giacenza");
createIndex(connection, new IndexTableDTO()
.setIndexName("IDX_mvw_articolo_mtb_colr_with_giacenza")
.setTableName("mvw_mtb_colr_with_giacenza")
.setMaxDop(1)
.setSortInTempDb(true)
.setColumnsIndex(new ArrayList<IndexTableDTO.ColumnIndex>() {{
add(new IndexTableDTO.ColumnIndex("cod_mart"));
add(new IndexTableDTO.ColumnIndex("partita_mag"));
add(new IndexTableDTO.ColumnIndex("cod_tagl"));
add(new IndexTableDTO.ColumnIndex("cod_col"));
}}));
dropIndex(connection, "mvw_mtb_colr_with_giacenza", "IDX_mvw_articolo_giac_mtb_colr_with_giacenza");
createIndex(connection, new IndexTableDTO()
.setIndexName("IDX_mvw_articolo_giac_mtb_colr_with_giacenza")
.setTableName("mvw_mtb_colr_with_giacenza")
.setMaxDop(1)
.setSortInTempDb(true)
.setColumnsIndex(new ArrayList<IndexTableDTO.ColumnIndex>() {{
add(new IndexTableDTO.ColumnIndex("cod_mart"));
add(new IndexTableDTO.ColumnIndex("partita_mag"));
add(new IndexTableDTO.ColumnIndex("cod_tagl"));
add(new IndexTableDTO.ColumnIndex("cod_col"));
}})
.setColumnsInclude("qta_col", "num_cnf"));
executeStatement(connection, "UPDATE STATISTICS dbo.mvw_mtb_colr_with_giacenza");
createOrUpdateView(connection, "mvw_sitart_udc_det_inventario", "CREATE VIEW [dbo].[mvw_sitart_udc_det_inventario] AS\n" +
" WITH baseMtbColr AS (SELECT c,\n" +
"\n" +
" ROUND(v.qta_col, cifre_dec) AS qta_col,\n" +
" ROUND(v.num_cnf, cifre_dec) AS num_cnf,\n" +
" IIF(flag_qta_cnf_fissa = 'S',\n" +
" v.qta_cnf_anag, v.qta_col / IIF(v.num_cnf = 0, 1, v.num_cnf)) AS qta_cnf,\n" +
" v.cod_mart,\n" +
" v.cod_col,\n" +
" v.cod_tagl,\n" +
" v.partita_mag,\n" +
" v.peso_netto_kg,\n" +
" v.peso_lordo_kg,\n" +
" mtb_colt.gestione,\n" +
" mtb_colt.data_collo,\n" +
" mtb_colt.ser_collo,\n" +
" mtb_colt.num_collo,\n" +
" v.cod_jcom,\n" +
" v.flag_qta_cnf_fissa,\n" +
" v.unt_mis,\n" +
" v.diacod,\n" +
" v.descrizione_estesa,\n" +
" v.cod_mgrp,\n" +
" mtb_grup.descrizione AS descrizione_gruppo,\n" +
" v.cod_msgr,\n" +
" mtb_sgrp.descrizione AS descrizione_sottogruppo,\n" +
" mtb_unt_mis.flag_dig,\n" +
" mtb_unt_mis.cifre_dec,\n" +
" mtb_colt.segno,\n" +
" v.cod_mdep,\n" +
" v.posizione,\n" +
" mtb_colt.cod_dtip,\n" +
" mtb_colt.cod_jfas,\n" +
" v.barcode_ul,\n" +
" v.qta_cnf_anag\n" +
" FROM mvw_mtb_colr_with_giacenza v WITH (NOEXPAND)\n" +
" INNER JOIN mtb_colt\n" +
" ON v.barcode_ul = mtb_colt.barcode_ul\n" +
" INNER JOIN dbo.mtb_unt_mis ON v.unt_mis = mtb_unt_mis.unt_mis\n" +
"\n" +
" INNER JOIN dbo.mtb_grup ON v.cod_mgrp = mtb_grup.cod_mgrp\n" +
" INNER JOIN dbo.mtb_sgrp ON v.cod_mgrp = mtb_sgrp.cod_mgrp\n" +
" AND v.cod_msgr = mtb_sgrp.cod_msgr\n" +
" WHERE qta_col > 0\n" +
" AND (segno = 1 OR (segno = -1 AND cod_dtip IS NULL AND mtb_colt.gestione = 'V'))\n" +
" ),\n" +
" final_stock AS (SELECT v.qta_col,\n" +
" v.num_cnf,\n" +
" v.qta_cnf,\n" +
" v.gestione,\n" +
" v.data_collo,\n" +
" v.ser_collo,\n" +
" v.num_collo,\n" +
" v.cod_mdep AS cod_mdep,\n" +
" v.posizione AS posizione,\n" +
" mtb_depo_posizioni.priorita,\n" +
" v.cod_mgrp AS codGruppo,\n" +
" v.descrizione_gruppo AS Gruppo,\n" +
" v.cod_msgr AS CodSgruppo,\n" +
" v.descrizione_sottogruppo AS Sottogruppo,\n" +
" v.cod_mart,\n" +
" v.diacod,\n" +
" v.descrizione_estesa,\n" +
" v.partita_mag,\n" +
" v.cod_col,\n" +
" v.cod_tagl,\n" +
" v.cod_jcom,\n" +
" v.peso_netto_kg,\n" +
" v.peso_lordo_kg,\n" +
" v.cod_jfas,\n" +
" v.flag_qta_cnf_fissa,\n" +
" v.unt_mis,\n" +
" v.segno,\n" +
" v.barcode_ul\n" +
" FROM baseMtbColr v\n" +
"\n" +
" LEFT OUTER JOIN mtb_depo_posizioni\n" +
" ON v.cod_mdep = mtb_depo_posizioni.cod_mdep\n" +
" AND v.posizione = mtb_depo_posizioni.posizione)\n" +
"\n" +
" SELECT qta_col,\n" +
" num_cnf,\n" +
" qta_cnf,\n" +
" gestione,\n" +
" data_collo,\n" +
" ser_collo,\n" +
" num_collo,\n" +
" cod_mdep,\n" +
" posizione,\n" +
" priorita,\n" +
" codGruppo,\n" +
" Gruppo,\n" +
" CodSgruppo,\n" +
" Sottogruppo,\n" +
" cod_mart,\n" +
" diacod,\n" +
" descrizione_estesa,\n" +
" partita_mag,\n" +
" cod_col,\n" +
" cod_tagl,\n" +
" cod_jcom,\n" +
" peso_netto_kg,\n" +
" peso_lordo_kg,\n" +
" cod_jfas,\n" +
" flag_qta_cnf_fissa,\n" +
" unt_mis,\n" +
" segno,\n" +
" barcode_ul\n" +
" FROM final_stock");
}
private static boolean existsView(Connection connection, String objectName) throws SQLException {
return UtilityDB.<Integer>executeSimpleQueryOnlyFirstRowFirstColumn(connection, "SELECT COUNT(*) FROM SYSOBJECTS WHERE id = object_id('" + objectName + "')") > 0;
}
private static void dropView(Connection connection, String objectName) throws SQLException, IOException {
UtilityDB.executeStatement(connection, "IF EXISTS (SELECT * FROM SYSOBJECTS WHERE id = object_id('" + objectName + "'))\r\n" +
"\tDROP " + SqlObjectTypeEnum.VIEW.toString() + " " + objectName);
}
private static boolean existsTable(Connection connection, String tableName) throws SQLException, IOException {
String schema = null;
if (tableName.contains(".")) {
schema = tableName.substring(0, tableName.indexOf("."));
tableName = tableName.replace(schema + ".", "");
}
String sql = Query.format("SELECT CAST(COUNT(*) AS BIT) AS exist FROM INFORMATION_SCHEMA.TABLES " +
"WHERE TABLE_NAME = N%s ", tableName);
if (schema != null)
sql += Query.format("AND TABLE_SCHEMA = N%s", schema);
return UtilityDB.<Boolean>executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);
}
private static void createIndex(Connection connection, IndexTableDTO indexTableDTO) throws Exception {
UtilityDB.createIndex(connection, indexTableDTO);
}
private static void dropIndex(Connection connection, String tableName, String indexName) throws Exception {
UtilityDB.dropIndex(connection, tableName, indexName);
}
private static void executeStatement(Connection connection, String... sqls) throws SQLException {
try (Statement statement = connection.createStatement()) {
for (String sql : sqls) {
statement.execute(sql);
}
}
}
private static void createOrUpdateView(Connection connection, String objectName, String createViewSql) throws SQLException, IOException {
alterObject(connection, SqlObjectTypeEnum.VIEW, objectName, createViewSql);
}
private static void alterObject(Connection connection, SqlObjectTypeEnum sqlObject, String objectName, String sql) throws SQLException, IOException {
executeStatement(connection, "IF EXISTS (SELECT * FROM SYSOBJECTS WHERE id = object_id('" + objectName + "'))\r\n" +
"\tDROP " + sqlObject.toString() + " " + objectName,
sql);
}
}

View File

@@ -2,10 +2,9 @@ package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
import it.integry.ems.settings.Model.AvailableConnectionsModel;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems.settings.Model.AvailableConnectionModel;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems_model.utility.UtilityDB;
import java.sql.DriverManager;
import java.sql.Statement;
@@ -15,9 +14,9 @@ public class Migration_20210721093948 extends BaseMigration implements Migration
@Override
public void up() throws Exception {
AvailableConnectionsModel historyDBModel = settingsController.getHistoryDbConnectionModel();
AvailableConnectionModel historyDBModel = settingsController.getHistoryDbConnectionModel();
if (!settingsModel.getDefaultProfile().equalsIgnoreCase(advancedDataSource.getProfileName()))
if (!settingsModel.getDefaultProfile().equalsIgnoreCase(connection.getProfileName()))
return;
if (historyDBModel == null)

View File

@@ -12,7 +12,7 @@ public class Migration_20210721125744 extends BaseMigration implements Migration
@Override
public void up() throws Exception {
if (!settingsModel.getDefaultProfile().equalsIgnoreCase(advancedDataSource.getDataSource().getDbName()))
if (!settingsModel.getDefaultProfile().equalsIgnoreCase(connection.getDbName()))
return;
String tomcatPath = System.getProperty("catalina.home");

View File

@@ -2,10 +2,9 @@ package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
import it.integry.ems.settings.Model.AvailableConnectionsModel;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems.settings.Model.AvailableConnectionModel;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems_model.utility.UtilityDB;
import java.sql.DriverManager;
import java.sql.Statement;
@@ -15,9 +14,9 @@ public class Migration_20210924152555 extends BaseMigration implements Migration
@Override
public void up() throws Exception {
AvailableConnectionsModel historyDBModel = settingsController.getHistoryDbConnectionModel();
AvailableConnectionModel historyDBModel = settingsController.getHistoryDbConnectionModel();
if (!settingsModel.getDefaultProfile().equalsIgnoreCase(advancedDataSource.getProfileName()))
if (!settingsModel.getDefaultProfile().equalsIgnoreCase(connection.getProfileName()))
return;
if (historyDBModel == null)

View File

@@ -38,7 +38,7 @@ public class Migration_20211022131206 extends BaseMigration implements Migration
" WHERE stb_user.user_name IS NULL ";
List<WtbUsers> wtbUsersList = UtilityDB.executeSimpleQueryDTO(advancedDataSource.getConnection(), sql, WtbUsers.class);
List<WtbUsers> wtbUsersList = UtilityDB.executeSimpleQueryDTO(connection, sql, WtbUsers.class);
if (wtbUsersList == null) return;
@@ -54,7 +54,7 @@ public class Migration_20211022131206 extends BaseMigration implements Migration
.setFlagAttivo(wtbUser.getCtrlState());
stbUser.setOperation(OperationType.INSERT);
stbUser.manageWithParentConnection(advancedDataSource.getConnection(), droolsDataCompleting);
stbUser.manageWithParentConnection(connection, droolsDataCompleting);
}

View File

@@ -19,10 +19,10 @@ public class Migration_20211027170945 extends BaseMigration implements Migration
"WHERE Name = N'orientation' " +
" AND Object_ID = Object_ID(N'dbo.wtb_jrept')";
boolean fieldExists = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), sql);
boolean fieldExists = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);
if (!fieldExists) {
sql = "ALTER TABLE wtb_jrept ADD orientation INT DEFAULT 0 NOT NULL CHECK (orientation IN (0, 1))";
Statement statement = advancedDataSource.getConnection().createStatement();
Statement statement = connection.createStatement();
statement.execute(sql);
statement.close();
}

View File

@@ -18,12 +18,12 @@ public class Migration_20211108185224 extends BaseMigration implements Migration
AutomatedOperationHandlerComponent automatedOperationHandlerComponent = ContextLoader.getCurrentWebApplicationContext().getBean(AutomatedOperationHandlerComponent.class);
final String migrateFileOperationName = "Migrate files grlAnagNote " + advancedDataSource.getProfileName().toUpperCase();
final String migrateFileOperationName = "Migrate files grlAnagNote " + connection.getProfileName().toUpperCase();
ServiceCallAutomatedOperationDTO serviceCallAutomatedOperationDTO = new ServiceCallAutomatedOperationDTO()
.setMethodName("migrateGtbAnagNoteFiles")
.setProfileDb(advancedDataSource.getProfileName())
.setUsername(advancedDataSource.getProfileName());
.setProfileDb(connection.getProfileName())
.setUsername(connection.getProfileName());
serviceCallAutomatedOperationDTO
.setCronTrigger("0 0 0 1/1 * ?")

View File

@@ -3,6 +3,7 @@ package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
import it.integry.ems.service.PrinterService;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems_model.entity.GrlAnagJrept;
import it.integry.ems_model.entity.MtbDepo;
import it.integry.ems_model.entity.WtbJreptSetup;
@@ -13,8 +14,6 @@ import it.integry.ems_model.utility.UtilityString;
import org.json.JSONArray;
import org.json.JSONObject;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
@@ -29,11 +28,11 @@ public class Migration_20220405180136 extends BaseMigration implements Migration
String checkTableSpesExistsSql = "SELECT CAST(COUNT(*) AS BIT) AS exist_table " +
"FROM INFORMATION_SCHEMA.TABLES " +
"WHERE TABLE_NAME = 'wtb_jrept_setup'";
boolean existTable = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), checkTableSpesExistsSql);
boolean existTable = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, checkTableSpesExistsSql);
if (!existTable) {
Statement statement = advancedDataSource.getConnection().createStatement();
Statement statement = connection.createStatement();
statement.execute("CREATE TABLE wtb_jrept_setup\n" +
"(\n" +
" id BIGINT IDENTITY\n" +
@@ -51,26 +50,26 @@ public class Migration_20220405180136 extends BaseMigration implements Migration
")");
statement.close();
statement = advancedDataSource.getConnection().createStatement();
statement = connection.createStatement();
statement.execute("CREATE UNIQUE INDEX wtb_jrept_setup_report_id_cod_mdep_tipo_uindex " +
"ON wtb_jrept_setup (report_id, cod_mdep, tipo)");
statement.close();
advancedDataSource.getConnection().commit();
connection.commit();
ArrayList<WtbJreptSetup> jreptSetupsToInsert = new ArrayList<>();
String sqlDepo = "SELECT cod_mdep FROM " + MtbDepo.ENTITY;
List<String> codMdeps = UtilityDB.executeSimpleQueryOnlyFirstColumn(advancedDataSource.getConnection(), sqlDepo);
List<String> codMdeps = UtilityDB.executeSimpleQueryOnlyFirstColumn(connection, sqlDepo);
if (codMdeps != null && !codMdeps.isEmpty()) {
for (String codMdep : codMdeps) {
String stampantePrimaria = getPrinterNameByDepo(advancedDataSource.getConnection(), codMdep, null, PrinterService.Type.PRIMARIA);
String stampanteSecondaria = getPrinterNameByDepo(advancedDataSource.getConnection(), codMdep, null, PrinterService.Type.SECONDARIA);
String stampantePrimaria = getPrinterNameByDepo(connection, codMdep, null, PrinterService.Type.PRIMARIA);
String stampanteSecondaria = getPrinterNameByDepo(connection, codMdep, null, PrinterService.Type.SECONDARIA);
String grlAnagJreptSql = "SELECT DISTINCT report_id, tipo FROM " + GrlAnagJrept.ENTITY;
List<GrlAnagJrept> grlAnagJrepts = UtilityDB.executeSimpleQueryDTO(advancedDataSource.getConnection(), grlAnagJreptSql, GrlAnagJrept.class);
List<GrlAnagJrept> grlAnagJrepts = UtilityDB.executeSimpleQueryDTO(connection, grlAnagJreptSql, GrlAnagJrept.class);
if (grlAnagJrepts != null && !UtilityString.isNullOrEmpty(stampantePrimaria)) {
for (GrlAnagJrept grlAnagJrept : grlAnagJrepts) {
@@ -90,7 +89,7 @@ public class Migration_20220405180136 extends BaseMigration implements Migration
}
for (WtbJreptSetup wtbJreptSetup : jreptSetupsToInsert) {
wtbJreptSetup.manageWithParentConnection(advancedDataSource.getConnection(), droolsDataCompleting);
wtbJreptSetup.manageWithParentConnection(connection, droolsDataCompleting);
}
}
}

View File

@@ -38,7 +38,7 @@ public class Migration_20220413102657 extends BaseMigration implements Migration
" WHERE stb_user.user_name IS NULL ";
List<WtbUsers> wtbUsersList = UtilityDB.executeSimpleQueryDTO(advancedDataSource.getConnection(), sql, WtbUsers.class);
List<WtbUsers> wtbUsersList = UtilityDB.executeSimpleQueryDTO(connection, sql, WtbUsers.class);
if (wtbUsersList == null) return;
@@ -63,11 +63,10 @@ public class Migration_20220413102657 extends BaseMigration implements Migration
.setCreationDatetime(wtbUser.getCreationDatetime())
.setPasswordExpiresDays(wtbUser.getPasswordExpiresDays())
.setLastPasswords(wtbUser.getLastPasswords())
.setFlagPasswordExpiring(wtbUser.getFlagPasswordExpiring())
.setDestructionDatetime(wtbUser.getDestructionDatetime());;
.setFlagPasswordExpiring(wtbUser.getFlagPasswordExpiring());
stbUser.setOperation(OperationType.INSERT);
stbUser.manageWithParentConnection(advancedDataSource.getConnection(), droolsDataCompleting);
stbUser.manageWithParentConnection(connection, droolsDataCompleting);
}
}

View File

@@ -20,7 +20,7 @@ public class Migration_20220415094936 extends BaseMigration implements Migration
"SET flag_default_contabilita = 'S', flag_default = 'N' " +
"WHERE flag_default = 'S'";
PreparedStatement updateDefaultFlagPS = advancedDataSource.getConnection().prepareStatement(updateDefaultFlagSql);
PreparedStatement updateDefaultFlagPS = connection.prepareStatement(updateDefaultFlagSql);
updateDefaultFlagPS.setQueryTimeout(30);
updateDefaultFlagPS.executeUpdate();
updateDefaultFlagPS.close();
@@ -38,13 +38,13 @@ public class Migration_20220415094936 extends BaseMigration implements Migration
" FROM " + StbEmail.ENTITY +
" WHERE e_mail = " + UtilityDB.valueToString(mailConfiguration.getFrom());
boolean exists = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), sql);
boolean exists = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);
if (!exists) {
boolean isOffice365 = mailConfiguration.getSmtp().contains("office365");
int newId = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(),
int newId = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection,
"SELECT ISNULL(MAX(id_riga), 0) + 1 as new_id " +
"FROM stb_email");
@@ -61,7 +61,7 @@ public class Migration_20220415094936 extends BaseMigration implements Migration
.setFlagDefault(isOffice365 ? "S" : "N");
stbEmail.setOperation(OperationType.INSERT);
stbEmail.manageWithParentConnection(advancedDataSource.getConnection(), droolsDataCompleting);
stbEmail.manageWithParentConnection(connection, droolsDataCompleting);
if (!isOffice365) {
String noReplyFrom = "noreply@" + mailConfiguration.getFrom().split("@")[1];
@@ -79,14 +79,14 @@ public class Migration_20220415094936 extends BaseMigration implements Migration
.setFlagDefault("S");
stbEmailNoReply.setOperation(OperationType.INSERT);
stbEmailNoReply.manageWithParentConnection(advancedDataSource.getConnection(), droolsDataCompleting);
stbEmailNoReply.manageWithParentConnection(connection, droolsDataCompleting);
}
} else {
updateDefaultFlagSql = "UPDATE stb_email " +
"SET flag_default = 'S' " +
"WHERE e_mail = " + UtilityDB.valueToString(mailConfiguration.getFrom());
updateDefaultFlagPS = advancedDataSource.getConnection().prepareStatement(updateDefaultFlagSql);
updateDefaultFlagPS = connection.prepareStatement(updateDefaultFlagSql);
updateDefaultFlagPS.setQueryTimeout(30);
updateDefaultFlagPS.executeUpdate();
updateDefaultFlagPS.close();

View File

@@ -3,6 +3,7 @@ package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
import it.integry.ems.service.PrinterService;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems_model.entity.GrlAnagJrept;
import it.integry.ems_model.entity.MtbDepo;
import it.integry.ems_model.entity.WtbJrept;
@@ -14,8 +15,6 @@ import it.integry.ems_model.utility.UtilityString;
import org.json.JSONArray;
import org.json.JSONObject;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
@@ -30,15 +29,15 @@ public class Migration_20220421125860 extends BaseMigration implements Migration
String checkTableSpesExistsSql = "SELECT CAST(COUNT(*) AS BIT) AS exist_table " +
"FROM INFORMATION_SCHEMA.TABLES " +
"WHERE TABLE_NAME = 'wtb_jrept_setup'";
boolean existTable = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), checkTableSpesExistsSql);
boolean existTable = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, checkTableSpesExistsSql);
if (existTable) {
Statement statement = advancedDataSource.getConnection().createStatement();
Statement statement = connection.createStatement();
statement.execute("drop table wtb_jrept_setup");
statement.close();
}
Statement statement = advancedDataSource.getConnection().createStatement();
Statement statement = connection.createStatement();
statement.execute("create table wtb_jrept_setup\n" +
"(\n" +
" id bigint identity\n" +
@@ -60,7 +59,7 @@ public class Migration_20220421125860 extends BaseMigration implements Migration
")");
statement.close();
statement = advancedDataSource.getConnection().createStatement();
statement = connection.createStatement();
statement.execute("create unique index wtb_jrept_setup_cod_mdep_tipo_cod_anag_uindex" +
" on wtb_jrept_setup (cod_mdep, tipo, cod_anag)");
statement.close();
@@ -68,17 +67,17 @@ public class Migration_20220421125860 extends BaseMigration implements Migration
ArrayList<WtbJreptSetup> jreptSetupsToInsert = new ArrayList<>();
String sqlAnagJrept = "SELECT * FROM " + GrlAnagJrept.ENTITY + " ";
List<GrlAnagJrept> anagJrepts = UtilityDB.executeSimpleQueryDTO(advancedDataSource.getConnection(), sqlAnagJrept, GrlAnagJrept.class);
List<GrlAnagJrept> anagJrepts = UtilityDB.executeSimpleQueryDTO(connection, sqlAnagJrept, GrlAnagJrept.class);
String sqlDepo = "SELECT cod_mdep FROM " + MtbDepo.ENTITY;
List<String> codMdeps = UtilityDB.executeSimpleQueryOnlyFirstColumn(advancedDataSource.getConnection(), sqlDepo);
List<String> codMdeps = UtilityDB.executeSimpleQueryOnlyFirstColumn(connection, sqlDepo);
if (anagJrepts != null && !anagJrepts.isEmpty()) {
for (GrlAnagJrept anagReport : anagJrepts) {
String sqlOrientationReport = "SELECT orientation FROM " + WtbJrept.ENTITY + " where id = " + UtilityDB.valueToString(anagReport.getReportId());
int orientation = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), sqlOrientationReport);
int orientation = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, sqlOrientationReport);
WtbJreptSetup wtbJreptSetup = new WtbJreptSetup()
.setCodMdep(null)
@@ -92,7 +91,7 @@ public class Migration_20220421125860 extends BaseMigration implements Migration
if (codMdeps != null && !codMdeps.isEmpty()) {
for (String codMdep : codMdeps) {
String stampantePrimaria = getPrinterNameByDepo(advancedDataSource.getConnection(), codMdep, null, PrinterService.Type.PRIMARIA);
String stampantePrimaria = getPrinterNameByDepo(connection, codMdep, null, PrinterService.Type.PRIMARIA);
if (!UtilityString.isNullOrEmpty(stampantePrimaria)) {
WtbJreptSetup wtbJreptSetupDepo = new WtbJreptSetup()
@@ -116,7 +115,7 @@ public class Migration_20220421125860 extends BaseMigration implements Migration
}
for (WtbJreptSetup wtbJreptSetup : jreptSetupsToInsert) {
wtbJreptSetup.manageWithParentConnection(advancedDataSource.getConnection());
wtbJreptSetup.manageWithParentConnection(connection);
}
}

View File

@@ -17,13 +17,13 @@ public class Migration_20220510103554 extends BaseMigration implements Migration
"FROM sys.columns " +
"WHERE Name = N'ref_uuid' " +
"AND Object_ID = Object_ID(N'dbo.stb_activity_file')";
boolean existColumn = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), checkTableSpesExistsSql);
boolean existColumn = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, checkTableSpesExistsSql);
if (existColumn) {
return;
}
Statement statement = advancedDataSource.getConnection().createStatement();
Statement statement = connection.createStatement();
statement.execute("ALTER TABLE stb_activity_file " +
"ADD ref_uuid VARCHAR(36) NULL");
statement.close();

View File

@@ -17,13 +17,13 @@ public class Migration_20220510123355 extends BaseMigration implements Migration
"FROM sys.columns " +
"WHERE Name = N'ref_uuid1' " +
"AND Object_ID = Object_ID(N'dbo.stb_activity_file')";
boolean existColumn = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), checkTableSpesExistsSql);
boolean existColumn = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, checkTableSpesExistsSql);
if (existColumn) {
return;
}
Statement statement = advancedDataSource.getConnection().createStatement();
Statement statement = connection.createStatement();
statement.execute("ALTER TABLE stb_activity_file " +
"ADD ref_uuid1 VARCHAR(36) NULL");
statement.close();

View File

@@ -28,11 +28,11 @@ public class Migration_20221128123233 extends BaseMigration implements Migration
"ALTER TABLE azienda\n" +
" ADD jwt_secret_key VARCHAR(MAX)");
Azienda azienda = Azienda.getDefaultAzienda(advancedDataSource.getConnection());
Azienda azienda = Azienda.getDefaultAzienda(connection);
azienda.setJwtSecretKey(secretKeyToUse)
.setOperation(OperationType.UPDATE);
azienda.manageWithParentConnection(advancedDataSource.getConnection());
azienda.manageWithParentConnection(connection);
}
@Override

View File

@@ -25,12 +25,12 @@ public class Migration_20230411163906 extends BaseMigration implements Migration
"ALTER TABLE stb_files_attached\n" +
" ADD mime_type VARCHAR(MAX)");
final List<HashMap<String, Object>> stbFilesAttached = UtilityDB.executeSimpleQuery(advancedDataSource.getConnection(),
final List<HashMap<String, Object>> stbFilesAttached = UtilityDB.executeSimpleQuery(connection,
"SELECT id_attach, file_name FROM stb_files_attached\n" +
"WHERE mime_type IS NULL");
new Thread(() -> {
String profileDb = advancedDataSource.getProfileName();
String profileDb = connection.getProfileName();
try (MultiDBTransactionManager mdb = new MultiDBTransactionManager(profileDb, false)) {
for (HashMap<String, Object> stbFileAttached : stbFilesAttached) {
final MediaType mimeType = mimeTypesHandler.getContentType((String) stbFileAttached.get("file_name"));

View File

@@ -23,7 +23,7 @@ public class Migration_20230523130047 extends BaseMigration implements Migration
.setIndexName("ix_dtb_ordr_id_contratto")
.setColumnsIndex(columnsIndex)/*
.setColumnsInclude("ciao", "prova", "sole") */;
UtilityDB.createIndex(advancedDataSource.getConnection(),indexTableDTO );
UtilityDB.createIndex(connection,indexTableDTO );
}
@Override

View File

@@ -27,7 +27,7 @@ public class Migration_20231025100023 extends BaseMigration implements Migration
.setColumnsIndex(columnsIndex)
.setUnique(true)/*
.setColumnsInclude("ciao", "prova", "sole") */;
UtilityDB.createIndex(advancedDataSource.getConnection(),indexTableDTO );
UtilityDB.createIndex(connection,indexTableDTO );
}

View File

@@ -8,7 +8,7 @@ public class Migration_20231130152938 extends BaseMigration implements Migration
@Override
public void up() throws Exception {
if (!settingsModel.getDefaultProfile().equalsIgnoreCase(advancedDataSource.getDataSource().getDbName()))
if (!settingsModel.getDefaultProfile().equalsIgnoreCase(connection.getDbName()))
return;
settingsModel.setEnableTokenCaching(!UtilityDebug.isDebugExecution());

View File

@@ -15,7 +15,7 @@ public class Migration_20231201094005 extends BaseMigration implements Migration
return;
String sql = "select cast(COUNT(*) as bit) from sys.syscolumns where OBJECT_NAME(id) = 'mtb_colt' and name = 'id_lotto'";
boolean existColumn = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), sql);
boolean existColumn = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);
if (!existColumn )
executeStatement(
@@ -30,7 +30,7 @@ public class Migration_20231201094005 extends BaseMigration implements Migration
new IndexTableDTO.ColumnIndex("cod_jfas"),
new IndexTableDTO.ColumnIndex("id_lotto")
));
UtilityDB.createIndex(advancedDataSource.getConnection(), indexTableDTO);
UtilityDB.createIndex(connection, indexTableDTO);
}
@Override

View File

@@ -17,7 +17,7 @@ public class Migration_20231201161808 extends BaseMigration implements Migration
@Override
public void up() throws Exception {
SetupGest setupGest = getContextBean(SetupGest.class);
String datiFornitori = setupGest.getSetup(advancedDataSource.getConnection(), "PVM", "DOC_INTERNI", "CHECK_FORNITORE");
String datiFornitori = setupGest.getSetup(connection, "PVM", "DOC_INTERNI", "CHECK_FORNITORE");
if (UtilityString.isNullOrEmpty(datiFornitori))
return;
@@ -30,7 +30,7 @@ public class Migration_20231201161808 extends BaseMigration implements Migration
" INNER JOIN azienda ON gtb_anag.part_iva = azienda.part_iva\n" +
" INNER JOIN atb_forn ON gtb_anag.cod_anag = atb_forn.cod_anag ";
List<String> fornitori = UtilityDB.executeSimpleQueryOnlyFirstColumn(advancedDataSource.getConnection(), sql);
List<String> fornitori = UtilityDB.executeSimpleQueryOnlyFirstColumn(connection, sql);
List<String> queries = new ArrayList<>();

View File

@@ -22,7 +22,7 @@ public class Migration_20240125114347 extends BaseMigration implements Migration
final String gestName = "PICKING";
final String section = "LOGISTICA";
final String keySection = "COD_DTIP_DOC_TRASF_INTERNI";
String jsonString = setupGest.getSetup(advancedDataSource.getConnection(), gestName, section, keySection);
String jsonString = setupGest.getSetup(connection, gestName, section, keySection);
if (UtilityString.isNullOrEmpty(jsonString))
return;

View File

@@ -12,7 +12,7 @@ public class Migration_20240201160125 extends BaseMigration implements Migration
return;
String existsCheckSql = "SELECT CAST(COUNT(*) AS BIT) AS exist FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'stb_migration_status'";
boolean exists = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), existsCheckSql);
boolean exists = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, existsCheckSql);
if(exists)
return;

View File

@@ -2,15 +2,13 @@ package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems_model.utility.Query;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityHashMap;
import javax.validation.constraints.NotNull;
import java.io.IOException;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
@@ -23,13 +21,13 @@ public class Migration_20240212000000 extends BaseMigration implements Migration
return;
String sql = "SELECT * FROM stb_publications";
final List<HashMap<String, Object>> oldStbPublications = UtilityDB.executeSimpleQuery(advancedDataSource.getConnection(), sql);
final List<HashMap<String, Object>> oldStbPublications = UtilityDB.executeSimpleQuery(connection, sql);
sql = "SELECT * FROM stb_publications_detail";
final List<HashMap<String, Object>> oldStbPublicationsDetails = UtilityDB.executeSimpleQuery(advancedDataSource.getConnection(), sql);
final List<HashMap<String, Object>> oldStbPublicationsDetails = UtilityDB.executeSimpleQuery(connection, sql);
dropOldTables();
createNewTables(advancedDataSource.getConnection());
createNewTables(connection);
for (HashMap<String, Object> oldStbPublication : oldStbPublications) {

View File

@@ -10,9 +10,9 @@ public class Migration_20240304165725 extends BaseMigration implements Migration
if (isHistoryDB())
return;
if (advancedDataSource.getProfileName().equalsIgnoreCase("carelli") ||
advancedDataSource.getProfileName().equalsIgnoreCase("gestfood") ||
advancedDataSource.getProfileName().equalsIgnoreCase("panimal")) {
if (connection.getProfileName().equalsIgnoreCase("carelli") ||
connection.getProfileName().equalsIgnoreCase("gestfood") ||
connection.getProfileName().equalsIgnoreCase("panimal")) {
String sql = "UPDATE carelli_giacenza_prog\n" +
"SET tipo_car = 'R'\n" +

View File

@@ -22,7 +22,7 @@ public class Migration_20240307103608 extends BaseMigration implements Migration
add("PANIMAL");
}};
if (elencoDb.stream().noneMatch(x -> x.equalsIgnoreCase(advancedDataSource.getDataSource().getDbName())))
if (elencoDb.stream().noneMatch(x -> x.equalsIgnoreCase(connection.getDbName())))
return;
String sql =
@@ -39,7 +39,7 @@ public class Migration_20240307103608 extends BaseMigration implements Migration
" AND wtb_users_info.flag_state = 'S'\n" +
" AND stb_user.key_group = '10'";
List<HashMap<String, Object>> elencoUtenti = UtilityDB.executeSimpleQuery(advancedDataSource.getConnection(), sql);
List<HashMap<String, Object>> elencoUtenti = UtilityDB.executeSimpleQuery(connection, sql);
List<ExportAutomatedOperationDTO> operations = new ArrayList<>();
for (HashMap<String, Object> user : elencoUtenti) {
@@ -53,7 +53,7 @@ public class Migration_20240307103608 extends BaseMigration implements Migration
.setUsername((String) user.get("user_name"))
.setPassword((String) user.get("password"))
.setJsonRequest("{ \t\"tipoReport\": \"G\" }")
.setProfileDb(advancedDataSource.getProfileName());
.setProfileDb(connection.getProfileName());
exportAutomatedOperationDTO
.setCronTrigger("0 0 22 1/1 * *")
.setName(operationName);

View File

@@ -15,7 +15,7 @@ public class Migration_20240312093539 extends BaseMigration implements Migration
boolean existTable = existsTable(tableName);
if (existTable) {
boolean existRow = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), "SELECT cast(count(*) as bit) FROM " + tableName);
boolean existRow = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, "SELECT cast(count(*) as bit) FROM " + tableName);
if (existRow) return;
dropTable(tableName);
}
@@ -40,12 +40,12 @@ public class Migration_20240312093539 extends BaseMigration implements Migration
" orientation int default 0 not null\n" +
")";
executeStatement(advancedDataSource.getConnection(), createSql);
executeStatement(connection, createSql);
String createIndex = "create unique index wtb_jrept_setup_cod_mdep_tipo_cod_anag_uindex" +
" on wtb_jrept_setup (cod_mdep, tipo, cod_anag)";
executeStatement(advancedDataSource.getConnection(), createIndex);
executeStatement(connection, createIndex);
}
@Override

View File

@@ -25,7 +25,7 @@ public class Migration_20240321144750 extends BaseMigration implements Migration
if (!isCustomer(IntegryCustomer.Tosca)) return;
String currentDbName = advancedDataSource.getDataSource().getDbName();
String currentDbName = connection.getDbName();
IntegryCustomerDB db = Arrays.stream(IntegryCustomer.Tosca.getValues()).filter(x -> x.getValue().equalsIgnoreCase(currentDbName)).findFirst().orElse(null);
LocalDate giorno = UtilityLocalDate.getNow();
@@ -52,7 +52,7 @@ public class Migration_20240321144750 extends BaseMigration implements Migration
}
String sql = "SELECT MAX(id_riga) from stb_calr_ore_gg where cod_Cal = 'DEFAULT'";
Integer idRiga = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(), sql);
Integer idRiga = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);
if (idRiga == null) {
throw new Exception("Calendario DEFAULT non configurato!");
@@ -71,7 +71,7 @@ public class Migration_20240321144750 extends BaseMigration implements Migration
.setOperation(OperationType.INSERT);
calendario.getStbCalrOreGg().add(firstWorkingHour);
calendario.manageWithParentConnection(advancedDataSource.getConnection());
calendario.manageWithParentConnection(connection);
}
@Override

View File

@@ -33,7 +33,7 @@ public class Migration_20240408151803 extends BaseMigration implements Migration
updateSetupValue("DATI_AZIENDA", "SETUP", "FLAG_ANSI_PADDING", "S");
updateSetupValue("DATI_AZIENDA", "SETUP", "FLAG_CONCAT_NULL_YIELDS_NULL", "S");
SQLServerDBSchemaManager schemaManager = new SQLServerDBSchemaManager(this.advancedDataSource.getConnection());
SQLServerDBSchemaManager schemaManager = new SQLServerDBSchemaManager(this.connection);
final List<String> queries = schemaManager.generateAlterTableToDisableAnsiPadding();
//executeStatement(queries.toArray(new String[0]));

View File

@@ -24,7 +24,7 @@ public class Migration_20240411152632 extends BaseMigration implements Migration
.setIndexName("ix_mtb_movi_kit")
.setColumnsIndex(columnsIndex)
.setColumnsInclude("anno");
UtilityDB.createIndex(advancedDataSource.getConnection(),indexTableDTO );
UtilityDB.createIndex(connection,indexTableDTO );
}
@Override

Some files were not shown because too many files have changed in this diff Show More