Compare commits

...

1751 Commits

Author SHA1 Message Date
jenkins
9a4d972160 20250403_103612 2025-04-03 10:36:13 +02:00
7611f09281 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-03 10:35:32 +02:00
9fe9c43946 [ROSSOGARGANO - accettazione da campo]
- aggiunto controllo su cambio numero certificato
2025-04-03 10:35:25 +02:00
8f7c5e95da Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-02 19:30:03 +02:00
b646e2d215 Corretto rientro materiale versato 2025-04-02 19:29:50 +02:00
141367dac2 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-04-02 17:38:47 +02:00
fcadbc73dc [ROSSOGARGANO]
- modificata stampa bins carciofi calibrati
- gestita partitaMagProd in campi raccolta
- modificato versamento materiale su ordine
2025-04-02 17:38:01 +02:00
b8953634cb Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-01 11:02:59 +02:00
0144079695 Fix exchange contratti vendita 2025-04-01 11:02:54 +02:00
329ee8672f Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-01 10:56:42 +02:00
26502d60b5 Implementata exchange contratti di vendita 2025-04-01 10:56:36 +02:00
31e72b6def Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-31 18:25:21 +02:00
b3f00afe78 aggiunto controllo in impotazione scontrini 2025-03-31 18:25:01 +02:00
ce66916d06 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-31 18:04:39 +02:00
7819ebac88 Fix exchange ordini vendita 2025-03-31 18:04:34 +02:00
bad647fa72 Finish FixDataConsMRP
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-31 16:33:05 +02:00
e377e0a97e Fix filtro data cons non usato in MRP 2025-03-31 16:32:55 +02:00
089b14693a Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-31 16:23:15 +02:00
c9f223e707 Fix exchange ordini vendita 2025-03-31 16:23:10 +02:00
b607ba8809 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-31 16:03:50 +02:00
413925fceb Implementata gestione ordini vendita in exchange 2025-03-31 16:03:45 +02:00
38991a4327 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-31 14:11:50 +02:00
159f19d7fe sistemati errori 2025-03-31 14:11:03 +02:00
d7d1da21f7 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-31 12:10:29 +02:00
9b49cb0016 Rimossa attesa durante la chiamata di UpdateQtaImpProx 2025-03-31 12:10:24 +02:00
c06d18a870 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-31 09:58:49 +02:00
c25d4dfc3a Modifica fattura elettronica su clienti C2432 e C1830 2025-03-31 09:58:34 +02:00
044f2d96bf Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-03-31 09:02:22 +02:00
375bd119e9 Migrazioe e upper su iban 2025-03-31 09:02:10 +02:00
14135f322f Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-28 18:32:05 +01:00
a3c3a75730 Modifiche servizi Consegna 2025-03-28 18:31:57 +01:00
04dd25b278 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-28 17:32:54 +01:00
c7baf12089 Rinominate voci menu delle gestioni documenti d'acquisto nel menu di rossogargano 2025-03-28 17:32:46 +01:00
993ed8dc1d Sistemato userCacheService
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-28 16:56:44 +01:00
c4c636160e gestito valore 0 in flagSezione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-28 14:26:35 +01:00
de41705cb8 Fix null pointer se dbPrimary null in closeAll
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-28 12:18:50 +01:00
d1bef48e99 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-28 09:46:45 +01:00
279fe47567 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-28 09:46:44 +01:00
c437131f4d Aggiunto mucci in integryCustomer 2025-03-28 09:46:31 +01:00
336d8f250f Modifica migrations per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-27 17:04:31 +01:00
afd090a508 Modifica taglie e cuci
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-27 16:57:44 +01:00
6c9fc82943 aggiunto servizion per assegnare barcode
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-27 16:48:16 +01:00
0611ea135a Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-27 12:49:29 +01:00
cd5a20041a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-27 12:49:29 +01:00
64a9b546ba Spostata build docker dopo il publish 2025-03-27 12:49:18 +01:00
82f31cf323 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-27 12:45:46 +01:00
b42cfb88fc Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-27 12:45:45 +01:00
bd532b6718 Implementata variabile printCopies nel printReport 2025-03-27 12:45:40 +01:00
ea5a448f90 Creato nuovo servizio di retrieve per verifica giacenze WMS. Aggiunta close quando si fa lo switch di db in MultiDBTransactionManager
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-27 10:33:33 +01:00
4774910dd7 Fix servizio per stampa documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-27 10:16:19 +01:00
d4286c8756 Ripristinato enum flagSezione in dtbdocr 2025-03-27 10:15:20 +01:00
58ceea29c5 Creato servizio "createUDCFromDocuments" 2025-03-27 10:14:50 +01:00
7f12fb12f5 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-26 20:17:34 +01:00
8361c7e951 aggiunta migratio con lettura dati da _azienda.ini 2025-03-26 20:17:26 +01:00
c458ba9af5 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-26 18:43:26 +01:00
5886b3d5e0 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-26 18:43:25 +01:00
200ed30238 Migliorie MRP cached data 2025-03-26 18:43:19 +01:00
978047900f Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-26 17:48:59 +01:00
3060bdeb62 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-26 17:48:59 +01:00
990420c90f Fix 2025-03-26 17:48:54 +01:00
9c4025b1f8 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-26 17:20:36 +01:00
046391b27c Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-26 17:20:36 +01:00
f7ed16f026 Fix su cached data MRP 2025-03-26 17:20:30 +01:00
219933da7a Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-26 17:15:28 +01:00
bc34a4d9d4 Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-26 17:15:28 +01:00
3b2fb434f9 Fix su cached data MRP 2025-03-26 17:15:21 +01:00
e455550294 - aggiunti editorFold in creazione certificati rg
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- corretta setup gramm
2025-03-26 15:24:13 +01:00
f7898ef5be aggiunta migratio con lettura dati da _azienda.ini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-26 12:38:50 +01:00
43a5948a1d Fix enum flagSezione in dtbDocr
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-26 11:09:04 +01:00
e8b53c6a39 Nuovo db Resina color di Semeraro Pasquale
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-26 08:49:43 +01:00
6f625187a9 Finish AggCal100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-25 12:25:56 +01:00
c1b0877e48 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-25 12:25:56 +01:00
b629a1b309 Aggiunto calibro 100 in report carciofi 2025-03-25 12:25:49 +01:00
90d4b6a8eb Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-25 09:58:46 +01:00
080bbdaa23 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-25 09:58:46 +01:00
cee2026f7e Rimosso log da ProductionOrderDataHandlerService 2025-03-25 09:58:39 +01:00
37dfa51882 Finish SpostaUl
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-25 09:33:29 +01:00
fef3475617 Ripristinata logica vecchia per i colli L+ su sposta ul
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-25 09:33:07 +01:00
3a2e236ef1 Merge branch 'develop' into feature/SpostaUl
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-25 09:02:43 +01:00
569863a298 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-24 17:51:06 +01:00
94c944e788 aggiunto nuovi campi in mtb_colr 2025-03-24 17:50:58 +01:00
2e6f7a1e8a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-24 16:45:44 +01:00
a0d798089f Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-24 16:45:43 +01:00
641f368c00 corretta migration views tosca 2025-03-24 16:45:36 +01:00
400d901f08 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-24 16:19:38 +01:00
d8289f2e07 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-03-24 16:19:37 +01:00
fb64b2fe10 [TOSCA - EDGECONN]
- migrazioni per gestione dati replica cloud
[BIOLEVANTE - CMMS]
- nuovi campi convalida
[CARELLI - ACCETTAZIONE]
- nuova setup check qta accettata a zero
2025-03-24 16:19:30 +01:00
49e5cafb2c Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-24 13:11:31 +01:00
c866b2d845 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-24 13:11:30 +01:00
087313f7c1 sistemate regola su porto 2025-03-24 13:11:19 +01:00
c203136d16 modifiche per salvataggio variazioni bene da movimento contabile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-24 12:41:01 +01:00
7c34166505 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-24 11:28:50 +01:00
986ebd295a nell'aggiornamento dei progressivi del contratto considerare equivalenti 2025-03-24 11:28:41 +01:00
226ba5ca4e Vario
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-24 10:44:39 +01:00
cf64606f18 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-24 08:40:38 +01:00
6b691a635e Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-24 08:40:37 +01:00
9a44353ff8 sistmato close task 2025-03-24 08:40:22 +01:00
c96cb31f8c Fix servizi consegna
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-03-21 17:50:39 +01:00
158295e0d9 Migliorie su ProductionOrderDataHandlerService
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-21 15:23:43 +01:00
5882c58c3f Gestione incassi PUDDY e importazione ordini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-20 18:55:35 +01:00
1b644dd65b Aggiunti nuovi campi per gestire minusvalenza e plusvalenza
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-20 15:12:13 +01:00
ebb51f815f Modifica gestione incassi per prevendita SEVEN
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-20 12:56:05 +01:00
727eb84d9b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-20 09:11:11 +01:00
49d9827f80 Gestione rif_ord_clie nota credito solo valore in fattura elettronica 2025-03-20 09:11:05 +01:00
faf4a6a79b Aggiunti campi in CU e corretti campi già esistenti, ma con valori errati
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-19 15:37:48 +01:00
405c804877 Gestione orgcons DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-19 11:35:51 +01:00
0eb16fe5a7 Migliorie log4j2.xml
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-19 11:12:23 +01:00
b0ecf67a8a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-19 10:43:46 +01:00
4719fa2089 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-19 10:43:45 +01:00
01b29ab4f5 Fix log di RESTEASY 2025-03-19 10:43:40 +01:00
2598b214f3 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-19 10:22:40 +01:00
13b3095c2c Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-19 10:22:40 +01:00
4f92ac87b4 Fix log di RESTEASY 2025-03-19 10:22:35 +01:00
3bb9f70127 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-19 09:46:16 +01:00
22f9d636cf Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-19 09:46:16 +01:00
761bccb5e6 Rimosso log di RESTEASY 2025-03-19 09:45:36 +01:00
de932ba99b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-18 18:55:16 +01:00
c90d3d3160 Gestione incassi PUDDY e importazione ordini 2025-03-18 18:55:10 +01:00
ce16e24083 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-18 14:46:45 +01:00
3ec779eacf Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-18 14:46:44 +01:00
b8037e69aa aggiunta setup 2025-03-18 14:46:37 +01:00
884e7e89c4 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-18 13:27:14 +01:00
f11b85ff68 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-18 13:27:13 +01:00
38c65c9c50 num_cmov nella distinta 2025-03-18 13:27:05 +01:00
58960d0a7b Migliorie interne
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-18 12:31:20 +01:00
42c12fff5b Aggiunto userCacheService.invalidateCache durante il cambio password
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-18 10:18:18 +01:00
4140671ad9 Fix nome colunna flag_escludi_ven
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-18 09:45:44 +01:00
6f9409769b Modifica MIGRATIONS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-18 09:24:19 +01:00
ba18acc39e Gestione incassi PUDDY e importazione ordini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-18 09:12:10 +01:00
2815c076f5 Gestione incassi PUDDY e importazione ordini 2025-03-18 09:12:01 +01:00
6e6d941c3f Gestiti flag escludi in MrpDepoArtEsclusiWms
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 18:48:55 +01:00
04f4cbb524 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 17:51:17 +01:00
f269b62520 aggiunti nuovi metodi 2025-03-17 17:51:10 +01:00
abb10baec6 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 17:43:22 +01:00
d76ea045ea Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 17:43:21 +01:00
89074c1146 Fix firebase 2025-03-17 17:43:16 +01:00
09497c3a84 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 17:35:24 +01:00
543fd7fab4 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 17:35:23 +01:00
c1bde4949f Fix firebase.
Migration fast-picking.
2025-03-17 17:35:17 +01:00
60a483873c Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 17:07:09 +01:00
1d00736d7c Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 17:07:09 +01:00
985fc1244f non sovrascrvre le attività se l'inserimetno delle ore prevede una descrizione 2025-03-17 17:06:57 +01:00
ea0cf0138a aggiunta ricerca per barcode ul
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-17 16:40:52 +01:00
7dcb344d3a Finish Feature-colli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 16:06:59 +01:00
209e627dbd Gestita visualizzazione dicitura BIO in fattura elettronica
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 15:52:17 +01:00
f92fda8830 aggiunti nuovi campi 2025-03-17 15:30:35 +01:00
2f81e44be3 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 15:29:37 +01:00
e1c34f654b migration per stampa immediata 2025-03-17 15:29:26 +01:00
b119f9a0de Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 12:39:44 +01:00
2e15c547ff aggiunti campi partita_mag_prod e data_prod nella mtb_partita_mag 2025-03-17 12:39:29 +01:00
e5eabc1a7a Cambiata return in printDocument
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 12:25:06 +01:00
e137c68eb3 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 09:51:54 +01:00
afd0ae8fae Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 09:51:53 +01:00
3b389a5319 Modifiche MIGRATION per DMS 2025-03-17 09:51:40 +01:00
2b55d16e11 Modifica export fatt. Elett. per cliente C2499 (GRAMM)
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 09:37:11 +01:00
e56ae14bb9 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-17 09:36:33 +01:00
afaff75409 Assegnazione controllo disallineamento progressivi a tutti 2025-03-17 09:36:25 +01:00
639a0148c8 Aggiornato servizio VerificaGiacenze
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-14 18:11:36 +01:00
424e0bcd2f MIGRATION
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-14 17:56:13 +01:00
66cb72290e Varie cancellazione documento, giacenza carelli, invio variazionie
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-14 17:37:41 +01:00
cef6308491 Fix su gestione dei device
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-14 16:40:37 +01:00
113cc4a95d Modificato confronto tra anno_doc e anno_iniz
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-14 14:48:51 +01:00
c777af7001 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-14 13:13:04 +01:00
d9828bb526 WMS: Implementate logiche di verifica giacenze 2025-03-14 13:12:57 +01:00
e42a2c5781 Controllo null su activityDTOS in getActivity
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-14 12:56:05 +01:00
e1e19b49c2 Migliorie log4j
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-13 18:35:40 +01:00
4e72e646de Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-13 18:24:16 +01:00
e734bd94e1 aggiunto dettaglio 2025-03-13 18:24:12 +01:00
ac032e6fc5 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-13 15:15:30 +01:00
ced03cd972 Finish FixLoginMD5
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-13 15:15:29 +01:00
928bd6c019 Fix su login web e migliorie log4j 2025-03-13 15:15:16 +01:00
bc5a5eee5a Corretto campo flag_fprfettario impostandolo not null
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-13 15:14:02 +01:00
61cc4c5416 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-13 15:02:07 +01:00
6491001332 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-03-13 15:02:07 +01:00
1ffd8936c4 sistemato filtro su file 2025-03-13 15:02:02 +01:00
419327a06b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-13 13:37:44 +01:00
6942b0eedc rigenera autofattura e calcolo risconti 2025-03-13 13:37:31 +01:00
823c4c6ad1 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-13 12:37:39 +01:00
7b04a57a22 Modifica procedura importazione ordini PUDDY
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-13 09:30:50 +01:00
2a4e257344 Migrations funzione calcolo costo totale distinte 2025-03-13 09:30:33 +01:00
e503116fca Migrations funzione calcolo costo totale distinte 2025-03-13 09:30:25 +01:00
24c30843ad Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-12 19:01:34 +01:00
d477133363 Fix su login web e migliorie log4j 2025-03-12 19:01:28 +01:00
5d166cceec Merge remote-tracking branch 'origin/develop' into develop 2025-03-12 12:54:18 +01:00
58920c932f Fix query ConSegna
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-12 11:59:08 +01:00
c7d8f71719 Fix anagrafiche docFinance 2025-03-12 11:58:45 +01:00
515e24dcfa Creato servizio di stampa documenti 2025-03-12 11:58:22 +01:00
4ff113f740 Fix WmsUtility
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-12 11:57:04 +01:00
c154762bb2 Merge branch 'develop' into feature/SpostaUl 2025-03-12 11:56:51 +01:00
502554fb84 ingrandito campo note_incoterms nella dtb_ordt 2025-03-12 10:21:16 +01:00
8a0a4f6014 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-12 10:20:39 +01:00
8e8fcc62bd ingrandito campo note_incoterms nella dtb_ordt 2025-03-12 10:20:32 +01:00
8d6ea2972d Rimosse vecchie config log4j
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-12 10:02:22 +01:00
d65994d72a Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-12 09:40:17 +01:00
7fa22bb88c Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-12 09:40:16 +01:00
82edb17664 sistemto controllo utenti e query per kit in accettazione bolle 2025-03-12 09:40:07 +01:00
a49d50c7ee Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-11 17:50:47 +01:00
e6029e9c0e Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-11 17:50:46 +01:00
36f4d532cf Rimosso log ALL per springframework
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-11 17:06:54 +01:00
b99e2214a3 Finish FirebaseRefactoring
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-11 16:10:13 +01:00
1ef875434a Ultimato refactoring FirebaseService
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-11 16:04:50 +01:00
252584caf5 Merge branch 'develop' into feature/FirebaseRefactoring
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
# Conflicts:
#	ems-core/src/main/java/it/integry/firebase/service/NotificationSenderComponent.java
2025-03-11 15:59:43 +01:00
ed4911012c Merge branch 'develop' into feature/SpostaUl 2025-03-11 15:13:00 +01:00
c42734835b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-11 15:12:41 +01:00
6f00b50c3d Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-11 15:12:40 +01:00
14108d9aef Fix query getActivity 2025-03-11 15:12:30 +01:00
2b5ebf2ed5 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-11 15:02:46 +01:00
f846767330 ingrandito campo porto nella dtb_doct e dtb_ordt 2025-03-11 15:02:36 +01:00
8924faedc9 sistemata lettura cod_anag nell'inserimneto dell'attività dell'installazione degli aggiornamenti 2025-03-11 13:31:55 +01:00
a7cb446bb7 Fix docker build
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-11 13:31:13 +01:00
0895f14e75 Fix docker build
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-11 13:29:56 +01:00
d4964e9f56 Fix docker build
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-11 13:27:21 +01:00
7d038e992a Fix docker build
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-11 13:19:03 +01:00
e49a7903dc Fix docker build
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2025-03-11 13:10:53 +01:00
6a2708dd82 Aggiornati json per docker build
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-03-11 13:05:55 +01:00
aedaad1de3 Integrato Docker
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2025-03-11 12:37:33 +01:00
abd5ae9409 migration per attivazione salvataggio servizi rest dei documenti new e aggiunto nuovo tipo invio
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-11 12:25:41 +01:00
2b2de39d8d Merge branch 'develop' into feature/SpostaUl 2025-03-11 09:42:14 +01:00
344604e996 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-11 09:41:59 +01:00
402bd64406 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-11 09:41:58 +01:00
91af9ec6ee Ripristinata logica sotto attività 2025-03-11 09:41:48 +01:00
311bee077a Fix su invio email di errore con allegato vuoto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-10 17:48:37 +01:00
529ad1c730 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-10 17:43:13 +01:00
7856856edd Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-10 17:43:12 +01:00
6d542fe035 [TOSCA]
corretto nome database cloud per conformarsi al nuovo nome su azure
2025-03-10 17:43:05 +01:00
e9999e520b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-10 17:08:13 +01:00
4acc5e9797 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-10 17:08:12 +01:00
95972989f1 [EdgeConn]
- corretta gestione caricamento impegnato
2025-03-10 17:08:05 +01:00
dd6d91f436 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_20250307174630.java
2025-03-10 16:38:55 +01:00
78c5b87e20 Modifica puddy 2025-03-10 16:35:31 +01:00
4c9bd35ba3 Modifica puddy 2025-03-10 16:35:14 +01:00
85afb0ce8a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-10 12:17:07 +01:00
d15301e08f Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-10 12:17:06 +01:00
207268100a Cambiata logica di retrieve delle sottoattività 2025-03-10 12:17:02 +01:00
b87b8a2fe8 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-10 11:45:33 +01:00
905eb1bf48 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-03-10 11:45:32 +01:00
8062e991dd Cambiata logica di retrieve delle sottoattività 2025-03-10 11:45:27 +01:00
64cd923582 Merge branch 'develop' into feature/SpostaUl 2025-03-10 09:29:59 +01:00
b91dc24dfa Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-10 09:02:49 +01:00
bcf19dba14 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-10 09:02:48 +01:00
eef66cbd20 Sistemata migration 2025-03-10 09:02:31 +01:00
fcb82908d3 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-10 08:52:01 +01:00
21809fa437 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-03-10 08:52:01 +01:00
b3034327b6 Sistemata migration 2025-03-10 08:51:44 +01:00
c57d5ecfba Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-03-07 18:12:50 +01:00
2d8107321a Migrations LICOR 2025-03-07 18:12:45 +01:00
188f488a0a varie ed eventuali
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-07 18:05:01 +01:00
e3e9db8847 Correzione documenti autofattura nel caso di note di credito
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-07 18:04:21 +01:00
a724f5d744 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-07 17:54:03 +01:00
2985681c0f Migrations LICOR 2025-03-07 17:53:59 +01:00
846ea79df0 Migrations LICOR 2025-03-07 17:53:51 +01:00
e5e7ab0f87 Aggiunto campo flag_bio per gestire dicitura bio in stampa documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-07 17:13:15 +01:00
8879c0fdbf Gestata visualizzazione termini di consegna in fattura elettronica ed eliminata la setup note_pie_pagina perchè già gestita nella setup testo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-07 16:48:26 +01:00
3bf7946fe3 creata setup per rendere bloccante il controllo su cod_dgrp_art della mtb_aart nel caso sia diverso da quello della linea
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-07 14:46:31 +01:00
45a9cb119b Rimosse inizializzazioni di ResponseJsonObjectMapper
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-07 13:23:13 +01:00
284ae789e0 Migliorie performance Import/Export
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 19:50:25 +01:00
b7a4ea0d4c Gestite anche in fattura elettronica note della gtb_anag_note che vengono stampate sul documento
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 18:15:36 +01:00
7faab50c66 Merge remote-tracking branch 'origin/develop' into develop
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-03-06 18:15:29 +01:00
24f7549297 Gestite anche in fattura elettronica note della gtb_anag_note che vengono stampate sul documento 2025-03-06 18:15:20 +01:00
687087ed1b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 18:13:21 +01:00
3c4a76a821 creata setup per rendere bloccante il controllo su cod_dgrp_art della mtb_aart nel caso sia diverso da quello della linea 2025-03-06 18:07:24 +01:00
6c947cdfe1 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 17:39:58 +01:00
c84f54fe72 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 17:39:58 +01:00
41d4697507 DMS 2025-03-06 17:39:44 +01:00
4c8c8c21ff Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 16:58:49 +01:00
ac36d6e8c5 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 16:58:48 +01:00
7efd83b370 DMS 2025-03-06 16:58:32 +01:00
de7fe11402 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 16:54:45 +01:00
62ccdbb599 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 16:54:45 +01:00
d1c2de66b4 DMS 2025-03-06 16:54:29 +01:00
7c6e3ae54b [GRAMM]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- aggiunta setup MES per proporre data scadenza lotto da data ordine di lavorazione
2025-03-06 16:44:00 +01:00
18e3c23f04 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 15:46:13 +01:00
15ab5f8792 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 15:46:12 +01:00
f553f0df06 Aggiunto urlPrefix in versione wms 2025-03-06 15:46:07 +01:00
3ab6899dae Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 15:26:18 +01:00
892d2e797a Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 15:26:17 +01:00
c90d875882 DMS 2025-03-06 15:26:02 +01:00
2128aff9d5 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 14:56:38 +01:00
afdebfd43c Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 14:56:38 +01:00
d8bd7a7182 DMS 2025-03-06 14:56:23 +01:00
abd6a3b0ca 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/menu/service/MenuConfigurationService.java
2025-03-06 13:37:26 +01:00
eeffde4d8c Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 13:36:55 +01:00
ee41ea2e1a Fix su menu 2025-03-06 13:36:49 +01:00
3ff7795d6d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 13:12:00 +01:00
7a1098559c Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-03-06 13:12:00 +01:00
dda7c15142 DMS 2025-03-06 13:11:35 +01:00
d145d62205 Modifica Puddy
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 12:58:51 +01:00
eb876791b3 Creata setup ALLOW_UDC_EDITING
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 10:48:10 +01:00
874a3ed07d Merge branch 'develop' into feature/SpostaUl
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-06 10:28:15 +01:00
cf011adb16 Aggiornato menu WMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-05 17:22:57 +01:00
f463460436 Aggiornato menu WMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-05 16:25:11 +01:00
c2ca6f7f1b Aggiornato menu WMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-05 16:09:54 +01:00
c27fe7fb5a Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-04 12:13:08 +01:00
bb07a9bcb2 Aggiunti campi valore della vendita e residuo del valore della vendita sulla ctb_varbeni 2025-03-04 12:13:01 +01:00
9424e81f83 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-04 12:05:43 +01:00
2ce7511e1e personalizzato datawindow "Fatturato Articoli Totali" per Maggio 2025-03-04 12:05:30 +01:00
7883bba8ad Aggiunto campo per calcolo automatico minusvalenza - plusvalenza
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-04 10:19:04 +01:00
44e9ce224d Modifica per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-04 09:18:24 +01:00
6f740706d0 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-03 17:51:54 +01:00
7bf24324c1 Vario 2025-03-03 17:51:35 +01:00
c95886e0ea cambio chiave della mtb_movi su chi non ha in movimenti e la sp nuova attiva
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-03 16:54:23 +01:00
cd96c05f08 eliminta funzione duplicata
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-03 14:38:22 +01:00
cd6eaefe08 Merge branch 'master' into develop
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build started...
2025-03-03 10:10:55 +01:00
cc6d143f96 Finish Hotfix-1
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build started...
2025-03-03 10:10:54 +01:00
c82d9eb954 [CMMS]
- gestione allegati manutenzione
- aggiunto tipo esito
- aggiunto tipo manutenzione
- aggiunta setup report manutenzioni

[Ricambi]
- aggiunta setup report etichetta udc

[MES]
- aggiutna setup per abilitare modifica lotto suggerito in impostazione lotto prod
2025-03-03 10:10:48 +01:00
0846097f7e Merge branch 'develop' into feature/SpostaUl 2025-03-03 10:01:06 +01:00
d959425bce modificata registrazione giroconto riscontie e calcolo risconti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-28 18:29:35 +01:00
5569f46e67 Modifica per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-28 16:25:57 +01:00
942e941e6b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-28 16:18:51 +01:00
adec19a033 Disattivazione AR012 2025-02-28 16:18:47 +01:00
7461568eb8 Disattivazione AR012 2025-02-28 16:18:32 +01:00
9b30938d9d inserito campo note_incoterms nella dtb_ordt e ingrandito campo porto a 40 nella dtb_ordt
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-28 14:38:40 +01:00
9e583b014f Merge branch 'develop' into feature/SpostaUl
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
2025-02-27 17:30:12 +01:00
9790f6bdd9 Finish Consegna
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-27 17:15:53 +01:00
66e18971df Fix sposta ul 2025-02-27 17:14:54 +01:00
a4251829da migration per rossogargano
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-27 16:47:51 +01:00
a20c02f568 sistemata query sospesi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-27 15:38:41 +01:00
630d5a85fb Aggiunto dipo report in query ConSegna 2025-02-27 14:54:14 +01:00
aad4b9f7cf Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-27 14:04:35 +01:00
6791104d1e Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-27 14:04:34 +01:00
46dcd16e98 Fix vari 2025-02-27 14:04:29 +01:00
7d2266f87b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-27 09:50:15 +01:00
23f82de33c Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-27 09:50:14 +01:00
b7a5762940 Fix sul nome db di Agricoper_Luva 2025-02-27 09:50:07 +01:00
c7cc3660f5 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-26 17:18:44 +01:00
a19c1cda5c Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-26 17:18:43 +01:00
76cf910a05 se pianifico un'attività in test spostare il progetto in test 2025-02-26 17:18:38 +01:00
6854e39952 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-02-26 17:15:27 +01:00
231104fcb5 varie registrazione corrispettivi, calcolo peso su doc, controllo e divisione ordini ordikids 2025-02-26 17:15:24 +01:00
03e58801e7 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-26 14:44:43 +01:00
64c20d7eff inserito campo incoterms nella dtb_ordt e note_incoterms nella vtb_viaggi 2025-02-26 14:44:21 +01:00
032c9c08af Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-26 14:34:53 +01:00
28507ad7db passaggio rest del giroconto di apertura risconti 2025-02-26 14:34:45 +01:00
b1323b328e Modifica Migrations DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-26 12:52:53 +01:00
96566bb7d9 Merge remote-tracking branch 'origin/develop' into develop 2025-02-26 12:50:38 +01:00
f9df98cfd9 Modifica Migrations DMS 2025-02-26 12:50:28 +01:00
3ac1fdeb1b In sposta ul cancello il barcodeUl dal vecchio collo 2025-02-26 12:06:43 +01:00
6bdb777d13 Fix importazione colli vebad e eviosys
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-26 09:57:44 +01:00
b900f7f36b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-26 09:38:02 +01:00
59999db299 sistemato considera budget 2025-02-26 09:37:57 +01:00
caf187053d Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-25 17:28:23 +01:00
d88c58eac1 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-25 17:28:23 +01:00
fedee5f4d9 Aggiunto supporto a wms beta 2025-02-25 17:28:18 +01:00
4cd32859c1 Aggiunto flag firmato in getDatiConsegne 2025-02-25 16:19:02 +01:00
754873a98c Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-25 15:37:02 +01:00
9903a8db16 Finish FixSaveAtbOfft
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-25 15:37:01 +01:00
65b9b40caf Fix errore di cast al salvataggio di AtbOfft 2025-02-25 15:36:47 +01:00
5c5682dc4f Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-25 13:29:38 +01:00
61153c501f Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-25 13:29:37 +01:00
d63c4a9bde sistemato servizio che chiude le attività 2025-02-25 13:29:32 +01:00
1e01a567a0 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-25 13:00:00 +01:00
130a21bf25 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-25 12:59:59 +01:00
a64c790330 sistemata procedura di importazione promo apulia e corretto errore su giacenza 2025-02-25 12:59:52 +01:00
dfdc57d20a in fase di accettazione modificare la data di registrazione del doucmento 2025-02-25 12:52:00 +01:00
a75bf5ecfe aggiunto campo condizionato all'esistenza sembra che da noi sia saltata la query
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-25 12:47:45 +01:00
b5c9cfc9a2 Merge branch 'develop' into feature/Consegna 2025-02-25 12:23:39 +01:00
ed422db84e Aggiunto stato importo in getDatiConsegne 2025-02-25 12:23:35 +01:00
a3e6fbbb6c Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-25 12:10:12 +01:00
002b24b447 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-25 12:10:11 +01:00
ac11203f7c Aggiunta setup forfettario 2025-02-25 12:10:06 +01:00
df30151112 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-25 11:03:55 +01:00
8cb453c7a0 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-25 11:03:54 +01:00
a1afb90c8c Fix su causale (colli V-) durante il picking libero 2025-02-25 11:03:48 +01:00
96bb7671da aggiunta procedura di rigenerazione autofattura
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-24 17:43:22 +01:00
b05449f158 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-24 17:34:06 +01:00
750792571f Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-24 17:34:05 +01:00
2587dd69c3 [GRAMM]
- aggiunto controllo su valore [NULL] in regola completamento partitaMag ordine
- aggiunta setup per reset partita ordine in ripianificazione
2025-02-24 17:33:55 +01:00
306601c228 Merge branch 'develop' into feature/Consegna 2025-02-24 17:22:19 +01:00
07de836a82 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-24 17:22:01 +01:00
ea15aea558 Finish FixAccorpaPianProd
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-24 17:22:01 +01:00
63a7a12edd Rimosso accorpamento ordine di lavorazione se in campagna 2025-02-24 17:21:54 +01:00
e77385c480 calcolo numero protocollo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-24 08:52:53 +01:00
d9680cf1e7 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-21 18:29:55 +01:00
7d462c784c Fix getSetupGruppi 2025-02-21 18:29:50 +01:00
16afcb76f9 Merge branch 'develop' into feature/SpostaUl 2025-02-21 18:14:09 +01:00
cc6cba10d7 varie load colli e aggiunto campo nell'importazione dei listini di acquisto di apulia
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-21 17:42:02 +01:00
0604e72b36 Fix includiBudget mrp
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-21 16:18:05 +01:00
73c59dc41e Revert rinomina package consegna 2025-02-21 15:42:17 +01:00
7d5437238e Merge branch 'develop' into feature/Consegna
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/document/export/service/DocumentiIntesaExportService.java
2025-02-21 15:26:43 +01:00
e879ecf011 Creato menu riepilogo consegne e gestiti dati pdf in getDatiConsegne 2025-02-21 15:25:44 +01:00
994b35bef7 Update setup INCLUDI_BUDGET
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-21 14:44:27 +01:00
8c98a1a323 Aggiunto flag_extracee per stampa dati azienda in registri iva
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-21 09:10:15 +01:00
d55c34a953 aggiuta quantità di stampa in setup linee di produzione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-20 19:05:12 +01:00
7948760bd6 [ROSSOGARGANO]
- servizio creazione udc con art
2025-02-20 18:31:24 +01:00
0ca1cfd288 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-20 16:05:12 +01:00
fbad76f55b Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-20 16:05:11 +01:00
0dbc8eb643 Fix su getGestisciColli null 2025-02-20 16:05:05 +01:00
02acca479a Aggiunta descrizione in Migration_20250220144413
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-20 15:06:04 +01:00
4f06a219bc Fix budget in calcolo disponibilità MRP
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-20 14:53:57 +01:00
4a09f2988e Sul MRP nel calcolo della disponibilità tramite setup esclusa la colonna budget per gruppo merc
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-20 12:42:39 +01:00
3ba8b5459e Fix esportazione documenti intesa
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-20 12:19:08 +01:00
940911344c Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-20 11:28:37 +01:00
e72e9f0364 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-20 11:28:36 +01:00
0d6607fd2d Fix su entity MtbDepoTipi nulla 2025-02-20 11:28:27 +01:00
8685fdef8d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-19 18:17:37 +01:00
45a4cb1fed Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-19 18:17:36 +01:00
48afdaec3e corretta gestione login steup 2025-02-19 18:17:28 +01:00
bb3380b27d Fix flagsezione 2025-02-19 18:00:36 +01:00
5dba36cd15 Sistemato sposta ul in caso di collo l+ 2025-02-19 13:37:00 +01:00
c5b6b69a5a Modicata query colli per prendere l'ultima rettifica fatta nella stessa giornata per deposito - articolo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-19 10:13:42 +01:00
32762a78ed Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-02-19 10:11:35 +01:00
7530d5dfdf Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-19 10:11:35 +01:00
26ecc2564f Rimossa lettura dello username direttamente dall'header in alcuni servizi 2025-02-19 10:11:27 +01:00
8e7b15cb29 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-18 15:36:12 +01:00
bd48535981 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-18 15:36:11 +01:00
d144dc61c1 Fix username in getDocInterniSetup 2025-02-18 15:36:03 +01:00
060bf42b6d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-18 14:11:23 +01:00
55f802667a Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-18 14:11:23 +01:00
0e50addf19 sepa, giacenza tuidi 2025-02-18 14:11:07 +01:00
242e4e75b2 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-18 13:21:44 +01:00
a26c7cda4d Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-18 13:21:43 +01:00
8a4b1e1490 Fix su controllo mtb_unt_mis nella retrieve degli articoli delle bolle di accettazione 2025-02-18 13:21:38 +01:00
d290d05674 inserito campo cod_dtip_sped nella atb_forn
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-18 12:15:59 +01:00
3eb6f73934 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-18 11:47:18 +01:00
4d4f213258 personalizzato datawindow "Giacenza per Partita" Rossogargano 2025-02-18 11:47:09 +01:00
803bcb641b Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-18 10:26:28 +01:00
d89b097871 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-02-18 10:26:28 +01:00
50cb55473f Fix su lettura setup 2025-02-18 10:26:17 +01:00
28c61a29d2 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-18 09:54:50 +01:00
5f7c9cf71e Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-18 09:54:49 +01:00
ea99bfee10 Migliorata lettura eccezione di token malformato 2025-02-18 09:54:44 +01:00
c0433e68e6 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-17 18:29:27 +01:00
72307ca9b4 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-17 18:29:27 +01:00
6e2563d981 Rimossi check user ridondanti nelle export da wms 2025-02-17 18:29:22 +01:00
c7eeacc8f1 In sposta ul gestito collo L+ 2025-02-17 16:47:42 +01:00
e42c795744 Creazione servizio di importazione ack intesa 2025-02-17 16:45:35 +01:00
2cd81d3dd1 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-17 15:57:30 +01:00
e86a9ee668 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-17 15:57:30 +01:00
cffd4efbbd Fix su password nulle in user cache service 2025-02-17 15:57:24 +01:00
96da24ca89 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-17 12:40:21 +01:00
c93803ba99 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-17 12:40:21 +01:00
a09e1b7660 aggiunta retrocompatibilità al servizio di login steup per terminalini non aggiornati 2025-02-17 12:40:13 +01:00
adc66fd2dd Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-17 12:35:18 +01:00
f94da9e99c Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-17 12:35:18 +01:00
5b12cb4cc8 correzione regole 2025-02-17 12:34:35 +01:00
4840c0ad9d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-17 12:08:11 +01:00
eaa15b73ed Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-17 12:08:10 +01:00
3d240a53ce corretta gestione stream in export da steup 2025-02-17 12:08:04 +01:00
4ec4ac4e0d Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-17 11:17:03 +01:00
22103bc012 Migliorato defaultAzienda 2025-02-17 11:16:57 +01:00
4c30a19dce Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-17 11:03:58 +01:00
93f39fb364 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-17 11:03:57 +01:00
05385040c7 correzione regole 2025-02-17 11:03:34 +01:00
2d23c51283 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-14 19:31:50 +01:00
2b6f2d7f25 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-14 19:31:49 +01:00
6d0146ccbc Aggiunto Biolevante storico tra gli integry customers 2025-02-14 19:31:42 +01:00
dd0bed86bc Aggiunta nuova login per steup
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-14 18:47:32 +01:00
80a4d97a81 Finish Feature-attivita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-14 18:23:31 +01:00
17a81d8f49 Aggiunto campo su viaggio
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-14 16:06:52 +01:00
be5412c5d9 eliminata c dalla setup PRECODE_CLIENTI per Rossogargano
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-14 16:00:16 +01:00
b274545284 Fix workedHours 2025-02-14 14:47:00 +01:00
5a097240ae Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-14 11:29:22 +01:00
0d5789bf0d Disabilitato Report tracciabilità per UDC tranne che a Rossogargano 2025-02-14 11:29:13 +01:00
c5db78f174 sistemata loadcolli con nuova logica di esclusione tipo pedana e sistemata sincronizzazione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-14 11:16:51 +01:00
cd1fadbd78 Merge remote-tracking branch 'origin/develop' into develop
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-02-14 11:15:31 +01:00
0fd892bf6f Inserita nuova voce menu Report tracciabilità per UDC 2025-02-14 11:15:22 +01:00
6d59a18671 Nella login è stata aggiunta la retrocompatibilità con gli applicativi che usano md5
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-02-14 11:11:24 +01:00
d31c0ff834 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-14 10:58:52 +01:00
163eec27a2 Migrations 2025-02-14 10:58:46 +01:00
717a3ecc3b Nuovo campo in anagrafica articoli per stampa articolo su documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-14 10:01:36 +01:00
4d5021fea6 Nuovo campo in anagrafica articoli per stampa articolo su documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-14 09:47:47 +01:00
0f92ccdd45 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-14 09:30:39 +01:00
ff1996ed43 Merge remote-tracking branch 'origin/develop' into develop 2025-02-14 09:30:31 +01:00
f5d56e71a4 Merge remote-tracking branch 'origin/develop' into develop
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-02-14 09:30:24 +01:00
dfd3974c53 Nuovo campo in anagrafica articoli per stampa articolo su documenti 2025-02-14 09:30:23 +01:00
1226a0f0c5 Fix gestisciColli in MtbDepoTipi 2025-02-14 09:30:02 +01:00
fbcfed3997 [carelli]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- aggiunta setup per prefisso codice ispezioni
[rossogargano]
- aggiunto indice su id_lotto in mtb_colt per miglrioare MEs_getworkorders
- modifiche al servizio creazione prodotto finito per poter definire in anticipo la data di versamento
2025-02-14 09:27:48 +01:00
ff9653444a Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-13 17:33:53 +01:00
43dd434ece eliminata setup 2025-02-13 17:33:46 +01:00
b2e829bbdb Fix su availableProfiles
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-13 15:42:09 +01:00
e13a73dd63 aggiunta setup
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-13 15:17:30 +01:00
36abb60aa4 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-13 15:09:22 +01:00
217b084c5a Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-13 15:09:21 +01:00
eb1d12e400 Aggiunto controllo in login su utente non trovato in cache per il profilo selezionato 2025-02-13 15:09:12 +01:00
10fa73e2a0 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-13 13:22:15 +01:00
ef2721a626 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-13 13:22:15 +01:00
72a9e5320b Migliorata login di PVM 2025-02-13 13:22:06 +01:00
6c1d469e40 Migliorata login di PVM
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-13 13:19:58 +01:00
4e5a33ebc1 Merge remote-tracking branch 'origin/develop' into develop 2025-02-13 13:18:58 +01:00
29a6ae9046 Revert executeStatement
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-13 12:35:40 +01:00
766848376d aggiunta firma
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-13 11:17:35 +01:00
4c57bc287d Migliorati controlli nel servizio di retrieve available profiles per l'utente 2025-02-13 10:56:43 +01:00
3270fbf052 Gestito TypeAttach come enum in StbFilesAttached, creata api getSignatureIdAttach ed impostato header ContentDisposition da spring
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-13 10:51:56 +01:00
1e5a4641d3 letto sempre il listino dalla setup
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-02-13 10:46:17 +01:00
0272408f23 letto sempre il listino dalla setup
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-13 10:45:54 +01:00
f313b9cf93 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-02-12 18:06:49 +01:00
05fc23f6df migration 2025-02-12 18:06:46 +01:00
c6951b8e3e Aggiunto DB OF_Demo tra gli integry customers
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-12 16:42:10 +01:00
7265f32b3d Aggiornate componenti per gestione token.
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-12 16:27:53 +01:00
ddd5cbaf77 Per le importazioni di vebad e eviosys il deposito viene preso dall'ordine
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-12 16:07:57 +01:00
5dc021234a Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-12 15:58:16 +01:00
3a6a463557 Modificato spostaUl per gestire i depositi che non gestiscono i colli 2025-02-12 15:58:11 +01:00
d62641c951 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-11 19:41:31 +01:00
caa534cab5 Migrations 2025-02-11 19:41:26 +01:00
977bd50e85 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-11 18:00:35 +01:00
e9e9138a40 nuovo servizio download immagini attività 2025-02-11 18:00:31 +01:00
0198f42530 Modificato servizio task 2025-02-11 16:40:43 +01:00
a1bb7f238a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-11 15:27:07 +01:00
804505017a Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-11 15:27:06 +01:00
cb0c0eead3 Fix su lettura data in getColloInGiac 2025-02-11 15:27:01 +01:00
4361215ce1 modifiche a servizio di task 2025-02-11 12:36:37 +01:00
d6ca1a19e3 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-11 11:51:38 +01:00
5cb37b5272 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-11 11:51:38 +01:00
0fb3b2d49c Aggiunto font Aptos 2025-02-11 11:51:31 +01:00
bcea23b867 Merge branch 'master' into develop 2025-02-11 10:28:34 +01:00
9e3288ae16 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-11 10:28:34 +01:00
8a62ce4936 Mlupdsrv 2025-02-11 10:28:24 +01:00
2ce648d380 Merge branch 'master' into develop
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-02-11 10:13:55 +01:00
09b6ccf235 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-11 10:13:55 +01:00
01dfea2917 Mlupdsrv 2025-02-11 10:13:38 +01:00
cbd7456179 Modifica getcap
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2025-02-11 10:08:52 +01:00
2107a292ec Merge tag 'Hotfix-100' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Finish Hotfix-100
2025-02-10 18:10:13 +01:00
281f6e01ee Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 18:10:12 +01:00
5ea0f17da6 Personalizzazione vis. lotto per USA e PORTORICO 2025-02-10 18:10:00 +01:00
5f26d4be8e Personalizzazione vis. lotto per USA e PORTORICO 2025-02-10 18:09:50 +01:00
db764949bf aggiunta proprietà e nuova setup
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 17:44:17 +01:00
4bd6018c9a aggiunta proprietà e nuova setup
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 17:37:33 +01:00
aa34fb0592 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 16:48:58 +01:00
d506f4cb7d Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 16:48:57 +01:00
8b36283dd9 Little fix 2025-02-10 16:48:52 +01:00
b99c0c926b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 16:34:46 +01:00
d9cdd847d1 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 16:34:46 +01:00
ef1b4aaf20 Fix su return di setupGest 2025-02-10 16:34:38 +01:00
ad3c16e97a Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 16:25:00 +01:00
6955ed9713 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 16:19:23 +01:00
04564d131b Ingrandito campo note nella vtb_list_data 2025-02-10 16:14:19 +01:00
99bfd5de61 aggiunta valorizzazione del flag_sezione sulle righe che provengono da collo 2025-02-10 16:05:25 +01:00
b6e1171ccb Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 15:29:51 +01:00
7b126f50b5 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 15:29:50 +01:00
beb064a0b4 Fix query getActivity 2025-02-10 15:17:08 +01:00
0364b2dc1b Nuovo campo in anagrafica articoli per stampa articolo su documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 14:41:51 +01:00
6400bda25f Nuovo campo in anagrafica articoli per stampa articolo su documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 14:39:47 +01:00
d2c2e98f96 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 14:07:07 +01:00
df3a710ce5 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 14:07:07 +01:00
fe3c1e3dca sistemare regola attività 2025-02-10 14:06:51 +01:00
946f0e5f7c Merge remote-tracking branch 'origin/master'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 13:13:02 +01:00
d5b2e47b14 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 12:48:27 +01:00
2171a35226 Merge branch 'master' into develop 2025-02-10 12:48:00 +01:00
feadd7b288 Finish Hotfix-2 2025-02-10 12:47:59 +01:00
acd262c82c Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2025-02-10 12:47:57 +01:00
f2a1c9f901 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 12:47:56 +01:00
20a600bddb corretta migratio vista contratti di acquisto 2025-02-10 12:47:49 +01:00
f02faea5c1 Fix contratti acquisto / vendita 2025-02-10 12:47:42 +01:00
e52ef6ac42 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 12:38:16 +01:00
b508198a7f Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-02-10 12:38:16 +01:00
1549bdbe7b [ROSSOGARGANO]
- Aggiunto campo compilatoDa in vista contratti di acquisto
2025-02-10 12:37:52 +01:00
f49e244901 [ROSSOGARGANO]
- Aggiunto campo compilatoDa in vista contratti di acquisto
2025-02-10 12:37:29 +01:00
77d1180a9f Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 12:33:00 +01:00
569a72b115 Sistemata voce disinta su menù rosso garbano 2025-02-10 12:32:55 +01:00
9bafd78534 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 12:22:18 +01:00
19aaa959e0 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 12:22:17 +01:00
14c63466d4 Fix di concorrenza durante l'avvio di tomcat 2025-02-10 12:22:12 +01:00
7d8503d03e Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-02-10 11:47:27 +01:00
12cf184235 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 11:47:26 +01:00
587b4d5f9a [ROSSOGARGANO]
- aggiunto rossogarganocont alla lista di database integry per problemi sulle regole
2025-02-10 11:47:14 +01:00
d61d64a6c4 Fix errore null in getConsumiMedi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-10 11:07:41 +01:00
9aa82b5cc7 Creata setup CONFIG_STAMPE_POPUP_ORD
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-07 18:37:09 +01:00
ee1eeecdc9 Modifica per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-07 18:19:07 +01:00
3cdf9708f9 Modifica dimensioni porto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-07 18:17:20 +01:00
b537da838d Modifica dimensioni porto 2025-02-07 18:17:08 +01:00
54acb98afa Modifiche per Task
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-07 17:56:29 +01:00
c14de9c68d aggiunto key group
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-07 17:47:16 +01:00
17400ff17d Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-07 17:26:19 +01:00
2c586a45f8 varie modifiche per rossogarngano 2025-02-07 17:26:15 +01:00
dea0545f07 update user_id con iniziali di full_name per rossogargano
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-07 17:20:02 +01:00
e1d78a98e8 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-07 17:11:10 +01:00
60cd2318a1 personalizzazione datawindow "Situazini Articoli Gruppi" solo quantità Rossogargano 2025-02-07 17:10:55 +01:00
02098b703d Esclusi gli articoli a peso variabile dall'accettazione bolle
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-07 16:59:56 +01:00
aea41e4c97 Fix import colli vebad
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-07 16:14:48 +01:00
103f6f23da Fix importazione colli Eviosys e Vebad
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-07 15:29:00 +01:00
7bd7ef9175 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-07 13:23:53 +01:00
b674a07bec [ROSSOGARGANO]
- corretta gestione documenti c.to deposito

 [CARELLI]
 - modifiche upload allegati setup
2025-02-07 13:23:42 +01:00
decc69378e Aggiunta setup filtro porti delivery plan
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-07 11:36:39 +01:00
9fe7defacb Impostata regola DtbOrds per tutti gli ordini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-07 09:28:29 +01:00
e9c74f85f1 [WMS] Fix rettifica giacenze
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-06 19:45:44 +01:00
491fc5143f [WMS] Fix rettifica giacenze
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-06 17:46:47 +01:00
adb1367ded [WMS] Aggiunto parametro per indicare se la rettifica deve disabilitare la creazione del movimento fiscale
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-06 17:39:13 +01:00
c57251bc2c [WMS] Implementata generazione documento durante la rettifica giacenze.
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Migliorie sulle LocalDate.
2025-02-06 17:06:29 +01:00
558fe6624c Modifiche migrations
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-06 16:00:57 +01:00
9ead6f7a5f Merge remote-tracking branch 'origin/develop' into develop 2025-02-06 12:18:44 +01:00
3165034bc8 Modifica migrations 2025-02-06 12:18:39 +01:00
4399733876 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-06 10:44:58 +01:00
a9a97bca6c Nuova setup per bloccare se partita iva o codice fiscale sono già presenti 2025-02-06 10:44:33 +01:00
9bb42d08ca Modifica riferimenti su inventario quando si modifica la chiave del documento INV
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-06 10:30:25 +01:00
547c87e1ed Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-06 10:28:52 +01:00
3b3463d643 Modifica riferimenti su inventario quando si modifica la chiave del documento INV 2025-02-06 10:28:46 +01:00
5605f597bc Iniziato refactoring di firebase in modo da supportare più instanze diverse
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-02-06 10:23:03 +01:00
a732e9bd18 Nuova setup per obbligare il caricamento di tutti i dati della persona fisica
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-06 09:53:49 +01:00
4fb12bdd1f Nuova setup per indicare nei movimenti se si tratta di un professionista 2025-02-06 09:53:28 +01:00
bf788f4f8c Refresh menu per aggiornare db senza menu
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-05 16:03:51 +01:00
4aa7084012 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-05 15:24:19 +01:00
74826bce29 Finish ReleaseAtbForn
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-05 15:24:18 +01:00
72edab6f08 Gestito AtbList in AtbForn ed EntityChild ArlFogm in GtbAnag
(cherry picked from commit 2180f860cc)
2025-02-05 15:23:54 +01:00
9060f4c893 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-05 13:27:01 +01:00
fd00c41d99 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-05 13:27:00 +01:00
9e48dce02f Fix su chiusura attività 2025-02-05 13:26:55 +01:00
db5dd1aca8 Migliorato avvio dell'ambiente con l'utilizzo del nuovo TaskExecutorService
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-05 13:10:55 +01:00
dde9453e16 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-05 12:33:39 +01:00
bb73f3c3db Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-05 12:33:38 +01:00
ab42bba892 esclusi articoli * 2025-02-05 12:32:35 +01:00
bec3801cad Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-05 12:28:15 +01:00
ebd2c47e46 rimossa serie doc da fattura C.to vendita 2025-02-05 12:28:03 +01:00
1e3baa067a Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-05 11:56:41 +01:00
742aaa8bef Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-05 11:56:41 +01:00
bb121425b4 Fix RequestDataDTO 2025-02-05 11:56:35 +01:00
da8b8d2490 Merge branch 'master' into develop 2025-02-05 11:39:11 +01:00
b71cddd4c3 Finish FixChkAutofattura
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-02-05 11:39:10 +01:00
11634bda38 Attivato controllo autofattura solo per STUDIOML da noi 2025-02-05 11:39:04 +01:00
afea11e683 Merge branch 'master' into develop 2025-02-05 11:11:19 +01:00
3d00d49a08 Finish Hotfix-2 2025-02-05 11:11:19 +01:00
297599e787 Rimossa eccezione nel caso di configurazione stampa non trovata 2025-02-05 11:11:14 +01:00
46c8a0f475 Aggiornati data handler dei contratti di acquisto e vendita 2025-02-05 11:09:51 +01:00
57c08355b4 Nuova setup per indicare nei movimenti se si tratta di un professionista
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2025-02-05 11:03:43 +01:00
383a48de8f contratti di vendita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-05 09:55:29 +01:00
56444a3003 Attivato tsNoCheck in generazione ts
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-05 09:19:37 +01:00
40656b32ec Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-04 15:59:11 +01:00
19812777e2 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-04 15:59:10 +01:00
0db52e5b40 Fix sulla creazione degli indici delle temp table di Exchange 2025-02-04 15:59:04 +01:00
1e7bd900ee aggiunto file regole rossogargano e sistemata registrazione autofattura
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-04 15:23:38 +01:00
d02dc485a1 file regole personalizzato
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-04 14:16:16 +01:00
17b4ed1114 ripristinata firma
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-04 13:43:22 +01:00
2a0f9ad197 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-04 12:19:05 +01:00
ad3d51dce8 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/service/ReportProcessor.java
2025-02-04 12:18:30 +01:00
7cf02eb1fc eliminate gestione firma 2025-02-04 12:17:58 +01:00
0a6b1a0f20 eliminate gestione firma
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-04 12:17:23 +01:00
65037e6b7f Aggiunto try in MenuStaticCreator ed aggiornato menu_config
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-04 11:12:01 +01:00
461d9c6b25 corretta stringa di connessione a SqlServer senza encrypt
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-04 11:06:57 +01:00
228eff0f00 attività integry
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-04 10:01:36 +01:00
db494444f7 [ROSSOGARGANO]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- fatturazione conto deposito
2025-02-04 09:59:49 +01:00
e31ed33c65 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-03 19:10:43 +01:00
b57508aec5 Creati servizi per il recupero materiale da WMS 2025-02-03 19:10:37 +01:00
9e08c61d8a aggiunto dettaglio allegati su utenti e aggiunto campo qta_fatt su contratti di vendita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-03 17:22:39 +01:00
1dc9b0c983 Merge remote-tracking branch 'origin/develop' into develop 2025-02-03 16:52:36 +01:00
b16124eb8a Sistemato problema bonfiico SEPA con più date valuta 2025-02-03 16:52:32 +01:00
2180f860cc Gestito AtbList in AtbForn ed EntityChild ArlFogm in GtbAnag
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-03 12:12:04 +01:00
2277443482 Fix email mancante in userDTO
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-02-03 09:47:26 +01:00
4303531b70 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-31 18:41:34 +01:00
b685260d89 [ROSSOGARGANO]
- correzioni gestione trasferimenti da doc diretti
2025-01-31 18:41:26 +01:00
cb71f26c1d Modifica remote_read_file
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-31 17:28:00 +01:00
671b8aa662 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-31 17:00:26 +01:00
abc934540e Modifica distribuzione ordini di vendita per gestione mezzo in tabella viaggi 2025-01-31 17:00:20 +01:00
f036947e1c Aggiornato servizio readRemoteFile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-31 16:59:34 +01:00
2e41494b9d [ROSSOGARGANO]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- corretta gestione trasferimenti in docmenti di vendita
2025-01-31 13:18:12 +01:00
bb86dd1785 sistemato cambio tipo documento non salvava più le righe
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-31 13:04:00 +01:00
1c38da764d sistemata verifica su file
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-30 18:12:48 +01:00
d0dd8013f8 Migrations da disabilitare per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-30 17:47:59 +01:00
76c2f55d68 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-30 17:31:57 +01:00
1d35861f1e Modifiche importazione documenti consortile 2025-01-30 17:31:52 +01:00
f8a44ea086 [ROSSOGARGANO]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- gestione versamento materiale tramite barcode ean128
2025-01-30 14:43:53 +01:00
f9f5456bc0 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-30 12:53:00 +01:00
7ce06d1657 [ROSSOGARGANO]
- modifica servizio get collo by baarcode con check su sscc in ean128
2025-01-30 12:52:48 +01:00
98e074b960 sistemata registrazione contabile distinte effetti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-30 11:51:08 +01:00
61232b053e Rimossi campi date da UserDTO poiché creavano errori nell'access token
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-29 19:17:39 +01:00
5c119d4f34 aggiunta nuova logica per stampare la firma nella stampa
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-29 18:21:08 +01:00
9642228166 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-29 17:27:17 +01:00
4f18272e95 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-29 17:27:15 +01:00
7a2bbdeaf0 Cambiato EMSConst in modo che ragioni per DB e non per Profile 2025-01-29 17:27:07 +01:00
e5a97a18e2 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-29 16:40:59 +01:00
14efc2453c Creata nuova tabella srl_user_attached 2025-01-29 16:40:51 +01:00
2011d8a06a aggiunta setup per gestione listini di vendita portale
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-29 15:47:58 +01:00
20b64b56df Fix su distribuzione e lettura dati utenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-29 13:14:03 +01:00
5d8f2f1e82 Migliorate logiche della nuova login
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-29 11:04:24 +01:00
9e77d3cc15 reso obbligatorio campo flag_riversa_promo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-28 19:08:07 +01:00
a1dc8161ea MODIFICATA GETSITART PER ANNO A CAVALLO
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-28 15:56:25 +01:00
93e6fa1177 [ROSSOGARGANO]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Modificata gestione lotto versamento confezionato rossogargano
2025-01-28 15:38:43 +01:00
ce9dda6614 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-28 12:58:40 +01:00
986aa7a6ea Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-28 12:58:40 +01:00
b9367e906b Risolto problema di formattazione di un date in datetime
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-28 12:58:29 +01:00
8ebd57b366 tolta close
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-28 12:52:30 +01:00
a7d879a808 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-28 12:42:01 +01:00
494a969bb8 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-28 12:42:01 +01:00
2e5f0d856c INSERIMENTO setup 2025-01-28 12:41:55 +01:00
47b3e61630 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-28 12:29:53 +01:00
6ed59f0e6f Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-28 12:29:53 +01:00
f733b29194 aggiunta aliquota nella tabella ntb_tipi_inca risolto problema accettazione bolla 2025-01-28 12:29:47 +01:00
381ee053af Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-28 12:16:28 +01:00
c3ad0ff516 sistemate viste per murgia e format 2025-01-28 12:13:46 +01:00
c05da43555 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-28 12:10:40 +01:00
473635031e Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-28 12:10:39 +01:00
dcaad40756 Fix su chiusura delle connessioni (non necessaria) durante la verifica dell'inventario 2025-01-28 12:10:33 +01:00
99b4bbb9f1 salvataggio note
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-27 18:50:29 +01:00
78b9aca0c9 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-27 17:47:02 +01:00
a8dd3be7f8 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-27 17:47:02 +01:00
cdca29f1a1 correzione 2025-01-27 17:46:52 +01:00
8732545219 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-27 16:06:42 +01:00
e655b93f3e Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-27 16:06:41 +01:00
298d963f98 sistemata regola che assegna num_dist 2025-01-27 16:06:30 +01:00
349ccb9915 aggiunto controllo su vtb_dist_incat
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-27 16:06:00 +01:00
948edb4db5 Finish FixUpdDatiArt
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-27 15:15:02 +01:00
336a39c081 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-27 15:15:02 +01:00
35e47984db Aggiunto controllo salvataggio con stringa vuota 2025-01-27 15:14:56 +01:00
5efd28965f Finish Hotfix-100
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-27 14:11:52 +01:00
0e0f1508b1 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-27 14:11:52 +01:00
980d210430 aggiunto servizi nel tipo gruppo 2025-01-27 14:11:39 +01:00
395ddc1e72 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-27 10:34:42 +01:00
65a270e8a7 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-27 10:34:41 +01:00
0243a3c4b5 eliminato controllo inserito per murgia, verificare bene cosa fa l'app 2025-01-27 10:34:29 +01:00
266ecb5f1b Corretto overload isValidConnection
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-27 09:37:15 +01:00
8ebcf6a6d0 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-27 09:27:38 +01:00
edaea12602 Finish FixIsValidConnection
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-27 09:27:37 +01:00
16862fd168 Fix nome in case sensitive 2025-01-27 09:27:03 +01:00
505f4b94c8 completamento id_contratto su documento
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-27 09:22:17 +01:00
761d645e85 Rimossa reflection EntityBase
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-24 19:36:26 +01:00
cd3953180e Servizio per riconoscere i kit quando leggono i componenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-24 18:35:58 +01:00
ea46822176 Merge remote-tracking branch 'origin/develop' into develop 2025-01-24 18:35:04 +01:00
e100a22428 Esclusi gli articoli a peso variabile dall'accettazione bolle 2025-01-24 18:34:57 +01:00
0a3c0e1218 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-24 17:47:34 +01:00
fc477445df Create setup per inserimento listino e codice pagamento di default 2025-01-24 17:47:25 +01:00
0d752fff26 Corretta gestione errore per downloadReport e fix null pointer per profilo non esistente in getConnection
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-24 11:40:30 +01:00
71810d52b5 - aggiunto trasferimento pedana agganciata a collo in trasferimento UL tra depositi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-24 10:57:40 +01:00
b9208d513a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-24 10:50:51 +01:00
0a84fd0e49 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-24 10:50:51 +01:00
35a41e97ca Aggiunto controllo su posizioni MonoUL nel servizio che controlla se una UL può essere eliminata 2025-01-24 10:50:45 +01:00
a97eb189d9 Vario
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-24 10:49:44 +01:00
a79ca8f47a Nuova setup per inserimento conto cliente di default
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-24 10:27:17 +01:00
65767d546b aggiunta indicazione kit su accettazione bolla
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-24 10:06:18 +01:00
27cd19f512 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-23 17:46:59 +01:00
561b31c8c0 eliminato valore C nella setup precode_clienti per rossogargano 2025-01-23 17:46:50 +01:00
d5a44d8905 eliminato valore C nella setup precode_clienti per rossogargano 2025-01-23 17:42:24 +01:00
ba82496c70 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-23 16:01:04 +01:00
765dfbbcf8 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-01-23 16:01:03 +01:00
62c00df670 corretta funzione suggerimento ean13 2025-01-23 15:58:03 +01:00
76471f5d71 corretta funzione suggerimento ean13 2025-01-23 15:55:27 +01:00
ad74041de9 Rimossa migration errata
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-23 15:51:11 +01:00
3fdfbb432c Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-23 12:27:35 +01:00
7da6c77400 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-23 12:27:34 +01:00
9bcf67a0b6 Fix su lista nulla durante la distribuzione 2025-01-23 12:27:29 +01:00
277f0df42b Sistemati problemi after merge di DocumentService
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-23 10:48:59 +01:00
8d7421f19c Esportazione documenti Intesa
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-23 10:21:04 +01:00
d116da7e49 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/document/service/DocumentService.java
2025-01-23 10:10:09 +01:00
cb90f86c0c Finish Hotfix-FE
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-23 10:06:04 +01:00
c43f07f83a aggiunto controllo in ckkInvioFE e import Orto 2025-01-23 10:05:09 +01:00
ecb5154db7 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-23 09:46:33 +01:00
e33a32fd8e Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-23 09:46:32 +01:00
9658a7a37d [Documenti diretti vendita]
trasferite anche pedane tra depositi se definite sul collo
2025-01-23 09:46:25 +01:00
db9f19efa8 Merge tag 'Hotfix-99' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Finish Hotfix-99
2025-01-22 18:11:03 +01:00
0897b859b0 Finish Hotfix-99
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-22 18:11:02 +01:00
012d616d95 Fattura elettronica (Biolevante - reso)
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-22 18:10:46 +01:00
22bb161967 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-22 17:12:42 +01:00
c3d4bcf7b8 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-22 17:12:41 +01:00
092f2fd581 Migliorata user cache 2025-01-22 17:12:35 +01:00
7f956eb808 Documenti acquisto nuova versione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-22 16:39:29 +01:00
b9241e82f1 Impostate spese conai come altre spese
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-22 15:49:34 +01:00
c99035cd6c Merge remote-tracking branch 'origin/develop' into develop 2025-01-22 15:49:25 +01:00
502678ce8e Impostate spese conai come altre spese 2025-01-22 15:49:21 +01:00
e494635b28 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-22 15:40:23 +01:00
62638d149c Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-22 15:40:22 +01:00
5fe992e842 Fix su getConnection dei profile non interni 2025-01-22 15:40:16 +01:00
a80b98cda0 Merge tag 'Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Finish Hotfix-1
2025-01-22 15:02:00 +01:00
b9baf60068 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-22 15:02:00 +01:00
94bf9c8d14 Risolto problema query 2025-01-22 15:01:45 +01:00
33e24f77b0 Inserita setup per visualizzazione pulsante distinta controllata in report W_NRIEP_GIORN_INCA_DISP
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-22 12:44:50 +01:00
8bea52cd36 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-22 11:13:24 +01:00
34d622c43a Inserita setup per visualizzazione pulsante registra incassi in report W_NRIEP_GIORN_INCA_DISP 2025-01-22 11:13:15 +01:00
3d43a41dff Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-22 09:41:32 +01:00
e0f0acc36d Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-22 09:41:31 +01:00
42d29b4c85 Fix su equals data ord in distribuzione 2025-01-22 09:41:25 +01:00
444dd32da1 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-22 09:37:55 +01:00
9e58769666 Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2025-01-22 09:37:54 +01:00
1007fff127 Fix su equals data ord in distribuzione 2025-01-22 09:37:48 +01:00
0561af8bc8 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-21 18:44:55 +01:00
60932a873e Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-21 18:44:54 +01:00
49b69555ac Cambiata gestione della pool di connessioni 2025-01-21 18:44:21 +01:00
a4a8b132ac nuovo servizio di registrazione distinte incassi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-21 18:27:28 +01:00
3971c9f0d5 Inserito campo compilato da
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-21 18:22:12 +01:00
33f1528f67 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-21 17:27:37 +01:00
7ab80e54ff Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-21 17:27:37 +01:00
870e07ec99 Synchronized collection in connection pool 2025-01-21 17:27:14 +01:00
e869d6c0b8 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-21 17:07:26 +01:00
400a320f2f Fix righe duplicate in inventario 2025-01-21 17:07:20 +01:00
f895683b9f Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-21 13:19:16 +01:00
3b141f1962 errore 2025-01-21 13:19:01 +01:00
462d26bae8 Finish Hotfix-98
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-21 12:21:22 +01:00
31ab1f651e Merge tag 'Hotfix-98' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Finish Hotfix-98
2025-01-21 12:21:22 +01:00
6431d2a3cb DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-21 12:21:04 +01:00
fd9e6f6d26 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-21 12:06:38 +01:00
1db34f68ca Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-21 11:52:59 +01:00
ba5af86eed Fix su ricreazione della WhereCondOld quando una Entity ha l'operation di Substitute e la classe delle righe Child non mantiene lo stesso nome dei campi del padre 2025-01-21 11:52:49 +01:00
12d5e0ab97 Inserito campo compilato da 2025-01-21 11:50:20 +01:00
2930e05346 Inserita voce menu produzione alimentare
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-21 10:27:40 +01:00
5fbb782d81 Finish Hotfix-97
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-21 09:23:17 +01:00
dd68f9564d Merge tag 'Hotfix-97' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Finish Hotfix-97
2025-01-21 09:23:17 +01:00
0319a1dbff DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-21 09:22:47 +01:00
b4521fe3e6 Merge tag 'Hotfix-96' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Finish Hotfix-96
2025-01-20 18:48:14 +01:00
2bf1924295 Finish Hotfix-96
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-20 18:48:14 +01:00
4a525114f3 Siciliani TAglia e cuci
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-20 18:47:57 +01:00
88557d1595 Uso codVdes se non è un nuovo inserimento in createField agribook
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-20 17:27:31 +01:00
82ffbdfbcd aggiunto aggiornamento della tabella costi nel salvataggio con i servizi rest
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-20 16:51:45 +01:00
f26342afc2 aggiunta cancellazione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-20 11:45:41 +01:00
0f842aa457 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-20 10:30:26 +01:00
4ad97ffa65 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-20 10:30:25 +01:00
dcfde2f886 Aggiornato JenkinsFile 2025-01-20 10:30:19 +01:00
0adf214736 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-20 10:29:00 +01:00
497e7eef70 Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-20 10:29:00 +01:00
5e5440dac4 Aggiornato JenkinsFile
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-20 10:28:49 +01:00
a12c39b9cb Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-17 18:29:00 +01:00
f2ab2ff326 correzione sul variazione dei documenti 2025-01-17 18:28:57 +01:00
0281f40b3e Migrations per Gestione oneri
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-17 18:26:04 +01:00
b8732ea3c2 Regola per controllare se l'articolo che si sta salvando nel listino di vendita ha un codice a barre o un plu
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-17 16:53:01 +01:00
200f8c26e9 sistemata storedprocedure
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-17 16:07:27 +01:00
64e3009805 sistemato cambio commessa
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-17 15:24:59 +01:00
b2335be17f Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-17 12:41:22 +01:00
ddb20bba3e Nei plu con lungezza inferiore a 7 aggiunti i 0 davanti 2025-01-17 12:41:19 +01:00
0f62c5e31f Mmodifica import ordini PUDDY
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-17 12:11:08 +01:00
ff886fce89 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-17 11:26:29 +01:00
1dcf4ab52f modifiche a importazione file tuttogelo 2025-01-17 11:26:26 +01:00
58482996b7 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-17 11:06:39 +01:00
052f222e6e modificato campo data_ins permessi valori null 2025-01-17 11:06:30 +01:00
80a70fe0f1 Sicialini DMS
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-17 09:46:32 +01:00
c9cb168c80 inserito campo data_ins sulla vtb_dist_incar
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-16 18:07:03 +01:00
ad051687e5 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-16 16:37:56 +01:00
9c20f064e3 modificata vista 2025-01-16 16:37:52 +01:00
e204b1b120 Nei documenti di perdita inserite le informazioni del documento di reso di riferimento
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-16 16:34:50 +01:00
18e800431b Aggiornato JenkinsFile
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-16 16:14:11 +01:00
ee48629055 Lettura da defaultMailConfiguration nel caso di invio mail da ServerDev
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-16 15:44:34 +01:00
d520aa7afd Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-16 15:29:43 +01:00
f86331690f eliminata migration che andava in errore per inserire default sui cmapi della dtb_tipi 2025-01-16 15:29:34 +01:00
ee2dfcd9f0 inserito default sui campi della dtb_tipi 2025-01-16 15:29:00 +01:00
8f577a0deb creata setup per maggiorazione prezzi di acquisto 2025-01-16 15:27:51 +01:00
fcd9cbe153 Cambiati stream in distribuzione colli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-16 15:22:52 +01:00
5ca4fbb9b5 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-16 15:12:25 +01:00
5768f97902 modificata vista 2025-01-16 15:12:22 +01:00
2d3976e1cc Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-16 15:06:55 +01:00
21b7a5941c Auricchio 2025-01-16 15:06:51 +01:00
afd6159c5c Modifica DMS 2025-01-16 15:06:05 +01:00
e98eb2d29e Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-16 14:28:44 +01:00
ea9965b91d aggiunta maggiorazione prezzo di acquisto su aggiornamento listino di vendita da listino di acquisto 2025-01-16 14:28:40 +01:00
f9d92a8322 Fix check su stringa in ignorecase
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-16 13:20:53 +01:00
a9c7aeb7f2 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-16 11:09:11 +01:00
4be6e58de0 Aggiornati servizi WMS per gestire il cambio deposito e il cambio tipo collo 2025-01-16 11:09:03 +01:00
686a48e99f Considerati impegni con includi arrivi in mrp
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-16 10:18:24 +01:00
c288e5ac7d Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-15 18:12:33 +01:00
fae5143add Aggiunti tipi espliciti sulle regole che chiamano getEntityData() 2025-01-15 18:11:57 +01:00
d2e59dab09 Modificato duplica promo in modo che salvi tutti i listini salvabili e ritorni l'elenco delle anomalie
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-15 18:02:53 +01:00
6998b313de Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-15 17:54:11 +01:00
1f7d637d12 Aggiunti tipi espliciti sulle regole che chiamano getMapData() 2025-01-15 17:54:07 +01:00
170bca8c8f Setup per accettazione su wms
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-15 17:50:34 +01:00
bc7246751f Gestito complete id per versioni costi di trasporto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-15 16:30:57 +01:00
67994565a2 Sostituiti tutti i controlli delle liste vuote con isEmpty()
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-15 15:58:08 +01:00
ab305b982d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-15 15:27:47 +01:00
f7615e490f Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-15 15:27:45 +01:00
2c74fd0740 Piccole migliorie 2025-01-15 15:27:40 +01:00
e37b6dbb44 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-15 15:03:23 +01:00
4fafe049f5 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-01-15 15:03:21 +01:00
626ab51fdf Fix su SecretKeyCacheComponent 2025-01-15 15:03:14 +01:00
97c3f8231a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-15 13:38:25 +01:00
53002f9765 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-01-15 13:38:24 +01:00
8cca0e06f1 Fix su check in UtilityDebug 2025-01-15 13:38:18 +01:00
283103b35d Rimossi import non necessari
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-15 13:04:24 +01:00
7b381d0bda Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-15 12:44:10 +01:00
506aa1f9aa Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-01-15 12:44:09 +01:00
fdfa45ca0e Fix su exchange colli 2025-01-15 12:44:03 +01:00
ec4c629280 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-15 11:42:09 +01:00
4b1dc6d909 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-15 11:42:07 +01:00
9c0ec134d1 Fix su exchange 2025-01-15 11:42:01 +01:00
a8b4fa5513 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-14 17:41:45 +01:00
2d17e1e6ff inserito default sui campi segno_qta_scar, segno_val_scar, segno_qta_car, segno_val_car, aggiorna_list, flag_cont_analit, flag_analisi_costi_com, flag_giornale_mag, flag_prz_iva, flag_visual_prz, flag_incl_stat, flag_doc_td, flag_calc_peso_intra della dtbTipi 2025-01-14 17:41:32 +01:00
8dbce4a5c1 Aggiunto codAnag in importazione colli vebad
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-14 17:39:46 +01:00
36324252bf In importazione colli Eviosys aggiunta distribuzione colli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-14 17:23:53 +01:00
702491bf1e [ConSegna] Creata setup per id certificato 2025-01-14 17:23:12 +01:00
242aa583d1 Aggiunta migration che converte tutte le SP in QuotedIdentifier ON
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-14 17:10:44 +01:00
62d5a2b72f Finish Hotfix-96
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-14 16:39:15 +01:00
386633ac36 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-14 16:39:15 +01:00
38525ae69b modifiche per rossogargano - imballi nei documenti 2025-01-14 16:39:08 +01:00
6e3fd330e4 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-14 13:12:04 +01:00
dc9909c137 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-14 13:12:03 +01:00
af246bbe26 Aggiunta eccezione quando viene erroneamente switchato il db 2025-01-14 13:11:58 +01:00
125752f332 Merge tag 'Hotfix-95' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Finish Hotfix-95
2025-01-14 12:20:56 +01:00
bb067ad3c8 Finish Hotfix-95
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-14 12:20:55 +01:00
843785505c Inner join ordini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-14 12:20:37 +01:00
9edb5512d9 cancellata migration
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-14 09:35:29 +01:00
d3346d2036 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-13 16:27:19 +01:00
f9fdaf7bba Finish Hotfix-95
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-13 16:27:18 +01:00
bfd2fe9df6 cambiata setup 2025-01-13 16:26:23 +01:00
83b6469dee Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-13 15:51:56 +01:00
56924a0739 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-13 15:51:55 +01:00
bbcfd2846d Fix su localdate 2025-01-13 15:51:25 +01:00
0dc8d98243 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-13 15:51:17 +01:00
1eb83053e8 Finish Hotfix-95
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-13 15:51:17 +01:00
4faa303074 ignorare la descrizione nella generazione dei corrispettivi 2025-01-13 15:51:02 +01:00
cdbcf00737 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-13 14:08:18 +01:00
e90b18f10d Finish Hotfix-95
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-13 14:08:17 +01:00
34da54282b CALCOLO TOTALI IVA INCLUSA 2025-01-13 14:08:09 +01:00
b4b8ebf99e Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-13 12:47:23 +01:00
f8a0f6d41e Finish Hotfix-95
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-13 12:47:22 +01:00
2d0c1c5c60 modifiche per rossogargano 2025-01-13 12:46:04 +01:00
4e6ef9362a ingrandito campo porto sulla dtbDoct
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-13 12:42:13 +01:00
4beedcc9fa Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-13 12:25:42 +01:00
15ea5db43e Finish Hotfix-95
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-13 12:25:41 +01:00
e3dc1eaba6 modifiche per rossogargano 2025-01-13 12:25:22 +01:00
64e5bcd51d ingrandito campo porto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-13 12:04:11 +01:00
bc2fa94143 Aggiunto SGSrl tra i customers
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-13 11:56:57 +01:00
a628b88010 Aggiornato driver JDBC alla versione 12.8 per supportare le connessioni a SQLServer 2022
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-13 11:25:10 +01:00
067c88ae08 Aggiunto XLSX a esportazione CMD2Export
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-01-10 19:40:29 +01:00
e7e683f3bb Taglia e cuci
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 18:43:43 +01:00
269880d57f Modifica ID_VIAGGIOO
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 18:40:48 +01:00
536f959de0 - corretta eliminazione documenti agganciati a doc di vendita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 18:18:22 +01:00
67327f7dea Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 17:17:46 +01:00
739b109fc2 - corretta query format in cancellazione documenti agganciati a doc di vendita 2025-01-10 17:17:36 +01:00
a66ae4d788 Vario
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-01-10 17:17:19 +01:00
f115394750 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 17:16:46 +01:00
b913f78107 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 17:16:45 +01:00
71b27da052 Fix su converter da localDate nel caso di data nulla 2025-01-10 17:16:38 +01:00
5826102a36 AGGIUNTO UPDATE QUERY NELLE SETUP
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 16:47:21 +01:00
0913f3ccd4 Migliorie alla gestione del PostContextConstruct all'avvio del sistema
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 16:18:37 +01:00
1769635793 Fix salvataggio stato in VtbViaggi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 16:08:38 +01:00
89d6ae9dcb Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 15:58:29 +01:00
7dfdbddcf3 - corretto servizio trasferimento UL
- aggiunta creazione documento di trasferimento in emissione documenti di vendita
2025-01-10 15:58:21 +01:00
807c2d148b Migrations modificate per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 13:54:04 +01:00
ea93105397 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 12:33:17 +01:00
60f193d4ef update campo cod_lucid nella tabella azienda su db rossogargano 2025-01-10 12:33:08 +01:00
ed2f873327 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 12:23:27 +01:00
90bf758223 Finish Hotfix-95
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 12:23:26 +01:00
9378b27e4c fatture da scontrino 2025-01-10 12:23:20 +01:00
3c2cbd488f Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 11:58:50 +01:00
717a9c236f sistemata getListinoVEnditapedane 2025-01-10 11:58:47 +01:00
61f416622d Merge tag 'Hotfix-94' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Finish Hotfix-94
2025-01-10 11:39:51 +01:00
5c41ea2ead Finish Hotfix-94
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 11:39:50 +01:00
90605ab8ae Importazione ordini smetar
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 11:39:37 +01:00
24aa9f3bc8 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 10:58:49 +01:00
963f4fcc45 Migration cancellata 2025-01-10 10:58:43 +01:00
e65337d260 Modifica priorità pedane proposte in getSuggestedPickingList
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 10:37:39 +01:00
f1731cd9ae Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 09:37:04 +01:00
d42a75ab5d aggiunto campo cod_lucid nella tabella azienda 2025-01-10 09:36:54 +01:00
41af31ef6d Fix importazione documenti acquisto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-10 09:25:32 +01:00
cf385e0375 Fix nel caso di connessione chiusa
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-09 20:09:57 +01:00
7d7f288122 Fix vari
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-09 19:56:07 +01:00
6bf4eefe83 Fix su controlli in UtilityDebug
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-09 19:39:29 +01:00
377710d969 Fix - Creato pool di connessioni al DB
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-09 19:29:38 +01:00
173a11ff0d Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2025-01-09 19:22:46 +01:00
4c18c861c6 Creato pool di connessioni al DB 2025-01-09 19:22:39 +01:00
98a0adf1c8 correzione per salvataggio documenti vettore
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-09 18:31:05 +01:00
9dd4781d3b eliminto campo flag_fatt_vettore
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-09 17:07:29 +01:00
4618b735a7 [ROSSOGARGANO]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
init creazione doc di trasferimento in creazione bolla di vendita
2025-01-09 15:14:25 +01:00
77de7b778f Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-09 15:13:49 +01:00
29d212273d Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-01-09 15:13:49 +01:00
423400b450 [BIOLEVANTE]
corretto servizio modifica peso articolo
2025-01-09 15:13:39 +01:00
fb5bb4d3e7 Finish Hotfix-94
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-09 12:57:49 +01:00
59f2233844 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-09 12:57:49 +01:00
55f847d289 correzione calcolo totale documenti iva inclusa 2025-01-09 12:57:43 +01:00
e85bc36593 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-09 11:52:47 +01:00
ff6e9baf82 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-09 11:52:46 +01:00
9d4fa00711 Fix su cast dataOrd 2025-01-09 11:52:13 +01:00
b721c76a70 Spostato mezzo in VtbViaggi come child di GtbMezzo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-09 11:44:32 +01:00
309bf5aba3 Migrations
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-09 11:41:17 +01:00
7e246c7814 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-09 10:19:04 +01:00
a15463cffe Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-09 10:19:02 +01:00
bb39d76649 [ROSSOGARGANO]
- raggruppate righe documento di trasferimento per articolo partita e spostate  annotazioni in riga documento
[BIOLEVANTE]
  - servizio aggiornamento peso articolo
2025-01-09 10:18:54 +01:00
aa8c6b7cd7 Modifica FILENI
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-08 18:25:45 +01:00
abc8c95758 Sistemate vecchi DTO di SmartEnterprise
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-08 16:10:50 +01:00
6313991e96 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-08 12:43:24 +01:00
12a939e19f Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-08 12:43:24 +01:00
98f9e30398 [GRAMM]
corretta join in colli per query MES

[CARELLI]
sostituito  controllo idRigaMov con Object.Equals per Evitare NullPointerException
2025-01-08 12:43:17 +01:00
fbc7f23db7 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-08 10:20:28 +01:00
ae9a6264fc Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-08 10:20:28 +01:00
6bbd896e14 Fix su arraylist di mtbColt null nel servizio di spostaArtsTraUl 2025-01-08 10:20:22 +01:00
11674851ad Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-08 09:50:00 +01:00
8d8f21213a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-08 09:50:00 +01:00
8773c1148d Errore su update di SysSequentialNumbers 2025-01-08 09:49:54 +01:00
ecd9baaefc sistemata storedProcedure che sposta chiavi e indici su file separati del db
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-07 17:07:26 +01:00
91d8d9306d sistemata storedProcedure che sposta chiavi e indici su file separati del db
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-07 16:22:33 +01:00
a84228f870 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-07 15:55:23 +01:00
877faa5a6e ingrandito campo note nella jtb_flav_eventi 2025-01-07 15:54:22 +01:00
8edfaf0b60 sistemata lettura setup in gvw_situaz_ordini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-07 15:48:09 +01:00
c9bb51278b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-07 15:06:53 +01:00
b40eecacf8 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-07 15:06:52 +01:00
f177ac3c30 Fix su localDirectoryImporter 2025-01-07 15:06:47 +01:00
b92d067f0b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-07 13:01:43 +01:00
be94da1260 Finish Hotfix-94
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-07 13:01:43 +01:00
668451af75 inviata email al responsabili del commessa con il riepilogo delle attività installate 2025-01-07 13:01:36 +01:00
03d6c64344 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-07 12:08:03 +01:00
40c0296761 aggiunti campi num_civ e cap nella jtb_flav 2025-01-07 12:07:14 +01:00
6bae4613be Aggiunta migration che popola inizialmente tutti i progressivi ul.
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-03 19:30:53 +01:00
7b8f62f2f8 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-03 18:09:39 +01:00
0c79857be4 Cambiato campo dataOrd in MtbColt e MtbColr in tipo LocalDate.
Implementata generazione del progressivo ul nelle testate collo.
2025-01-03 18:09:33 +01:00
2c682df3d1 Importazione documenti filconad
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-03 17:41:45 +01:00
588b6237b7 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-03 17:19:32 +01:00
05013cd177 varie modifiche su documenti di vendita 2025-01-03 17:19:14 +01:00
e250cbf5c0 Implementata cancellazione files già importati con directory watcher
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-03 16:34:06 +01:00
3a2e1a8e76 Fix pulsante salva in form pianificate webui
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-03 13:03:55 +01:00
c4f40f4d0c errore null su wdt_doct
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-02 17:09:46 +01:00
69120d946e CORRETTA REGOLA
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-01-02 16:49:57 +01:00
e3b731014e - gestito in servizio trasferimento ul la possibilità di spostare più UL contemporaneamente
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-30 15:35:07 +01:00
381d7cbb47 Fix su migration per textiles
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-27 15:59:44 +01:00
7a6cabe4d7 Modifica funzione calcolo disponibilità Textiles
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-12-27 14:45:07 +01:00
80cf3ec5de Fix type boolean e cambio loghi webapp
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-23 12:45:40 +01:00
8f79fc7c65 [Consegna] Fix sincronizzazione incasso
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-23 12:15:53 +01:00
1470364637 inserimento cliente su anagrafica fornitore vettore
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-23 11:28:39 +01:00
eff2b0688c Finish Feature-FatturaDiffertita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-23 09:53:38 +01:00
a851439ee4 Merge branch 'develop' into feature/Feature-FatturaDiffertita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-20 18:04:14 +01:00
d431462dbd gestioen fatturazione pedane
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-20 18:03:27 +01:00
93b4569587 gestioen fatturazione pedane
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-20 16:14:55 +01:00
5c41e291e6 Inserimento incoterms
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-20 16:09:25 +01:00
a5f2963715 attivato salavataggio con i servizi rest alla gestione tipi pagamento
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-20 10:35:24 +01:00
cc4a8cf979 [ROSSOGARGANO]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Servizio di trasferimento UL
2024-12-19 18:13:49 +01:00
5e9c853880 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-19 17:21:57 +01:00
b09e75da84 Aggiunti campi in gestione porto: flag_incoterms - costo - assicurazione - rischi 2024-12-19 17:21:49 +01:00
5145255e7b Fix nome assicurazioni
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-19 16:56:38 +01:00
028e8a591f Aggiunti campi in gestione porto: flag_incoterms - costo - assicurazione - rischi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-19 16:51:41 +01:00
11ae3a10e2 Gestiti enum in GtbPorto come short
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-19 16:32:13 +01:00
7e1c790864 Merge branch 'develop' into feature/Feature-FatturaDiffertita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/resources/rules/documenti.drl
2024-12-19 16:19:36 +01:00
f1858c0bfb Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-19 16:04:45 +01:00
7595dd92ea export listini infragruppo 2024-12-19 16:04:43 +01:00
d58ca3c5f5 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-19 15:42:37 +01:00
a8d1f4a4e0 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-19 15:42:37 +01:00
dc12962435 Fix importazione colli exchange 2024-12-19 15:42:32 +01:00
d232d467de Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-19 15:41:43 +01:00
a54cd715eb Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2024-12-19 15:41:43 +01:00
3329067a1f Fix importazione colli exchange 2024-12-19 15:41:36 +01:00
0bb90170ca modifiche per ventilazione iva
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-19 15:22:25 +01:00
b968bc8e37 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-19 13:03:55 +01:00
76253a4d53 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-19 13:03:54 +01:00
bf80466d45 Implementato indice unique su tabelle tmp di Exchange 2024-12-19 13:03:47 +01:00
378e73ad24 Implementato indice unique su tabelle tmp di Exchange 2024-12-19 13:03:22 +01:00
bb54056c46 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-19 12:45:32 +01:00
717231ad3f Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-19 12:45:31 +01:00
f10f6000f0 Fixate alcune librerie da aggiornare 2024-12-19 12:45:24 +01:00
c073169e53 Merge remote-tracking branch 'origin/develop' into develop
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2024-12-19 12:45:00 +01:00
1d024abd43 modifiche per ventilazione iva
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-19 12:40:41 +01:00
06eccfdfcd Fixate alcune librerie da aggiornare 2024-12-19 12:37:13 +01:00
232c094e4b Aggiunti campi in gestione porto: flag_incoterms - costo - assicurazione - rischi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-19 10:48:59 +01:00
6ccc539cbe Aggiunti campi in gestione porto: flag_incoterms - costo - assicurazione - rischi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-19 10:31:54 +01:00
02a33ef5ee Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-18 16:19:45 +01:00
f2cdf532c2 corretto errore su aggiornamento colli 2024-12-18 16:19:26 +01:00
2c95e3f0d4 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-18 16:17:20 +01:00
7f3100baf2 Sistemato calcolo quando la data ammortamento era uguale alla data del cespite 2024-12-18 16:17:15 +01:00
955403ad48 cancellata setup 2024-12-18 15:53:40 +01:00
d422d9a123 Finish Hotfix-94
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-18 12:07:56 +01:00
eb04d04dba Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-18 12:07:56 +01:00
d7d68f9e19 aggiunto campo cod_forn_trasp 2024-12-18 12:07:51 +01:00
82fd2e48e4 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-18 10:05:00 +01:00
e0032b0c37 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-18 10:05:00 +01:00
35fe4a3c9e Fix su importazione exchange colli 2024-12-18 10:04:53 +01:00
9335cc71a8 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-17 18:03:39 +01:00
2969b4b510 Aggiunto ritorno errore tramite mail in import colli EURITMO 2024-12-17 18:03:31 +01:00
7223b8a846 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-17 13:31:03 +01:00
8aa7409b8a Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-17 13:31:02 +01:00
c305dba6ba Rimosso segno da servizio di InstantItemGiacenza 2024-12-17 13:30:57 +01:00
a204a4acac Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-17 13:24:14 +01:00
70f5cb3ecc Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-17 13:24:14 +01:00
f6fc09cdc3 Fix su exchange 2024-12-17 13:24:08 +01:00
3b17ca48a2 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2024-12-17 13:22:57 +01:00
f52db8ff2e Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2024-12-17 13:22:56 +01:00
d43f90ea12 Fix su exchange 2024-12-17 13:22:50 +01:00
5e557d938a Merge tag 'Hotfix-93' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Finish Hotfix-93
2024-12-17 12:59:28 +01:00
e44263055f Finish Hotfix-93
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-17 12:59:27 +01:00
a90cda991a Ripristinata libreria groovy 2024-12-17 12:59:16 +01:00
ae29ccae1c Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-16 18:27:28 +01:00
bdf24ebf1e Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-16 18:27:27 +01:00
1be9631c8a Migliorato log errore in exchange clienti/fornitori 2024-12-16 18:27:21 +01:00
094ebf7b4d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-16 17:48:25 +01:00
fb7452eefd Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-16 17:48:25 +01:00
4b8637d48d reintegrata libreria per report 2024-12-16 17:44:06 +01:00
c33f90ba79 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-16 17:00:36 +01:00
760fbf66d6 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-16 17:00:35 +01:00
1b64a2f745 Migliorato log errore in exchange fornitori 2024-12-16 17:00:27 +01:00
ccf4277f79 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-16 15:56:43 +01:00
c6f85fe920 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-16 15:56:42 +01:00
199a71f20c gestione rientro merce versata da mes 2024-12-16 15:56:10 +01:00
44a67b94b7 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2024-12-16 15:54:34 +01:00
099a567e3e Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2024-12-16 15:54:34 +01:00
66e08cd3ff Migliorati log errore exchange documenti 2024-12-16 15:54:28 +01:00
1fc6012863 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-13 18:09:38 +01:00
87c00bcc34 Creata migration per aggiornare la mvw_sitart_udc_det_inventario 2024-12-13 18:09:33 +01:00
eadafb4678 [conSegna] Sincronizzazione sospesi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-13 18:00:01 +01:00
faadd76568 Ripristinata versione di Firebase precedente 2024-12-13 16:37:33 +01:00
7931434d40 Impostato StandardServletMultipartResolver come multipartResolver e rimossi file non utilizzati
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-13 15:37:13 +01:00
d26a5c9596 Nuove procedure di import ed export listini infragruppo
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-12-13 15:01:23 +01:00
dcad7799fe GESTIONE VENTILAZIONE SU PV E PERIODO
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-12-13 12:14:20 +01:00
6f94bb4ed2 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-12-13 10:58:49 +01:00
09f5a14aac inserito modulo di stampa Packing List e modificata descrizione del modulo di stampa CMR 2024-12-13 10:58:40 +01:00
4452c48845 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-12-12 19:41:15 +01:00
15637aee83 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-12 19:41:14 +01:00
9b90513b18 Fix su exchange colli 2024-12-12 19:41:06 +01:00
5a98e370cf Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-12-12 19:05:39 +01:00
fc5a95b672 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-12 19:05:39 +01:00
34b8fa70b9 Fix date su exchange colli 2024-12-12 19:05:34 +01:00
9f63e66d1f Rimossi alcuni conflitti di librerie.
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Rimosse librerie inutilizzate.
2024-12-12 18:55:59 +01:00
285f4e68bd Impostato rap_Conv listino = 1 se null
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-12 18:47:46 +01:00
b9e9b443f8 Merge branch 'develop' into feature/Feature-FatturaDiffertita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-12 18:17:53 +01:00
5c72a0f9bd gestito flag su movimenti contabili per ventilazione iva
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-12 18:16:45 +01:00
874f72d545 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-12 17:22:31 +01:00
6883043607 Merge branch 'master' into develop
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2024-12-12 17:22:24 +01:00
13f5e0b2a1 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-12 17:22:23 +01:00
584b392f8c Nuove procedure di import ed export listini infragruppo 2024-12-12 17:22:19 +01:00
2e907ec72e Cambiata data di partenza durante l'importazione dei colli da exchange 2024-12-12 17:22:16 +01:00
7ad6f150e1 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-12 17:01:27 +01:00
eea7dd43e9 Implementato directory watcher su cartelle SFTP 2024-12-12 17:01:20 +01:00
6278554155 modificato tipo cod_fda e update campi cod_fda e cod_fce a rossogargano
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-12 12:19:51 +01:00
3abeb76377 Merge tag 'Hotfix-92' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Finish Hotfix-92
2024-12-12 11:26:22 +01:00
88bdc76186 Finish Hotfix-92
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-12 11:26:21 +01:00
daed2478ff Modifica export Sicilaini 2024-12-12 11:26:06 +01:00
42193720f5 aggiunti campi cod_fda e cod_fce nella tabella azienda
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-12 10:46:13 +01:00
0a26474785 aggiunto salvataggio immagini in direcotry temporanea tomcat
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-12 10:39:20 +01:00
08e532123e aggiunto salvataggio immagini in direcotry temporanea tomcat 2024-12-12 10:38:52 +01:00
0c53ee4d80 modifiche su documenti di vendita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-12 10:38:14 +01:00
fbec278804 Cambiate altre chiamate alla gest setup (inclusa connection)
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-12 10:19:01 +01:00
52eba5261d Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-11 20:07:44 +01:00
a5c31098a1 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-11 20:07:44 +01:00
7552964651 Fix su gest setup regola 2024-12-11 20:07:38 +01:00
dc60f02272 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-11 19:45:55 +01:00
4245485351 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2024-12-11 19:45:55 +01:00
cc1717ea49 Fix import colli vendita exchange 2024-12-11 19:45:50 +01:00
47aea268e7 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/rules/completing/SalesRules.java
2024-12-11 19:24:52 +01:00
44eca19bbc Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-11 19:24:17 +01:00
09c879b1d9 Passato il parametro connection in alcune setup 2024-12-11 19:24:12 +01:00
5775553cd2 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-11 17:58:40 +01:00
02a7764c8e Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-11 17:58:40 +01:00
7152234567 Implementata logica che non cancella gli articoli in exchange ma li disattiva e riattiva 2024-12-11 17:58:34 +01:00
4cfa58b873 Aggiornamento log4j, pulizia config pom su core ed engine e fix cancellazione file di log
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-11 12:41:31 +01:00
fc4b3d82fa Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-11 11:32:26 +01:00
8f3bb93c0d Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-11 11:32:25 +01:00
2e43314b0e Cambiate logiche di salvataggio errore Exchange 2024-12-11 11:32:20 +01:00
fa116d51a1 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-11 10:05:41 +01:00
aedfccdc93 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-11 10:05:41 +01:00
7102cc0e13 Fix su MultiDbTransactionManager in una regola che non aveva scope Request 2024-12-11 10:04:58 +01:00
925ee134cb Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-10 17:33:20 +01:00
0ed531b965 Finish MRPSoloConDati
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-10 17:33:20 +01:00
0db53f0ffa Aggiunto filtro solo con dati in mrp 2024-12-10 17:33:15 +01:00
9b9b4af6b4 Merge branch 'develop' into feature/Feature-FatturaDiffertita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-10 15:53:28 +01:00
afce979ca6 aggiunto campo su vtbClie
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-10 15:52:10 +01:00
896b4b719a documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-10 15:47:51 +01:00
b7e6ebd9ed Merge branch 'develop' into feature/Feature-FatturaDiffertita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-10 14:17:40 +01:00
7acc3ae6b6 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-10 12:54:57 +01:00
f6d045bfcf Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-10 12:54:56 +01:00
bee772aa1a [ROSSOGARGANO]
- servizi modifica versamento materiale
- nuovi campi in gestione ricambistica WMS
2024-12-10 12:54:49 +01:00
0facaf720d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-10 12:09:15 +01:00
964269c749 Finish MRPSoloArtDis
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-10 12:09:15 +01:00
484fefc31a Gestito parametro per mostrare solo articoli disattivi in MRP 2024-12-10 12:09:08 +01:00
f155a40606 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-10 11:30:28 +01:00
2b7a2d4785 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-10 11:30:27 +01:00
86f52c5ceb Aggiunto autocompletamento iva22% nel salvataggio di un nuovo articolo.
Gestiti gli errori nel sistema di Exchange.
2024-12-10 11:30:22 +01:00
e65daee04e servizio di salvataggio documenit
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-09 20:04:52 +01:00
72a6f512a4 Merge branch 'develop' into feature/Feature-FatturaDiffertita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-09 19:43:55 +01:00
79fdef37c5 aggiunto flag su porto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-09 19:43:33 +01:00
f8fbdc2499 Merge branch 'develop' into feature/Feature-FatturaDiffertita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241209150324.java
#	ems-core/src/main/java/it/integry/ems/rules/businessLogic/DocumentBusinessLogic.java
#	ems-core/src/main/java/it/integry/ems_model/entity/DtbDocImb.java
2024-12-09 19:41:31 +01:00
3ce3e75f5b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-09 19:30:13 +01:00
6281079988 AGGIUNTO NUOVO DETTAGLIO SUI DOCUMENTI 2024-12-09 19:30:08 +01:00
3a6ec0e530 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-09 19:18:57 +01:00
0198a04af4 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-09 19:18:57 +01:00
25c9e11e61 Create setup per creazione articoli in rettifica giacenze WMS 2024-12-09 19:18:51 +01:00
e26baf935a documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-09 16:36:50 +01:00
cbb1f5b22e Merge branch 'develop' into feature/Feature-FatturaDiffertita
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-12-09 15:35:53 +01:00
8807fca122 aggiunto campo nella gestione dei clienti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-09 15:03:04 +01:00
3367f18b69 Finish FixSetidArtEqui
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-09 10:29:51 +01:00
2d48cca81f Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-09 10:29:51 +01:00
c9911ff456 Fix errore in salvataggio ordini delivery plan 2024-12-09 10:29:44 +01:00
4e18ae6721 Migliorie EntityPropertyHolder
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-06 19:23:28 +01:00
265e8cbb9c Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-06 17:04:53 +01:00
ab7f4c6d76 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-06 17:04:53 +01:00
d92e18f0cf Implementata sync exchange dei colli di vendita 2024-12-06 17:04:47 +01:00
567bc2289f [ROSSOGARGANO]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- servizio inserimento articolo in listino di acquisto
- corretta gestione barcode_ul in colli
2024-12-06 12:53:55 +01:00
2e2f6c20d9 sistemato salvataggo colli aggnaciati a documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-06 11:45:44 +01:00
38cfa166f5 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-06 11:38:16 +01:00
ce21b0b928 Implementata gestione degli aggiornamenti obbligatori su WMS 2024-12-06 11:38:05 +01:00
15f3721397 Merge branch 'develop' into feature/Feature-FatturaDiffertita
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdCalTotaliRules.java
#	ems-core/src/main/java/it/integry/ems/rules/completing/DocumentRules.java
2024-12-05 18:21:46 +01:00
d232c9dfb1 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-05 17:58:28 +01:00
70b6142e55 Salvare l'ordine di tuidi annullato e "disannullarlo" quando ha terminato il salvataggio 2024-12-05 17:58:25 +01:00
be7dfc0af2 Aggiunta descrizione estera su articoli equivalenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-05 17:47:54 +01:00
c4ea42f9f9 Merge remote-tracking branch 'origin/develop' into develop 2024-12-05 17:47:47 +01:00
fe25e6e1cb Aggiunta descrizione estera su articoli equivalenti 2024-12-05 17:47:42 +01:00
2c335ba683 Metodi per app ConSegna
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-05 17:04:37 +01:00
88045e83f8 Sistemate viste errate MES
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-05 16:36:00 +01:00
a596460bbd Setup controllo postura in lavorazione olive
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-05 15:55:12 +01:00
ff6d511e45 Fix pom.xml per compilazione regole
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-05 15:50:40 +01:00
84bd040093 Cambiata vista SYS_SequentialNumbers
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-12-05 15:40:51 +01:00
7b63fbc1e2 Cambiata vista SYS_SequentialNumbers
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2024-12-05 15:34:40 +01:00
b67d6dc58a Rimosso syslog dai log interni
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-12-05 10:27:14 +01:00
d280bbc236 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-12-04 16:12:51 +01:00
6aced9972b Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-04 16:12:50 +01:00
7bb66f7f5d Fix su null in fase di import exchange 2024-12-04 16:12:46 +01:00
328759f530 Migliorato Jenkinsfile
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-12-04 13:08:08 +01:00
07da155e08 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-12-04 12:54:56 +01:00
a207d795e4 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-04 12:54:55 +01:00
b369212a26 Rimosso auto completamento del codice commessa sui colli quando non è un A+ o L+ 2024-12-04 12:54:46 +01:00
9fc2db9a8a Rimosso auto completamento del codice commessa sui colli quando non è un A+ o L+ 2024-12-04 12:54:18 +01:00
6cc7e4ac3a Migliorie su compilazione Drools.
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
Nuovi servizi in WMSArticoloController.
2024-12-04 12:47:49 +01:00
69ff98f0cf Creazione tabella stb_note
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-03 19:08:41 +01:00
a7885fe585 Aggiunto messaggio importazione EDI quando manca listino o codice a barre
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-03 19:07:10 +01:00
b28ebb276c Aggiunto check in caso last step null in openOrderStep
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-03 19:02:33 +01:00
adf4b286f7 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-03 18:02:55 +01:00
9bd85b6d94 cambiata chiave primaria nella arl_fogm e permessi valori null al campo cod_msgr 2024-12-03 18:02:45 +01:00
f5d04eaa07 aggiunti campi nei viaggi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-03 17:03:17 +01:00
4603bc17ed aggiunto controllo su movimento senza codice
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-03 16:40:04 +01:00
dfbf2e8d33 Creata Entity StbNote
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-03 12:55:31 +01:00
416d0baee5 Fix template Entity ed EntityChild
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-03 12:30:33 +01:00
e9710d8998 Finish Hotfix-91
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-03 12:19:50 +01:00
b8e784c201 Merge tag 'Hotfix-91' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Finish Hotfix-91
2024-12-03 12:19:50 +01:00
f63c37c78c Migrations errate
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-12-03 12:19:35 +01:00
6a6fcf6511 Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-03 12:00:40 +01:00
f36d216c9d Merge tag 'Hotfix-90' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Finish Hotfix-90
2024-12-03 12:00:40 +01:00
94816061a1 Migrations errate
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-03 12:00:27 +01:00
508e079bee Abilitazione per utente modifica prevista fatturazione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-02 18:46:22 +01:00
437b684508 Abilitazione per utente modifica prevista fatturazione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-02 18:46:13 +01:00
523b167966 Nuovi campi su gestione documento e nuove setup
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-02 17:42:45 +01:00
ac555b8972 aggiunta setup
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-02 14:54:16 +01:00
e08e7c5fcc Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-02 12:45:23 +01:00
09d5e13b4e Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-12-02 12:45:01 +01:00
b005b43201 Fix migrations 2024-12-02 12:44:56 +01:00
1549a7ad25 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-12-02 12:22:43 +01:00
235bb78b69 Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2024-12-02 12:22:42 +01:00
ad89effced Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java
2024-12-02 12:22:38 +01:00
30fa3ea9e7 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/_base/BaseMigration.java
2024-12-02 12:21:25 +01:00
99257c8553 Fix migrations 2024-12-02 12:19:33 +01:00
68c1541253 modifica vista e aggiunto controllo su esistenza tabella
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-12-02 11:54:33 +01:00
5d4963594a Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-29 18:41:08 +01:00
d4c3a96a5c Modifica per esclusione DMS 2024-11-29 18:41:02 +01:00
457e0c3d8b non permessi valori null ai campi della entity
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-29 17:55:15 +01:00
ee450a8483 inserita arlFogm come entity child 2024-11-29 17:52:01 +01:00
5304966a51 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-29 16:52:38 +01:00
c20fc4b315 - corretta creazione ordine di produzione (codJfas mancante) 2024-11-29 16:52:31 +01:00
00b1120e8a Modifica per esclusione DMS
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-29 12:43:39 +01:00
d6c062e86e Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-29 12:42:47 +01:00
ed6d2a3c76 Modifica per esclusione DMS 2024-11-29 12:42:42 +01:00
231953a663 - corretta gestione ordine in corso in calcolo fine produzione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-28 17:26:20 +01:00
248d4efece popolamento tabella costo listino
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-28 16:26:45 +01:00
66092ff815 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-28 15:02:20 +01:00
37b4cbf161 Inserimetno condizione per escludione gruppo merceologico da ripartizione materiali SMETAR 2024-11-28 15:02:15 +01:00
2baceaf87a Inserimetno condizione per escludione gruppo merceologico da ripartizione materiali SMETAR 2024-11-28 15:02:08 +01:00
f1406a1e2e Migliorata MES_GetWorkOrders
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-28 12:40:22 +01:00
4ae5d0bfc8 creata entity ArlFogm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-28 09:14:54 +01:00
20917ed880 Aggiunto check su null in child filter setField ed impostati ts con questionMarkAndNullableType
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-27 18:00:24 +01:00
10ddc46460 creata nuova voce menu report costi di produzione per smetar
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-27 17:51:17 +01:00
8d9aaf3c88 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-27 17:04:33 +01:00
3369ca6e66 creata nuova voce menu report costi di produzione per smetar 2024-11-27 17:04:24 +01:00
c23ac44783 Migliorata MES_GetWorkOrders
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-27 16:16:18 +01:00
845882a0f4 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-27 16:03:13 +01:00
17344759d8 Migliorata MES_GetWorkOrders 2024-11-27 16:03:07 +01:00
dbe0665d2f Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-27 15:19:00 +01:00
e82c497875 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-27 15:18:59 +01:00
7aea06330c corretto cast di string a short in enum 2024-11-27 15:18:42 +01:00
dd01b7b5b3 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-27 13:19:51 +01:00
82642c7a29 Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2024-11-27 13:19:51 +01:00
6d4591145c SuggestCodeIdArtEqui 2024-11-27 13:19:46 +01:00
1d0cf9443e Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-27 13:07:49 +01:00
b7b71f43f9 Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2024-11-27 13:07:49 +01:00
1cbb8a374f SuggestCodeIdArtEqui 2024-11-27 13:07:44 +01:00
eaf8d7efd2 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-27 12:55:58 +01:00
61c14c7bb4 Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2024-11-27 12:55:58 +01:00
4af1cd1fd8 SuggestCodeIdArtEqui 2024-11-27 12:55:06 +01:00
63621ec58c Migliorata MES_GetWorkOrders
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2024-11-27 12:53:54 +01:00
1ac9e6115a Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-27 11:09:25 +01:00
edb2942d66 - aggiunti nuovi campi in dto 2024-11-27 11:09:11 +01:00
3a048c8036 Finish FixNoSuchMethod
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-27 09:39:55 +01:00
da66701175 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-27 09:39:55 +01:00
720be35001 Commentato per errore NoSuchMethodError 2024-11-27 09:39:47 +01:00
59f3fa7c55 Migliorata MES_GetWorkOrders
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-26 18:54:24 +01:00
cb521362c5 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-26 18:47:24 +01:00
7fe43e2a07 Modifica migrations per escludione da DMS 2024-11-26 18:47:19 +01:00
a3335d9fe6 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-26 18:36:22 +01:00
acc1e44ba2 modificato gest_name della setup FORMULA_PREZZO_NETTO in ATB_LIST 2024-11-26 18:36:13 +01:00
3a30f03e64 [SMETAR]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- aggiunte descrizioni articoli e commesse in dettaglio costi
- corretto caricamento partita di produzione
2024-11-26 18:06:48 +01:00
0c8c4518e5 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-26 16:38:39 +01:00
811e79668d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-26 16:38:39 +01:00
d04d207e8b [gramm]
- aggiunto timeout in comunicazione con collector per errori di comunicazione a gramm
2024-11-26 16:38:32 +01:00
826543a238 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-26 16:28:32 +01:00
e0399e766e Migliorata MES_GetWorkOrders 2024-11-26 16:28:26 +01:00
1f0b317077 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-26 16:27:34 +01:00
7b75877630 Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-26 16:27:33 +01:00
3a2e55a187 [gramm]
- aggiunto timeout in comunicazione con collector per errori di comunicazione a gramm
2024-11-26 16:27:26 +01:00
b40ec8c2e2 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-26 16:17:24 +01:00
07ec556038 Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-26 16:17:23 +01:00
f0a91b2139 [gramm]
- risolto errore in creazione ordine di trasferimento
- aggiunto timeout in comunicazione con collector per errori di comunicazione a gramm
2024-11-26 16:17:15 +01:00
86ab8313cd correzione steup
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-26 15:51:29 +01:00
d289d0e1ad correzione steup
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-26 15:50:36 +01:00
9ed5876ab4 eliminato log
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-26 12:48:25 +01:00
bc4aaac3f7 Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-26 12:45:03 +01:00
af434d6ec2 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-26 12:45:03 +01:00
b34f8e6e54 sistematao salvataggio articoli equivalenti nel listino 2024-11-26 12:44:51 +01:00
ae648c09ce popolamento tabella costo listino
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-26 12:24:01 +01:00
4b0aad2c24 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-26 12:16:30 +01:00
14f5bae293 Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-26 12:16:29 +01:00
ff6c01b113 sistemato controllo steup e aggiorna prezzo equivalente nel caso di un nuovo inserimento 2024-11-26 12:14:19 +01:00
90a2a3bcba personalizzato datawindow report packing list per sardinya
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-26 11:59:20 +01:00
87d7ceefc1 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-25 12:56:12 +01:00
786e830b5c Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-25 12:56:12 +01:00
fb51505aa7 Ottimizzazione dati per estrazione ordini di acquisto 2024-11-25 12:56:03 +01:00
8b87d13182 aggiungere nell'invio dei fine promo anche quelli che sono terminati 2 gg prima ma modificata il gg prec
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-25 12:48:29 +01:00
48ea31bd96 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-25 10:43:21 +01:00
2c12233d84 Nella query del saldo, se l'anno è aperto, presi i movimenti dall'ultimo anno contabile aperto 2024-11-25 10:42:15 +01:00
a3adb0ab56 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-25 10:41:39 +01:00
fda84f8460 Modificata Migrations 2024-11-25 10:41:10 +01:00
f563330832 Implementato servizio di retrieve articoli per WMS (con pagination e filtri)
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-25 10:09:02 +01:00
4a063f6bd8 Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-25 09:56:23 +01:00
497afaca55 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-25 09:56:23 +01:00
46fb7f631e nella giacenza non restituire l'ordinato quando fanno RGIAC 2024-11-25 09:56:11 +01:00
ff234a5c68 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-25 08:16:08 +01:00
324495c612 Modifica EDI 2024-11-25 08:16:00 +01:00
d0d3fb708f Aggiunta l'ora in dataInsOrd WdtbOrdt
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-22 18:12:27 +01:00
e511a7d89a Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-22 17:40:29 +01:00
9e3448ddbf Nella procedura di accettazione aggiungere data iniz trasp 2024-11-22 17:40:19 +01:00
3cbdb69194 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-22 17:36:17 +01:00
6e9656df3f Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-22 17:36:16 +01:00
38dec72616 Fix su conversione enum durante applyDefault 2024-11-22 17:36:10 +01:00
05cf6ad902 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-22 16:13:45 +01:00
1c076ae0d6 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-22 16:13:44 +01:00
79bb385c31 Implementati mtb_tipi nella Exchange degli articoli 2024-11-22 16:13:36 +01:00
bae59c1efe Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-22 16:00:41 +01:00
a1c173e437 Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-22 16:00:40 +01:00
2faed8b2ef aggiornare importazione documenti 2024-11-22 16:00:36 +01:00
ed0d029436 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-22 15:27:13 +01:00
4158c82bff Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-22 15:27:12 +01:00
c98a94c675 aggiornare importazione documenti 2024-11-22 15:27:04 +01:00
3f9ce26c35 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-22 15:08:39 +01:00
07b182055e Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-22 15:08:39 +01:00
25124f9308 evitare che l'update inserisca i valori di default 2024-11-22 15:08:26 +01:00
6104a5c597 Valorizzato id flag sulla registrazione contabile delle paghe
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-22 13:15:18 +01:00
6ea3b56fdb Migliorate logiche di Apply Default delle Entity
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-22 10:40:52 +01:00
ab52987969 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-22 10:38:59 +01:00
5aaec8f4a0 Migliorate logiche di Apply Default delle Entity 2024-11-22 10:38:51 +01:00
f705220e34 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-22 09:17:45 +01:00
50223e4f1d Smetyar 2024-11-22 09:17:40 +01:00
cd9cba57e1 Aggiornato Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-21 16:46:43 +01:00
6965f5c0fb Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-21 15:18:20 +01:00
e19d122a46 Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-21 15:18:19 +01:00
2f8a9ed786 sportata regola 2024-11-21 15:18:13 +01:00
fb4baa146b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-21 13:12:15 +01:00
8feec59927 Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-21 13:12:14 +01:00
7284697ee2 sistemato salvataggio giacenza negli rgiac 2024-11-21 13:12:09 +01:00
ca2171dc1c sistemato salvataggio giacenza negli rgiac
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-21 13:00:06 +01:00
a196c46870 fare in modo che crei un solo collo con tutti gli articoli 2024-11-21 12:35:39 +01:00
7d26505baf Menu
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-21 10:05:49 +01:00
79a62e9095 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-20 18:59:32 +01:00
656acd7a2a Fattrua elettronica Biolevante e migration per calcolo costo per commessa SMETAR 2024-11-20 18:59:09 +01:00
c5137ab16d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-20 16:12:01 +01:00
a0e40d5a82 Finish AggMenuRG
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-20 16:12:00 +01:00
70a25d117c Rigenerato menu 2024-11-20 16:11:55 +01:00
267e1c4df2 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-20 13:28:49 +01:00
797c38a6ce Finish PubbRicambiRG
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-20 13:28:49 +01:00
603b5d0aff Fix errore migration with inline per sql 2014
(cherry picked from commit 6fef9c6d70)
2024-11-20 13:28:41 +01:00
199606427f Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-20 12:44:41 +01:00
c3d9799fa2 Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-20 12:44:40 +01:00
64a2112dfd sistemata query 2024-11-20 12:44:29 +01:00
bc8ede8b42 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-20 12:31:32 +01:00
2b5dcc64e3 Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-20 12:31:31 +01:00
7a91596547 sistemata query 2024-11-20 12:30:41 +01:00
6fef9c6d70 Fix errore migration with inline per sql 2014
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-20 12:23:42 +01:00
70c92956aa Fix nullpointer savearticolodto
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-20 11:14:46 +01:00
e7eeca92e9 Modificato cod_opz MR048
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-20 10:28:53 +01:00
8df5478fea Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-20 10:20:59 +01:00
155fe28af1 Corretta condizione di where 2024-11-20 10:20:51 +01:00
221ba0d38c Finish Rossogargano_ricambi
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-20 10:09:26 +01:00
1b47d866fa Merge branch 'develop' into feature/Rossogargano_ricambi 2024-11-20 10:09:20 +01:00
ff48588328 Fix set per campi boolean da stringa 2024-11-20 10:09:16 +01:00
c89eb28c64 modificata cvw_mov_black_list
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-20 09:31:22 +01:00
676bccff73 sistemato errore query
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-20 09:28:17 +01:00
aeb2e845bf Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-19 18:18:24 +01:00
fe6fc932f2 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-19 18:18:23 +01:00
c33936d9bb Aggiunto exchange acquisti in sistema pianificato 2024-11-19 18:18:16 +01:00
bdb8d6997e Merge branch 'develop' into feature/Rossogargano_ricambi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-19 17:50:01 +01:00
400ca76767 sistemata condizione su cod_jcom
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-19 17:15:27 +01:00
a40a2aab27 Finish Hotfix-91
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-19 12:52:03 +01:00
ef50eee5c1 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-19 12:52:03 +01:00
32d888e52e sistemata logica della qta_cnf nel listino di acquisto 2024-11-19 12:51:54 +01:00
bb8e93efbe Merge branch 'develop' into feature/Rossogargano_ricambi 2024-11-19 11:33:22 +01:00
e45245f51c Finish FixCheckCanCloseOrder
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-19 11:33:13 +01:00
aa693866a9 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-19 11:33:13 +01:00
520e918bf8 Corretto controllo step chiusura ordine 2024-11-19 11:33:04 +01:00
7c732e6de0 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-19 10:20:03 +01:00
344b8b5260 Merge remote-tracking branch 'origin/master'
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-19 10:19:47 +01:00
937ee15033 Merge branch 'develop' into feature/Rossogargano_ricambi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-19 09:40:58 +01:00
b40f5e654f Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-19 09:40:42 +01:00
8ac41de12d Finish FixMesSetup
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-19 09:40:41 +01:00
14222c8fba Rimossa lettura da vista stb_gest_setup_user 2024-11-19 09:40:36 +01:00
53fea7413c Aggiunto logger in templates entity ed ordinamento su definizioni ts
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-19 09:33:34 +01:00
536236836e [Rossogargano]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
servizio creazione articoli
2024-11-18 19:37:29 +01:00
b7dc9f971d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/resources/rules/config_activity.drl
2024-11-18 17:46:24 +01:00
24e654b9c8 Finish Hotfix-90 2024-11-18 17:31:10 +01:00
823a3d70c5 aggiunti campi sulle righe dei rapportini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-18 17:31:00 +01:00
8cebbe4df1 Ripristinata configurazione Tomcat.xml
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-18 17:06:07 +01:00
20f2870d83 aggiunti campi sulle righe dei rapportini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-18 15:33:54 +01:00
8c39a14c20 eliminto db menu dall'aggiornamento dei menù
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-18 15:33:23 +01:00
8397ffd1bf Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-18 13:18:59 +01:00
1838dd28eb Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-18 13:18:58 +01:00
cb2f8c7a17 Fix su whereCond in fase di stampa report 2024-11-18 13:18:53 +01:00
eede5ab023 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-18 13:07:11 +01:00
47b8338fe1 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-18 13:07:11 +01:00
97bf29cd1d Fix su stampa report senza reportId 2024-11-18 13:07:05 +01:00
e9d0faaea9 modificato db per creazione menù
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-18 10:38:40 +01:00
5223963d56 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-15 18:33:36 +01:00
dbbc306bbf importazione trasferimenti slim 2024-11-15 18:33:31 +01:00
cf0bb3231d Fix su update dei campi null in EntityBase
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-15 17:04:01 +01:00
4cf34e6bea importazione trasferimenti slim
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-15 15:46:59 +01:00
f32c22380c Merge remote-tracking branch 'origin/develop' into develop 2024-11-15 09:59:09 +01:00
8cbfe8b750 Eliminato bug che ecludeva update a NULL dalla Update Entity 2024-11-15 09:59:05 +01:00
c7cd69a28d Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-14 19:14:38 +01:00
d01a79884d eliminata migration 2024-11-14 19:14:34 +01:00
a9f7538ddf Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-14 18:23:52 +01:00
75ccbcb6a0 Finish Hotfix-2
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-14 18:23:51 +01:00
6e73f1cd05 [TOSCA]
-corretta importazione vettori
2024-11-14 18:23:43 +01:00
836745deab Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-14 18:21:37 +01:00
341524da1c - corretta importazione vettori 2024-11-14 18:21:27 +01:00
b623a6a39f Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-14 18:13:19 +01:00
5397f8eb5c migration canvcellazione dati biolevante, nuova setup, cancellazione voce di menu 2024-11-14 18:13:17 +01:00
ab850ad3b1 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-14 17:27:37 +01:00
194b13c84e Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-14 17:27:36 +01:00
487f2f2f55 [TOSCA]
importazione vettori e data consegna al cliente da Excel
[GRAMM]
corretto controllo in chiusura ordine
2024-11-14 17:27:29 +01:00
e7e8148e73 Merge branch 'master' into hotfix/Hotfix-1 2024-11-14 17:26:34 +01:00
619505dd4b Merge branch 'master' into hotfix/Hotfix-1 2024-11-14 17:26:20 +01:00
5a40b23f17 Rimossa whereCond in getOrdiniLavorazione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-14 15:45:40 +01:00
add41c0c44 Funzione visualizzazione castelletto IVA
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-14 09:35:34 +01:00
c086918cf3 Modifica getsospesi_completo: non era corretta la condizione sul tipo_note = SOSPESO
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-13 16:05:49 +01:00
390993decc Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-13 16:05:36 +01:00
060ea26ad1 Modifica getsospesi_completo: non era corretta la condizione sul tipo_note = SOSPESO 2024-11-13 16:05:32 +01:00
09dbd7e304 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-13 13:03:56 +01:00
babcd9f621 varie migration 2024-11-13 13:03:42 +01:00
1239852229 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-13 11:00:07 +01:00
9302af9992 Modifica altridati_dest per escludizone indirizzo destinatario GRAMM 2024-11-13 11:00:00 +01:00
6016ed6555 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 18:41:39 +01:00
e8fa96e18c Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 18:41:38 +01:00
aaea21d781 sistemate lettura qta_cnf nel listino 2024-11-12 18:41:30 +01:00
e90076d528 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 18:32:39 +01:00
4444fdb7e0 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 18:32:37 +01:00
60628bef1d Fix su equals in GtbAnag e VtbDest 2024-11-12 18:32:14 +01:00
7ce34bde92 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 18:11:26 +01:00
157d4ee002 aggiunto campo id_lav nella ctb_movr_coan 2024-11-12 18:11:21 +01:00
ff03a20e8d Corretta condizione di where
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 17:29:45 +01:00
ca8c8c9991 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 17:18:02 +01:00
8ccec6c0d4 Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 17:18:01 +01:00
5a01b325ee presi tutti gli scarichi non solo quelli dei materiali 2024-11-12 17:17:52 +01:00
602a80bb37 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/production/service/ProductionService.java
2024-11-12 15:15:26 +01:00
a22d98ecf1 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 15:14:34 +01:00
8aceacd3b8 - nodificata operation sincronizzazione clienti tosca per errori in sincronizzazione
- aggiunti documenti conto terzi in attribuzione costi materiali smetar
2024-11-12 15:14:25 +01:00
70e12e556b cherry pick servizio di attribuzione costi materiali per hotfix 2024-11-12 15:13:31 +01:00
09f1e648c2 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 13:08:31 +01:00
d41112c85c Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 13:08:30 +01:00
17593085ab Fix exchange dei destinatari 2024-11-12 13:08:26 +01:00
237f89be3c Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 12:48:47 +01:00
7fd97f7a34 aggiornamento colli 2024-11-12 12:48:37 +01:00
350a82ab57 Migration su gramm tipo valore a 5 per cq con valore rif calendario
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 12:41:29 +01:00
64c487aa8c Merge tag 'Hotfix-89' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Finish Hotfix-89
2024-11-12 12:35:23 +01:00
c26ae38781 Finish Hotfix-89
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 12:35:21 +01:00
724637d437 Fix codMedep null in genera ord lav
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 12:34:45 +01:00
20e836d74e Finish Feature-RGIAC 2024-11-12 12:13:29 +01:00
a4f5a55c85 Merge branch 'develop' into feature/Feature-RGIAC 2024-11-12 12:13:24 +01:00
bc98c73281 salvataggio giacenza in rgiac
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 12:13:16 +01:00
b2312a7cc3 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 11:39:03 +01:00
981f6e0b8d - corretto calcolo costo unitario rapportini di lavoro 2024-11-12 11:38:56 +01:00
08078175dc Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 10:59:05 +01:00
eea71a91a8 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 10:59:04 +01:00
bf8ceb345f Implementata exchange dei documenti di acquisto 2024-11-12 10:58:59 +01:00
11d17670fd Merge remote-tracking branch 'origin/develop' into develop 2024-11-12 10:41:05 +01:00
c3a262e31b Migliorie process report 2024-11-12 10:41:00 +01:00
ddc8365374 Merge branch 'develop' into feature/Feature-RGIAC
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 09:33:34 +01:00
134585b8c2 assegnazione automatica gruppo di equivalenza
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-12 09:33:15 +01:00
9021e84e6d - aggiunto campo note in ctbAmac
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- corretta migration report sui nullpointer
2024-11-11 18:28:48 +01:00
a478e2834a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-11 15:26:31 +01:00
32c91c9968 Finish Hotfix-89
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-11 15:26:30 +01:00
3c7a6b29b3 sistemata sincronizzazione fornitori 2024-11-11 15:26:19 +01:00
47eb7dba21 salvare la giacenza negli RGIAC
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-11 15:13:53 +01:00
05fa575507 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-11 14:21:24 +01:00
fd820e9c85 Finish Hotfix-89
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-11 14:21:23 +01:00
23058f0832 aggiunto controllo su lista vuota 2024-11-11 14:20:52 +01:00
417fd440fd Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-11 13:38:24 +01:00
a7ed8ea579 Aggiornata libreria Jaspersoft.
Fix su whereCond durante creazione sql di update.
Refactoring UnitaTerritorialiService (rimosso executorService).
2024-11-11 13:38:15 +01:00
c247f72b1c Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-11 13:06:06 +01:00
00753b91aa - Servizio attribuzione costi di lavorazione per articolo/partita/commessa/ordine 2024-11-11 13:05:47 +01:00
346eb60844 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-11 12:21:28 +01:00
056c8cb905 Implementata bulk query anche per le update in EntityBase.
Migliorata compilazione dei report.
2024-11-11 12:21:23 +01:00
f6be56c7ec valorizzato tipo valore nei controlli di qualità
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-11 11:33:21 +01:00
3b9170d091 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-11 11:01:53 +01:00
e8c6f59476 - bloccato asyncMAnager in ambienti di sviluppo 2024-11-11 11:01:32 +01:00
95607f39b3 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-11 10:51:03 +01:00
426d1f5e09 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-11 10:51:02 +01:00
390fe20f80 Vario 2024-11-11 10:50:55 +01:00
efcf593f4c Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-11 10:34:44 +01:00
ba8315c73f Finish Hotfix-89
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-11 10:34:43 +01:00
566dc9e158 aggiunte setup per suggest idArtEqui e modifiche per distribuzione materiali 2024-11-11 10:34:28 +01:00
fee5c6b83a Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-11 09:38:57 +01:00
7c44376e3a Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-08 16:29:53 +01:00
d19aa711ae Modifica Accise su causale 057 2024-11-08 16:29:48 +01:00
caa4a17dc7 Modificata migration tipo_valore
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-08 15:14:03 +01:00
240eb9117d Finish TipoValoreCq
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2024-11-08 15:12:51 +01:00
d7f9485d63 Merge branch 'develop' into feature/TipoValoreCq 2024-11-08 15:12:03 +01:00
1d6fb6f551 aggiunto cod_art_for nei colli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-08 14:57:09 +01:00
e79d2e1019 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-08 14:54:45 +01:00
83ec954a2d Finish Hotfix-89
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-08 14:54:45 +01:00
98aa065ce9 sistemato controllo 2024-11-08 14:54:39 +01:00
e56259290e Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-08 14:53:43 +01:00
eec4a3777c cancellazione funzioni di db new e old 2024-11-08 14:53:37 +01:00
152e2f3fdb Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-07 19:21:14 +01:00
997a6937fc Aggiunta possibilità di escludere gli articoli gestiti da WMS nella procedura di carico prodotto finito (CaricoProdFin) 2024-11-07 19:21:09 +01:00
771363442a Merge branch 'develop' into feature/TipoValoreCq
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-07 19:15:41 +01:00
1b3e560d1d Merge remote-tracking branch 'origin/develop' into develop 2024-11-07 16:23:00 +01:00
26bfc1a099 - Creata classe Wrapper per la connessione al DB,
- Gestita la possibilità di far partire funzioni al postCommit
- corretta gestione delle rollBack nelle sincronizzazioni offline
2024-11-07 16:11:07 +01:00
c0d2fc48c6 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-07 15:05:50 +01:00
6c7a5e3880 Finish Hotfix-89
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-07 15:05:49 +01:00
0530b4132e corretto errore su esportazione reparti 2024-11-07 15:05:26 +01:00
8833d7dffc corretto errore su esportazione reparti 2024-11-07 15:03:50 +01:00
56ac903f9e Personalizzazione stampa prezzi bolla per VG
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-07 11:46:11 +01:00
b95c4a1caa Personalizzazione stampa prezzi bolla per VG
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-07 11:45:55 +01:00
1750bcf890 esclusi articoli null
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-07 10:50:00 +01:00
f62dee068a aggiunta regola che riporta il vettore sull'ordine quando viene agganciato un viaggio 2024-11-07 10:49:45 +01:00
f5bd93b108 Esluse righe ordine web a 0
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-07 09:51:24 +01:00
f428d46ed4 Fix conflitto nome classe causale
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-06 16:50:06 +01:00
d493e822e6 aggiunto campo tipo_valore sulla jtb_cicl_cq e sulla dtb_ord_cq
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-06 16:17:38 +01:00
ae2f331b26 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-06 15:05:27 +01:00
6d16b8183e Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-06 15:05:27 +01:00
5db66278d4 Rinominato enum causale MtbColr per conflitto con classe omonima in MtbCols 2024-11-06 15:03:04 +01:00
38026cdf7c Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-06 14:21:02 +01:00
1e00bd2668 Finish Hotfix-89
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-06 14:21:01 +01:00
0dc4a0a2a5 aggiunto invio dell'errore 2024-11-06 14:20:45 +01:00
faf5fafed3 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-06 12:09:45 +01:00
5027d7c169 Piccole migliorie su CaricoProdFinLav 2024-11-06 12:09:37 +01:00
0fe15ae2eb Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-06 12:04:24 +01:00
208dfb9d1e Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-06 12:04:24 +01:00
f18ce73d2a [ROSSOGARGANO]
gestione versamenti su ordine di lavorazione con associazione lotto SL
2024-11-06 12:04:16 +01:00
8064573fc8 aggiornamento su getlistino con pedane
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-05 18:28:06 +01:00
e822371f01 Fix sblocco sospesi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-05 13:25:40 +01:00
0745f7edf0 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-05 11:52:18 +01:00
0e093d7ea5 Finish FixInsertCharacter
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-05 11:52:17 +01:00
de805d90dd Gestito salvataggio entity con tipi Character 2024-11-05 11:52:12 +01:00
7a0ffcdd23 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-05 11:38:39 +01:00
1f666f7ba1 Rimossa publish over FTP in Jenkinsfile 2024-11-05 11:38:34 +01:00
8a80c5b91d Gestito sblocco sospesi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-05 10:58:57 +01:00
34171795fe Finish FixProcessReport
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-05 10:56:42 +01:00
b6680971e4 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-05 10:56:42 +01:00
7c5ee10a4f Fix doppia response in processReport 2024-11-05 10:56:35 +01:00
cd766ef78c Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-04 19:18:45 +01:00
bb4eda2738 Personalizzazione report Distinta base valorizzata MAGGIO 2024-11-04 19:18:39 +01:00
01aff8ac45 Modifica per esclusione da aggiornamento DMS 2024-11-04 19:18:16 +01:00
3cad0db10d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-04 18:54:31 +01:00
04e02d46a7 Finish Hotfix-89
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-04 18:54:31 +01:00
4eb77d7435 sistemata registrazione movimenti contabili da distinta effetti con compensazione di note credito 2024-11-04 18:50:40 +01:00
bfce2a8886 Aggiornato metodo di update wms
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-04 18:30:41 +01:00
93748d5203 Finish Hotfix-90
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-04 17:32:09 +01:00
c013ac6a06 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-04 17:32:09 +01:00
e744550ccb sistemata registrazione movimenti contabili da distinta effetti con compensazione di note credito 2024-11-04 17:30:38 +01:00
e33666c4f6 Impostata riga ord mtbColr a 0
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-04 16:35:49 +01:00
99a28aeeda Rimossa riga ord in createColloCaricoGroup
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-04 16:26:47 +01:00
e78c3eb56e Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-04 12:42:23 +01:00
98a2bef2ce Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-04 12:42:22 +01:00
c4abd71340 Modifiche Jenkinsfile 2024-11-04 12:42:17 +01:00
7c1952cf95 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-04 12:25:49 +01:00
31dbf58c45 Modifica per esclusione da aggiornamento DMS 2024-11-04 12:25:43 +01:00
ede2909b4d Finish Hotfix-89
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-04 12:23:16 +01:00
505856c901 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-11-04 12:23:16 +01:00
e0890aecf9 sistemata funzione che torna il prezzo con il costo del trasporto 2024-11-04 12:23:00 +01:00
da12abb54a sistemata funzione che torna il prezzo con il costo del trasporto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-11-04 12:22:17 +01:00
f1ca5e7441 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-31 17:36:03 +01:00
60c96474cc Implementate exchange 2024-10-31 17:32:37 +01:00
a1ed714a36 modificata load colli, exportazione dialogo, e modifica su SteUp
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-31 16:44:05 +01:00
c876e1d1ca rinomiti 2024-10-31 16:43:22 +01:00
29069c918d Gestito enum flag evaso e gestito come Character, gestito stato viaggio al posto di confermato
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-10-31 11:20:15 +01:00
f9eabd79d3 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-30 10:19:41 +01:00
1f7d8dbf49 Modifica generazione ordine lavorazione 2024-10-30 10:19:36 +01:00
c32c674ad5 Fix GeneraOrdLav
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-30 09:31:12 +01:00
62bcfb5a98 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-29 16:46:46 +01:00
877702879b Finish FixDeleteJtbFasiImpMesi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-29 16:46:45 +01:00
2b445d2573 Fix deleteChilds JtbFasiImpMesi 2024-10-29 16:46:39 +01:00
d144ec65e6 Aggiunti uds scaricati in MES_GetWorkOrders 2024-10-29 16:41:11 +01:00
51e2c0e96a Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-29 16:20:07 +01:00
6a444ff0f8 personalizzato datawindow report scadenze fornitori per smetar 2024-10-29 16:19:57 +01:00
56b6e581e0 Fix generaOrdLav
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-29 16:03:45 +01:00
6c6e5bc549 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-29 15:41:25 +01:00
bbb2375d4f Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-29 15:41:25 +01:00
08499fc7d7 Aggiornata email di apertura tickets 2024-10-29 15:41:16 +01:00
0aa5f3ad77 Aggiornata email di apertura tickets 2024-10-29 15:41:03 +01:00
af9b5e99b2 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-29 13:08:49 +01:00
73677b3a2b Gestito rappprto di conversione variabile 2024-10-29 13:08:45 +01:00
6dea2b5556 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-29 12:55:41 +01:00
13487040bc Fix su controlli esecuzione migration.
Aggiunto codJcom durante la creazione dei colli da produzione.
2024-10-29 12:55:36 +01:00
6ddd7f04fb [Smetar] Fix procedura conto terzista
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-29 12:21:02 +01:00
0718cf22dc aggiunta setup per smetar
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-28 20:32:20 +01:00
0cae88b469 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-28 17:24:24 +01:00
84094a1b29 aggiunto campo data_cons_obbl nella vtb_clie 2024-10-28 17:24:11 +01:00
22ff728308 Aggiunta ATI
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-28 16:36:09 +01:00
996546b6c8 Merge remote-tracking branch 'origin/develop' into develop 2024-10-28 16:35:59 +01:00
8065e83809 Aggiunta ATI 2024-10-28 16:35:49 +01:00
2e963427cd Finish RevertRapConvProd
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-28 12:44:40 +01:00
6946e7b9b7 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-28 12:44:40 +01:00
6bf0e0a475 Revert "Impostata qta col x rap conv prod in createColloCaricoGroup"
This reverts commit 5eff9e907e.
2024-10-28 12:44:24 +01:00
3437a89762 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/migration/model/Migration_20241025173251.java
2024-10-28 10:39:43 +01:00
2593feb362 Finish Hotfix-89 2024-10-28 10:38:17 +01:00
26e88f4b29 varie per importazione movimenti di rossogargano 2024-10-28 10:38:03 +01:00
8a8c952855 aggiunta voce menu
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-25 17:35:30 +02:00
e2b997c4b4 aggiunta qta_cnf su listini di acquisto in data e gestiti campi cod_prod e partia_mag nella ctb_movr_coan
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-25 15:22:51 +02:00
a5f1e98332 Fix su migration dedicata per maggio
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-25 10:41:00 +02:00
24e935bd0b Merge branch 'develop' into GestioneDocumentiLavorazioneWMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-25 10:27:59 +02:00
d68620cce4 Migliorato servizio di ImportColliDaProduzione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-25 10:27:43 +02:00
a833b973ac Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-25 09:50:26 +02:00
14ad51ac6d Finish FixOrdifyImport
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-25 09:50:25 +02:00
77fe4dfe50 Controllo setup null per errore null pointer 2024-10-25 09:50:20 +02:00
5eff9e907e Impostata qta col x rap conv prod in createColloCaricoGroup
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-24 16:41:27 +02:00
5c0d291096 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-24 13:18:06 +02:00
0fc9b21529 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-24 13:18:06 +02:00
9e1671411b [ROSSOGARGANO]
funzioni modifica versamenti
funzione sgancio documenti di lavorazione da collo
corretta fuzione DB getWorkOrders(elapsed time supera il limite del tipo int)
corretto calcolo scarto in accettazione pomodoro
2024-10-24 13:17:58 +02:00
73b71d31ef Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-24 13:05:47 +02:00
955d8f3ca8 Aggiornamento configurazione export ordini vendita EDI 2024-10-24 13:05:40 +02:00
858fb066a2 Distribuzione materiali su ordini presenti nel lotto di lavorazione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-24 10:53:30 +02:00
a471a97e95 Merge branch 'develop' into GestioneDocumentiLavorazioneWMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-24 09:33:36 +02:00
9319d82cfd Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-24 09:33:14 +02:00
11dd540812 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-24 09:33:13 +02:00
222ac6d070 Fix su recalc column in caso di entity nulla 2024-10-24 09:33:07 +02:00
f64c816bf3 correzione su aggancio html su importaizone fatture elettroniche per rosso gargano
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-23 18:03:58 +02:00
8a0800a5d5 Merge branch 'develop' into GestioneDocumentiLavorazioneWMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-23 16:55:25 +02:00
890c6f772a Aggiunto logRotator build jenkins
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-23 11:38:36 +02:00
f8f3032855 Aggiunto logRotator build jenkins
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-23 11:35:13 +02:00
6c977d1c58 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-23 11:20:16 +02:00
5e1e41bc0d Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-23 11:20:15 +02:00
6765a4a04c Aggiunto logRotator build jenkins 2024-10-23 11:20:10 +02:00
05884dd775 Merge branch 'master' into develop 2024-10-23 11:14:30 +02:00
264387fd31 Finish Hotfix-1 2024-10-23 11:14:29 +02:00
304b0909c5 Aggiunto logRotator build jenkins 2024-10-23 11:14:25 +02:00
89f101b6ed Merge branch 'master' into develop 2024-10-23 10:53:15 +02:00
852442adfc Finish Hotfix-1 2024-10-23 10:53:14 +02:00
d07b0b68fb Aggiunto logRotator build jenkins 2024-10-23 10:52:57 +02:00
2f3f498f52 Refactoring servizio di retrieve comuni 2024-10-23 10:44:10 +02:00
ea0c71b4b1 varie: steup, invio variazioni, controllo resi 2024-10-22 17:38:07 +02:00
36a4c5f99e Finish Hotfix-89 2024-10-22 17:34:20 +02:00
e659810e39 Merge branch 'master' into develop 2024-10-22 17:34:20 +02:00
091aeecbab aggiunto un controllo su numero tentativi = 0 2024-10-22 17:34:14 +02:00
e9ae94e8de attivata SETUP STAMPA_GRAFICA a Carelli 2024-10-22 15:36:40 +02:00
59fc5feef9 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-22 10:48:14 +02:00
77379ec33e aggiunti campi cod_pro e partita_mag_prod nella tabella ctb_movr_coan 2024-10-22 10:48:02 +02:00
28695d7f7d Fix null cod_mdep_prod in MEs_getWorkOrders
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-10-22 09:57:21 +02:00
d43b8101a9 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-22 09:56:25 +02:00
b6a3cd1a45 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-10-22 09:56:25 +02:00
affaf0326a Fix null cod_mdep_prod in MEs_getWorkOrders 2024-10-22 09:56:17 +02:00
94a8fe3996 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-21 20:00:32 +02:00
f25984d6c7 migration sian 2024-10-21 20:00:25 +02:00
42046cf8a2 Merge branch 'develop' into GestioneDocumentiLavorazioneWMS 2024-10-21 17:20:02 +02:00
f9274b13f2 Merge tag 'Hotfix-88' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Finish Hotfix-88
2024-10-21 17:06:30 +02:00
0a30072299 Finish Hotfix-88
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-21 17:06:29 +02:00
bb7f142ca1 Modifica export ordini EURITMO 2024-10-21 17:06:22 +02:00
f6199da1c2 Aggiunta part_iva in MES_GetWorkOrders
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-21 16:08:53 +02:00
7c15fd02ad Aggiunta esportazione DocFinance
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-21 15:21:33 +02:00
364a48862d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-21 13:24:48 +02:00
d95db68d27 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-21 13:24:47 +02:00
627a50c959 Migliorata gestione del transaction group id nelle sincronizzazioni 2024-10-21 13:24:43 +02:00
50927abea0 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-21 13:00:20 +02:00
1787e15c77 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-21 13:00:19 +02:00
38a55cdf0c Fix su cod_mdep di Mes_GetWorkOrder 2024-10-21 12:53:28 +02:00
682effe77c abilitazione menu da query a carelli e sapori veri
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-21 12:31:04 +02:00
3ab2b97fa4 abilitare menù da query su carelli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-21 12:19:58 +02:00
0d9aec2e34 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-21 12:11:38 +02:00
94555047a5 Finish Hotfix-87
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-21 12:11:37 +02:00
0c68b2ec73 correzione importazione documenti infragruppo e cambio menu' 2024-10-21 12:11:01 +02:00
d0948f8787 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-21 11:51:39 +02:00
74615797a6 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-21 11:51:38 +02:00
96ae788412 Migliorata gestione del transaction group id nelle sincronizzazioni 2024-10-21 11:51:33 +02:00
9618c5758f Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-21 11:30:13 +02:00
55e9f465a4 Finish Hotfix-87
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-10-21 11:30:12 +02:00
2d7a4af6f4 varie per exportazione e importazione doc finance 2024-10-21 11:29:56 +02:00
e0b483a956 Merge branch 'develop' into GestioneDocumentiLavorazioneWMS
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/production/service/ProductionOrderDataHandlerService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java
2024-10-18 17:17:16 +02:00
b34b5572b4 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-18 15:45:45 +02:00
931b463b7d Finish Hotfix-87
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-18 15:45:45 +02:00
8d055ebf1b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-18 15:45:30 +02:00
6e5c65117d modifiche per doc finance 2024-10-18 15:43:56 +02:00
1e3ec5721b elimintati spazi dall'aggiornamneto dei progressivi di magazzino 2024-10-18 15:43:26 +02:00
51696be2fe Mini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-18 12:22:53 +02:00
4e49375563 Finish Hotfix-87
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-17 15:48:36 +02:00
07ffbe6d4b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-17 15:48:36 +02:00
a0f113af55 aggiunto utente 2024-10-17 15:48:24 +02:00
2ed1ec5177 Finish Hotfix-87
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-17 11:41:04 +02:00
c4bb29f28c Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-17 11:41:04 +02:00
26089db02f rinominato il file e gestita anomalia come errore 2024-10-17 11:40:49 +02:00
c73f6e59da Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-16 17:08:44 +02:00
65abca51f2 modificata la data di pagamento delle scadenze agganciate alla distitna effetti 2024-10-16 17:08:41 +02:00
7d0528e08b Aggiunto count allegati mancante in ordini web
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-16 16:33:25 +02:00
f4b38907e2 Finish CreaCommInPrev
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-16 15:40:03 +02:00
291ee7f7c8 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-10-16 15:40:03 +02:00
372ce92b94 Gestita creazione nuova commessa in modifica preventivo 2024-10-16 15:39:53 +02:00
442e0792a8 Aggiunto cod_mdep_prod in MES_GetWorkOrders
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-10-16 15:38:06 +02:00
afd095a2f6 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-16 10:18:03 +02:00
4914f40fae personalizzato datawindow "Report Scadenze Fornitori" Suit 2024-10-16 10:17:53 +02:00
15a6b746d4 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-10-16 09:43:27 +02:00
3aa6224532 Finish Hotfix-87
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-16 09:43:26 +02:00
a25d235dfa sistemato errore in esportazione scadenze 2024-10-16 09:43:13 +02:00
93a3fb1c06 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-15 19:04:58 +02:00
fa9d85f9d2 Migration LICOR REGISTRO CALI 2024-10-15 19:04:50 +02:00
24175b70fd Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-15 17:31:17 +02:00
5708581390 Finish Hotfix-87
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-10-15 17:31:14 +02:00
4f15eec2a9 modifiche per doc finance 2024-10-15 17:31:08 +02:00
ddb43af3f4 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-15 16:58:18 +02:00
09b3c755dc Finish Hotfix-87
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-15 16:58:18 +02:00
d91a430189 modifiche per doc finance 2024-10-15 16:58:13 +02:00
468df8a23c Merge branch 'master' into develop
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2024-10-15 16:14:11 +02:00
ee0e88e203 Finish Hotfix-87
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2024-10-15 16:14:10 +02:00
493fed02ea modifiche per doc finance 2024-10-15 16:14:04 +02:00
b68ecdb2ff Merge remote-tracking branch 'origin/develop' into develop
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2024-10-15 16:09:54 +02:00
61498766f6 modifiche per docfinance 2024-10-15 16:09:23 +02:00
a444afe041 aggiunto campo tipo_trasporto nella dtb_doct, dtb_dift e dtb_dif_bolle
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-10-15 12:19:28 +02:00
f52f8d8025 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-15 11:52:16 +02:00
160919eeed inserita nuova voce menu report Fatturato per condizioni di resa (Incoterms) 2024-10-15 11:52:04 +02:00
1ad488e206 Gestita funzione pvm_getassortimentoCliente con pedane
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-15 11:38:41 +02:00
1b3a2165d3 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-15 10:41:46 +02:00
35c4361c7e Gestione personalizzazione funzione MES_GetWorkOrders per gestione tempi su MES 2024-10-15 10:41:38 +02:00
7678c24e39 Setup per escludere dal filtro di mtbcolt la data consegna
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-15 09:43:02 +02:00
b21b7ae7ae varie modifiche per chiusura partite contabili e importazione scadenze
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-14 19:45:19 +02:00
38d1bee85f Fix generateOrdLav
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-14 14:38:24 +02:00
94d9f9693d Creata migration per setup wms gramm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-14 13:12:47 +02:00
5601be4845 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-14 11:59:36 +02:00
9853cffd00 aggiunta vista su textiles 2024-10-14 11:59:28 +02:00
df3ea4f7ca Modifica generazione step
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-14 10:55:28 +02:00
85f70694bc In importazione gelorent aggiunti riferimenti dell'ordine 2024-10-14 10:54:08 +02:00
56cbb5262c Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-14 10:31:24 +02:00
e7dcd2118c Finish Hotfix-87
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-14 10:31:23 +02:00
2f61827f95 miglioramenti sulla query delle giacenze 2024-10-14 10:31:05 +02:00
918263345b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-11 18:07:02 +02:00
a42f031a51 Modificata migrations custom vsvw_vendite biolevante 2024-10-11 18:06:57 +02:00
ff6420dd20 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-11 13:18:05 +02:00
0b661b8151 SISTEMATA ESPORTAZIONE SCADENZE 2024-10-11 13:18:00 +02:00
4a6c245b6c AGGIORNA SETUP ROSSOGARGANO 2024-10-11 13:17:48 +02:00
506e8ec82c Fatto in modo che per il conto terzista sia possibile indicare la fase e il codice spesa
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-11 10:59:30 +02:00
9ad2f83dc4 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-11 09:45:21 +02:00
59ff62dbbd aggiunto campo cod_ccau_coan nella tabella dtb_tipi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-11 09:31:10 +02:00
52ac12e3f4 aggiunto campo cod_ccon_wip nella tabella mtb_sgrp
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-11 09:12:50 +02:00
ead3b46163 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-10 16:27:13 +02:00
e9d90f89e7 creata tabella ctb_coan 2024-10-10 16:27:02 +02:00
acdf0da784 Creato servizio AziendaService e gestita creazione documenti per terzista smetar
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-10 15:54:44 +02:00
282f52cf63 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-10 13:19:30 +02:00
412c40499d Gestione modifica data inizio prod su generaordlav
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-10 13:09:32 +02:00
f1c55ab283 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-10 09:54:50 +02:00
3d8769fe24 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-10-10 09:51:38 +02:00
1ba334a6e8 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-10 09:37:51 +02:00
9426ec6bca Merge remote-tracking branch 'origin/develop' into develop 2024-10-10 07:52:52 +02:00
32ef4ac49c Migrations Trigger Ins DTB_ORDT 2024-10-10 07:52:08 +02:00
df5744466a Merge branch 'master' into develop 2024-10-09 17:34:16 +02:00
b98fcfbb29 Modificato dataInizProd in DtbOrdt in LocalDate 2024-10-09 13:37:47 +02:00
761cb0af0e Modificato dataInizProd in DtbOrdt in LocalDate 2024-10-09 13:27:54 +02:00
d57e29e48e Merge branch 'master' into develop 2024-10-09 13:16:18 +02:00
9426cffad6 Merge branch 'master' into develop 2024-10-09 13:07:03 +02:00
d95cca0d97 Merge branch 'master' into develop 2024-10-09 11:27:28 +02:00
29fcc24f18 Migrations 2024-10-09 09:45:24 +02:00
c620a68a45 Modifica generazione ordine di lavorazione per SUIT 2024-10-09 09:09:16 +02:00
7ac093efce Merge branch 'master' into develop 2024-10-08 16:32:15 +02:00
f866d98e6b Merge branch 'master' into develop 2024-10-08 15:44:48 +02:00
39a2c5170e Merge branch 'master' into develop 2024-10-08 15:38:23 +02:00
f61905653f Merge tag 'Hotfix-86' into develop
Finish Hotfix-86
2024-10-08 14:39:12 +02:00
8d30666bb7 Merge remote-tracking branch 'origin/develop' into develop 2024-10-08 12:02:07 +02:00
725a0c6152 aggiunto campo prezzo_netto_premi nella vista gvw_situaz_ordini 2024-10-08 12:01:55 +02:00
8f0f694c18 Merge branch 'master' into develop 2024-10-08 09:10:39 +02:00
c0c15f005b Merge branch 'master' into develop 2024-10-07 17:30:30 +02:00
c7ea385b11 Merge remote-tracking branch 'origin/develop' into develop 2024-10-07 15:37:55 +02:00
84044d8848 [JENKINS] Aggiunto batch di creazione tag 2024-10-07 15:37:49 +02:00
351832080b Merge branch 'master' into develop 2024-10-07 15:28:04 +02:00
ca205959ae Merge branch 'master' into develop 2024-10-07 13:49:01 +02:00
8365d24c02 Merge branch 'master' into develop 2024-10-07 13:23:08 +02:00
b13b23eb53 Merge branch 'master' into develop 2024-10-07 12:23:18 +02:00
ba04afba6e creata e attivata SETUP per stampa bilancio provvisorio 2024-10-07 12:17:31 +02:00
871d1f7aec Merge remote-tracking branch 'origin/develop' into develop 2024-10-07 10:00:28 +02:00
17915beadf attivato il salvataggio con i servizi rest nella gestione ganag 2024-10-07 10:00:15 +02:00
c5c4bb22e3 Merge branch 'master' into develop 2024-10-07 09:47:43 +02:00
29a0911889 [WMS] Implementati documenti scarico in CloseUDS del Picking Libero di Lavorazione 2024-09-16 10:13:29 +02:00
bc90d0bb3c Merge branch 'refs/heads/develop' into GestioneDocumentiLavorazioneWMS 2024-09-13 10:36:01 +02:00
7c1c68f7d2 [WMS] Implementati documenti scarico in CloseUDS lavorazione 2024-09-13 09:22:17 +02:00
dbeb142d6d Merge branch 'develop' into feature/Feature-FatturaDiffertita 2024-09-10 09:56:00 +02:00
5c97cd9eb4 Merge branch 'develop' into feature/Feature-FatturaDiffertita
# Conflicts:
#	ems-core/src/main/java/it/integry/ems_model/entity/DtbDoct.java
2024-09-02 10:15:10 +02:00
3757315f08 Merge branch 'develop' into feature/Feature-FatturaDiffertita 2024-08-05 09:20:19 +02:00
6dedf90dcf salvataggio documenti differiti 2024-08-01 12:27:26 +02:00
1533 changed files with 65700 additions and 18486 deletions

2
.gitignore vendored
View File

@@ -121,3 +121,5 @@ fabric.properties
*.ckie
/ts
/temp
/docker/tomcat/conf/integry/logs.db
/docker/tomcat/conf/integry/logs.db-journal

0
.gitmodules vendored
View File

12
.idea/dataSources.xml generated Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="@SERVERDB2019" uuid="ff4f0bad-7271-429e-a4e1-bae28629efc8">
<driver-ref>sqlserver.ms</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc-driver>
<jdbc-url>jdbc:sqlserver://SERVERDB2019</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component>
</project>

View File

@@ -3,6 +3,8 @@
import com.fasterxml.jackson.annotation.JsonTypeName;
import it.integry.ems_model.annotation.*;
import it.integry.ems_model.base.EntityBase;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.kie.api.definition.type.PropertyReactive;
#parse("File Header.java")
@@ -11,9 +13,15 @@ import org.kie.api.definition.type.PropertyReactive;
@Table(${NAME}.ENTITY)
@JsonTypeName(${NAME}.ENTITY)
public class ${NAME} extends EntityBase {
public static final String ENTITY = "${TABLE}";
private static final long serialVerionUID = 1L;
private static final Logger logger = LogManager.getLogger();
private static final long serialVersionUID = 1L;
public ${NAME}() {
super(logger);
}
}

View File

@@ -3,6 +3,8 @@
import com.fasterxml.jackson.annotation.JsonTypeName;
import it.integry.ems_model.annotation.*;
import it.integry.ems_model.base.EntityBase;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.kie.api.definition.type.PropertyReactive;
#parse("File Header.java")
@@ -12,5 +14,11 @@ import org.kie.api.definition.type.PropertyReactive;
public class ${NAME} extends EntityBase {
public static final String ENTITY = "${TABLE}";
#[[$END$]]#
private static final Logger logger = LogManager.getLogger();
public ${NAME}() {
super(logger);
}
}

View File

@@ -1,5 +1,5 @@
#if(${PACKAGE_NAME}&&${PACKAGE_NAME}!="")package ${PACKAGE_NAME};#end
#parse("File Header.java")
#parse("File Header.java")
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
@@ -12,8 +12,6 @@ public class ${NAME} extends BaseMigration implements MigrationModelInterface{
}
@Override
public void down()throws Exception{
public void down()throws Exception {
}
}

View File

@@ -6,6 +6,11 @@
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="repo.jenkins-ci.org" />
<option name="name" value="repo.jenkins-ci.org" />
<option name="url" value="https://repo.jenkins-ci.org/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />

View File

@@ -0,0 +1,17 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="KieStaticCompiler" type="Application" factoryName="Application" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="it.integry.ems_model.rulescompleting.KieStaticCompiler" />
<module name="ems-core" />
<shortenClasspath name="MANIFEST" />
<option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="it.integry.ems_model.rulescompleting.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>

View File

@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="1.8" nameIsGenerated="true">
<option name="COMMON_VM_ARGUMENTS" value="-Xms512m -Xmx2048m" />
<option name="COMMON_VM_ARGUMENTS" value="-DDISABLE_DROOLS_COMPILE=TRUE -Xms1G -Xmx6G" />
<deployment>
<artifact name="ems-engine:war exploded">
<settings>
@@ -82,6 +82,21 @@
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Profile ">
<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="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
@@ -98,6 +113,7 @@
</SHUTDOWN>
</ConfigurationWrapper>
<method v="2">
<option name="RunConfigurationTask" enabled="true" run_configuration_name="KieStaticCompiler" run_configuration_type="Application" />
<option name="Make" enabled="true" />
<option name="BuildArtifacts" enabled="true">
<artifact name="ems-engine:war exploded" />

View File

@@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat #2 (GestSRV)" type="Remote" folderName="Carelli">
<configuration default="false" name="Tomcat9Wingest (GestSRV)" type="Remote" folderName="Carelli">
<module name="ems-engine" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />

16
.idea/runConfigurations/Tomcat9__1.xml generated Normal file
View File

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat9 #1" type="Remote" folderName="Frudis">
<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="PORT" value="8001" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="8001" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>

View File

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat9 #1 (DBServer)" type="Remote" folderName="Lamonarca">
<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="192.168.1.7" />
<option name="PORT" value="8001" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="8001" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>

View File

@@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat #1 (GestSRV)" type="Remote" folderName="Carelli">
<configuration default="false" name="Tomcat9 (GestSRV)" type="Remote" folderName="Carelli">
<module name="ems-engine" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />

View File

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat 9 #1 (DBServer2019)" type="Remote" folderName="Biolevante">
<module name="ims" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="192.168.10.6" />
<option name="PORT" value="8001" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="8001" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>

View File

@@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat 9 #1 (ServerDev)" type="Remote">
<configuration default="false" name="Tomcat 9 #1 (ServerDev)" type="Remote" folderName="Integry">
<module name="ems-engine" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />

View File

@@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat 9 #2 (ServerDev)" type="Remote">
<configuration default="false" name="Tomcat 9 #2 (ServerDev)" type="Remote" folderName="Integry">
<module name="ems-engine" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -7,6 +7,10 @@
<option name="HOST" value="serverdev" />
<option name="PORT" value="8002" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="8002" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>

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.13" />
<option name="HOST" value="172.16.10.51" />
<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 #1 (ServerTomcat)" type="Remote">
<configuration default="false" name="Tomcat #1 (ServerTomcat)" type="Remote" folderName="Integry">
<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="localhost" />
<option name="HOST" value="192.168.3.16" />
<option name="PORT" value="8000" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">

View File

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat #2 (ServerTomcat)" type="Remote" folderName="Integry">
<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="192.168.3.16" />
<option name="PORT" value="8001" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="8001" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>

View File

@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat (FAST)" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat" ALTERNATIVE_JRE_ENABLED="false">
<option name="COMMON_VM_ARGUMENTS" value="-DDISABLE_DROOLS_COMPILE=TRUE -Xms6G -Xmx6G -XX:MaxPermSize=1G -XX:PermSize=512M" />
<configuration default="false" name="Tomcat (FAST)" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat" ALTERNATIVE_JRE_ENABLED="false" show_console_on_std_err="true" show_console_on_std_out="true">
<option name="COMMON_VM_ARGUMENTS" value="-DDISABLE_DROOLS_COMPILE=TRUE -Xms1G -Xmx6G" />
<deployment>
<artifact name="ems-engine:war exploded">
<settings>
@@ -82,6 +82,21 @@
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Profile ">
<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="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>

13
Dockerfile Normal file
View File

@@ -0,0 +1,13 @@
FROM tomcat:9-jre8-alpine
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/
EXPOSE 8080
EXPOSE 5005

View File

@@ -1,7 +1,13 @@
pipeline {
agent any
options {
buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10'))
disableConcurrentBuilds()
}
stages {
stage ('PreBuild Steps (Master)') {
stage('PreBuild Steps (Master)') {
when {
expression {
return env.GIT_BRANCH == "master"
@@ -19,7 +25,7 @@ pipeline {
bat(script: 'mvn clean install -t toolchains-jenkins.xml', returnStdout: true)
archiveArtifacts(artifacts: 'ems-engine/target/*.war*', onlyIfSuccessful: true)
}
stash includes: 'ems-engine/target/*.war,docker/**,Dockerfile', name: 'docker-files'
}
}
@@ -43,16 +49,11 @@ pipeline {
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'
}
}
}
}
stage('Publish over FTP') {
steps {
echo "Publish over FTP"
}
}
}
}
@@ -86,37 +87,65 @@ sudo /usr/bin/systemctl start tomcat9backup
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'
}
}
}
}
stage('Publish over FTP') {
stage('Publish on Azure') {
steps {
ftpPublisher alwaysPublishFromMaster: false,
continueOnError: false,
failOnError: false,
masterNodeName: '',
paramPublish: null,
publishers: [[configName: 'OVH Linux Web Server (51.38.112.23)',
transfers: [[asciiMode: false,
cleanRemote: false,
excludes: '',
flatten: false,
makeEmptyDirs: false,
noDefaultExcludes: false,
patternSeparator: '[, ]+',
remoteDirectory: '/download/Aggiornamenti',
remoteDirectorySDF: false,
removePrefix: 'ems-engine/target/',
sourceFiles: 'ems-engine/target/*.war*']],
usePromotionTimestamp: false,
useWorkspaceInPromotion: false,
verbose: true]]
azureUpload fileShareName: 'storage-ci', filesPath: 'ems-engine/target/*.war*', removePrefixPath: 'ems-engine/target/', storageCredentialId: '83a86793-c1d6-4776-b20f-1ff652a57fee', storageType: 'filestorage', uploadArtifactsOnlyIfSuccessful: true, verbose: true, virtualPath: 'ems-api'
}
}
}
}
stage('Docker Build') {
steps {
node('server-build') {
echo "Building Docker image"
unstash 'docker-files'
script {
def branchVersion = ""
if (env.GIT_BRANCH != "master") {
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\" ."
//containerImageLink "git.studioml.it/integry/ems-api-${env.GIT_BRANCH.toLowerCase().replace('/', '-')}:latest}"
}
}
}
}
}
post {
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'
}
}
}
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'
}
}
}
failure {
script {
if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "develop") {
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'
}
}
}
}
}

11
docker-compose.yml Normal file
View File

@@ -0,0 +1,11 @@
services:
tomcat:
build: ./
restart: unless-stopped
ports:
- "8080:8080"
- "5005:5005"
volumes:
- ./docker/tomcat/conf/integry:/usr/local/tomcat/conf/integry
extra_hosts:
- host.docker.internal:host-gateway

View File

@@ -0,0 +1,13 @@
ini.path=C:/MLSetupWS
global.connection.ini.path=C:/MLSetupWS/connectDB.ini
endpoint.ws=http://localhost:8080
endpoint.brt.ws=http://10.0.0.12:9005/easyspeddews?wsdl
receipts.folder=C:/WEB_SHARE/SCONTRINI
crontime.folder=
quartz.enabled=false
cron.expr=0 0/2 * 1/1 * ? *
default.printer.name=Samsung SCX-4x24 Series PCL 6
default.database=integry
default.nodatabase.login=integry_ems_psw_system_legacy
amazon.import.enabled=false
sh.import.enabled=false

View File

@@ -0,0 +1 @@
{}

View File

@@ -0,0 +1,853 @@
{
"accessTokenExpireMinutes" : 30,
"refreshTokenExpireDays" : 14,
"defaultProfile" : "INTEGRY",
"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
}, {
"profileName" : "AGRICOPER",
"connectionType" : "MSSQL",
"dbName" : "agricoper",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "MUCCI",
"connectionType" : "MSSQL",
"dbName" : "MUCCI",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "COAP",
"connectionType" : "MSSQL",
"dbName" : "COAP",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "RESINA_COLOR",
"connectionType" : "MSSQL",
"dbName" : "RESINACOLOR",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "ALAMBICCO",
"connectionType" : "MSSQL",
"dbName" : "alambicco",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "AURICCHIO",
"connectionType" : "MSSQL",
"dbName" : "auricchio",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "AURICCHIOSRL",
"connectionType" : "MSSQL",
"dbName" : "auricchiosrl",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "AURICCHIO_MIKI",
"connectionType" : "MSSQL",
"dbName" : "auricchio_miki",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "CARELLI",
"connectionType" : "MSSQL",
"dbName" : "carelli",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "CSGR",
"connectionType" : "MSSQL",
"dbName" : "csgr",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "CHIUSO",
"connectionType" : "MSSQL",
"dbName" : "chiuso",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "COSMAPACK",
"connectionType" : "MSSQL",
"dbName" : "cosmint",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "DAGA",
"connectionType" : "MSSQL",
"dbName" : "Daga",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "DIDONNA",
"connectionType" : "MSSQL",
"dbName" : "DIDONNA",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "DOLCE_BONTA",
"connectionType" : "MSSQL",
"dbName" : "DOLCE_BO",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "DULCIAR",
"connectionType" : "MSSQL",
"dbName" : "dulciar",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "FLORAPULIA",
"connectionType" : "MSSQL",
"dbName" : "florapulia",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "FLORAPULIASRL",
"connectionType" : "MSSQL",
"dbName" : "florapuliasrl",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "PAPARELLAD",
"connectionType" : "MSSQL",
"dbName" : "PAPARELLAD",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "PAPARELLAP",
"connectionType" : "MSSQL",
"dbName" : "PAPARELLAP",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "PAPARELLAPIETRO",
"connectionType" : "MSSQL",
"dbName" : "PAPARELLAPIETRO",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "FOLLIESGROUP",
"connectionType" : "MSSQL",
"dbName" : "folliesgroup",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "FORMAT",
"connectionType" : "MSSQL",
"dbName" : "format",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "GESTFOOD",
"connectionType" : "MSSQL",
"dbName" : "GESTFOOD",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "GIOVMAGGIO",
"connectionType" : "MSSQL",
"dbName" : "giovmaggio",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "GRAMM",
"connectionType" : "MSSQL",
"dbName" : "gramm",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "IDROTECNICA",
"connectionType" : "MSSQL",
"dbName" : "idrotecnica",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "IGOOD",
"connectionType" : "MSSQL",
"dbName" : "IGOOD",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "IME_BA",
"connectionType" : "MSSQL",
"dbName" : "IME_BA",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "IME_TE",
"connectionType" : "MSSQL",
"dbName" : "IME_TE",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "IND01",
"connectionType" : "MSSQL",
"dbName" : "ind01",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "IND02",
"connectionType" : "MSSQL",
"dbName" : "ind02",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "IND04",
"connectionType" : "MSSQL",
"dbName" : "ind04",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "IND05",
"connectionType" : "MSSQL",
"dbName" : "ind05",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "INTEGRY",
"connectionType" : "MSSQL",
"dbName" : "studioml",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "LAMONARCA",
"connectionType" : "MSSQL",
"dbName" : "lamonarca",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "LEVANPLAST",
"connectionType" : "MSSQL",
"dbName" : "levanplast",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "LICOR",
"connectionType" : "MSSQL",
"dbName" : "licor",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "MASSERIEAMICHE",
"connectionType" : "MSSQL",
"dbName" : "masserieAmiche",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "MIDEL",
"connectionType" : "MSSQL",
"dbName" : "midel",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "MURGIA",
"connectionType" : "MSSQL",
"dbName" : "MURGIA",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "NUOVAVG",
"connectionType" : "MSSQL",
"dbName" : "vgalimenti",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "OF_DEMO",
"connectionType" : "MSSQL",
"dbName" : "of_demo",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "PANIMAL",
"connectionType" : "MSSQL",
"dbName" : "panimal",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "PAPARELLAPIETRO",
"connectionType" : "MSSQL",
"dbName" : "paparellapietro",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "PAPARELLAD",
"connectionType" : "MSSQL",
"dbName" : "paparellad",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "PAPARELLAP",
"connectionType" : "MSSQL",
"dbName" : "paparellap",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "RISTO_CASH",
"connectionType" : "MSSQL",
"dbName" : "risto_cash",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "SALPAR",
"connectionType" : "MSSQL",
"dbName" : "salpar",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "MASABA",
"connectionType" : "MSSQL",
"dbName" : "masabasrl",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "SANTANTONIO",
"connectionType" : "MSSQL",
"dbName" : "SANTANTONIO",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "SARDINYA",
"connectionType" : "MSSQL",
"dbName" : "Sardinya",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "SABATO",
"connectionType" : "MSSQL",
"dbName" : "SABATO",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "SICILIANIDMSOLAP",
"connectionType" : "MSSQL",
"dbName" : "SicilianiDMSOlap",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : false
}, {
"profileName" : "SICILIANIOLAP",
"connectionType" : "MSSQL",
"dbName" : "SicilianiDMSOlap",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : false
}, {
"profileName" : "SICILIANITRAXAL",
"connectionType" : "MSSQL",
"dbName" : "scambio_traxal",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : false
}, {
"profileName" : "SMETAR",
"connectionType" : "MSSQL",
"dbName" : "smetar",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "SUIT",
"connectionType" : "MSSQL",
"dbName" : "SUIT",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "BIOSUIT",
"connectionType" : "MSSQL",
"dbName" : "BIOSUIT",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "SUIT_PUGLIA",
"connectionType" : "MSSQL",
"dbName" : "SUIT_PUGLIA",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "CARNI_SARDEGNA",
"connectionType" : "MSSQL",
"dbName" : "CARNI_SARDEGNA",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "TEMPESTA",
"connectionType" : "MSSQL",
"dbName" : "tempesta",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "TEMPESTADI",
"connectionType" : "MSSQL",
"dbName" : "tempestadi",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "TOSCA_BA",
"connectionType" : "MSSQL",
"dbName" : "tosca_ba",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "TOSCA_CE",
"connectionType" : "MSSQL",
"dbName" : "tosca_ce",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "TOSCA_CZ",
"connectionType" : "MSSQL",
"dbName" : "tosca_cz",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "TOSCA_FC",
"connectionType" : "MSSQL",
"dbName" : "tosca_fc",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "TOSCA_MI",
"connectionType" : "MSSQL",
"dbName" : "tosca_mi",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "TOSCA_RM",
"connectionType" : "MSSQL",
"dbName" : "tosca_rm",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "TOSCA_RG",
"connectionType" : "MSSQL",
"dbName" : "tosca_rg",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "TOSCA_VR",
"connectionType" : "MSSQL",
"dbName" : "tosca_vr",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "TOSCA_CLOUD",
"connectionType" : "MSSQL",
"dbName" : "tosca_cloud",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "VGALIMENTI",
"connectionType" : "MSSQL",
"dbName" : "vgalimenti",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "VINELLA",
"connectionType" : "MSSQL",
"dbName" : "VINELLA",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "LEVANPLASTSRL",
"connectionType" : "MSSQL",
"dbName" : "levanplastsrl",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "BIOLEVANTE",
"connectionType" : "MSSQL",
"dbName" : "biolevante",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "ROSSOGARGANO",
"connectionType" : "MSSQL",
"dbName" : "RossoGargano",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "Aida",
"connectionType" : "MSSQL",
"dbName" : "aida",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "ROSSOGARGANOCONT",
"connectionType" : "MSSQL",
"dbName" : "RossoGarganoCont",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "ROSSOGARGANOEXCHANGE",
"connectionType" : "MSSQL",
"dbName" : "ROSSOGARGANOEXCHANGE",
"username" : "sa",
"password" : "sZ",
"host" : "SERVERDB2019",
"encryptedDbPsw" : true,
"internalDb" : false
}, {
"profileName" : "MORGANTE",
"connectionType" : "MSSQL",
"dbName" : "morgante",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "WINACT",
"connectionType" : "MSSQL",
"dbName" : "winact",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "FRUDIS",
"connectionType" : "MSSQL",
"dbName" : "frudis",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "SAPORI_VERI",
"connectionType" : "MSSQL",
"dbName" : "SAPORI_VERI",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "DISPENSA",
"connectionType" : "MSSQL",
"dbName" : "DISPENSA",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "TWOBROTHERS",
"connectionType" : "MSSQL",
"dbName" : "twobrothers",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "MEDSOL",
"connectionType" : "MSSQL",
"dbName" : "medsol",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "SGSRL",
"connectionType" : "MSSQL",
"dbName" : "SGSRL",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "STUDIOML_HISTORY",
"connectionType" : "MSSQL",
"dbName" : "studioml_history",
"username" : "sa",
"password" : "sa",
"host" : "192.168.2.220",
"encryptedDbPsw" : false,
"internalDb" : false
}, {
"profileName" : "VETTA",
"connectionType" : "MSSQL",
"dbName" : "vetta",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
} ],
"defaultMailConfiguration" : {
"from" : "developer@integry.it",
"smtp" : "mail.studioml.it",
"port" : 1025,
"enableSSL" : false,
"username" : "mailuser",
"password" : "ZTikBVpBmZC6CVtGamTQ",
"encryptedPassword" : false
},
"loggerConfiguration" : {
"level" : "DEBUG",
"deleteDays" : 7,
"dbDeleteDays" : 0,
"dbMaxSize" : "1G"
},
"enablePermissionCheck" : false,
"minioConfiguration" : {
"host" : "192.168.2.206",
"port" : 9000,
"accessKey" : "integry_minio",
"secretKey" : "9yMd3@0.GPKf",
"enabled" : true,
"enableOldSave" : false,
"excludedEntities" : [ ]
}
}

View File

@@ -13,25 +13,7 @@
<name>Ems Core</name>
<repositories>
<repository>
<id>maven-public</id>
<url>https://maven.studioml.it/repository/maven-public/</url>
</repository>
</repositories>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -61,7 +43,7 @@
<classpath/>
<argument>it.integry.ems_model.rulescompleting.KieStaticCompiler</argument>
<argument>src/main/resources/rules/</argument>
<argument>../ems-engine/src/main/webapp/drools/</argument>
<argument>../ems-engine/src/main/resources/drools/</argument>
</arguments>
<systemProperties>
<projectProperties/>
@@ -115,31 +97,32 @@
<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>
<profiles>
<profile>
<id>dev</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<id>prod</id>
</profile>
</profiles>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
<version>2.24.3</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<version>2.16.1</version>
<scope>compile</scope>
</dependency>
@@ -160,7 +143,7 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>9.4.1.jre8</version>
<version>12.8.0.jre8</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
@@ -176,7 +159,7 @@
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
<version>8.4.3</version>
<version>8.5.14</version>
</dependency>
<!-- SWAGGER -->
@@ -209,22 +192,6 @@
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpasyncclient</artifactId>
<version>4.0.2</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.3.6</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
@@ -261,11 +228,11 @@
<!-- <artifactId>itext</artifactId>-->
<!-- <version>2.1.7.js8</version>-->
<!-- </dependency>-->
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports-htmlcomponent</artifactId>
<version>4.1.1</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>net.sf.jasperreports</groupId>-->
<!-- <artifactId>jasperreports-htmlcomponent</artifactId>-->
<!-- <version>4.1.1</version>-->
<!-- </dependency>-->
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports-fonts</artifactId>
@@ -281,6 +248,11 @@
<artifactId>Arial</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>it.integry.font</groupId>
<artifactId>Aptos</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>it.integry.font</groupId>
<artifactId>ArialBlack</artifactId>
@@ -303,81 +275,81 @@
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>1.7.5</version>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>4.0.16</version>
</dependency>
<!-- SOSTITUISCONO batik-all -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-awt-util</artifactId>
<version>1.9</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.xmlgraphics</groupId>-->
<!-- <artifactId>batik-awt-util</artifactId>-->
<!-- <version>1.9</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-bridge</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-css</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-dom</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-ext</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-gvt</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-parser</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-svg-dom</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-transcoder</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-util</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-xml</artifactId>
<version>1.9</version>
<version>1.17</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.xmlgraphics</groupId>-->
<!-- <artifactId>batik-css</artifactId>-->
<!-- <version>1.9</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.xmlgraphics</groupId>-->
<!-- <artifactId>batik-dom</artifactId>-->
<!-- <version>1.9</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.xmlgraphics</groupId>-->
<!-- <artifactId>batik-ext</artifactId>-->
<!-- <version>1.9</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.xmlgraphics</groupId>-->
<!-- <artifactId>batik-gvt</artifactId>-->
<!-- <version>1.9</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.xmlgraphics</groupId>-->
<!-- <artifactId>batik-parser</artifactId>-->
<!-- <version>1.9</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.xmlgraphics</groupId>-->
<!-- <artifactId>batik-svg-dom</artifactId>-->
<!-- <version>1.9</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.xmlgraphics</groupId>-->
<!-- <artifactId>batik-transcoder</artifactId>-->
<!-- <version>1.9</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.xmlgraphics</groupId>-->
<!-- <artifactId>batik-util</artifactId>-->
<!-- <version>1.9</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.xmlgraphics</groupId>-->
<!-- <artifactId>batik-xml</artifactId>-->
<!-- <version>1.9</version>-->
<!-- </dependency>-->
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>5.2.3</version>
<version>5.2.5</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.2.3</version>
<version>5.2.5</version>
</dependency>
<dependency>
@@ -414,13 +386,7 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>2.0.22</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
<version>2.0.24</version>
</dependency>
<dependency>
@@ -449,12 +415,6 @@
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.47</version>
</dependency>
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
@@ -465,6 +425,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@@ -523,15 +489,28 @@
<artifactId>disruptor</artifactId>
<version>3.4.4</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.19.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-web</artifactId>
<version>2.19.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.17.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.36</version>
</dependency>
<dependency>
@@ -549,7 +528,7 @@
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.39.2.0</version>
<version>3.41.2.2</version>
</dependency>
<dependency>
@@ -561,22 +540,14 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.9</version>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.3</version>
<version>1.10.0</version>
</dependency>
<!-- UTILS -->
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.8.0</version>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>javax</groupId>
@@ -588,30 +559,20 @@
<artifactId>jta</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.5</version>
</dependency>
<dependency>
<groupId>com.mashape.unirest</groupId>
<artifactId>unirest-java</artifactId>
<version>1.4.9</version>
<version>3.9.0</version>
</dependency>
<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.0</version>
<version>1.1</version>
</dependency>
<dependency>
<groupId>com.google.maps</groupId>
<artifactId>google-maps-services</artifactId>
<version>0.2.7</version>
<version>2.2.0</version>
</dependency>
<!-- File manipulation -->
@@ -661,18 +622,18 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.70</version>
<artifactId>bcpkix-jdk18on</artifactId>
<version>1.78.1</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk15on</artifactId>
<version>1.70</version>
<artifactId>bcmail-jdk18on</artifactId>
<version>1.78.1</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.70</version>
<artifactId>bcprov-jdk18on</artifactId>
<version>1.78.1</version>
</dependency>
@@ -682,26 +643,19 @@
<version>1.2.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.http-client/google-http-client -->
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
<version>1.34.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.http-client/google-http-client-xml -->
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-xml</artifactId>
<version>1.34.0</version>
</dependency>
<dependency>
<groupId>com.google.firebase</groupId>
<artifactId>firebase-admin</artifactId>
<version>9.2.0</version>
</dependency>
<!-- Needed for Firebase 9.4.2 -->
<!-- <dependency>-->
<!-- <groupId>com.google.auth</groupId>-->
<!-- <artifactId>google-auth-library-credentials</artifactId>-->
<!-- <version>1.28.0</version>-->
<!-- </dependency>-->
<!-- Video -->
<dependency>
@@ -724,7 +678,7 @@
<dependency>
<groupId>com.hierynomus</groupId>
<artifactId>sshj</artifactId>
<version>0.27.0</version>
<version>0.39.0</version>
</dependency>
<dependency>

View File

@@ -152,7 +152,7 @@ public class CollectionsUtils {
}
if (objs.size() == 0) {
if (objs.isEmpty()) {
return;

View File

@@ -441,7 +441,7 @@ public class GeneralComparator implements Comparator,
}
if (this.fields.size() == 0) {
if (this.fields.isEmpty()) {
this.fields.add(0,
new SortField(field,

View File

@@ -526,7 +526,7 @@ public class ObjectCache implements ObjectCacheManager {
public boolean isEmpty() {
return this.keys.size() == 0;
return this.keys.isEmpty();
}

View File

@@ -208,7 +208,7 @@ public class DefaultHttpClient implements HttpClient {
private List<NameValuePair> getParametersAsList(Map<String, String> params) {
List<NameValuePair> postParameters = new ArrayList<>();
if (params != null && params.size() > 0) {
if (params != null && !params.isEmpty()) {
for (String key : params.keySet()) {
postParameters.add(new BasicNameValuePair(key, params.get(key)));
}

View File

@@ -12,6 +12,7 @@ import it.integry.WooCommerce.dto.order.WooCommerceBillingDTO;
import it.integry.WooCommerce.dto.order.WooCommerceShippingDTO;
import it.integry.WooCommerce.dto.product.WooCommerceImageDTO;
import it.integry.WooCommerce.dto.product.WooCommerceProductAttributeDTO;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems_model.db.ResultSetMapper;
import it.integry.ems_model.service.SetupGest;
@@ -28,7 +29,6 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
@@ -305,7 +305,7 @@ public class WooCommerceArticoliDataManager {
List<CategoriaDTO> categorieList = UtilityDB.executeSimpleQueryDTO(conn, sql, CategoriaDTO.class);
if (categorieList != null && categorieList.size() > 0) {
if (categorieList != null && !categorieList.isEmpty()) {
return categorieList;
} else {
return null;
@@ -320,7 +320,7 @@ public class WooCommerceArticoliDataManager {
List<CategoriaDTO> categorieList = UtilityDB.executeSimpleQueryDTO(conn, sql, CategoriaDTO.class);
if (categorieList != null && categorieList.size() > 0) {
if (categorieList != null && !categorieList.isEmpty()) {
return categorieList;
} else {
return null;
@@ -333,7 +333,7 @@ public class WooCommerceArticoliDataManager {
List<ArticoloListino> list = getArticoliListino(codMarts);
if (list != null && list.size() > 0) return list.get(0);
if (list != null && !list.isEmpty()) return list.get(0);
return null;
}
@@ -358,7 +358,7 @@ public class WooCommerceArticoliDataManager {
" left join gtb_aliq on mtb_aart.cod_aliq = gtb_aliq.cod_aliq" +
" where cod_mdep = dbo.getGestSetup('WOOCOMMERCE','SETUP','COD_MDEP')";
if (codMarts != null && codMarts.size() > 0) {
if (codMarts != null && !codMarts.isEmpty()) {
sql += " AND lisv.cod_mart IN (" + UtilityQuery.concatStringFieldsWithSeparator(codMarts, ",") + ")";
}
@@ -451,11 +451,11 @@ public class WooCommerceArticoliDataManager {
}
public boolean getBooleanSetup(String keySection) throws Exception {
return setupGest.getSetupBoolean("WOOCOMMERCE", "SETUP", keySection);
return setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "WOOCOMMERCE", "SETUP", keySection);
}
public int getSetupInteger(String keySection) throws Exception {
return setupGest.getSetupInteger("WOOCOMMERCE", "SETUP", keySection);
return setupGest.getSetupInteger(multiDBTransactionManager.getPrimaryConnection(), "WOOCOMMERCE", "SETUP", keySection);
}
public List<WooCommerceImageDTO> getImagesArticolo(String codMart) throws Exception {

View File

@@ -33,7 +33,7 @@ public class WooCommerceDataFactory {
List<WooCommerceProductCategoryDTO> result = new ArrayList<>();
for (CategoryDTO toConvert : toConvertList) {
WooCommerceProductCategoryDTO convCat = new WooCommerceProductCategoryDTO();
if (remoteCategories != null && remoteCategories.size() > 0) {
if (remoteCategories != null && !remoteCategories.isEmpty()) {
convCat = remoteCategories.stream().filter(
rmt -> rmt.getName().equalsIgnoreCase(toConvert.getCodice() != null ? toConvert.getCodice() : toConvert.getDescrizione())
).findFirst().orElse(new WooCommerceProductCategoryDTO());

View File

@@ -206,7 +206,7 @@ public class WooCommerceRestService {
categorie = instance.getAll(EndpointBaseType.PRODUCTS_CATEGORIES.getValue(), params, new TypeReference<List<WooCommerceProductCategoryDTO>>() {
});
totRemoteCategories.addAll(categorie);
} while (categorie.size() > 0 && categorie.size() == per_page);
} while (!categorie.isEmpty() && categorie.size() == per_page);
return totRemoteCategories;
}
@@ -301,7 +301,7 @@ public class WooCommerceRestService {
}
}
if (exceptionList.size() > 0) throw new Exception(exceptionList.get(0).getError());
if (!exceptionList.isEmpty()) throw new Exception(exceptionList.get(0).getError());
List<UpdateArticoloDTO> syncedArts = new ArrayList<>(artsToCreate);
syncedArts.addAll(artsToUpdate);

View File

@@ -86,7 +86,7 @@ public class WooCommerceService {
///trasmetto articoli
List<ArticoloException> errors = syncProdotti(restInstance, attributes, categories);
if (errors.size() > 0) {
if (!errors.isEmpty()) {
StringBuilder builder = new StringBuilder("Uno o più errori sono avvenuti durante l'esecuzione dello script: \n\r");
Stream.of(errors).forEach(err -> {
@@ -108,7 +108,7 @@ public class WooCommerceService {
List<WooCommerceProductAttributeDTO> finalAttributes = new ArrayList<>();
List<AttributeDTO> localAttributes = dataManager.getAttributes();
List<WooCommerceProductAttributeDTO> attributes = restService.getAttributes(restInstance);
if (localAttributes.size() > 0) {
if (!localAttributes.isEmpty()) {
List<AttributeDTO> localAttrTypes = localAttributes.stream().filter(UtilityStream.distinctByKey(AttributeDTO::getAttributo)).collect(Collectors.toList());
if (syncAttributi) {
for (AttributeDTO type : localAttrTypes) {
@@ -160,7 +160,7 @@ public class WooCommerceService {
term -> term.getName().equalsIgnoreCase(attribute.getCodice())
)
).collect(Collectors.toList());
if (toCreateAttrs.size() > 0) {
if (!toCreateAttrs.isEmpty()) {
AttributeTermsBatchUpdateRequest request = dataFactory.createTermsBatchRequest(toCreateAttrs, null, null);
AttributeTermsBatchUpdateRequest response = restService.batchUpdateAttribute(restInstance, attr, request);
@@ -176,12 +176,12 @@ public class WooCommerceService {
if (syncCategorie) {
List<CategoryDTO> localCategories = dataManager.getCategories();
if (localCategories.size() > 0) {
if (!localCategories.isEmpty()) {
List<WooCommerceProductCategoryDTO> remoteCategories = restService.getCategories(restInstance);
List<WooCommerceProductCategoryDTO> convertList = dataFactory.convertLocalToRemoteCategory(localCategories, remoteCategories);
List<WooCommerceProductCategoryDTO> toCreate = convertList.stream().filter(conv -> conv.getId() == null).collect(Collectors.toList());
CategoryBatchUpdateRequest request = new CategoryBatchUpdateRequest();
if (toCreate.size() > 0) {
if (!toCreate.isEmpty()) {
request.setCreate(toCreate);
remoteCategories.addAll(restService.batchUpdateCategories(restInstance, request).getCreate());
convertList = dataFactory.convertLocalToRemoteCategory(localCategories, remoteCategories);
@@ -290,7 +290,7 @@ public class WooCommerceService {
.setSku(art.getSku());
batch.add(updateDTO);
if (art.getVariations() != null && art.getVariations().size() > 0) {
if (art.getVariations() != null && !art.getVariations().isEmpty()) {
List<WooCommerceProductVariationDTO> variations = restService.getVariazioniArticolo(restInstance, art.getId());
List<UpdateArticoloDTO> variazioni = Stream.of(variations)
.map(x -> new UpdateArticoloDTO()
@@ -347,7 +347,7 @@ public class WooCommerceService {
}
//creo varianti
if (textilesArt.getVariazioni() != null && textilesArt.getVariazioni().size() > 0) {
if (textilesArt.getVariazioni() != null && !textilesArt.getVariazioni().isEmpty()) {
List<UpdateArticoloDTO> varianti = new ArrayList<>();
List<WooCommerceProductVariationDTO> variations = new ArrayList<>();
@@ -648,7 +648,7 @@ public class WooCommerceService {
error.setError(e.getMessage());
errorArts.add(error);
}
} else if (dto.getVariations().size() > 0) {
} else if (!dto.getVariations().isEmpty()) {
BatchUpdateRequest updateVariazioni = new BatchUpdateRequest();
dto.getVariations().forEach(variation -> {

View File

@@ -30,6 +30,7 @@ public class CommonConstants {
public static final String DATETIME_FORMAT_YMD = String.format("%s %s", DATE_FORMAT_YMD, 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_DASHED = String.format("%s %s", DATE_FORMAT_DMY_DASHED, TIME_FORMAT);
public static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.TIME_FORMAT)
@@ -54,6 +55,8 @@ public class CommonConstants {
.withZone(ZoneId.systemDefault());
public static final DateTimeFormatter DATETIME_DMY_SLASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATETIME_FORMAT_DMY_SLASHED)
.withZone(ZoneId.systemDefault());
public static final DateTimeFormatter DATETIME_DMY_DASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATETIME_FORMAT_DMY_DASHED)
.withZone(ZoneId.systemDefault());
public static final String ULTC = "ULTC";

View File

@@ -1,33 +1,51 @@
package it.integry.common.var;
import it.integry.ems._context.ApplicationContextProvider;
import it.integry.ems.settings.Model.SettingsModel;
import it.integry.ems_model.entity.Azienda;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.concurrent.locks.ReentrantLock;
@Service
public class EmsDBConst {
private final ReentrantLock datiAziendaLock = new ReentrantLock();
private HashMap<String, Const> datiAziendaBindingTable = new HashMap<String, Const>() {{
}};
public Const getConsts(String profileDb) {
String aziendaUp = profileDb.toUpperCase();
public Const getConstsByProfile(String profileDb) {
profileDb = profileDb.toUpperCase();
final SettingsModel settingsModel = ApplicationContextProvider.getApplicationContext().getBean(SettingsModel.class);
final String dbName = settingsModel.getDbNameFromProfileDb(profileDb);
return getConsts(dbName);
}
public Const getConsts(String dbName) {
String aziendaUp = dbName.toUpperCase();
datiAziendaLock.lock();
if (!datiAziendaBindingTable.containsKey(aziendaUp)) {
datiAziendaBindingTable.put(aziendaUp, new Const());
}
return datiAziendaBindingTable.get(aziendaUp);
final Const aConst = datiAziendaBindingTable.get(aziendaUp);
datiAziendaLock.unlock();
return aConst;
}
public void destroyAll() {
datiAziendaBindingTable = new HashMap<String, Const>();
datiAziendaLock.lock();
datiAziendaBindingTable = new HashMap<>();
datiAziendaLock.unlock();
}
public class Const {
public static class Const {
private String applicationDbName;
private String nomeAzienda;

View File

@@ -15,9 +15,8 @@ public enum EntityImportType {
DOCUMENTI_VENDITA("DOCUMENTI VENDITA"),
PROSPECT("PROSPECT"),
LISTINI_ACQUISTO("LISTINI ACQUISTO"),
LISTINI_VENDITA("LISTINI VENDITA"),
ACK("ACK"),
INVENTARIO("INVENTARIO"),
RAPPORTINI("RAPPORTINI"),
RAPPORTINI_FG("RAPPORTINI FG"),

View File

@@ -0,0 +1,20 @@
package it.integry.ems._context;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
@Component
public class ApplicationContextProvider implements ApplicationContextAware {
private static ApplicationContext applicationContext;
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
ApplicationContextProvider.applicationContext = applicationContext;
}
public static ApplicationContext getApplicationContext() {
return applicationContext;
}
}

View File

@@ -13,11 +13,8 @@ import org.apache.logging.log4j.Logger;
import org.postgresql.Driver;
import org.reflections.Reflections;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.springframework.web.context.ContextLoader;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -33,10 +30,14 @@ import java.util.stream.Collectors;
import static org.reflections.scanners.Scanners.TypesAnnotated;
@Component
public class EmsCoreContext implements ApplicationListener<ContextRefreshedEvent> {
public class EmsCoreContext {
private final Logger logger = LogManager.getLogger();
//Aggiunta dipendenza non utilizzata per forzare spring al caricamento di essa
@Autowired
private ApplicationContextProvider applicationContextProvider;
@Autowired
private SettingsController settingsController;
@@ -59,6 +60,7 @@ public class EmsCoreContext implements ApplicationListener<ContextRefreshedEvent
DriverManager.registerDriver(new Driver());
settingsController.init();
onApplicationEvent();
} catch (Exception e) {
logger.error(EmsCoreContext.class.getSimpleName(), e);
}
@@ -69,18 +71,27 @@ public class EmsCoreContext implements ApplicationListener<ContextRefreshedEvent
contextInitialized = false;
}
@Override
public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent) {
//@EventListener(ContextRefreshedEvent.class)
public void onApplicationEvent() {
if (firstStart) {
firstStart = false;
logger.debug("Init");
try {
new Thread(() -> {
emsCoreDBLoader.load(this::onPostDBLoaded);
}).start();
//new Thread(() -> {
try {
emsCoreDBLoader.load((multiDBTransactionManager, onDone) -> {
try {
this.onPostDBLoaded(multiDBTransactionManager, onDone);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
});
} catch (Exception e) {
throw new RuntimeException(e);
}
//}).start();
} catch (Exception e) {
logger.error(EmsCoreContext.class.getSimpleName(), e);
@@ -89,19 +100,27 @@ public class EmsCoreContext implements ApplicationListener<ContextRefreshedEvent
}
private void onPostDBLoaded(MultiDBTransactionManager multiDBTransactionManager) {
try {
private void onPostDBLoaded(MultiDBTransactionManager multiDBTransactionManager, Runnable onDone) throws InterruptedException {
dispatchPostContextConstruct(multiDBTransactionManager);
// final ExecutorService executorService = Executors.newSingleThreadExecutor();
contextInitialized = true;
new Thread(() -> {
try {
dispatchPostContextConstruct(multiDBTransactionManager);
dispatchPostWebServerConstruct(multiDBTransactionManager);
contextInitialized = true;
dispatchPostWebServerConstruct(multiDBTransactionManager);
onDone.run();
} catch (Exception e) {
e.printStackTrace();
logger.error("EmsCoreContext.onPostDBLoaded", e);
}
}).start();
// executorService.shutdown();
// executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS);
} catch (Exception e) {
e.printStackTrace();
logger.error("EmsCoreContext.onPostDBLoaded", e);
}
}
@@ -121,7 +140,7 @@ public class EmsCoreContext implements ApplicationListener<ContextRefreshedEvent
for (Class<?> classType : classesWithPostContextConstruct) {
logger.debug("PostContextConstruct - " + classType.getSimpleName() + " - START");
Object beanInstance = ContextLoader.getCurrentWebApplicationContext().getBean(classType);
Object beanInstance = ApplicationContextProvider.getApplicationContext().getBean(classType);
List<Field> fieldsToInject = Arrays.stream(classType.getDeclaredFields())
.filter(y -> y.isAnnotationPresent(PostContextAutowired.class))
@@ -162,7 +181,7 @@ public class EmsCoreContext implements ApplicationListener<ContextRefreshedEvent
for (Class<?> classType : classesWithPostWebServerConstruct) {
logger.debug("PostWebServerConstruct - " + classType.getSimpleName() + " - START");
Object beanInstance = ContextLoader.getCurrentWebApplicationContext().getBean(classType);
Object beanInstance = ApplicationContextProvider.getApplicationContext().getBean(classType);
List<Field> fieldsToInject = Arrays.stream(classType.getDeclaredFields())
.filter(y -> y.isAnnotationPresent(PostContextAutowired.class))

View File

@@ -3,12 +3,15 @@ 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.RunnableArgs;
import it.integry.ems.expansion.RunnableArgss;
import it.integry.ems.settings.Model.AvailableConnectionsModel;
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;
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;
@@ -19,14 +22,16 @@ import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.sql.Connection;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicReference;
@Component
public class EmsCoreDBLoader {
private final Logger logger = LogManager.getLogger();
private MultiDBTransactionManager multiDBTransactionManager;
//private MultiDBTransactionManager multiDBTransactionManager;
@Autowired
private SetupGest setupGest;
@@ -43,109 +48,111 @@ public class EmsCoreDBLoader {
@Autowired
private UserCacheService userCacheService;
@Autowired
private BasicConnectionPool connectionPool;
@Autowired
private TaskExecutorService taskExecutorService;
@PostContextConstruct(priority = 10)
public void init() {
public void init() throws Exception {
this.settingsController.addOnConfigUpdated(() -> {
load(null);
try {
load(null);
} catch (Exception e) {
throw new RuntimeException(e);
}
});
}
public void load(final RunnableArgs<MultiDBTransactionManager> onComplete) {
multiDBTransactionManager = new MultiDBTransactionManager();
public void load(final RunnableArgss<MultiDBTransactionManager, Runnable> onComplete) throws Exception {
connectionPool.init();
MultiDBTransactionManager multiDBTransactionManager = new MultiDBTransactionManager(connectionPool);
try {
discoverAllConnections();
setupAzienda();
discoverAllConnections(multiDBTransactionManager);
setupAzienda(multiDBTransactionManager);
userCacheService.discoverAllUsers(multiDBTransactionManager);
if (onComplete != null) onComplete.run(multiDBTransactionManager, () -> {
try {
multiDBTransactionManager.closeAll();
} catch (Exception e) {
throw new RuntimeException(e);
}
});
} catch (Exception ex) {
ex.printStackTrace();
logger.error("EmsCoreDBLoader", ex);
} finally {
try {
if (onComplete != null) onComplete.run(multiDBTransactionManager);
multiDBTransactionManager.closeAll();
} catch (Exception e) {
logger.error("EmsCoreDBLoader", e);
}
}
}
private boolean checkIfDatabaseConnectionExists(String dbName) throws Exception {
boolean exists = true;
if (multiDBTransactionManager != null) {
private void discoverAllConnections(MultiDBTransactionManager multiDBTransactionManager) throws Exception {
if (!multiDBTransactionManager.containsDB(dbName)) {
multiDBTransactionManager.Destroy();
ArrayList<Callable<Void>> futureTasks = new ArrayList<>();
for (AvailableConnectionsModel model : settingsModel.getAvailableConnectionsWithoutDuplicatedProfiles(true, settingsController.getHistoryProfileDb())) {
emsDBConst.destroyAll();
AtomicReference<AvailableConnectionsModel> modelAtomicReference = new AtomicReference<>(model);
exists = false;
}
} else exists = false;
return exists;
}
futureTasks.add(() -> {
try {
final DataSource ds = connectionPool.getConnection(modelAtomicReference.get().getProfileName());
private void discoverAllConnections() {
for (AvailableConnectionsModel model : settingsModel.getAvailableConnections()) {
if ( !model.getInternalDb() )
continue;
try {
DataSource ds = new DataSource();
ds.initialize(model.getProfileName());
String dbDistributore = null;
boolean isInternalDb = model.getInternalDb();
if (isInternalDb) {
String sql = "SELECT db_distributore FROM azienda";
dbDistributore = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(ds.getConnection(), sql);
}
String dbDistributore = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(ds.getConnection(), sql);
multiDBTransactionManager.addConnection(model.getProfileName(), ds, model.getDbName().equalsIgnoreCase(dbDistributore));
} catch (Exception ex) {
logger.error(String.format("La connessione al DB \"%s\" non è valida. %s", model.getProfileName(), ex.getMessage()), ex);
}
multiDBTransactionManager.addConnection(modelAtomicReference.get().getProfileName(), ds, modelAtomicReference.get().getDbName().equalsIgnoreCase(dbDistributore));
return null;
} catch (Exception ex) {
throw new Exception("[" + modelAtomicReference.get().getProfileName() + "] " + ex.getMessage(), ex.getCause());
}
});
}
taskExecutorService.executeTasks(futureTasks);
}
private void setupAzienda() throws Exception {
private void setupAzienda(MultiDBTransactionManager multiDBTransactionManager) throws Exception {
ArrayList<Callable<Void>> futureTasks = new ArrayList<>();
for (final AdvancedDataSource advancedDataSource : multiDBTransactionManager.getActiveConnections()) {
AtomicReference<AdvancedDataSource> atomicAdvancedDataSource = new AtomicReference<>(advancedDataSource);
futureTasks.add(() -> {
Connection conn = atomicAdvancedDataSource.get().getConnection();
Azienda azienda = Azienda.getDefaultAzienda(conn);
String dbName = atomicAdvancedDataSource.get().getDataSource().getDbName();
try {
Connection conn = advancedDataSource.getConnection();
if (advancedDataSource.isInternalDb()) {
Azienda azienda = Azienda.getDefaultAzienda(conn);
if (azienda != null) {
String applicationDbName = azienda.getApplicationName();
String nomeAzienda = azienda.getNomeDitta();
if (azienda != null) {
String applicationDbName = azienda.getApplicationName();
String nomeAzienda = azienda.getNomeDitta();
if(UtilityString.isNullOrEmpty(applicationDbName)) {
throw new Exception("Impostare il campo \"Application Name\"");
}
HashMap<String, String> gestSetupValues =
setupGest.getSetupSection(conn, "DATI_AZIENDA", "FATTURAZIONE_ELETTRONICA");
emsDBConst.getConsts(advancedDataSource.getDataSource().getProfile())
.setApplicationDbName(applicationDbName)
.setNomeAzienda(nomeAzienda)
.setAzienda(azienda)
.setGestSetupDatiAzienda(gestSetupValues);
} else {
throw new Exception("Non è stato possibile leggere i dati dalla tabella azienda");
if (UtilityString.isNullOrEmpty(applicationDbName)) {
throw new Exception("Impostare il campo \"Application Name\"");
}
HashMap<String, String> gestSetupValues =
setupGest.getSetupSection(conn, "DATI_AZIENDA", "FATTURAZIONE_ELETTRONICA");
emsDBConst.getConsts(dbName)
.setApplicationDbName(applicationDbName)
.setNomeAzienda(nomeAzienda)
.setAzienda(azienda)
.setGestSetupDatiAzienda(gestSetupValues);
} else {
throw new Exception("Non è stato possibile leggere i dati dalla tabella azienda");
}
} catch (Exception ex) {
ex.printStackTrace();
logger.error(String.format("Impossibile caricare alcune informazioni dal DB \"%s\". %s", advancedDataSource.getProfileName(), ex.getMessage()));
throw new Exception("[" + atomicAdvancedDataSource.get().getProfileName() + "] " + ex.getMessage(), ex.getCause());
}
return null;
});
}
taskExecutorService.executeTasks(futureTasks);
}
}

View File

@@ -33,7 +33,7 @@ public class BooleanDeserializer extends JsonDeserializer<Boolean> {
if ("1".equals(text) || "true".equals(text)) {
return true;
}
if ("0".equals(text) || "false".equals(text) || text.length() == 0) {
if ("0".equals(text) || "false".equals(text) || text.isEmpty()) {
return Boolean.FALSE;
}

View File

@@ -1,7 +1,6 @@
package it.integry.ems.adapter;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import it.integry.ems_model.config.EmsRestConstants;
@@ -9,7 +8,6 @@ import it.integry.ems_model.utility.UtilityString;
import java.io.IOException;
import java.time.LocalDate;
import java.util.Date;
public class JsonLocalDateAdapterDeserializer extends JsonDeserializer<LocalDate> {
@@ -21,7 +19,7 @@ public class JsonLocalDateAdapterDeserializer extends JsonDeserializer<LocalDate
return null;
if (jp.getText().equalsIgnoreCase("null") || jp.getText().equalsIgnoreCase("1900-01-01"))
return null;
return EmsRestConstants.LOCAL_DATE_NULL;
return UtilityString.parseLocalDate(jp.getText());

View File

@@ -3,10 +3,10 @@ package it.integry.ems.adapter;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.utility.UtilityString;
import java.io.IOException;
import java.time.LocalDate;
import java.time.LocalDateTime;
public class JsonLocalDateTimeAdapterDeserializer extends JsonDeserializer<LocalDateTime> {
@@ -19,7 +19,7 @@ public class JsonLocalDateTimeAdapterDeserializer extends JsonDeserializer<Local
return null;
if (jp.getText().equalsIgnoreCase("null") || jp.getText().equalsIgnoreCase("1900-01-01"))
return null;
return EmsRestConstants.LOCAL_DATE_TIME_NULL;
return UtilityString.parseLocalDateTime(jp.getText());

View File

@@ -1,19 +0,0 @@
package it.integry.ems.configuration;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
public class ApplicationContextProvider implements ApplicationContextAware {
private static ApplicationContext context;
public static ApplicationContext getApplicationContext() {
return context;
}
@Override
public void setApplicationContext(ApplicationContext ctx) {
context = ctx;
}
}

View File

@@ -0,0 +1,34 @@
package it.integry.ems.configuration;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
@Configuration
public class ExecutorServiceConfig {
private final int corePoolSize = Runtime.getRuntime().availableProcessors();
private final int maxPoolSize = 20;
private final int queueSize = 500;
@Bean
public ExecutorService taskExecutor() {
return new ThreadPoolExecutor(
corePoolSize,
maxPoolSize,
60L,
TimeUnit.SECONDS,
new LinkedBlockingQueue<>(queueSize),
new ThreadFactoryBuilder()
.setNameFormat("ims-thread-%d")
.build()
);
}
}

View File

@@ -1,6 +1,5 @@
package it.integry.ems.controller;
import com.annimon.stream.Stream;
import com.fasterxml.jackson.databind.JsonNode;
import it.integry.common.var.CommonConstants;
import it.integry.ems.Import.base.EntityImportResponse;
@@ -49,6 +48,8 @@ import org.quartz.*;
import org.quartz.impl.matchers.GroupMatcher;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.http.ContentDisposition;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.mail.javamail.ConfigurableMimeFileTypeMap;
@@ -72,10 +73,10 @@ import java.util.Date;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@RestController
@Scope("request")
public class EmsController {
private final Logger logger = LogManager.getLogger();
@@ -221,7 +222,7 @@ public class EmsController {
} else {
byte[] stream = Base64Utility.decodeBase64Zipped(encodedFile);
if (stream != null) {
printerService.print(printerName, new ByteArrayInputStream(stream), mimeType);
printerService.print(printerName, new ByteArrayInputStream(stream), mimeType, 1);
response = new ServiceRestResponse(EsitoType.OK);
} else {
@@ -338,19 +339,12 @@ public class EmsController {
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, e, multiDBTransactionManager.getPrimaryDatasource().getProfile(), entity);
} finally {
try {
multiDBTransactionManager.closeAll();
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, e, multiDBTransactionManager.getPrimaryDatasource().getProfile(), entity);
}
}
if (entity.getOperation() == OperationType.SELECT_OBJECT) {
return obj;
} else {
return response;
}
if (entity.getOperation() == OperationType.SELECT_OBJECT) {
return obj;
} else {
return response;
}
}
@@ -417,7 +411,7 @@ public class EmsController {
String sql = procedure;
JsonNode parametersList = json.has("parameters") ? json.path("parameters") : null;
if (parametersList != null && parametersList.size() == 0) {
if (parametersList != null && parametersList.isEmpty()) {
parametersList = null;
}
@@ -605,13 +599,13 @@ public class EmsController {
ServiceRestResponse response;
if (entities != null && entities.size() > 0 && Stream.of(entities).anyMatch(x -> x instanceof EntityBase)) {
List<MessageDTO> errorMessages = Stream.of(entities)
if (entities != null && !entities.isEmpty() && entities.stream().anyMatch(x -> x instanceof EntityBase)) {
List<MessageDTO> errorMessages = entities.stream()
.filter(x -> x.getException() != null)
.map(x -> MessageDTO.error(x.getException().getMessage()))
.toList();
.collect(Collectors.toList());
List<MessageDTO> messages = Stream.of(importResponse.getAnomalie())
List<MessageDTO> messages = importResponse.getAnomalie().stream()
.filter(x -> x.getTipo() != null)
.map(x -> {
switch (x.getTipo()) {
@@ -622,24 +616,24 @@ public class EmsController {
return MessageDTO.warning(x.getMessage());
}
})
.toList();
.collect(Collectors.toList());
errorMessages.addAll(messages);
if (errorMessages.size() > 0) {
if (!errorMessages.isEmpty()) {
response = ServiceRestResponse.createNegativeResponse();
} else {
response = ServiceRestResponse.createPositiveResponse();
}
response.setMessages(errorMessages);
response.setEntityList(Stream.of(entities).filter(x -> x.getException() == null).toList());
response.setEntityList(entities.stream().filter(x -> x.getException() == null).collect(Collectors.toList()));
} else {
if (importResponse.getAnomalie() != null) {
if (!importResponse.getAnomalie().isEmpty()) {
List<MessageDTO> messages = Stream.of(importResponse.getAnomalie())
List<MessageDTO> messages = importResponse.getAnomalie().stream()
.map(x -> {
switch (x.getTipo()) {
case ERROR:
@@ -649,7 +643,7 @@ public class EmsController {
return MessageDTO.warning(x.getMessage());
}
})
.toList();
.collect(Collectors.toList());
response = ServiceRestResponse.createNegativeResponse();
response.setMessages(messages);
@@ -754,11 +748,11 @@ public class EmsController {
@RequestMapping(value = EmsRestConstants.PATH_DOWNLOAD_STB_FILE_ATTACHMENT + "/{idAttach}/{filename}", method = RequestMethod.GET)
@ResponseBody
public ResponseEntity<byte[]> downloadStbFileAttachment(
@RequestParam(CommonConstants.PROFILE_DB) String config,
@PathVariable String idAttach,
@PathVariable String filename,
@RequestParam(name = "contentDisposition", defaultValue = "attachment") String contentDispositionType,
@RequestParam(defaultValue = "false") boolean requestThumbnail) throws Exception {
AttachmentDTO attachmentDTO = emsServices.downloadStbFileAttachment(idAttach, requestThumbnail);
@@ -766,7 +760,11 @@ public class EmsController {
return ResponseEntity.ok()
.contentType(MediaType.parseMediaType(attachmentDTO.getMimeType()))
.contentLength(attachmentDTO.getFileSize())
.header("Content-Disposition", "attachment; filename=\"" + attachmentDTO.getFileName() + "\"")
.header(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition
.builder(contentDispositionType)
.filename(attachmentDTO.getFileName())
.build()
.toString())
.body(attachmentDTO.getFileContent());
}
@@ -785,7 +783,11 @@ public class EmsController {
return ResponseEntity.ok()
.contentType(MediaType.parseMediaType(attachmentDTO.getMimeType()))
.contentLength(attachmentDTO.getFileSize())
.header("Content-Disposition", "attachment; filename=\"" + attachmentDTO.getFileName() + "\"")
.header(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition
.attachment()
.filename(attachmentDTO.getFileName())
.build()
.toString())
.body(attachmentDTO.getFileContent());
}
@@ -806,7 +808,7 @@ public class EmsController {
if (stbEmailContent != null) {
response.setContentType("application/octet-stream");
response.setStatus(HttpServletResponse.SC_OK);
response.addHeader("Content-Disposition", "attachment; filename=\"email.eml\"");
response.addHeader(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition.attachment().filename("email.eml").build().toString());
byte[] byteArr = null;
@@ -830,14 +832,15 @@ public class EmsController {
}
@RequestMapping(value = EmsRestConstants.PATH_DOWNLOAD_DTB_DOC_PDF, method = RequestMethod.GET)
public byte[] downloadDtbDocPdf(HttpServletResponse response,
@RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestParam String dataDoc,
@RequestParam String serDoc,
@RequestParam Integer numDoc,
@RequestParam String codAnag,
@RequestParam String codDtip,
@RequestParam Integer versione) throws Exception {
public ResponseEntity<byte[]> downloadDtbDocPdf(
@RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestParam(name = "contentDisposition", defaultValue = "attachment") String contentDispositionType,
@RequestParam String dataDoc,
@RequestParam String serDoc,
@RequestParam Integer numDoc,
@RequestParam String codAnag,
@RequestParam String codDtip,
@RequestParam Integer versione) throws Exception {
DtbDocPdf dtbDocPdf = new DtbDocPdf();
dtbDocPdf.setDataDoc(UtilityDate.RecognizeDate(dataDoc));
@@ -851,9 +854,7 @@ public class EmsController {
dtbDocPdf = entityProcessor.processEntity(dtbDocPdf, multiDBTransactionManager);
if (dtbDocPdf != null) {
response.setContentType("application/octet-stream");
response.setStatus(HttpServletResponse.SC_OK);
response.addHeader("Content-Disposition", "attachment; filename=\"" + dtbDocPdf.getFilename() + "\"");
MediaType mimeType = mimeTypesHandler.getContentType(dtbDocPdf.getFilename());
byte[] byteArr = null;
@@ -871,12 +872,18 @@ public class EmsController {
byteArr = dtbDocPdf.getFilecontentByteArr(false);
}
response.setContentLength(byteArr != null ? byteArr.length : 0);
return byteArr;
return ResponseEntity.ok()
.contentType(mimeType)
.contentLength(byteArr != null ? byteArr.length : 0)
.header(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition
.builder(contentDispositionType)
.filename(dtbDocPdf.getFilename())
.build()
.toString())
.body(byteArr);
}
response.sendError(404, "Allegato non trovato");
return null;
return ResponseEntity.notFound().build();
}
@RequestMapping(value = EmsRestConstants.PATH_DOWNLOAD_DTB_ORD_PDF, method = RequestMethod.GET)
@@ -898,7 +905,7 @@ public class EmsController {
if (dtbOrdPdf != null) {
response.setContentType("application/octet-stream");
response.setStatus(HttpServletResponse.SC_OK);
response.addHeader("Content-Disposition", "attachment; filename=\"" + dtbOrdPdf.getFilename() + "\"");
response.addHeader(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition.attachment().filename(dtbOrdPdf.getFilename()).build().toString());
byte[] byteArr = dtbOrdPdf.getFilecontentByteArr(true);
response.setContentLength(byteArr != null ? byteArr.length : 0);
@@ -910,11 +917,10 @@ public class EmsController {
}
@RequestMapping(value = EmsRestConstants.PATH_UPLOAD_STB_FILE_ATTACHMENT, method = RequestMethod.POST)
public ServiceRestResponse uploadStbFileAttachment(HttpServletRequest request, HttpServletResponse response,
@RequestParam(CommonConstants.PROFILE_DB) String config,
public ServiceRestResponse uploadStbFileAttachment(@RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestParam(required = false) String idAttach,
@RequestParam(required = false) String descrizione,
@RequestParam(required = false) String typeAttach,
@RequestParam(required = false) StbFilesAttached.TypeAttach typeAttach,
@RequestPart() MultipartFile[] files
) {
try {
@@ -934,11 +940,7 @@ public class EmsController {
stbFilesAttached.setOnlyPkMaster(false);
ServiceRestResponse serviceRestResponse = ServiceRestResponse.createPositiveResponse();
serviceRestResponse.setEntity(stbFilesAttached);
return serviceRestResponse;
return ServiceRestResponse.createEntityPositiveResponse(stbFilesAttached);
} catch (Exception e) {
logger.error(e.getMessage(), e);
return new ServiceRestResponse(EsitoType.KO, config, e);

View File

@@ -0,0 +1,60 @@
package it.integry.ems.controller;
import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems.service.EntityProcessor;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems_model.entity.WtbJrept;
import it.integry.ems_model.types.OperationType;
import net.sf.jasperreports.engine.JasperCompileManager;
import net.sf.jasperreports.engine.JasperReport;
import net.sf.jasperreports.engine.util.JRSaver;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.web.bind.annotation.*;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@RestController
@Scope("request")
@RequestMapping("report-management")
public class ReportManagementController {
@Autowired
private MultiDBTransactionManager multiDBTransactionManager;
@Autowired
private EntityProcessor entityProcessor;
@RequestMapping(value = "/compile/{reportId}", method = RequestMethod.GET)
public @ResponseBody ServiceRestResponse compile(@PathVariable("reportId") long reportId) throws Exception {
WtbJrept wtbJrept = new WtbJrept()
.setId(reportId);
wtbJrept.setOperation(OperationType.SELECT_OBJECT);
wtbJrept = entityProcessor.processEntity(wtbJrept, multiDBTransactionManager);
byte[] jrxml = Base64.decodeBase64(wtbJrept.getB64Jrxml());
ByteArrayInputStream bais = new ByteArrayInputStream(jrxml);
final JasperReport compiledReport = JasperCompileManager.compileReport(bais);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
JRSaver.saveObject(compiledReport, baos);
wtbJrept.setCompiledJasper(ArrayUtils.toObject(baos.toByteArray()));
wtbJrept.setOperation(OperationType.UPDATE);
entityProcessor.processEntity(wtbJrept, multiDBTransactionManager);
return ServiceRestResponse.createPositiveResponse();
}
}

View File

@@ -2,6 +2,7 @@ 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;
@@ -11,7 +12,6 @@ import org.springframework.stereotype.Service;
import javax.annotation.PreDestroy;
import java.io.IOException;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.SQLException;
@@ -28,6 +28,7 @@ public class DataSource {
private String profile;
private Short sessionID;
private Connection connection = null;
private String applicationName;
public String getDbName() {
return connectionModel.getDbName();
@@ -41,13 +42,15 @@ public class DataSource {
return connectionModel.getConnectionType();
}
public String getApplicationName() {
return applicationName;
}
public int getSessionID() {
return sessionID;
}
public synchronized Connection getConnection() throws IOException, SQLException {
if (connection == null || connection.isClosed())
init();
return connection;
}
@@ -55,9 +58,12 @@ public class DataSource {
return !(connection != null && !connection.isClosed());
}
private void init() throws SQLException, IOException {
private void init(String applicationName) throws SQLException, IOException {
this.applicationName = applicationName;
connection = DriverManager.getConnection(connectionModel.getDbConnectionString(), connectionModel.getUsername(), connectionModel.getPasswordDecrypted());
connection = Connection.fromConnection(
DriverManager.getConnection(connectionModel.getDbConnectionString(applicationName), connectionModel.getUsername(), connectionModel.getPasswordDecrypted())
);
connection.setTransactionIsolation(java.sql.Connection.TRANSACTION_READ_UNCOMMITTED);
connection.setAutoCommit(false);
@@ -110,7 +116,7 @@ public class DataSource {
this.connectionModel = connectionModel;
if (autoOpenConnection) {
init();
init(connectionName);
}
}

View File

@@ -2,60 +2,23 @@ package it.integry.ems.devices;
import it.integry.common.var.CommonConstants;
import it.integry.ems.devices.dto.RegisterDeviceRequestDTO;
import it.integry.ems.javabeans.RequestDataDTO;
import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems_model.config.EmsRestConstants;
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")
@RequestMapping("device")
public class DevicesController {
private final Logger logger = LogManager.getLogger();
@Autowired
private MultiDBTransactionManager multiDBTransactionManager;
@Autowired
private RequestDataDTO requestDataDTO;
@Autowired
private DevicesService devicesService;
@Deprecated
@RequestMapping(value = "register", method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse register(@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody RegisterDeviceRequestDTO registerDeviceRequestDTO) throws Exception {
public @ResponseBody ServiceRestResponse register(@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody Object registerDeviceRequestDTO) throws Exception {
DevicesService.App application = null;
switch (registerDeviceRequestDTO.getApp().toLowerCase()) {
case "wms":
application = DevicesService.App.WMS;
break;
case "wingest":
application = DevicesService.App.Wingest;
break;
case "textiles":
application = DevicesService.App.Textiles;
break;
case "agribook":
application = DevicesService.App.Agribook;
break;
}
if(application == null)
throw new Exception("Impossibile riconoscere l'applicativo");
devicesService.register(application, requestDataDTO.getDeviceId());
//TODO: To be removed
//Mantenuto solo per lasciare compatibilità con le vecchie versioni del WMS
//Non serve più per >= v1.45.00
return ServiceRestResponse.createPositiveResponse();
}

View File

@@ -1,55 +1,38 @@
package it.integry.ems.devices;
import com.annimon.stream.Stream;
import it.integry.common.var.CommonConstants;
import it.integry.common.var.EmsDBConst;
import it.integry.ems.javabeans.RequestDataDTO;
import it.integry.ems.properties.EmsProperties;
import it.integry.ems.settings.Model.AvailableConnectionsModel;
import it.integry.ems.settings.Model.SettingsModel;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems_model.utility.UtilityHashMap;
import it.integry.ems_model.utility.UtilityString;
import it.integry.security.service.DeviceService;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.xpath.operations.Mult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.web.context.ContextLoader;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import org.springframework.web.servlet.HandlerInterceptor;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Optional;
@Component
@Scope("request")
public class DevicesRequestInterceptor extends HandlerInterceptorAdapter {
public class DevicesRequestInterceptor implements HandlerInterceptor {
private final Logger logger = LogManager.getLogger();
@Autowired
private SettingsModel settingsModel;
@Autowired
private DevicesService devicesService;
@Override
public boolean preHandle(
HttpServletRequest request,
HttpServletResponse response, Object handler) {
try {
DeviceService deviceService = ContextLoader.getCurrentWebApplicationContext().getBean(DeviceService.class);
RequestDataDTO requestDataDTO = ContextLoader.getCurrentWebApplicationContext().getBean(RequestDataDTO.class);
MultiDBTransactionManager multiDBTransactionManager = ContextLoader.getCurrentWebApplicationContext().getBean(MultiDBTransactionManager.class);
if (requestDataDTO.isValidProfileDB() && requestDataDTO.isValidDeviceId()) {
devicesService.updateUsage(multiDBTransactionManager.getPrimaryConnection(), requestDataDTO.getDeviceId());
deviceService.updateUsage(requestDataDTO.getApplication(), requestDataDTO.getDeviceId());
}
return true;
} catch (Exception ex) {
ex.printStackTrace();
logger.error(ex.getMessage(), ex);
return false;
}

View File

@@ -1,71 +0,0 @@
package it.integry.ems.devices;
import it.integry.ems.service.EntityProcessor;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.user.UserSession;
import it.integry.ems_model.entity.StbDevices;
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.UtilityLocalDate;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
import org.springframework.web.context.ContextLoader;
import java.sql.Connection;
import java.util.Date;
@Service
public class DevicesService {
public enum App {
WMS,
Wingest,
Textiles,
Agribook
}
private final Logger logger = LogManager.getLogger();
public void register(App application, String deviceId) throws Exception{
MultiDBTransactionManager multiDBTransactionManager = ContextLoader.getCurrentWebApplicationContext().getBean(MultiDBTransactionManager.class);
EntityProcessor entityProcessor = ContextLoader.getCurrentWebApplicationContext().getBean(EntityProcessor.class);
UserSession userSession = ContextLoader.getCurrentWebApplicationContext().getBean(UserSession.class);
if (!userSession.isAttivo()) {
throw new UsernameNotFoundException("Utente " + userSession.getUsername() + " non riconoscuto!");
}
String appName = application.name();
String selectSql = Query.format("SELECT CAST(COUNT(*) AS BIT) AS exist FROM stb_devices " +
" WHERE identification_id = {}", deviceId);
boolean exists =
UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), selectSql);
if(!exists) {
StbDevices stbDevices = new StbDevices()
.setName(appName)
.setIdentificationId(deviceId)
.setCreatedAt(new Date())
.setLastUse(new Date());
stbDevices.setOperation(OperationType.INSERT_OR_UPDATE);
entityProcessor.processEntity(stbDevices, multiDBTransactionManager);
}
}
public void updateUsage(Connection connection, String deviceId) throws Exception {
String updateSql = Query.format("UPDATE stb_devices " +
" SET last_use = {}" +
" WHERE identification_id = {}", UtilityLocalDate.getNowTime(), deviceId);
UtilityDB.executeSimpleUpdate(connection, updateSql);
}
}

View File

@@ -1,15 +0,0 @@
package it.integry.ems.devices.dto;
public class RegisterDeviceRequestDTO {
private String app;
public String getApp() {
return app;
}
public RegisterDeviceRequestDTO setApp(String app) {
this.app = app;
return this;
}
}

View File

@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.activation.MimetypesFileTypeMap;
import javax.servlet.http.HttpServletResponse;
import java.nio.file.Files;
import java.nio.file.Paths;

View File

@@ -1,6 +1,5 @@
package it.integry.ems.dto;
import java.util.List;
public class ApplicationInfoDTO {
private String name;
@@ -10,7 +9,6 @@ public class ApplicationInfoDTO {
private Short annoContab;
private String loadMenuPvm;
private List<String> salvataggiSoap;
private boolean delimitedIdentifier;
private boolean ansiPadding;
@@ -70,15 +68,6 @@ public class ApplicationInfoDTO {
return this;
}
public List<String> getSalvataggiSoap() {
return salvataggiSoap;
}
public ApplicationInfoDTO setSalvataggiSoap(List<String> salvataggiSoap) {
this.salvataggiSoap = salvataggiSoap;
return this;
}
public boolean isConcatNullYieldsNull() {
return concatNullYieldsNull;
}

View File

@@ -1,15 +1,12 @@
package it.integry.ems.dto;
import com.fasterxml.jackson.annotation.JsonValue;
import it.integry.ems.report.dto.JasperDTO;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.entity.DtbDocPdf;
import it.integry.ems_model.entity.MtbAartLink;
import it.integry.ems_model.entity.MtbUntMis;
import it.integry.ems_model.entity.StbActivityFile;
import it.integry.ems_model.entity._enum.IBaseEnum;
import java.util.HashMap;
import java.util.List;
public class CreateZipDTO {

View File

@@ -95,13 +95,19 @@ public class EntityHierarchy {
}
public static class Field {
public static class Field implements Cloneable {
private java.lang.reflect.Field field;
private PK primaryKey;
private Identity identity;
private SqlField sqlField;
private ImportFromParent importFromParent;
private Priority priority;
private ObjectStorage objectStorage;
private Blob blob;
private Clob clob;
private VarBinary varBinary;
private String fieldName;
public java.lang.reflect.Field getField() {
return field;
@@ -109,13 +115,26 @@ public class EntityHierarchy {
public Field setField(java.lang.reflect.Field field) {
this.field = field;
this.fieldName = field.getName();
return this;
}
public boolean isPrimaryKey() {
return primaryKey != null;
}
public boolean isSqlField() {
return sqlField != null;
}
public boolean isImportFromParent() {
return importFromParent != null;
}
public boolean isPriority() {
return priority != null;
}
public boolean isObjectStorage() {
return objectStorage != null;
}
@@ -132,6 +151,19 @@ public class EntityHierarchy {
return identity != null;
}
public boolean isVarBinary() {
return varBinary != null;
}
public PK getPrimaryKey() {
return primaryKey;
}
public Field setPrimaryKey(PK primaryKey) {
this.primaryKey = primaryKey;
return this;
}
public Identity getIdentity() {
return identity;
}
@@ -150,6 +182,24 @@ public class EntityHierarchy {
return this;
}
public ImportFromParent getImportFromParent() {
return importFromParent;
}
public Field setImportFromParent(ImportFromParent importFromParent) {
this.importFromParent = importFromParent;
return this;
}
public Priority getPriority() {
return priority;
}
public Field setPriority(Priority priority) {
this.priority = priority;
return this;
}
public ObjectStorage getObjectStorage() {
return objectStorage;
}
@@ -176,5 +226,46 @@ public class EntityHierarchy {
this.clob = clob;
return this;
}
public VarBinary getVarBinary() {
return varBinary;
}
public Field setVarBinary(VarBinary varBinary) {
this.varBinary = varBinary;
return this;
}
public String getFieldName() {
return fieldName;
}
@Override
public Field clone() {
try {
Field cloned = (Field) super.clone();
// java.lang.reflect.Field è final, quindi usiamo lo stesso riferimento
cloned.field = this.field;
// Tutte le altre proprietà sono @interface (annotazioni) quindi immutabili
cloned.primaryKey = this.primaryKey;
cloned.identity = this.identity;
cloned.sqlField = this.sqlField;
cloned.importFromParent = this.importFromParent;
cloned.priority = this.priority;
cloned.objectStorage = this.objectStorage;
cloned.blob = this.blob;
cloned.clob = this.clob;
cloned.varBinary = this.varBinary;
// String è immutabile
cloned.fieldName = this.fieldName;
return cloned;
} catch (CloneNotSupportedException e) {
throw new RuntimeException("Errore durante la clonazione del Field", e);
}
}
}
}

View File

@@ -0,0 +1,60 @@
package it.integry.ems.dto;
public class Quartet<A, B, C, D> {
private final A first;
private final B second;
private final C third;
private final D fourth;
public Quartet(A first, B second, C third, D fourth) {
this.first = first;
this.second = second;
this.third = third;
this.fourth = fourth;
}
public A getFirst() {
return first;
}
public B getSecond() {
return second;
}
public C getThird() {
return third;
}
public D getFourth() {
return fourth;
}
public A getValue0() {
return first;
}
public B getValue1() {
return second;
}
public C getValue2() {
return third;
}
public D getValue3() {
return fourth;
}
@Override
public String toString() {
return "Quartet{" +
"first=" + first +
", second=" + second +
", third=" + third +
", fourth=" + fourth +
'}';
}
}

View File

@@ -5,6 +5,7 @@ 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.SettingsModel;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.utility.UtilityDB;
@@ -13,7 +14,6 @@ import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.sql.Connection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -37,7 +37,8 @@ public class DynamicCacheService {
DATI_AZIENDA_KEY,
ENTITY_LOGGER_SETUP,
GRIGLIA_ACQUISTO_KEY,
ENTITY_SYNC_KEY
ENTITY_SYNC_KEY,
STB_GEST_SETUP_KEY
}
public void addItem(Keys key, int invalidateTimeInMins, RunnableWithReturn<Object> refreshAction) {
@@ -46,7 +47,7 @@ public class DynamicCacheService {
}, invalidateTimeInMins * 60 * 1000, "dynamic-cache-" + key);
}
public <T>void addDbItem(Keys key, int invalidateTimeInMins, RunnableArgsWithReturn<Connection, T> refreshAction, List<String> dbNames) {
public <T> void addDbItem(Keys key, int invalidateTimeInMins, RunnableArgsWithReturn<Connection, T> refreshAction, List<String> dbNames) {
List<String> finalDbNames = dbNames.stream().map(String::toLowerCase).collect(Collectors.toList());
RunnableWithReturn<Object> internalRefreshAction = () -> {
@@ -161,13 +162,9 @@ public class DynamicCacheService {
}
private void cacheQueryByDB(String dbName, String profileName, String query, Class<?> clazz, HashMap<String, List<?>> cacheObjectByDB) throws Exception {
MultiDBTransactionManager m = new MultiDBTransactionManager(profileName, false);
try {
try (MultiDBTransactionManager m = new MultiDBTransactionManager(profileName, false)){
List<?> objects = UtilityDB.executeSimpleQueryDTO(m.getPrimaryConnection(), query, clazz);
cacheObjectByDB.putIfAbsent(dbName.toLowerCase(), objects);
} finally {
m.closeAll();
}
}
@@ -183,7 +180,7 @@ public class DynamicCacheService {
return cachedEntityList;
}
public <T>T getDbItem(Keys key, String dbName) {
public <T> T getDbItem(Keys key, String dbName) {
dbName = dbName.toLowerCase();
final HashMap<String, T> cacheObjectByDB = (HashMap<String, T>) cacheData.getOrDefault(key, null);
if (cacheObjectByDB == null) return null;

View File

@@ -37,7 +37,7 @@ public enum EuritmoQtaSpedTypes {
public static String toValue(String type) throws EuritmoException {
try {
EuritmoQtaSpedTypes qtaSpedType = EuritmoQtaSpedTypes.valueOf(type);
if (mapUdm.get(qtaSpedType).size() > 0) {
if (!mapUdm.get(qtaSpedType).isEmpty()) {
return mapUdm.get(qtaSpedType).get(0);
}
} catch (IllegalArgumentException ex) {

View File

@@ -1,8 +1,5 @@
package it.integry.ems.entity_development;
import it.integry.common.var.CommonConstants;
import it.integry.ems.devices.DevicesService;
import it.integry.ems.devices.dto.RegisterDeviceRequestDTO;
import it.integry.ems.entity_development.dto.CreateEntityItemRequestDTO;
import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems.utility.UtilityDebug;

View File

@@ -3,6 +3,8 @@ package it.integry.ems.entity_logger.db_schema_manager.component;
import com.annimon.stream.Stream;
import com.microsoft.sqlserver.jdbc.SQLServerException;
import it.integry.ems.entity_logger.db_schema_manager.dto.*;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems_model.types.TypeDbObject;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityHashMap;
import it.integry.ems_model.utility.UtilityLocalDate;
@@ -10,7 +12,7 @@ import it.integry.ems_model.utility.UtilityString;
import org.apache.commons.lang3.StringUtils;
import java.io.File;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
@@ -38,7 +40,7 @@ public class SQLServerDBSchemaManager {
}
public void connect() throws SQLException {
mConnection = DriverManager.getConnection(getConnectionString(mHost), mUsername, mPassword);
mConnection = Connection.fromConnection(DriverManager.getConnection(getConnectionString(mHost), mUsername, mPassword));
mConnection.setTransactionIsolation(java.sql.Connection.TRANSACTION_READ_UNCOMMITTED);
mConnection.setAutoCommit(false);
}
@@ -390,15 +392,19 @@ public class SQLServerDBSchemaManager {
public void dropTable(DatabaseTable databaseTable) throws Exception {
String dropSql = "DROP TABLE " + databaseTable.getTableName();
execTableAlterSQL(dropSql);
if (UtilityDB.existDatabaseObject(mConnection, databaseTable.getTableName(), TypeDbObject.TABLE)) {
String dropSql = "DROP TABLE " + databaseTable.getTableName();
execTableAlterSQL(dropSql);
}
this.mConnection.commit();
}
public void dropView(DatabaseView databaseTable) throws Exception {
String dropSql = "DROP VIEW " + databaseTable.getTableName();
execTableAlterSQL(dropSql);
if (UtilityDB.existDatabaseObject(mConnection, databaseTable.getTableName(), TypeDbObject.VIEW)) {
String dropSql = "DROP VIEW " + databaseTable.getTableName();
execTableAlterSQL(dropSql);
}
this.mConnection.commit();
}
@@ -530,7 +536,7 @@ public class SQLServerDBSchemaManager {
}
private String getConnectionString(String host) {
return String.format("jdbc:sqlserver://%s;applicationName=%s", host, "EMS Connection");
return String.format("jdbc:sqlserver://%s;applicationName=%s;encrypt=false", host, "EMS Connection");
}
}

View File

@@ -106,7 +106,7 @@ public class EntityLoggerComponent {
}
if (!Stream.of(settingsModel.getAvailableConnections()).anyMatch(x -> x.getDbName().equalsIgnoreCase(destDBName))) {
if (settingsModel.getAvailableConnections().stream().noneMatch(x -> x.getDbName().equalsIgnoreCase(destDBName))) {
settingsModel.addAvailableConnection(new AvailableConnectionsModel()
.setInternalDb(false)
.setHost(dbHost)

View File

@@ -0,0 +1,7 @@
package it.integry.ems.expansion;
public interface RunnableArgss<T, U> {
void run(T data, U data2);
}

View File

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.exc.MismatchedInputException;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
import it.integry.ems.Import.dto.AnomalieDTO;
import it.integry.ems._context.ApplicationContextProvider;
import it.integry.ems.export.enums.EntityExportTipoInvio;
import it.integry.ems.file_sharer.IFileSharer;
import it.integry.ems.file_sharer.IFileSharerAttachment;
@@ -189,7 +190,7 @@ public abstract class BaseEntityExporter implements IEntityExporter {
}
}
if (generatedFiles.size() > 0) {
if (!generatedFiles.isEmpty()) {
entityExportResponse.setResponse(generatedFiles);
success = sendFile(entityExportResponse);
}
@@ -251,7 +252,7 @@ public abstract class BaseEntityExporter implements IEntityExporter {
case WEBSERVICES:
ResponseJSONObjectMapper objectMapper = new ResponseJSONObjectMapper();
ResponseJSONObjectMapper objectMapper = ApplicationContextProvider.getApplicationContext().getBean(ResponseJSONObjectMapper.class);
String url = wtbUserInfo.getWsEndpoint();
@@ -312,6 +313,9 @@ public abstract class BaseEntityExporter implements IEntityExporter {
boolean shouldCreateDirectory = "S".equalsIgnoreCase(wtbUserInfo.getFtpCreateDirectory());
String directory = UtilityString.isNullOrEmpty(wtbUserInfo.getFtpDirectory()) ? "/" : "/" + wtbUserInfo.getFtpDirectory();
if (wtbUserInfo.getFtpRetries() == null || wtbUserInfo.getFtpRetries() == 0)
throw new Exception("Attenzione valorizzare il numero di tentativi");
switch (wtbUserInfo.getFtpType()) {
case 1:
case 3:

View File

@@ -5,16 +5,13 @@ 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.types.OperationType;
import it.integry.ems_model.utility.Query;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityResultSet;
import it.integry.ems_model.utility.UtilityString;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
import org.springframework.web.context.ContextLoader;
import java.io.File;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.text.SimpleDateFormat;

View File

@@ -17,6 +17,7 @@ public enum EntityExportType {
RAPPORTINI("RAPPORTINI"),
VARIAZIONE_PV("VARIAZIONE PV"),
LISTINI_ACQUISTO("LISTINI ACQUISTO"),
LISTINI_VENDITA("LISTINI VENDITA"),
COLLI("COLLI"),
SCADENZE("SCADENZE");

View File

@@ -22,7 +22,7 @@ public class CsvMapper<T> {
private final Map<String, Field> map = new HashMap<String, Field>();
public String serialize(List<T> dtoList, String splitChar, boolean hasHeader ) throws Exception {
if (dtoList == null || dtoList.size() == 0 )
if (dtoList == null || dtoList.isEmpty())
return null;
List<Field> declaredFields = Arrays.asList(dtoList.get(0).getClass().getDeclaredFields());
@@ -32,7 +32,7 @@ public class CsvMapper<T> {
.sortBy(x -> x.getAnnotation(DtoField.class).startPosition())
.toList();
if (sortedFields == null || sortedFields.size() == 0 ) {
if (sortedFields == null || sortedFields.isEmpty()) {
System.out.println("Manca l'annotazione nella classe");
return null;
}

View File

@@ -54,12 +54,24 @@ public class TxtMapper<T> {
if (dtoField.maxLength() > 0 && !UtilityString.isNullOrEmpty(dtoField.fillChar())) {
UtilityString.H_POSITION position;
String segno = "";
int maxLength = dtoField.maxLength();
if (declaredField.getType() == Integer.class || declaredField.getType() == BigDecimal.class) {
position = UtilityString.H_POSITION.LEFT;
if (dtoField.showSign()) {
segno = value.substring(0, 1);
if (segno.equalsIgnoreCase("-") || segno.equalsIgnoreCase("+"))
value = value.substring(1);
else
segno="+";
maxLength = maxLength - 1;
}
} else {
position = UtilityString.H_POSITION.RIGHT;
}
value = UtilityString.fillString(value, dtoField.fillChar().charAt(0), dtoField.maxLength(), position);
value = UtilityString.fillString(value, dtoField.fillChar().charAt(0), maxLength, position);
value = segno + value;
}
if (ignorePosition)
@@ -208,10 +220,13 @@ public class TxtMapper<T> {
if (!UtilityString.isNullOrEmpty(dtoField.moltiplicatore())) {
value = ((BigDecimal) value).multiply(new BigDecimal(dtoField.moltiplicatore()));
}
value = value.toString();
if (!dtoField.showFloatPoint()) value = ((String) value).replaceAll("\\.", "").replaceAll(",", "");
if (!dtoField.showFloatPoint())
value = ((String) value).replaceAll("\\.", "").replaceAll(",", "");
else if (!UtilityString.isNullOrEmpty(dtoField.separator()))
value = ((String) value).replaceAll("\\.", dtoField.separator()).replaceAll(",", dtoField.separator());
} else if (value instanceof Integer) {
value = value.toString();
} else if (value instanceof Boolean) {

View File

@@ -37,7 +37,7 @@ public class RequestDataDTO {
private String requestClientIP;
private String profileDB;
private String deviceId;
private Long deviceId;
private String username;
private String password;
private boolean includeNulls = false;
@@ -55,10 +55,6 @@ public class RequestDataDTO {
profileDB = request.getHeader(CommonConstants.PROFILE_DB);
}
if (request != null && request.getHeader(EmsRestConstants.DEVICE_ID) != null) {
deviceId = request.getHeader(EmsRestConstants.DEVICE_ID);
}
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication != null && !(authentication instanceof AnonymousAuthenticationToken)) {
readAuthenticationClaims(authentication);
@@ -95,12 +91,19 @@ public class RequestDataDTO {
}
}
public static RequestDataDTO systemMockupData() {
return new RequestDataDTO()
.setUsername("dba")
.setPassword("sql");
}
public boolean isValidProfileDB() {
return !UtilityString.isNullOrEmpty(profileDB);
}
public boolean isValidDeviceId() {
return !UtilityString.isNullOrEmpty(deviceId);
return deviceId != null;
}
public boolean isValidUsername() {
@@ -110,6 +113,10 @@ public class RequestDataDTO {
}
public boolean isValidPassword() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication != null && !(authentication instanceof AnonymousAuthenticationToken))
return true;
return !UtilityString.isNullOrEmpty(password);
}
@@ -125,7 +132,7 @@ public class RequestDataDTO {
return profileDB;
}
public String getDeviceId() {
public Long getDeviceId() {
return deviceId;
}
@@ -133,16 +140,18 @@ public class RequestDataDTO {
return username;
}
public void setUsername(String username) {
public RequestDataDTO setUsername(String username) {
this.username = username;
return this;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
public RequestDataDTO setPassword(String password) {
this.password = password;
return this;
}
public boolean shouldIncludeNulls() {
@@ -160,10 +169,10 @@ public class RequestDataDTO {
private void readAuthenticationClaims(Authentication authentication) {
username = authentication.getName();
//final UsernamePasswordAuthenticationToken principal = (UsernamePasswordAuthenticationToken) authentication.getPrincipal();
final AuthTokenDetails authTokenDetails = (AuthTokenDetails) authentication.getDetails();
userDTO = authTokenDetails.getUserDTO();
deviceId = authTokenDetails.getDeviceId();
}
}

View File

@@ -1,7 +1,6 @@
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.servlet.handler.HandlerInterceptorAdapter;

View File

@@ -2,15 +2,16 @@ package it.integry.ems.license;
import com.fasterxml.jackson.core.type.TypeReference;
import it.integry.annotations.PostContextAutowired;
import it.integry.annotations.PostContextConstruct;
import it.integry.ems.datasource.DataSource;
import it.integry.ems.json.ResponseJSONObjectMapper;
import it.integry.ems.looper.service.LooperService;
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.SettingsModel;
import it.integry.ems.sync.MultiDBTransaction.AdvancedDataSource;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.utility.UtilityDebug;
import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.utility.UtilityDB;
@@ -19,11 +20,12 @@ import org.apache.http.entity.ContentType;
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.Connection;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.TimeUnit;
@Component
public class LicenseComponent {
@@ -33,27 +35,46 @@ public class LicenseComponent {
@Autowired
private SettingsModel settingsModel;
@Autowired
private LooperService looperService;
@Autowired
private ResponseJSONObjectMapper jsonObjectMapper;
@PostContextAutowired
private MultiDBTransactionManager multiDBTransactionManager;
private final HashMap<String, LicenseStatusDTO> cachedLicenseStatus = new HashMap<>();
boolean canStart = false;
@PostContextConstruct(priority = 10)
public void init() {
logger.info("Initializing license checker service");
if(UtilityDebug.isDebugExecution() || UtilityDebug.isIntegryServer())
return;
logger.debug("isDebug: " + (UtilityDebug.isDebugExecution() ? "yes" : "no"));
logger.debug("isIntegryServer: " + (UtilityDebug.isIntegryServer() ? "yes" : "no"));
if (!UtilityDebug.isDebugExecution() && !UtilityDebug.isIntegryServer())
looperService.add(this::syncLicense, 60 * 60 * 1000, LicenseComponent.class.getName());
// else
// looperService.add(this::syncLicense, 15 * 1000, LicenseComponent.class.getName());
canStart = true;
this.syncLicense(multiDBTransactionManager);
}
private void syncLicense() {
@Scheduled(fixedDelay = 1, timeUnit = TimeUnit.HOURS)
private void syncLicenseScheduled() {
if (!canStart)
return;
List<AvailableConnectionsModel> availableConnectionsModels = settingsModel.getAvailableConnections(true);
try (MultiDBTransactionManager multiDBTransactionManager = new MultiDBTransactionManager()) {
for (AvailableConnectionsModel model : availableConnectionsModels) {
multiDBTransactionManager.addConnection(model);
}
syncLicense(multiDBTransactionManager);
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
}
}
private void syncLicense(MultiDBTransactionManager multiDBTransactionManager) {
try {
String url = "https://services.studioml.it/ems-api" + EmsRestConstants.PATH_GET_LICENSE_STATUS;
@@ -61,19 +82,12 @@ public class LicenseComponent {
final HashMap<String, String> listAziende = new HashMap<>();
for (AvailableConnectionsModel model : settingsModel.getAvailableConnections()) {
if (model.getInternalDb()) {
for (AdvancedDataSource model : multiDBTransactionManager.getActiveConnections()) {
String sql = "SELECT part_iva FROM azienda WHERE part_iva is not null";
String partIva = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(model.getConnection(), sql);
DataSource ds = new DataSource();
ds.initialize(model.getProfileName());
Connection conn = ds.getConnection();
String sql = "SELECT part_iva FROM azienda WHERE part_iva is not null";
String partIva = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
if (!UtilityString.isNullOrEmpty(partIva)) listAziende.put(model.getProfileName(), partIva);
ds.forceClose();
}
if (!UtilityString.isNullOrEmpty(partIva))
listAziende.put(model.getProfileName(), partIva);
}
String jsonBody = jsonObjectMapper.writeValueAsString(listAziende.values());
@@ -89,8 +103,9 @@ public class LicenseComponent {
if (response.getEsito() == EsitoType.KO) {
throw new Exception(response.getErrorMessage());
} else {
List<LicenseStatusDTO> licenses = response.getDTO(new TypeReference<List<LicenseStatusDTO>>() {});
if(licenses == null) return;
List<LicenseStatusDTO> licenses = response.getDTO(new TypeReference<List<LicenseStatusDTO>>() {
});
if (licenses == null) return;
listAziende.forEach((key, value) -> {
cachedLicenseStatus.remove(key);

View File

@@ -2,19 +2,12 @@ package it.integry.ems.license;
import it.integry.common.var.CommonConstants;
import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems.response.StatusResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jcodec.api.NotImplementedException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import java.util.List;
@RestController
@Scope("request")
@RequestMapping("license")

View File

@@ -6,17 +6,23 @@ import it.integry.ems.menu.dto.MenuConfigDTO;
import it.integry.ems.menu.dto.StbMenuDTO;
import it.integry.ems.menu.dto.StbMenuOpzDTO;
import it.integry.ems.menu.dto.StbTipoAziendaDTO;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems.utility.UtilityDirs;
import it.integry.ems_model.base.EntityPropertyHolder;
import it.integry.ems_model.entity.StbMenu;
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.UtilityLocalDate;
import it.integry.ems_model.utility.UtilityQuery;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -26,17 +32,77 @@ public class MenuStaticCreator {
public static void main(String[] args) throws Exception {
System.out.println("Running the Menu UPDATE");
String connectionString = String.format("jdbc:sqlserver://%s;databaseName=%s;applicationName=%s", "SERVERDB2019", "studioml", "IntelliJ Connection");
String connectionString = String.format("jdbc:sqlserver://%s;databaseName=%s;applicationName=%s;encrypt=false", "SERVERDB2019", "menu", "IntelliJ Connection");
String username = "sa";
String password = "sa";
Connection connection = DriverManager.getConnection(connectionString, username, password);
connection.setTransactionIsolation(java.sql.Connection.TRANSACTION_READ_UNCOMMITTED);
connection.setAutoCommit(false);
EntityPropertyHolder entityPropertyHolder = new EntityPropertyHolder();
entityPropertyHolder.init();
createMenu(connection, UtilityDirs.getDevelopmentMenusFolder());
try (Connection connection = Connection.fromConnection(DriverManager.getConnection(connectionString, username, password))) {
connection.setTransactionIsolation(java.sql.Connection.TRANSACTION_READ_UNCOMMITTED);
connection.setAutoCommit(false);
copyWmsMenuFromGenericaConfig(connection, entityPropertyHolder);
createMenu(connection, UtilityDirs.getDevelopmentMenusFolder());
}
}
private static void copyWmsMenuFromGenericaConfig(Connection connection, EntityPropertyHolder entityPropertyHolder) throws SQLException {
final String wmsRootCodOpz = "MM007";
try {
String sql = Query.format("WITH MenuCTE AS (\n" +
" -- Ancoraggio della ricorsione: Seleziona tutte le opzioni di menu di alto livello (che non hanno un cod_parent)\n" +
" SELECT *,\n" +
" 0 AS Livello -- Livello iniziale\n" +
" FROM " + StbMenu.ENTITY + "\n" +
" WHERE cod_opz = {} AND tipo_azienda = 'GENERICA'\n" +
"\n" +
" UNION ALL\n" +
"\n" +
" -- Ricorsione: Seleziona tutte le opzioni di menu figlie\n" +
" SELECT m.*,\n" +
" c.Livello + 1 AS Livello -- Incrementa il livello per il menu figlio\n" +
" FROM " + StbMenu.ENTITY + " m\n" +
" INNER JOIN\n" +
" MenuCTE c ON m.cod_parent = c.cod_opz AND m.tipo_azienda = c.tipo_azienda)\n" +
"-- Seleziona tutti i risultati dalla CTE ricorsiva\n" +
"SELECT *\n" +
"FROM MenuCTE\n" +
"ORDER BY Livello", wmsRootCodOpz);
final List<StbMenu> stbMenus = UtilityDB.executeSimpleQueryDTO(connection, sql, StbMenu.class);
final List<String> idsToDelete = stbMenus.stream().map(StbMenu::getCodOpz)
.collect(Collectors.toList());
String deleteInOtherAziendaTypes = String.format("DELETE FROM " + StbMenu.ENTITY +
" WHERE cod_opz IN (%s) AND tipo_azienda <> 'GENERICA'", UtilityQuery.concatStringFieldsWithSeparator(idsToDelete, ","));
connection.prepareStatement(deleteInOtherAziendaTypes).executeUpdate();
List<String> tipiAzienda = retrieveTipiAzienda(connection);
for (String tipoAzienda : tipiAzienda) {
for (StbMenu stbMenu : stbMenus) {
stbMenu.setTipoAzienda(tipoAzienda);
stbMenu.setOperation(OperationType.INSERT);
stbMenu.manageWithParentConnection(connection, OperationType.INSERT, null, entityPropertyHolder);
}
}
connection.commit();
} catch (Exception e) {
e.printStackTrace();
connection.rollback();
}
}
public static void createMenu(Connection connection, String menuJsonResourceFolder) throws Exception {
ObjectMapper jsonObjectMapper = new ObjectMapper();
@@ -48,14 +114,14 @@ public class MenuStaticCreator {
final List<StbMenuDTO> stbMenus = UtilityDB.executeSimpleQueryDTO(connection, "SELECT * FROM stb_menu", StbMenuDTO.class);
final Map<String, List<StbMenuDTO>> menusByAzienda = stbMenus.stream().collect(Collectors.groupingBy(StbMenuDTO::getTipoAzienda));
MenuConfigDTO menuConfigDTO = new MenuConfigDTO(Integer.parseInt(CommonConstants.DATESTAMP_YMD_FORMATTER.format(UtilityLocalDate.getNow())))
final long menuVersion = Long.parseLong(CommonConstants.TIMESTAMP_FORMATTER.format(UtilityLocalDate.getNowTime()));
MenuConfigDTO menuConfigDTO = new MenuConfigDTO(menuVersion)
.setStbMenuOpz(stbMenuOpzs)
.setStbTipoAzienda(stbTipoAziendas)
.setMenusByAzienda(menusByAzienda);
writeContentToFile(menuJsonResourceFolder + "menu_config.json", jsonObjectMapper.writeValueAsString(menuConfigDTO), true);
connection.close();
}
@@ -71,4 +137,12 @@ public class MenuStaticCreator {
outputStream.close();
}
private static List<String> retrieveTipiAzienda(Connection connection) throws SQLException {
return UtilityDB.executeSimpleQueryOnlyFirstColumn(connection, "SELECT DISTINCT tipo_azienda\n" +
"FROM stb_menu\n" +
"WHERE tipo_azienda <> 'GENERICA'\n" +
"ORDER BY tipo_azienda");
}
}

View File

@@ -26,8 +26,9 @@ public class MenuConfigurationController {
@RequestMapping(value = "refresh", method = RequestMethod.GET)
public @ResponseBody
ServiceRestResponse refresh(@RequestParam(CommonConstants.PROFILE_DB) String profileDB) throws Exception {
menuConfigurationService.refresh(multiDBTransactionManager.getPrimaryConnection());
ServiceRestResponse refresh(@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestParam(required = false, defaultValue = "false") boolean forceRefresh) throws Exception {
menuConfigurationService.refresh(multiDBTransactionManager.getPrimaryConnection(), forceRefresh);
return ServiceRestResponse.createPositiveResponse();
}

View File

@@ -5,7 +5,7 @@ import java.util.Map;
public class MenuConfigDTO {
private int version;
private long version;
private List<StbMenuOpzDTO> stbMenuOpz;
private List<StbTipoAziendaDTO> stbTipoAzienda;
private Map<String, List<StbMenuDTO>> menusByAzienda;
@@ -13,15 +13,15 @@ public class MenuConfigDTO {
public MenuConfigDTO() {
}
public MenuConfigDTO(int version) {
public MenuConfigDTO(long version) {
this.version = version;
}
public int getVersion() {
public long getVersion() {
return version;
}
public MenuConfigDTO setVersion(int version) {
public MenuConfigDTO setVersion(long version) {
this.version = version;
return this;
}

View File

@@ -9,8 +9,10 @@ import it.integry.ems.menu.dto.MenuConfigDTO;
import it.integry.ems.menu.dto.StbMenuDTO;
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;
import it.integry.ems_model.entity.Azienda;
@@ -26,7 +28,8 @@ import org.springframework.stereotype.Service;
import java.io.IOException;
import java.net.URL;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Date;
import java.util.List;
import static it.integry.ems_model.utility.UtilityDB.executeStatement;
@@ -43,6 +46,9 @@ public class MenuConfigurationService {
@PostContextAutowired
private MultiDBTransactionManager multiDBTransactionManager;
@Autowired
private MailService mailService;
@PostContextConstruct(priority = 5)
public void init() throws Exception {
//if(UtilityDebug.isDebugExecution()) return;
@@ -53,7 +59,7 @@ public class MenuConfigurationService {
for (AdvancedDataSource advancedDataSource : multiDBTransactionManager.getActiveConnections()) {
if (advancedDataSource.getDataSource().getDbName().equalsIgnoreCase("studioml") || isHistoryDB(advancedDataSource))
if (advancedDataSource.getDataSource().getDbName().equalsIgnoreCase("menu") || isHistoryDB(advancedDataSource))
continue;
try {
@@ -74,9 +80,9 @@ public class MenuConfigurationService {
return historyProfileDB.equalsIgnoreCase(advancedDataSource.getProfileName());
}
public void refresh(Connection connection) throws Exception {
public void refresh(Connection connection, boolean forceRefresh) throws Exception {
final MenuConfigDTO menuConfig = loadMenuData();
internalRefresh(connection, menuConfig);
internalRefresh(connection, menuConfig, forceRefresh);
}
private MenuConfigDTO loadMenuData() throws IOException {
@@ -91,111 +97,141 @@ public class MenuConfigurationService {
}
private void internalRefresh(Connection connection, MenuConfigDTO menuConfig) throws Exception {
final Azienda azienda = Azienda.getDefaultAzienda(connection);
int lastMenuUpd = Integer.parseInt(azienda.getLastUpgDbMenu().replace("QM", ""));
internalRefresh(connection, menuConfig, false);
}
if (lastMenuUpd >= menuConfig.getVersion())
private void internalRefresh(Connection connection, MenuConfigDTO menuConfig, boolean forceRefresh) throws Exception {
final Azienda azienda = Azienda.getDefaultAzienda(connection);
if (azienda.getTipoAzienda() == null)
return;
executeStatement(connection, "DELETE FROM stb_menu",
"EXECUTE dbo.DropForeignKey 'azienda', 'stb_tipo_azienda'",
"DELETE FROM stb_tipo_azienda",
"DELETE FROM stb_menu_opz");
final long lastMenuUpd = Long.parseLong(azienda.getLastUpgDbMenu().replace("QM", ""));
String insertStbMenuOpzSQL = "INSERT INTO " + StbMenuOpz.ENTITY + " (cod_opz, " +
"descrizione, gest_name, entity_name, picture_menu, picture_select, object_type, flag_printer_setup, parameter, note, open_type, is_deprecated)" +
" VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
if (!forceRefresh && lastMenuUpd > 0 && lastMenuUpd >= menuConfig.getVersion())
return;
try (SQLServerPreparedStatement insertBulkPs = (SQLServerPreparedStatement) connection.prepareStatement(insertStbMenuOpzSQL)) {
for (StbMenuOpzDTO stbMenuOpzDto : menuConfig.getStbMenuOpz()) {
try {
executeStatement(connection, "DELETE FROM stb_menu",
"EXECUTE dbo.DropForeignKey 'azienda', 'stb_tipo_azienda'",
"DELETE FROM stb_tipo_azienda",
"DELETE FROM stb_menu_opz");
insertBulkPs.setString(1, stbMenuOpzDto.getCodOpz());
insertBulkPs.setString(2, stbMenuOpzDto.getDescrizione());
insertBulkPs.setString(3, stbMenuOpzDto.getGestName());
insertBulkPs.setString(4, stbMenuOpzDto.getEntityName());
insertBulkPs.setString(5, stbMenuOpzDto.getPictureMenu());
insertBulkPs.setString(6, stbMenuOpzDto.getPictureSelect());
insertBulkPs.setString(7, stbMenuOpzDto.getObjectType());
insertBulkPs.setString(8, stbMenuOpzDto.getFlagPrinterSetup());
insertBulkPs.setString(9, stbMenuOpzDto.getParameter());
insertBulkPs.setString(10, stbMenuOpzDto.getNote());
insertBulkPs.setString(11, stbMenuOpzDto.getOpenType());
insertBulkPs.setString(12, stbMenuOpzDto.getIsDeprecated());
String insertStbMenuOpzSQL = "INSERT INTO " + StbMenuOpz.ENTITY + " (cod_opz, " +
"descrizione, gest_name, entity_name, picture_menu, picture_select, object_type, flag_printer_setup, parameter, note, open_type, is_deprecated)" +
" VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
insertBulkPs.addBatch();
}
try (SQLServerPreparedStatement insertBulkPs = (SQLServerPreparedStatement) connection.prepareStatement(insertStbMenuOpzSQL)) {
for (StbMenuOpzDTO stbMenuOpzDto : menuConfig.getStbMenuOpz()) {
insertBulkPs.executeLargeBatch();
}
for (StbTipoAziendaDTO stbTipoAziendaDto : menuConfig.getStbTipoAzienda()) {
StbTipoAzienda stbTipoAzienda = stbTipoAziendaDto.toEntity();
stbTipoAzienda.setOperation(OperationType.INSERT);
stbTipoAzienda.manageWithParentConnection(connection);
}
List<StbMenuDTO> stbMenus = menuConfig.getMenusByAzienda().get(azienda.getTipoAzienda().toUpperCase());
if (stbMenus == null)
logger.error("Nessuna configurazione trovata per il menu " + azienda.getTipoAzienda() + " di " + azienda.getNomeDitta());
else {
String insertStbMenuSql = "INSERT INTO " + StbMenu.ENTITY + " (cod_opz, descrizione, cod_parent, pos, tipo_azienda, flag_attivo, url_descrizione, " +
"pos_tipo_azienda, pos_cliente, descrizione_estesa) " +
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
try (SQLServerPreparedStatement insertBulkPs = (SQLServerPreparedStatement) connection.prepareStatement(insertStbMenuSql)) {
for (StbMenuDTO stbMenuDto : stbMenus) {
insertBulkPs.setString(1, stbMenuDto.getCodOpz());
insertBulkPs.setString(2, stbMenuDto.getDescrizione());
insertBulkPs.setString(3, stbMenuDto.getCodParent());
if(stbMenuDto.getPos() != null) insertBulkPs.setInt(4, stbMenuDto.getPos());
else insertBulkPs.setObject(4, null);
insertBulkPs.setString(5, stbMenuDto.getTipoAzienda());
insertBulkPs.setString(6, stbMenuDto.getFlagAttivo());
insertBulkPs.setString(7, stbMenuDto.getUrlDescrizione());
if(stbMenuDto.getPosTipoAzienda() != null) insertBulkPs.setInt(8, stbMenuDto.getPosTipoAzienda());
else insertBulkPs.setObject(8, null);
if(stbMenuDto.getPosCliente() != null) insertBulkPs.setInt(9, stbMenuDto.getPosCliente());
else insertBulkPs.setObject(9, null);
insertBulkPs.setString(10, stbMenuDto.getDescrizioneEstesa());
insertBulkPs.setString(1, stbMenuOpzDto.getCodOpz());
insertBulkPs.setString(2, stbMenuOpzDto.getDescrizione());
insertBulkPs.setString(3, stbMenuOpzDto.getGestName());
insertBulkPs.setString(4, stbMenuOpzDto.getEntityName());
insertBulkPs.setString(5, stbMenuOpzDto.getPictureMenu());
insertBulkPs.setString(6, stbMenuOpzDto.getPictureSelect());
insertBulkPs.setString(7, stbMenuOpzDto.getObjectType());
insertBulkPs.setString(8, stbMenuOpzDto.getFlagPrinterSetup());
insertBulkPs.setString(9, stbMenuOpzDto.getParameter());
insertBulkPs.setString(10, stbMenuOpzDto.getNote());
insertBulkPs.setString(11, stbMenuOpzDto.getOpenType());
insertBulkPs.setString(12, stbMenuOpzDto.getIsDeprecated());
insertBulkPs.addBatch();
}
insertBulkPs.executeLargeBatch();
}
for (StbTipoAziendaDTO stbTipoAziendaDto : menuConfig.getStbTipoAzienda()) {
StbTipoAzienda stbTipoAzienda = stbTipoAziendaDto.toEntity();
stbTipoAzienda.setOperation(OperationType.INSERT);
stbTipoAzienda.manageWithParentConnection(connection);
}
List<StbMenuDTO> stbMenus = menuConfig.getMenusByAzienda().get(azienda.getTipoAzienda().toUpperCase());
if (stbMenus == null) {
String message = String.format("Nessuna configurazione trovata per il menu %s di %s", azienda.getTipoAzienda(), azienda.getNomeDitta());
Exception exception = new Exception(message);
mailService.sendSystemErrorLog(
String.format("[%s] Refresh menu", azienda.getNomeDitta()),
"Refresh menu",
"Errore durante il refresh menu",
exception,
new Date()
);
throw exception;
} else {
String insertStbMenuSql = "INSERT INTO " + StbMenu.ENTITY + " (cod_opz, descrizione, cod_parent, pos, tipo_azienda, flag_attivo, url_descrizione, " +
"pos_tipo_azienda, pos_cliente, descrizione_estesa) " +
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
try (SQLServerPreparedStatement insertBulkPs = (SQLServerPreparedStatement) connection.prepareStatement(insertStbMenuSql)) {
for (StbMenuDTO stbMenuDto : stbMenus) {
insertBulkPs.setString(1, stbMenuDto.getCodOpz());
insertBulkPs.setString(2, stbMenuDto.getDescrizione());
insertBulkPs.setString(3, stbMenuDto.getCodParent());
if (stbMenuDto.getPos() != null) insertBulkPs.setInt(4, stbMenuDto.getPos());
else insertBulkPs.setObject(4, null);
insertBulkPs.setString(5, stbMenuDto.getTipoAzienda());
insertBulkPs.setString(6, stbMenuDto.getFlagAttivo());
insertBulkPs.setString(7, stbMenuDto.getUrlDescrizione());
if (stbMenuDto.getPosTipoAzienda() != null)
insertBulkPs.setInt(8, stbMenuDto.getPosTipoAzienda());
else insertBulkPs.setObject(8, null);
if (stbMenuDto.getPosCliente() != null) insertBulkPs.setInt(9, stbMenuDto.getPosCliente());
else insertBulkPs.setObject(9, null);
insertBulkPs.setString(10, stbMenuDto.getDescrizioneEstesa());
insertBulkPs.addBatch();
}
insertBulkPs.executeLargeBatch();
}
}
short aziendaUpdDbColumnLength = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection,
"SELECT COL_LENGTH('azienda','last_upg_db_menu') AS column_length");
if (aziendaUpdDbColumnLength != 16) {
executeStatement(connection, "ALTER TABLE azienda ALTER COLUMN last_upg_db_menu VARCHAR(16)");
}
executeStatement(connection, "ALTER TABLE azienda ADD CONSTRAINT FK_azienda_stb_tipo_azienda FOREIGN KEY (tipo_azienda) REFERENCES stb_tipo_azienda ( tipo_azienda )",
"DELETE FROM stb_abil WHERE cod_opz not in (select cod_opz from stb_menu_opz )",
"INSERT INTO stb_Abil SELECT opz2Abil.cod_parent AS cod_opz, opz2Abil.user_name, 'S' flag_Abil, NULL gest_name\n" +
"FROM (SELECT DISTINCT opz.cod_parent, abil.user_name\n" +
" FROM stb_menu opz\n" +
" LEFT OUTER JOIN stb_menu root ON opz.cod_parent = root.cod_opz,\n" +
" stb_abil Abil,\n" +
" azienda\n" +
" WHERE opz.cod_parent <> 'ROOT'\n" +
" AND ISNULL(root.cod_parent, '') <> 'WM002'\n" +
" AND opz.cod_opz = abil.cod_opz\n" +
" AND opz.tipo_azienda = azienda.tipo_azienda\n" +
" AND abil.flag_Abil <> 'N') Opz2Abil\n" +
" LEFT OUTER JOIN stb_Abil ON stb_Abil.cod_opz = Opz2Abil.cod_parent AND stb_abil.user_name = Opz2Abil.user_name\n" +
"WHERE stb_abil.cod_opz IS NULL",
"UPDATE azienda SET last_upg_db_menu = " + UtilityDB.valueToString(String.valueOf(menuConfig.getVersion())));
connection.commit();
} catch (SQLException e) {
connection.rollback();
throw e;
}
executeStatement(connection, "ALTER TABLE azienda ADD CONSTRAINT FK_azienda_stb_tipo_azienda FOREIGN KEY (tipo_azienda) REFERENCES stb_tipo_azienda ( tipo_azienda )",
"DELETE FROM stb_abil WHERE cod_opz not in (select cod_opz from stb_menu_opz )",
"INSERT INTO stb_Abil SELECT opz2Abil.cod_parent AS cod_opz, opz2Abil.user_name, 'S' flag_Abil, NULL gest_name\n" +
"FROM (SELECT DISTINCT opz.cod_parent, abil.user_name\n" +
" FROM stb_menu opz\n" +
" LEFT OUTER JOIN stb_menu root ON opz.cod_parent = root.cod_opz,\n" +
" stb_abil Abil,\n" +
" azienda\n" +
" WHERE opz.cod_parent <> 'ROOT'\n" +
" AND ISNULL(root.cod_parent, '') <> 'WM002'\n" +
" AND opz.cod_opz = abil.cod_opz\n" +
" AND opz.tipo_azienda = azienda.tipo_azienda\n" +
" AND abil.flag_Abil <> 'N') Opz2Abil\n" +
" LEFT OUTER JOIN stb_Abil ON stb_Abil.cod_opz = Opz2Abil.cod_parent AND stb_abil.user_name = Opz2Abil.user_name\n" +
"WHERE stb_abil.cod_opz IS NULL",
"UPDATE azienda SET last_upg_db_menu = " + UtilityDB.valueToString(menuConfig.getVersion()));
connection.commit();
}
public void generate() throws Exception {
try (MultiDBTransactionManager studioMlMultiDb = new MultiDBTransactionManager("INTEGRY")) {
try (MultiDBTransactionManager studioMlMultiDb = new MultiDBTransactionManager("MENU")) {
MenuStaticCreator.createMenu(studioMlMultiDb.getPrimaryConnection(), UtilityDirs.getDevelopmentMenusFolder());
}
}

View File

@@ -1,6 +1,5 @@
package it.integry.ems.migration;
import com.annimon.stream.Stream;
import com.gentlyweb.utils.GeneralUtils;
import it.integry.annotations.PostContextAutowired;
import it.integry.annotations.PostContextConstruct;
@@ -59,7 +58,7 @@ public class MigrationComponent {
private final HashMap<String, Boolean> migrationsErrorMapByProfiles = new HashMap<>();
@PostContextConstruct
public void init() {
public void init() throws Exception {
Reflections reflections = new Reflections("it.integry.ems.migration.model");
allMigrationsList = reflections.get(SubTypes.of(MigrationModelInterface.class).asClass())
@@ -75,67 +74,66 @@ public class MigrationComponent {
startMigrationsGlobally(multiDBTransactionManager);
}
public void startMigrationsGlobally(MultiDBTransactionManager multiDBTransactionManager) {
public void startMigrationsGlobally(MultiDBTransactionManager multiDBTransactionManager) throws Exception {
List<AdvancedDataSource> advancedDataSources;
try {
advancedDataSources = multiDBTransactionManager.getActiveConnections();
advancedDataSources = Stream.of(advancedDataSources)
advancedDataSources = advancedDataSources.stream()
.filter(AdvancedDataSource::isInternalDb)
.toList();
} catch (Exception e) {
.collect(Collectors.toList());
} catch (SQLException e) {
advancedDataSources = new ArrayList<>();
e.printStackTrace();
logger.error("MigrationService - Init", e);
}
Exception firstException = null;
for (final AdvancedDataSource advancedDataSource : advancedDataSources) {
executeMigrationGroup(advancedDataSource);
try {
executeMigrationGroup(advancedDataSource);
} catch (Exception e) {
if(firstException == null) firstException = e;
logger.error("MigrationService (" + advancedDataSource.getProfileName() + ")", e);
}
}
// if(firstException != null)
// throw firstException;
}
public void executeMigrationGroup(AdvancedDataSource advancedDataSource) {
try {
migrateStatus(advancedDataSource);
List<StbMigrationStatus> migrationStatuses = retrieveAllMigrationsStatus(advancedDataSource);
public void executeMigrationGroup(AdvancedDataSource advancedDataSource) throws Exception {
migrateStatus(advancedDataSource);
List<StbMigrationStatus> migrationStatuses = retrieveAllMigrationsStatus(advancedDataSource);
for (Class<? extends MigrationModelInterface> migrationClass : allMigrationsList) {
long migrationNumber = Long.parseLong(migrationClass.getSimpleName().replace("Migration_", ""));
for (Class<? extends MigrationModelInterface> migrationClass : allMigrationsList) {
long migrationNumber = Long.parseLong(migrationClass.getSimpleName().replace("Migration_", ""));
if (migrationStatuses.stream().anyMatch(x -> x.getMigrationCode() == migrationNumber && (x.isCompleted() || x.isSkipped())))
continue;
if (migrationStatuses.stream().anyMatch(x -> x.getMigrationCode() == migrationNumber && (x.isCompleted() || x.isSkipped())))
continue;
try {
executeMigration(migrationClass, advancedDataSource, settingsController, settingsModel, droolsDataCompleting);
updateLastMigrationIntoDB(advancedDataSource, migrationNumber);
advancedDataSource.getConnection().commit();
} catch (Exception e) {
try {
//LocalDateTime startTime = UtilityLocalDate.getNowTime();
executeMigration(migrationClass, advancedDataSource, settingsController, settingsModel, droolsDataCompleting);
//logger.debug("MIGRATION TIME: " + ChronoUnit.SECONDS.between(startTime, UtilityLocalDate.getNowTime()));
updateLastMigrationIntoDB(advancedDataSource, migrationNumber);
advancedDataSource.getConnection().commit();
} catch (Exception e) {
try {
advancedDataSource.getConnection().rollback();
} catch (Exception ex) {
ex.printStackTrace();
logger.error("MigrationService - Rollback", ex);
}
trackMigrationError(advancedDataSource, migrationNumber, e);
break;
advancedDataSource.getConnection().rollback();
} catch (Exception ex) {
ex.printStackTrace();
logger.error("MigrationService - Rollback", ex);
}
trackMigrationError(advancedDataSource, migrationNumber, e);
throw e;
}
migrationsErrorMapByProfiles.putIfAbsent(advancedDataSource.getProfileName(), false);
migrationsErrorMapByProfiles.replace(advancedDataSource.getProfileName(), false);
} catch (Exception e) {
logger.error("MigrationService (" + advancedDataSource.getProfileName() + ")", e);
e.printStackTrace();
}
migrationsErrorMapByProfiles.putIfAbsent(advancedDataSource.getProfileName(), false);
migrationsErrorMapByProfiles.replace(advancedDataSource.getProfileName(), false);
}
private void executeMigration(Class<? extends MigrationModelInterface> migrationClass,
@@ -222,7 +220,8 @@ public class MigrationComponent {
}
private List<StbMigrationStatus> retrieveAllMigrationsStatus(AdvancedDataSource advancedDataSource) throws SQLException, IOException, DataConverterNotFoundException, InstantiationException, IllegalAccessException {
private List<StbMigrationStatus> retrieveAllMigrationsStatus(AdvancedDataSource advancedDataSource) throws
SQLException, IOException, DataConverterNotFoundException, InstantiationException, IllegalAccessException {
String sql = "SELECT * FROM " + StbMigrationStatus.ENTITY;
List<StbMigrationStatus> stbMigrationStatuses = UtilityDB.executeSimpleQueryDTO(advancedDataSource.getConnection(), sql, StbMigrationStatus.class);
@@ -261,6 +260,7 @@ public class MigrationComponent {
.setSkipped(false)
.setErrorMessage(e.getMessage() + "\n" + exceptionTraceAsString);
stbMigrationStatus.manageWithParentConnection(advancedDataSource.getConnection());
advancedDataSource.getConnection().commit();
if (UtilityDebug.isDebugExecution() || UtilityDebug.isIntegryServer()) return;

View File

@@ -1,12 +1,13 @@
package it.integry.ems.migration._base;
import com.fasterxml.jackson.core.type.TypeReference;
import it.integry.ems._context.ApplicationContextProvider;
import it.integry.ems.migration.dto.SqlObjectTypeEnum;
import it.integry.ems.schedule.new_cron_job.dto.operations.base_classes.BaseScheduledOperationDTO;
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;
import it.integry.ems_model.entity.StbGestSetup;
@@ -24,9 +25,14 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.web.context.ContextLoader;
import javax.validation.constraints.NotNull;
import java.io.IOException;
import java.sql.*;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
public abstract class BaseMigration implements MigrationModelInterface {
@@ -47,9 +53,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
}
protected <R> R getContextBean(Class<R> clazz) {
TypeReference<R> type = new TypeReference<R>() {
};
return ContextLoader.getCurrentWebApplicationContext().getBean(clazz);
return ApplicationContextProvider.getApplicationContext().getBean(clazz);
}
protected boolean isHistoryDB() throws Exception {
@@ -57,11 +61,19 @@ public abstract class BaseMigration implements MigrationModelInterface {
return historyProfileDB.equalsIgnoreCase(advancedDataSource.getProfileName());
}
protected boolean isDebug() throws Exception {
protected boolean isDebug() {
return UtilityDebug.isDebugExecution();
}
protected @NotNull List<HashMap<String, Object>> executeQuery(String sql) throws SQLException, IOException {
return UtilityDB.executeSimpleQuery(advancedDataSource.getConnection(), sql);
}
protected @NotNull <T> List<T> executeQueryDTO(String sql, Class<T> clazz) throws Exception {
return UtilityDB.executeSimpleQueryDTO(advancedDataSource.getConnection(), sql, clazz);
}
protected void executeStatement(String... sqls) throws SQLException, IOException {
executeStatement(advancedDataSource.getConnection(), sqls);
}
@@ -105,10 +117,22 @@ public abstract class BaseMigration implements MigrationModelInterface {
dropObject(SqlObjectTypeEnum.FUNCTION, objectName);
}
protected void dropProcedure(String objectName) throws SQLException, IOException {
dropObject(SqlObjectTypeEnum.PROCEDURE, objectName);
}
protected void dropView(String objectName) throws SQLException, IOException {
dropObject(SqlObjectTypeEnum.VIEW, objectName);
}
protected void createOrUpdateView(String objectName, String createViewSql) throws SQLException, IOException {
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 void createOrUpdateProcedure(String objectName, String createProcedureSql) throws SQLException, IOException {
alterObject(SqlObjectTypeEnum.PROCEDURE, objectName, createProcedureSql);
}
@@ -129,7 +153,11 @@ public abstract class BaseMigration implements MigrationModelInterface {
}
protected void createIndex(IndexTableDTO indexTableDTO) throws Exception {
UtilityDB.createIndex(advancedDataSource.getConnection(), indexTableDTO );
UtilityDB.createIndex(advancedDataSource.getConnection(), indexTableDTO);
}
protected void dropIndex(String tableName, String indexName) throws Exception {
UtilityDB.dropIndex(advancedDataSource.getConnection(), tableName, indexName);
}
@@ -150,8 +178,11 @@ public abstract class BaseMigration implements MigrationModelInterface {
}
protected void renameColumn(String tableName, String oldColumnname, String newColumnName) throws SQLException, IOException {
String sql = "exec sp_rename 'dbo." + tableName + "." + oldColumnname + "', " + newColumnName + ", 'COLUMN'";
executeStatement(sql);
if (existsColumn(tableName, oldColumnname)) {
String sql =
"exec sp_rename 'dbo." + tableName + "." + oldColumnname + "', " + newColumnName + ", 'COLUMN'";
executeStatement(sql);
}
}
protected void dropColumn(String tableName, String columnName) throws SQLException, IOException {
@@ -170,6 +201,38 @@ public abstract class BaseMigration implements MigrationModelInterface {
executeStatement(Query.format("ALTER TABLE dbo." + tableName + " ADD DEFAULT (%s) FOR " + columnName, defaultValue));
}
protected void dropDefault(String tableName, String columnName) throws SQLException, IOException {
boolean existDefault = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(),
Query.format("SELECT CAST(COUNT(*) AS BIT)\n" +
"FROM sys.syscolumns\n" +
"WHERE name = %s\n" +
" AND OBJECT_NAME(id) = %s\n" +
" AND cdefault <> 0", columnName, tableName));
if (existDefault) {
executeStatement(Query.format("EXEC DropDefault %s, %s", tableName, columnName));
}
}
protected void dropChecks(String tableName, String columnName) throws SQLException, IOException {
boolean checkExists = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(),
Query.format("SELECT CAST(COUNT(*) AS BIT)\n" +
"FROM sys.objects obj_table\n" +
" JOIN sys.objects obj_Constraint\n" +
" ON obj_table.object_id = obj_Constraint.parent_object_id\n" +
" JOIN sys.sysconstraints constraints\n" +
" ON constraints.constid = obj_Constraint.object_id\n" +
" JOIN sys.columns columns\n" +
" ON columns.object_id = obj_table.object_id\n" +
" AND columns.column_id = constraints.colid\n" +
"WHERE obj_Constraint.type = 'C'\n" +
" AND obj_table.NAME = %s\n" +
" AND columns.NAME = %s", tableName, columnName));
if (checkExists) {
executeStatement(Query.format("EXEC DropChecks %s, %s", tableName, columnName));
}
}
protected boolean existsTable(String tableName) throws SQLException, IOException {
String schema = null;
@@ -188,8 +251,10 @@ public abstract class BaseMigration implements MigrationModelInterface {
}
protected void dropTable(String tableName) throws SQLException, IOException {
String dropSql = "DROP TABLE " + tableName;
executeStatement(dropSql);
if (existsTable(tableName)) {
String dropSql = "DROP TABLE " + tableName;
executeStatement(dropSql);
}
}
protected void createSetupQuery(String codQuery, String name, String query) throws SQLException, IOException {
@@ -394,6 +459,23 @@ public abstract class BaseMigration implements MigrationModelInterface {
stbGestSetup.manageWithParentConnection(advancedDataSource.getConnection());
}
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(),
Query.format("SELECT cod_query FROM stb_gest_setup_query WHERE query_default = %s", query));
}
StbGestSetup stbGestSetup = new StbGestSetup()
.setGestName(gestName)
.setSection(section)
.setKeySection(keySection)
.setQueryDefault(codQuery);
stbGestSetup.setOperation(OperationType.UPDATE);
stbGestSetup.manageWithParentConnection(advancedDataSource.getConnection());
}
protected void addAutomatedOperation(BaseScheduledOperationDTO operation) {
new Thread(() -> {
try {
@@ -459,7 +541,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
protected void enableSaveToRest(String gestName) throws Exception {
boolean existRow =
UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(),
Query.format("SELECT cast(count(*) as bit) FROM stb_gest_sync WHERE gest_name = %s", gestName));
Query.format("SELECT cast(count(*) as bit) FROM stb_gest_sync WHERE gest_name = %s", gestName));
StbGestSync gestSync =
new StbGestSync()
@@ -467,7 +549,7 @@ public abstract class BaseMigration implements MigrationModelInterface {
.setSyncronize("R");
if (existRow) {
gestSync.setOperation(OperationType.UPDATE);
} else{
} else {
String entityName =
UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(advancedDataSource.getConnection(),
Query.format("SELECT entity_name FROM stb_menu_opz WHERE gest_name = %s", gestName));

View File

@@ -1,10 +1,14 @@
package it.integry.ems.migration._base;
import java.util.Arrays;
public enum IntegryCustomer {
Agricoper(IntegryCustomerDB.Agricoper_Agricoper,
IntegryCustomerDB.Agricoper_IlVisone,
IntegryCustomerDB.Agricoper_Luva),
ATI(IntegryCustomerDB.ATI_Finpart),
Auricchio(IntegryCustomerDB.Auricchio_Auricchio,
IntegryCustomerDB.Auricchio_AuricchioMiki,
IntegryCustomerDB.Auricchio_AuricchioSrl,
@@ -13,7 +17,8 @@ public enum IntegryCustomer {
IntegryCustomerDB.Auricchio_Ind04,
IntegryCustomerDB.Auricchio_Ind05,
IntegryCustomerDB.Auricchio_AuricchioSons),
Biolevante(IntegryCustomerDB.Biolevante_Biolevante),
Biolevante(IntegryCustomerDB.Biolevante_Biolevante,
IntegryCustomerDB.Biolevante_BiolevanteStorico),
Carelli(IntegryCustomerDB.Carelli_Carelli,
IntegryCustomerDB.Carelli_GestFood,
IntegryCustomerDB.Carelli_Chiuso,
@@ -65,12 +70,15 @@ public enum IntegryCustomer {
IntegryCustomerDB.Gramm_PrimeOlive,
IntegryCustomerDB.Gramm_ProveStage),
Idrotecnica(IntegryCustomerDB.Idrotecnica_Idrotecnica),
Igood(IntegryCustomerDB.Igood_Igood,
Igood(IntegryCustomerDB.Igood_Aida,
IntegryCustomerDB.Igood_Igood,
IntegryCustomerDB.Igood_ShopService),
Ime(IntegryCustomerDB.Ime_ImeTe),
Integry(IntegryCustomerDB.Integry_Studioml),
Integry_Demo(IntegryCustomerDB.IntegryDemo_OFDemo, IntegryCustomerDB.IntegryDemo_Menu),
Ivr(IntegryCustomerDB.Ivr_Vetta, IntegryCustomerDB.Ivr_Varci),
Lamonarca(IntegryCustomerDB.Lamonarca_Lamonarca),
Lippolis(IntegryCustomerDB.Lippolis_SGSRL),
Levanplast(IntegryCustomerDB.Levanplast_Levanplast,
IntegryCustomerDB.Levanplast_Perilflor,
IntegryCustomerDB.Levanplast_PerilflorSrl),
@@ -80,9 +88,11 @@ public enum IntegryCustomer {
MFI(IntegryCustomerDB.MFI_FashionGroup),
Midel(IntegryCustomerDB.Midel_Midel),
Morgante(IntegryCustomerDB.Morgante_Morgante),
ResinaColor(IntegryCustomerDB.ResinaColor_ResinaColor),
Mucci(IntegryCustomerDB.Mucci_Mucci),
Querceta(IntegryCustomerDB.Querceta_MasserieAmiche),
ResinaColor(IntegryCustomerDB.ResinaColor_ResinaColor, IntegryCustomerDB.ResinaColor_ResinaColorPasquale),
RistoCash(IntegryCustomerDB.RistoCash_RistoCash),
RossoGargano(IntegryCustomerDB.RossoGargano_RossoGargano),
RossoGargano(IntegryCustomerDB.RossoGargano_RossoGargano, IntegryCustomerDB.RossoGargano_RossoGarganoCont),
Salpar(IntegryCustomerDB.Salpar_AlfaImmobiliare,
IntegryCustomerDB.Salpar_MasabaSrl,
IntegryCustomerDB.Salpar_Salpar,
@@ -130,4 +140,13 @@ public enum IntegryCustomer {
public IntegryCustomerDB[] getValues() {
return values;
}
public static IntegryCustomer getFromDB(IntegryCustomerDB customerDB) {
if(customerDB == null)
return null;
return Arrays.stream(values()).filter(x -> Arrays.stream(x.getValues()).anyMatch(y -> y == customerDB))
.findFirst()
.orElse(null);
}
}

View File

@@ -1,11 +1,15 @@
package it.integry.ems.migration._base;
import it.integry.ems_model.utility.UtilityString;
import java.util.Arrays;
public enum IntegryCustomerDB {
Agricoper_Agricoper("agricoper"),
Agricoper_IlVisone("ilvisone"),
Agricoper_Luva("ilvisone"),
Agricoper_Luva("luva"),
ATI_Finpart("Finpart"),
Auricchio_Auricchio("auricchio"),
Auricchio_AuricchioMiki("auricchio_miki"),
Auricchio_AuricchioSrl("auricchiosrl"),
@@ -17,6 +21,7 @@ public enum IntegryCustomerDB {
Biolevante_Biolevante("biolevante"),
Biolevante_BiolevanteStorico("biolevante_storico"),
Carelli_Carelli("carelli"),
@@ -90,6 +95,7 @@ public enum IntegryCustomerDB {
Idrotecnica_Idrotecnica("idrotecnica"),
Igood_Aida("aida"),
Igood_Igood("igood"),
Igood_ShopService("shop_service"),
@@ -98,6 +104,8 @@ public enum IntegryCustomerDB {
Integry_Studioml("studioml"),
IntegryDemo_Menu("menu"),
IntegryDemo_OFDemo("of_demo"),
Ivr_Vetta("vetta"),
@@ -106,6 +114,8 @@ public enum IntegryCustomerDB {
Lamonarca_Lamonarca("lamonarca"),
Lippolis_SGSRL("sgsrl"),
Levanplast_Perilflor("perilflor"),
Levanplast_PerilflorSrl("perilflorsrl"),
@@ -128,13 +138,20 @@ public enum IntegryCustomerDB {
Morgante_Morgante("morgante"),
ResinaColor_ResinaColor("resinacolor"),
Mucci_Mucci("mucci"),
Querceta_MasserieAmiche("masserieamiche"),
ResinaColor_ResinaColor("resinacolor"),
ResinaColor_ResinaColorPasquale("resinacolor_pasquale"),
RistoCash_RistoCash("risto_cash"),
RossoGargano_RossoGargano("rossogargano"),
RossoGargano_RossoGarganoCont("rossogarganocont"),
Salpar_VgAlimenti("vgalimenti"),
@@ -181,7 +198,7 @@ public enum IntegryCustomerDB {
Tosca_Vr("tosca_vr"),
Tosca_Rg("tosca_rg"),
Tosca_Fc("tosca_fc"),
Tosca_Cloud("tosca_cloud"),
Tosca_Cloud("tosca-primary-db"),
TwoBrothers_TwoBrothers("twobrothers"),
@@ -201,4 +218,13 @@ public enum IntegryCustomerDB {
public String getValue() {
return value;
}
public static IntegryCustomerDB parse(String value) {
if(UtilityString.isNullOrEmpty(value))
return null;
return Arrays.stream(values()).filter(x -> x.getValue().equalsIgnoreCase(value))
.findFirst()
.orElse(null);
}
}

View File

@@ -1,10 +1,10 @@
package it.integry.ems.system.controller;
package it.integry.ems.migration.controller;
import it.integry.ems.migration.dto.SqlObjectDTO;
import it.integry.ems.migration.service.SystemMigrationService;
import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems.system.dto.SqlObjectDTO;
import it.integry.ems.system.service.SystemMigrationService;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.utility.UtilityDebug;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.entity.StbGestSetup;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
@@ -21,6 +21,9 @@ public class SystemMigrationController {
@Autowired
private SystemMigrationService systemMigrationService;
@Autowired
private MultiDBTransactionManager multiDBTransactionManager;
@RequestMapping(value = "createFromExistingObjects", method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse createFromExistingObjects(@RequestParam String objectsToCreate) throws Exception {
@@ -33,7 +36,7 @@ public class SystemMigrationController {
final String[] split = objectsToCreate.split("\\|");
final List<SqlObjectDTO> querySyntaxFromExistingObjects = systemMigrationService.createQuerySyntaxFromExistingObjects(split);
final List<SqlObjectDTO> querySyntaxFromExistingObjects = systemMigrationService.createQuerySyntaxFromExistingObjects(multiDBTransactionManager.getPrimaryConnection(), split);
systemMigrationService.createMigrationFileFromSqlObjects(querySyntaxFromExistingObjects);

View File

@@ -1,6 +1,4 @@
package it.integry.ems.system.dto;
import it.integry.ems.migration.dto.SqlObjectTypeEnum;
package it.integry.ems.migration.dto;
public class SqlObjectDTO {

View File

@@ -5,7 +5,8 @@ import it.integry.ems.migration._base.MigrationModelInterface;
import it.integry.ems.settings.Model.AvailableConnectionsModel;
import it.integry.ems_model.utility.UtilityDB;
import java.sql.Connection;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import java.sql.DriverManager;
import java.sql.Statement;
import java.util.List;
@@ -28,7 +29,7 @@ public class Migration_20210721093948 extends BaseMigration implements Migration
String connectionString = String.format("jdbc:sqlserver://%s;applicationName=%s", dbHost, "EMS Connection");
Connection connection = DriverManager.getConnection(connectionString, dbUsername, dbPassword);
Connection connection = Connection.fromConnection(DriverManager.getConnection(connectionString, dbUsername, dbPassword));
String sqlSessions = "SELECT conn.session_id " +
"FROM sys.dm_exec_sessions AS sess " +

View File

@@ -5,7 +5,8 @@ import it.integry.ems.migration._base.MigrationModelInterface;
import it.integry.ems.settings.Model.AvailableConnectionsModel;
import it.integry.ems_model.utility.UtilityDB;
import java.sql.Connection;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import java.sql.DriverManager;
import java.sql.Statement;
import java.util.List;
@@ -29,7 +30,7 @@ public class Migration_20210924152555 extends BaseMigration implements Migration
String connectionString = String.format("jdbc:sqlserver://%s;applicationName=%s", dbHost, "EMS Connection");
Connection connection = DriverManager.getConnection(connectionString, dbUsername, dbPassword);
Connection connection = Connection.fromConnection(DriverManager.getConnection(connectionString, dbUsername, dbPassword));
String sqlSessions = "SELECT conn.session_id " +
"FROM sys.dm_exec_sessions AS sess " +

View File

@@ -13,7 +13,8 @@ import it.integry.ems_model.utility.UtilityString;
import org.json.JSONArray;
import org.json.JSONObject;
import java.sql.Connection;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;

View File

@@ -14,7 +14,8 @@ import it.integry.ems_model.utility.UtilityString;
import org.json.JSONArray;
import org.json.JSONObject;
import java.sql.Connection;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;

View File

@@ -30,10 +30,8 @@ public class Migration_20230411163906 extends BaseMigration implements Migration
"WHERE mime_type IS NULL");
new Thread(() -> {
try {
String profileDb = advancedDataSource.getProfileName();
MultiDBTransactionManager mdb = new MultiDBTransactionManager(profileDb, false);
String profileDb = advancedDataSource.getProfileName();
try (MultiDBTransactionManager mdb = new MultiDBTransactionManager(profileDb, false)) {
for (HashMap<String, Object> stbFileAttached : stbFilesAttached) {
final MediaType mimeType = mimeTypesHandler.getContentType((String) stbFileAttached.get("file_name"));
@@ -41,7 +39,6 @@ public class Migration_20230411163906 extends BaseMigration implements Migration
Query.format("UPDATE stb_files_attached SET mime_type = {} WHERE id_attach = {}", mimeType.toString(), stbFileAttached.get("id_attach")));
}
mdb.commitAll();
mdb.closeAll();
} catch (Exception e) {
throw new RuntimeException(e);
}

View File

@@ -8,7 +8,9 @@ import it.integry.ems_model.utility.UtilityHashMap;
import javax.validation.constraints.NotNull;
import java.io.IOException;
import java.sql.Connection;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
@@ -50,8 +52,8 @@ public class Migration_20240212000000 extends BaseMigration implements Migration
Long newParentId = getNewGeneratedIdFromOldKey(oldId, oldStbPublications);
String insertSql = Query.format("INSERT INTO stb_publications_detail " +
"(stb_publication_id, entity_name, where_cond_sql, recalc_columns, active, where_cond, ready_to_transmit) " +
"VALUES (%s, %s, %s, %s, %s, %s, %s)",
"(stb_publication_id, entity_name, where_cond_sql, recalc_columns, active, where_cond, ready_to_transmit) " +
"VALUES (%s, %s, %s, %s, %s, %s, %s)",
newParentId,
entityName,
whereCondSql,

View File

@@ -1,15 +1,9 @@
package it.integry.ems.migration.model;
import com.annimon.stream.Stream;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
import it.integry.ems.schedule.new_cron_job.dto.AutomatedOperationTypeEnum;
import it.integry.ems.schedule.new_cron_job.dto.operations.ExportAutomatedOperationDTO;
import it.integry.ems.schedule.new_cron_job.dto.operations.base_classes.BaseAutomatedOperationDTO;
import it.integry.ems.schedule.new_cron_job.service.AutomatedOperationHandlerComponent;
import it.integry.ems.sync.MultiDBTransaction.AdvancedDataSource;
import it.integry.ems_model.utility.UtilityDB;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.ArrayList;
import java.util.HashMap;

View File

@@ -2,11 +2,8 @@ package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
import it.integry.ems_model.utility.Query;
import it.integry.ems_model.utility.UtilityDB;
import java.sql.Statement;
public class Migration_20240312093539 extends BaseMigration implements MigrationModelInterface {
@Override

View File

@@ -3,8 +3,6 @@ package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
import java.sql.Statement;
public class Migration_20240313163623 extends BaseMigration implements MigrationModelInterface {
@Override

View File

@@ -1,7 +1,6 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.IntegryCustomerDB;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20240415130140 extends BaseMigration implements MigrationModelInterface {

View File

@@ -2,11 +2,6 @@ package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.dto.IndexTableDTO;
import java.util.ArrayList;
import java.util.List;
public class Migration_20240422133238 extends BaseMigration implements MigrationModelInterface {

View File

@@ -1,7 +1,6 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.IntegryCustomer;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20240517180054 extends BaseMigration implements MigrationModelInterface {

View File

@@ -2,8 +2,6 @@ package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
import it.integry.ems_model.entity.Azienda;
import it.integry.ems_model.types.ApplicationName;
public class Migration_20240521124415 extends BaseMigration implements MigrationModelInterface {

View File

@@ -1,14 +1,9 @@
package it.integry.ems.migration.model;
import com.google.common.collect.ImmutableList;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.IntegryCustomer;
import it.integry.ems.migration._base.IntegryCustomerDB;
import it.integry.ems.migration._base.MigrationModelInterface;
import it.integry.ems_model.entity.JtbFasi;
import it.integry.ems_model.utility.Query;
import java.util.List;
public class Migration_20240522093401 extends BaseMigration implements MigrationModelInterface {

View File

@@ -3,7 +3,6 @@ package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.IntegryCustomer;
import it.integry.ems.migration._base.MigrationModelInterface;
import it.integry.ems_model.entity.JtbFasi;
public class Migration_20240527192333 extends BaseMigration implements MigrationModelInterface {

View File

@@ -1,7 +1,6 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.IntegryCustomer;
import it.integry.ems.migration._base.IntegryCustomerDB;
import it.integry.ems.migration._base.MigrationModelInterface;

View File

@@ -1,7 +1,6 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.IntegryCustomer;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20240530174017 extends BaseMigration implements MigrationModelInterface {

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