Compare commits

...

5647 Commits

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

# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/controller/WMSGenericController.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java
2025-05-22 10:13:42 +02:00
4c71015588 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-22 10:04:53 +02:00
065fb956d3 Migliorato shutdown BasicConnectionPool 2025-05-22 10:04:38 +02:00
4cd960ffc5 Migliorato shutdown BasicConnectionPool
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-22 10:03:56 +02:00
f096f72942 [Controllo giacenze]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- stampa sscc da distinta in stampa etichetta ul
2025-05-22 10:02:43 +02:00
8f2b71fc90 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-22 09:19:15 +02:00
9a2fbe8be6 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-22 09:19:13 +02:00
6cd5b411d9 Importo ordini PUDDY 2025-05-22 09:18:45 +02:00
1d1cbbf330 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-22 09:17:11 +02:00
e12f5fe762 Modifica funzione Plafond 2025-05-22 09:17:03 +02:00
cf0cb0c8b8 Modifica funzione Plafond 2025-05-22 09:16:55 +02:00
f61f8283f0 Rimpiazzato utilizzo di LooperService con @Scheduler
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-21 18:48:19 +02:00
2165732206 Rimpiazzato utilizzo di LooperService con @Scheduler
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-21 18:47:43 +02:00
c490661c1d Rimpiazzato utilizzo di LooperService con @Scheduler
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-21 18:07:26 +02:00
0682af0dee Migliorie allo shutdown di Tomcat
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-21 17:21:06 +02:00
2bb8c773ee Migliorie allo shutdown di Tomcat
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-21 17:20:48 +02:00
0a4ae28e17 Aggiornati plugin toolchain e Typescript generator
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-21 13:01:59 +02:00
fb09e637ee Convertito campo dataScad in LocalDate nel dto dell'ordine di lavoro (MES)
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-21 10:54:25 +02:00
be61adb5e7 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-21 10:53:47 +02:00
792693ad59 Convertito campo dataScad in LocalDate nel dto dell'ordine di lavoro (MES) 2025-05-21 10:53:34 +02:00
aa4619e323 [ROSSOGARGANO]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- Documenti di trasferimento Raggruppati se provenienti dal MES
- gestita possibilità di scegliere se creare i documenti in rettifica colli
2025-05-21 10:41:03 +02:00
5e30e340a2 [ROSSOGARGANO]
- Documenti di trasferimento Raggruppati se provenienti dal MES
- gestita possibilità di scegliere se creare i documenti in rettifica colli
2025-05-21 10:40:56 +02:00
0c13b16da3 aggiunto controllo per vettore obbligatorio
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 17:17:33 +02:00
f7ac81f033 fattura differita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 16:03:51 +02:00
ca8fba8d6f Implementato servizio di retrieve uds già registrate
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 15:26:49 +02:00
e6e42921c3 Implementato servizio di retrieve uds già registrate
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 15:25:31 +02:00
7012dca4a6 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 11:50:37 +02:00
5a8c5799a5 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 11:50:19 +02:00
654d4d5017 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 11:50:19 +02:00
874f9d4799 Aggiunto codJfas in createUDC 2025-05-20 11:50:13 +02:00
32413c0359 Aggiunto profilo tunneling di Lamonarca
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 11:49:38 +02:00
0dcf09d1a7 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 11:30:44 +02:00
e12dfb0fa6 Finish PermMES
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 11:30:43 +02:00
d860ca8fc2 Aggiunti permessi per pulsante di pausa nel MES 2025-05-20 11:30:36 +02:00
0159dc5d4f Sistemato controllo su conto setup distinta incassi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-20 10:28:10 +02:00
8256c1e0ce Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
2025-05-19 20:04:49 +02:00
38129b6bb7 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 20:01:47 +02:00
38a2259b4c Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 20:01:46 +02:00
73fd69905a Cambiati servizi che creano UDC dai collector 2025-05-19 20:01:41 +02:00
cba65774a2 modifiche per registrazione movimenti contabili
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 16:26:48 +02:00
90c0ec111c Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-19 16:22:20 +02:00
f3bae6449c modifiche per registrazione movimenti contabili 2025-05-19 16:21:58 +02:00
9e7ad50291 Controllo se flag_evaso_forzato è S se richiesti ordini evasi in MES_GetWorkOrders
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 15:45:07 +02:00
eabe183d35 modifiche per salvataggio dei movimenti contabili
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 14:17:49 +02:00
f92de927ff Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 12:22:57 +02:00
48255e9d63 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 12:22:42 +02:00
758fcd1dcb Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-19 12:22:42 +02:00
5edcfb38ee Sistemata gestione shutdown nel looper service 2025-05-19 12:22:34 +02:00
a7e2271216 inserito campo archiviazione_elettronica nella vtb_vett
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 09:50:42 +02:00
fe5dc1f55b Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java
2025-05-19 09:37:19 +02:00
a6b90aa9ca Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 08:42:45 +02:00
57af537e38 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-19 08:42:44 +02:00
07dce22d57 aggiunto controllo su campo esistete 2025-05-19 08:42:25 +02:00
04944298ce Aggiunti tutti i permessi per utenti con controllo_giacenze abilitata
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-05-16 18:35:11 +02:00
557ada2363 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 18:04:09 +02:00
819a5bc363 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 18:03:11 +02:00
c6d64201ac Merge remote-tracking branch 'origin/develop' into develop 2025-05-16 18:00:50 +02:00
bb52efea76 [CARELLI]
- gestione salvataggio activity_Types per calendario pv
2025-05-16 18:00:43 +02:00
c572e2017c Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 18:00:42 +02:00
975e545f44 Modifica import ordini SEVENBAR 2025-05-16 18:00:27 +02:00
6b30fea7b8 Aggiornata createULLavorazione nella sezione MES per supportare la nuova struttura
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 17:59:21 +02:00
22cbc5eeba Gestita riapertura ordine per id lotto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 17:45:44 +02:00
71df21c003 sistemato controlo su traferimento
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 15:17:27 +02:00
d73f607e21 Aggiornata vista di getPickingList per WMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 13:02:53 +02:00
1f10d162f5 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 12:05:10 +02:00
8c14fbf8c6 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 12:05:09 +02:00
afa7f701af errore nell'invio delle anomalie 2025-05-16 12:05:05 +02:00
2c592164f4 errore nell'invio delle anomalie 2025-05-16 12:04:35 +02:00
a2fd1322a4 errore nell'invio delle anomalie 2025-05-16 11:59:02 +02:00
2af6148398 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 11:29:34 +02:00
b6a76b7389 aggiunto lotto nelle variazioni 2025-05-16 11:27:35 +02:00
204542a160 Creato metodo per riapertura ordine di lavorazione MES
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-16 10:07:00 +02:00
960f74e7cd Fix posizione in spostaMerceTraUl
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 18:28:20 +02:00
68afe86f87 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 18:15:59 +02:00
caf6ffe38e Mmodifica per DMS 2025-05-15 18:15:51 +02:00
9e4a1a1749 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 17:27:51 +02:00
01688728be Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 17:27:51 +02:00
328d7f8067 correzione su accettazione 2025-05-15 17:27:46 +02:00
13698c9664 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 17:26:59 +02:00
ccad444ef6 Aggiornamento per invio variazioni 2025-05-15 17:26:52 +02:00
25693d6089 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 17:12:05 +02:00
b4733eda79 Modifica generazione XML per problema su destinatario merce con RIF 2025-05-15 17:12:01 +02:00
14590bbe4c update campi costi_art_obb e ricavi_art_obb nella mtb_grup per gramm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 15:41:10 +02:00
b10048e3cb Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 15:27:46 +02:00
a3f1c7d271 inseriti campi costi_art_obb e ricavi_art_obb nella mtb_grup 2025-05-15 15:27:37 +02:00
e1e9a3cbfc Rimosso Rossogargano_peppe da build docker
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 13:41:44 +02:00
56cea98c92 Aggiunta retrieve MtbAartBarCode in getArticoliByCodMarts
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 12:50:56 +02:00
48d5190586 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
2025-05-15 12:15:39 +02:00
0f2879cdcc Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 12:14:35 +02:00
2dcab245e4 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 12:14:35 +02:00
857c9d3489 [ROSSOGARGANO]
- recuperata sezione trasferimento automatico in versamento materiale su ordine
2025-05-15 12:14:24 +02:00
36c6ec6c64 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-15 10:19:47 +02:00
7f3c43f263 sistemato controllo per trasferimenti 2025-05-15 10:19:44 +02:00
748e9fe168 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 18:06:50 +02:00
11bf825b16 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 18:06:50 +02:00
d22e3f562b rimosso controllo su deposito collo diverso da documento in generazione CLAV 2025-05-14 18:06:37 +02:00
4d0dfc5341 rimosso controllo su deposito collo diverso da documento in generazione CLAV
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 18:06:04 +02:00
b08e1ef6bb Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 17:36:57 +02:00
e1aa08391b Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 17:36:37 +02:00
dc42169ce4 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 17:36:36 +02:00
a7f3775343 [ROSSOGARGANO]
- corretta gestione scarichi teorici in nuovo servizio chiusura ordine
2025-05-14 17:36:26 +02:00
09b8d47c76 modifiche su creazione colli da documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 16:01:45 +02:00
315e85b0ca Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 15:34:14 +02:00
e1e96c1283 cancellazione migration e sistemato controllo su data fine 2025-05-14 15:34:11 +02:00
d44e51b8c5 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 12:09:38 +02:00
87732e1bba personalizzato datawindow report scadenze clienti (nuova versione) e report scadenze fornitori per Auricchio 2025-05-14 12:01:36 +02:00
dde2713528 Abilitata gestione oneri db Carelli e tipo_azienda DISTR_DETTAGLIO
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 10:01:39 +02:00
47633b826c Cambiata compilazione Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	build/Jenkinsfile.groovy
2025-05-14 09:58:12 +02:00
2290f46c3b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 09:51:15 +02:00
65656768bd Cambiata compilazione Jenkinsfile 2025-05-14 09:51:10 +02:00
08941e234b Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-14 09:48:26 +02:00
e755a3a8c4 invio tracciabilità gastronimia 2025-05-14 09:48:23 +02:00
2069e0afa6 Cambiata compilazione Jenkinsfile
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-14 09:38:24 +02:00
0963dd7360 invio tracciabilità gastronimia
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-14 09:31:48 +02:00
f5b606a0cd Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-14 09:24:53 +02:00
6f71ac7ddf Cambiata compilazione Jenkinsfile 2025-05-14 09:24:47 +02:00
dad0dd6a2b invio tracciabilità gastronimia
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-14 09:23:21 +02:00
a40c1d2ab9 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250512135039.java
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250512161113.java
2025-05-14 09:11:33 +02:00
2e70e1edc1 Modificate parentesi nella condizione di where con l'or 2025-05-14 09:09:55 +02:00
e0f31b670d Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250512135039.java
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250512161113.java
2025-05-14 09:04:13 +02:00
e3d76dd29e Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250512135039.java
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250512161113.java
2025-05-14 08:46:01 +02:00
43f59ccf3b Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 20:25:50 +02:00
42e5ab520d Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 20:25:35 +02:00
fbd37e887f Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 20:25:34 +02:00
5a8fa29252 corretta publish su Azure per feature 2025-05-13 20:25:15 +02:00
fee5320c37 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 20:18:54 +02:00
1d4bf6675a Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 20:17:50 +02:00
069dab7523 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 20:17:50 +02:00
31cff1e649 corretta publish su Azure per feature 2025-05-13 20:17:39 +02:00
84c7876dcc [GRAMM]
- rimossa pezza temporeanea salvataggio ordini di lavorazione
2025-05-13 20:02:10 +02:00
a534c93546 invio tracciabilità gastronimia 2025-05-13 20:02:08 +02:00
c8256bed89 nuova procedura di allinemento costo per suddivisione 2025-05-13 20:02:05 +02:00
c02cf474c0 nuova migration 2025-05-13 20:02:03 +02:00
2c9e387927 Migrations IME 2025-05-13 20:01:42 +02:00
bb20c6d7e5 Migrations IME 2025-05-13 20:01:40 +02:00
2721e10075 migration per abilitare il menu da query ed non visualizzare sul menu le voci del portale 2025-05-13 20:01:38 +02:00
d4e0bf3419 modificata posizione voce menu Configurazione Tolleranza Giorni di Scadenza 2025-05-13 20:01:30 +02:00
521804f2d2 [carelli]
-  report personalizzato listini di acquisto
2025-05-13 20:01:28 +02:00
95d8986de0 varie listini 2025-05-13 20:01:25 +02:00
d2657e3531 riattivata cacenllazione variaziione 2025-05-13 20:01:20 +02:00
2513b93a75 Merge branch 'master' into develop 2025-05-13 20:00:36 +02:00
940ccfdb9f aggiunta migration 2025-05-13 19:59:11 +02:00
3a55dcdb58 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 19:51:20 +02:00
919547f30c Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 19:46:32 +02:00
5c223b5d74 corretta publish su Azure per feature 2025-05-13 19:46:22 +02:00
f5ea90a0d0 -corretta pubblicazione su azure di branch non classici
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 18:47:53 +02:00
b833fc79e8 Merge branch 'master' into feature/RefactoringGestioneColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-13 18:39:00 +02:00
e897535772 Merge remote-tracking branch 'origin/develop' into develop
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-05-13 18:36:43 +02:00
2091efe828 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 18:36:33 +02:00
f52aa4d837 Merge branch 'hotfix/Hotfix-1'
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-13 18:36:32 +02:00
3f9917355a aggiunta publish su Azure per feature 2025-05-13 18:36:22 +02:00
6b80297851 invio tracciabilità gastronimia 2025-05-13 18:36:05 +02:00
f7f3b1cc88 Merge branch 'hotfix/Hotfix-1' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-13 18:34:27 +02:00
a944d15333 Merge branch 'hotfix/Hotfix-1'
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-13 18:34:26 +02:00
75f10ffaf4 aggiunta publish su Azure per feature 2025-05-13 18:34:16 +02:00
fff5faf3be Merge branch 'master' into feature/RefactoringGestioneColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-13 18:30:37 +02:00
d8ea146bf6 Merge branch 'hotfix/Hotfix-1' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-13 18:27:54 +02:00
42c4048244 Merge branch 'hotfix/Hotfix-1'
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-13 18:27:53 +02:00
c8d7225038 aggiunta publish su Azure per feature 2025-05-13 18:27:43 +02:00
bba3f423fe Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 15:53:57 +02:00
a6238a443a nuova procedura di allinemento costo per suddivisione 2025-05-13 15:52:56 +02:00
1685ff6e86 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 14:44:43 +02:00
ed7a7d57c8 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 14:44:43 +02:00
df0ce6bdac [GRAMM]
- pezza temporeanea salvataggio ordini di lavorazione
2025-05-13 14:44:09 +02:00
9895dc9bd5 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 12:37:03 +02:00
1bf10bd350 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 12:37:03 +02:00
7d67f96e57 sistemato controllo su data fine ( localDate) 2025-05-13 12:36:58 +02:00
89e122664c nuova migration
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 12:28:44 +02:00
019eed8aa8 Migrations IME
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 11:04:40 +02:00
ce54af539b Migrations IME
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-05-13 11:04:30 +02:00
7d6c6a5434 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 10:47:31 +02:00
0b30b45e6a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 10:47:31 +02:00
a2f995933e sistemato registrazione corrispettivi 2025-05-13 10:47:25 +02:00
328c2f8437 migration per abilitare il menu da query ed non visualizzare sul menu le voci del portale
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 10:24:11 +02:00
4e0800c972 Finish FixOrderVerify
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 09:43:45 +02:00
3ea1ceb057 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-13 09:43:45 +02:00
85eb3468e2 Cambio tipo ll_row ad int in OrderVerify phpApp 2025-05-13 09:43:39 +02:00
978b42d18a Aggiunto barcode ul nella retrieveAlreadyRegisteredUDC
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 19:12:20 +02:00
c7c8b1be24 Aggiunto supporto procedura di versamento automatico con le nuove logiche dei colli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 18:45:20 +02:00
62db4ce0ed Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 17:20:30 +02:00
2caf6f985a modificata posizione voce menu Configurazione Tolleranza Giorni di Scadenza 2025-05-12 17:20:21 +02:00
ba52d480d9 [carelli]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
-  report personalizzato listini di acquisto
2025-05-12 17:08:43 +02:00
96cdac8df9 varie listini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 16:39:28 +02:00
dca15da646 riattivata cacenllazione variaziione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 14:24:35 +02:00
934095fa28 aggiunta migration
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 14:01:48 +02:00
6034120f1f Aggiunto CodJfas in create UDC
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 12:17:51 +02:00
c2b6d4ba69 Rimosso _peppe da rossogargano
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 10:37:04 +02:00
bc97f9a573 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 10:25:30 +02:00
595e04cea1 Migliorie sui confronti in Exchange Documenti/Colli/Ordini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 10:25:15 +02:00
ce1f68deb2 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 09:41:02 +02:00
ef4676ed26 Fix su interpretazione enum FlagEvaso, non era gestita la stringa empty.
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 09:39:56 +02:00
45bf3d67d1 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-12 09:27:46 +02:00
04138cf66b Finish export_documenti_intesa
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-09 18:43:00 +02:00
83cef89203 Merge branch 'develop' into feature/export_documenti_intesa
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-09 18:42:37 +02:00
1bd1684f5c Migliorati servizi di assenza per task
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-09 18:42:08 +02:00
dd2c78ac92 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-09 17:45:40 +02:00
b579d802c9 inserita voce menu Configurazione Tolleranza Giorni di Scadenza 2025-05-09 17:45:32 +02:00
bf38dfe0d8 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-09 17:28:25 +02:00
c8233817f3 [ROSSOGARGANO]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- correzioni in riproporzionamento materiali (decimali )
2025-05-09 17:27:53 +02:00
af68b892f3 aggiunto trasferimento automatico in versamento materia prima su ordine di lavorazione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-09 16:20:44 +02:00
015813db2b aggiornamenti per licor
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-09 15:10:39 +02:00
af29eeba58 Merge branch 'develop' into feature/RefactoringGestioneColli
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java
2025-05-09 13:23:54 +02:00
9c5b719b75 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-09 13:18:58 +02:00
0dc0f44493 [ROSSOGARGANO]
- nuova chiusura ordine con riproporzionamento
2025-05-09 13:18:54 +02:00
5698329cc8 Fix su distribuzione colli. Quando si distribuiva un collo con 2 righe dello stesso articolo / partita la distribuzione attribuiva ad entrambe le righe gli stessi collo_rif.
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-09 10:58:48 +02:00
4fdd5b86cb inserimento promozioni
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-09 10:42:34 +02:00
44cc11ce15 creazione colli da lavorazioni
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-09 09:47:21 +02:00
f6e7ac4ea9 sistemata cancella del collo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-08 18:53:17 +02:00
d70efd3af2 aggiunti dati testata collo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-08 18:52:52 +02:00
27ecf045ff Aggiunta unique key per id_bdg, cod_anag e cod_mart in vtb_bdgr
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-08 17:55:05 +02:00
f99957eb41 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-08 16:52:15 +02:00
05bee71bd6 creazione colli da documento di vendita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-08 16:51:49 +02:00
8c1caed359 Fix thread in InsertPromo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-08 16:38:13 +02:00
0736df0976 migratoio eliminato metodno inutilizzato
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-08 15:38:49 +02:00
f61e792ebe carelli tomcatsrv
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-08 15:37:22 +02:00
bb315e35dd Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-08 12:08:31 +02:00
04c4052805 modifiche per inserimento promo 2025-05-08 12:08:14 +02:00
8cf9a3a1be Modifica migrations per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-08 12:07:28 +02:00
db52f7fc3e Fix versamento partita material con partita_mag_prod null
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-07 18:10:42 +02:00
e3d4754bd8 Migliorato servizio importPromo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-07 09:42:11 +02:00
b5442618ba Fix più destinatari ConSegna 2025-05-07 09:41:47 +02:00
bd83fc79ff Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-07 09:02:33 +02:00
4d4514d0b2 controllo su chkcompatibilità 2025-05-07 09:02:28 +02:00
6617aef023 Merge branch 'develop' into feature/export_documenti_intesa 2025-05-06 16:42:26 +02:00
df6928c9c2 modificata regola per assegnazione commessa su ordine
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-06 15:02:25 +02:00
61a8e1b07a aggiunta cancellazione ctb_rilcas_conti e ctb_sana, ctb_scon
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-06 13:03:25 +02:00
ce4f2461b8 salvataggio con rest del calendario
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-06 12:53:45 +02:00
459f956763 salvataggio con rest del calendario
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-06 12:52:22 +02:00
de3784eb3a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-06 12:01:17 +02:00
ffb16fe7d2 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-06 12:01:17 +02:00
00e17add15 modifiche a giacena 2025-05-06 12:00:27 +02:00
469a0f2ccc Merge branch 'develop' into feature/export_documenti_intesa 2025-05-06 10:40:50 +02:00
40104bcce7 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-06 10:39:46 +02:00
bf3ac91f6c Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-06 10:37:17 +02:00
af1e56864b Migliorata import colli vebad e eviosys 2025-05-06 10:37:09 +02:00
7a6c737c1b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-06 09:57:39 +02:00
656185a8c6 Gestita formattazione bigdecimal in export excel
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-06 09:26:36 +02:00
e70258d2d3 Finish Feature-CArat 2025-05-05 19:20:50 +02:00
72fb7299ba Merge branch 'develop' into feature/Feature-CArat 2025-05-05 19:20:36 +02:00
f3540c1669 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-05 19:20:23 +02:00
d0e948a190 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-05 19:20:23 +02:00
cc023c6d26 modificata logica di attribuzione codice listno in importazione listini apulia 2025-05-05 19:20:15 +02:00
cedcc3b67a cancellati campi da mtb_aart_carat 2025-05-05 18:21:25 +02:00
90597b26de Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-05 17:50:29 +02:00
81dcc1a0a3 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-05 17:50:28 +02:00
4d483dd76b Migrations 2025-05-05 17:50:11 +02:00
af7f97efbe Migrations 2025-05-05 17:50:01 +02:00
bb4612809c aggiunta tabella per format per tolleraziona gg scad in fase di accettazione, varie modifiche per caratatteristiche articoli e partite
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-05 17:22:41 +02:00
67098a3351 Gestita validazione password in metodo changePassword
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-05 16:25:41 +02:00
ea4143ac24 lavoro propedetico per il salvataggio dei colli L
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-05 14:15:00 +02:00
48f9b43f15 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-05 13:06:54 +02:00
439a0cd559 Finish FixSalvaViaggio
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-05 13:06:53 +02:00
5f1b99c083 Fix controllo idViaggio in salvaViaggio 2025-05-05 13:06:08 +02:00
f2de2c076c disabilitato trigger su cancellazione articoli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-05 12:59:52 +02:00
9c8af86c64 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-05-05 12:19:35 +02:00
667c4cee82 Finish FixSalvaViaggio
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-05 12:19:34 +02:00
9b581e851b Fix salvataggio viaggi senza cod forn trasp 2025-05-05 12:19:27 +02:00
jenkins
03d2b6fa4e Merge branch 'develop'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-04 07:41:33 +02:00
44b4ecb4f0 riempita tabella ricorrenze
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-02 18:27:29 +02:00
cc1e8b704a Finish Insert_promo 2025-05-02 17:58:23 +02:00
6b74c61c45 Merge branch 'develop' into feature/Insert_promo
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-05-02 17:57:18 +02:00
2d5f59c943 MODIFICHE SU IMPORT PROMO
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-02 17:57:00 +02:00
0aca052fdd Creato servizio per gestione viaggi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-02 16:53:00 +02:00
d495ea05d7 Merge branch 'develop' into feature/Insert_promo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-02 12:43:49 +02:00
fbae847e7a eliminata voce di menù e attiviata definitivamente la voce della tracciabilità per rossogargano
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-02 10:18:39 +02:00
1c534835e1 eliminata voce di menù e attiviata definitivamente la voce della tracciabilità per rossogargano
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-05-02 09:38:04 +02:00
7a1b099e1b Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-30 17:28:54 +02:00
4ebf9085d5 inserita voce menu Inserimento promozioni 2025-04-30 17:28:41 +02:00
edda81733d Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
2025-04-30 09:59:42 +02:00
f3ba1a3dec Sistemata assegnazione del costo sulle lavorazioni, se il costo è 0 assegnato il costo in base al listino nel sempre ad ultimo costo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-30 09:42:31 +02:00
537ec87f1b procedura di allineamento numero documento
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 17:04:05 +02:00
f8caa35eee Fix query insertPromo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 17:02:59 +02:00
23dbca9233 Merge branch 'develop' into feature/Insert_promo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 16:47:12 +02:00
e57270e80a Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 16:46:51 +02:00
d7a2f52c99 Aggiunto Task in integryApplicationEnum 2025-04-29 16:46:44 +02:00
0d093b607e rendere obbligatorio tipo_anag
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 16:28:51 +02:00
77163ef011 correzioni
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 16:05:56 +02:00
c45ac36597 Merge branch 'develop' into feature/Insert_promo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 14:34:41 +02:00
ee9c0f95a2 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 13:18:03 +02:00
2a088112ce fare in modo che la procedura di apulia sia utilizzabile anche per altri fornitori 2025-04-29 13:18:00 +02:00
09c35872dd Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 12:34:33 +02:00
9095db21db inserita voce menu Movimentazione Pedane per Vettore 2025-04-29 12:34:25 +02:00
dec76f29a4 Merge branch 'hotfix/Hotfix-1' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-29 11:55:02 +02:00
35ef419b33 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 11:55:01 +02:00
63969d0611 [ROSSOGARGANO]
- fix servizio cambio partita giornaliera
2025-04-29 11:54:50 +02:00
98a32847a6 modificata voce menu Allineamento Numero Documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 11:10:29 +02:00
fac98188a7 inserita voce menu allineamento numero documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 11:04:56 +02:00
31a48319cf Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 10:31:23 +02:00
b7c7a1937a Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 10:31:23 +02:00
7c58261a7a [ROSSOGARGANO]
- cambiata logica pianificata cambio lotto nuova giornata
 - aggiunto controllo su posizione ul in versamento ul in produzione da MES
2025-04-29 10:31:10 +02:00
c54cd54606 Creato servizio per allineamento numeri documenti nei registri
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 10:20:08 +02:00
1292d6d029 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 10:13:17 +02:00
aa986e5556 abilitato report tracciabilità per UDC a Rossogargano 2025-04-29 10:13:08 +02:00
f148bff05d Modifiche migrations per DMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 10:01:03 +02:00
543f27c280 Merge remote-tracking branch 'origin/develop' into develop 2025-04-29 09:58:28 +02:00
5eb08eebd4 Modifica organizzazione consegna DMS 2025-04-29 09:58:24 +02:00
c79a28fc0f gestito id viaggio
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-29 09:25:23 +02:00
e5f283311b aggiunto id viaggio
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-28 15:07:21 +02:00
f794c2b171 eliminati metodi non più necessari
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-28 12:03:47 +02:00
9690f0d0a2 Aggiunte migration per carelli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-28 12:03:19 +02:00
579fdfded0 Finish AggDataVersCreaRettifCollo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-28 11:37:08 +02:00
d428359bca Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-28 11:37:08 +02:00
520b5b9722 Aggiunta la possibilita di cambiare da data del versamento in creaRettificaCollo 2025-04-28 11:37:02 +02:00
675f127e82 Aggiunte migration per carelli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-28 11:09:12 +02:00
20f9151199 Fix invalidateCache in debug execution
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-28 10:37:43 +02:00
jenkins
ad3276d67f Merge branch 'develop'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-27 07:41:29 +02:00
063e8f5e71 Migliorata gestione commit in duplicaOrdiniGiornoDopo MES
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-24 17:05:06 +02:00
9fa118b521 Refactor gestione anomalie in ServiceRestResponse
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-24 16:02:57 +02:00
b7f8e94e1b Creato servizio insertPromo in listini di vendita 2025-04-24 16:02:12 +02:00
1926d85414 aggiunte parentesi [] nella creazione delle tabelle di history e cancellato file dopo l'importazione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-24 13:03:17 +02:00
322e3264c0 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-24 12:18:34 +02:00
a25e074af7 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-24 12:18:34 +02:00
7affd1247b - correzioni phpApp 2025-04-24 12:18:23 +02:00
595abf07c0 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-24 11:53:09 +02:00
c5919b5ce4 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-24 11:53:09 +02:00
a71f170deb - correzioni phpApp 2025-04-24 11:52:57 +02:00
ea0df59def Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-24 11:39:42 +02:00
ce2190fdc0 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-24 11:39:42 +02:00
8d6f4a927e - correzioni phpApp 2025-04-24 11:39:29 +02:00
6a81d29e40 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-24 11:15:54 +02:00
f4ace70843 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-24 11:15:54 +02:00
a249a218a3 - corretta gestione salvataggio certificati esistenti
- corretto tipo dato in DTO PhpApp
2025-04-24 11:15:40 +02:00
b7eb512805 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-24 11:03:03 +02:00
89076c4596 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-24 11:03:03 +02:00
4e97fa1d56 Ripristinati lock e unlock 2025-04-24 11:02:53 +02:00
794612fc16 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-24 10:19:17 +02:00
7e7860a5df Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-24 10:19:17 +02:00
d3200d28c8 Fix query duplicaOrdiniGiornoDopo 2025-04-24 10:19:11 +02:00
9e8b432bb1 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-23 18:38:17 +02:00
bf6d6786da Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-23 18:38:17 +02:00
3eb42b8663 Finish Hotfix-100 2025-04-23 18:38:09 +02:00
ff03094ad4 Finish Hotfix-100
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-23 16:39:41 +02:00
1097a7deed Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-23 16:39:41 +02:00
cbd1cf9ce6 eliminato ReentrantLock 2025-04-23 16:39:35 +02:00
2e50bcc5e3 Finish FixLeadTimeMRP
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-04-23 15:49:23 +02:00
6e62813063 Merge branch 'master' into develop
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-04-23 15:49:23 +02:00
85e505bcfa Rimosso relativeWorkDateConsLav per ordini di vendita in mrp 2025-04-23 15:49:17 +02:00
6c6b015d6b Finish Hotfix-100
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-23 15:29:48 +02:00
f0295f3366 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-23 15:29:48 +02:00
bf7b3e099a sistemato errore Primary database not present yet 2025-04-23 15:29:43 +02:00
ceb11d3261 aggiunti riferimenti collo in movimenti di cambio posizione ul
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-23 15:14:44 +02:00
84fbb81924 Merge branch 'develop' into feature/export_documenti_intesa
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-23 14:35:40 +02:00
ff6a711f3d Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-23 13:37:39 +02:00
255162ba65 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-23 13:37:39 +02:00
b2e7c0b1f8 [GRAMM]
corretto salvataggio phpapp
2025-04-23 13:37:27 +02:00
af99adba4b Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-23 13:27:07 +02:00
c5a7c4c80d Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-23 13:27:06 +02:00
ae1e8afa0e [GRAMM] 2025-04-23 13:26:30 +02:00
b47cc69a39 Merge branch 'develop' into feature/export_documenti_intesa 2025-04-23 13:04:04 +02:00
12c00dfd34 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2025-04-23 12:13:53 +02:00
dae8d94498 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-23 12:13:53 +02:00
846cb0a6c9 Fix invio mail app consegna 2025-04-23 12:13:43 +02:00
48fbf84325 Merge branch 'develop' into feature/export_documenti_intesa 2025-04-23 11:55:18 +02:00
97e741bab0 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-23 11:43:10 +02:00
b7cd4da183 Finish FixFermaCreaDocs
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-23 11:43:10 +02:00
27b143e742 Invertito controllo setup FERMA_CREA_DOCS 2025-04-23 11:43:04 +02:00
2e530675e5 Aggiunta serie nell'indice di esportazione 2025-04-23 10:59:47 +02:00
b65294d0af Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-23 10:45:48 +02:00
b4b02c4f3c Finish Hotfix-100
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-23 10:45:48 +02:00
56c772c460 sistemata regola per rossogargano 2025-04-23 10:45:43 +02:00
48edb707a7 Merge branch 'develop' into feature/export_documenti_intesa 2025-04-23 10:40:40 +02:00
61b9f80c2f Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-23 09:59:37 +02:00
3a9636b537 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-23 09:59:36 +02:00
58f3b9f8d1 sistemato errore Primary database not present yet 2025-04-23 09:59:30 +02:00
78310161bd Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-22 19:16:07 +02:00
9186b48c8f Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-22 19:16:07 +02:00
7bcb1a8630 [GRAMM]
Refactoring servizi PhpApp rimuovendo utilizzo di connessioni per problemi con connection pool
2025-04-22 19:15:56 +02:00
e66b5c0841 [GRAMM]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- aggiunta configurazione tomcat debug remoto gramm
2025-04-22 19:11:21 +02:00
213a8d7b2a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-22 18:39:10 +02:00
d7247a2298 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-22 18:39:09 +02:00
41f808321e configurazione tomcatImport Carelli 2025-04-22 18:39:02 +02:00
793784a6ad Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-22 17:26:05 +02:00
4994e7e27d Finish FixProgressivi
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-22 17:26:05 +02:00
832b3e1001 Commentata regola custom calcolo progressivi 2025-04-22 17:25:59 +02:00
9079709dc8 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-22 16:38:09 +02:00
0fb1de5d48 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-22 16:38:09 +02:00
9a160a8b95 Fix apertura pool 2025-04-22 16:37:58 +02:00
56a5f84bae Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-22 15:47:22 +02:00
46646b8501 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-22 15:47:21 +02:00
f226aabfd7 Rimosso filtro su db history 2025-04-22 15:47:08 +02:00
2805967ee0 Fix null extraConnectionCounters 2025-04-22 15:01:56 +02:00
9937b1c6f5 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-22 13:01:46 +02:00
19055ff297 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-22 13:01:45 +02:00
dc6285fdb3 Fix null in createExtraConnection 2025-04-22 13:01:35 +02:00
bc1214a4ff Aggiunta configurazione debug su vg
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-22 12:54:26 +02:00
a13671c51a Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-22 11:46:08 +02:00
b94d9b1177 [TRASFERIMENTO UL]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
corretto deposito testata movimento di scarico a PV
aggiunto rollback in errore trasferimento
2025-04-22 11:42:57 +02:00
2df8cbdb43 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-22 10:08:22 +02:00
ad527b8e1e Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-22 10:08:22 +02:00
38d6385e0b corretto tipo variabile plan_id in stb_activity 2025-04-22 10:08:03 +02:00
jenkins
a7c0e79635 Merge branch 'develop'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-20 07:41:26 +02:00
a078cf50cf ABILITAZIONE SERVIZI REST
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 17:54:25 +02:00
6e8fe81917 Aggiunto controllo codVdes in printDocument
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 17:15:23 +02:00
45c2ae9bf6 Aggiunta setup ELENCO_FORNITORI_INTERNI
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 17:08:54 +02:00
d027f3ff20 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 15:23:17 +02:00
e0d4b3995a Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 15:14:47 +02:00
b95f026d0c Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 15:14:46 +02:00
883fc9f641 risolto errore in creazione connessione su db non interni 2025-04-18 15:14:34 +02:00
86c3db7f7b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 15:10:51 +02:00
c7adff4b89 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 15:10:50 +02:00
63f5733acd controllato se connectionPool e usedconnection sono valorizzate 2025-04-18 15:10:38 +02:00
ab6e6cc643 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 14:56:58 +02:00
8fb2c5709d Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 14:56:57 +02:00
27a43dde29 controllato se connectionPool e usedconnection sono valorizzate 2025-04-18 14:56:52 +02:00
8601f4fd90 gestione documenti di trasferimento in emissione documenti di vendita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 14:54:35 +02:00
6fd7fddc4b Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 11:43:23 +02:00
5ae5fcf857 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 11:43:23 +02:00
8153ffb903 Rimossi pool lock in Connection Pool 2025-04-18 11:43:18 +02:00
73ade8691d Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 10:39:28 +02:00
a65c833b54 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 10:39:05 +02:00
c048ed07fb rimossa faulty migration 2025-04-18 10:38:42 +02:00
c9dbcd8757 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/production/service/MesProductionServiceV2.java
2025-04-18 10:30:29 +02:00
f487d04de1 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-18 10:29:52 +02:00
c75f3e8386 Fix su timeout in HttpRestWrapper.
Migliorato caricamento iniziale databases.
2025-04-18 10:29:38 +02:00
df2a7d6e36 Merge branch 'develop' into feature/RefactoringGestioneColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-18 10:20:54 +02:00
1f765f1a76 Merge branch 'feature/carelli_calendario_pv' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-18 10:16:59 +02:00
d0de756752 Merge branch 'develop' into feature/carelli_calendario_pv 2025-04-18 10:16:40 +02:00
d1106b3c33 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-17 18:15:20 +02:00
cff4cce9cd Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-17 18:15:19 +02:00
21e0a4fa0d Aggiunti controllo BasicConnectionPool 2025-04-17 18:15:14 +02:00
84ed7f7122 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-17 17:45:22 +02:00
5c7ea38f1f Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-17 17:45:21 +02:00
63fb64ed06 Aggiunto timeout nelle chiamate generic 2025-04-17 17:45:14 +02:00
a0a3c93958 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-17 16:50:08 +02:00
ee087fff45 inserita voce menu esportazione dati 2025-04-17 16:49:57 +02:00
ff6a882db0 Merge branch 'hotfix/Hotfix-1'
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-17 16:25:42 +02:00
20e44ff71e Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-17 16:25:42 +02:00
c2fc8a4c89 nuove funzioni utility per barcode 2025-04-17 16:25:30 +02:00
c7c6affe3e Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
#	ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
2025-04-17 15:32:22 +02:00
932b16fbe8 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-17 15:24:20 +02:00
ac43561391 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-17 15:24:20 +02:00
282b6192d2 Alleggerito servizio di export ISCC 2025-04-17 15:24:15 +02:00
54fc28eb74 Fix su migration per nuova logica WMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-17 15:17:48 +02:00
20468c14cf Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-17 15:12:26 +02:00
9b95d19ef8 Finish Hotfix-100
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-17 15:12:24 +02:00
9d552c9980 chiuse le connessione a db 2025-04-17 15:12:13 +02:00
03d1cfe91d Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-17 13:43:23 +02:00
7c83d3b061 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-17 13:43:22 +02:00
bc707e1335 eliminta connessione db dal servizion system/ok 2025-04-17 13:43:17 +02:00
841ab996b1 Aggiunto extractZipFile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-17 10:59:49 +02:00
2dfd120b54 Fix export documenti intesa 2025-04-17 10:57:43 +02:00
6b3f9fe44e Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-16 18:17:52 +02:00
ad76a0f419 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-04-16 18:17:52 +02:00
8947d9a5b3 aggiunto controllo aggiunta setup report cq carciofi accettazione da campo 2025-04-16 18:17:39 +02:00
bfdd093ff0 Revert "aggiunto controllo aggiunta setup report cq carciofi accettazione da campo"
This reverts commit 5afc2e7340.
2025-04-16 18:17:20 +02:00
5afc2e7340 aggiunto controllo aggiunta setup report cq carciofi accettazione da campo 2025-04-16 18:14:49 +02:00
51a319f1a4 Impostazione disattivazione commessa su ordine produzione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-16 17:14:05 +02:00
d5a5997f3a Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-16 16:21:37 +02:00
627e7ff2a2 Migliorie in alcuni utilizzi del datasource 2025-04-16 16:21:24 +02:00
26993d717d Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-16 16:15:12 +02:00
6ae64489db Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-16 16:15:12 +02:00
4e002ab81e steup esclusione kit 2025-04-16 16:14:22 +02:00
ab1200ff84 Aggiunto tentativo di riconoscimento ean128 in createUDCFromArt
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-16 15:12:57 +02:00
90555e7123 Sistemato FlagPersonaFG in GtbAnag che diventa F se viene riconosciuto un codice fiscale
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-16 12:06:45 +02:00
1b75cf1ecd Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-16 10:46:33 +02:00
f275204a80 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-16 10:46:33 +02:00
35622df4dc aggiunto controllo in creazione certificato da campo su esistenza certificato selelzionato 2025-04-16 10:45:51 +02:00
22f65037f4 aggiunto riavvio automatico cache utenti all' invalidate
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-16 10:26:03 +02:00
0cf4f18993 sistemata regola assegna id riga
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-15 18:30:39 +02:00
aabcd4b181 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-15 18:18:45 +02:00
6b4193fef2 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-15 18:18:45 +02:00
ab9372962b chiusa connessione su check autofattura, elimintato salvataggio dei colli dalla insert entity 2025-04-15 18:18:40 +02:00
ec2b83657a corretto servizio trasferimento UL 2025-04-15 16:38:28 +02:00
7e30817697 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-15 12:55:05 +02:00
b2b8bebc4b Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-15 12:55:04 +02:00
66cca8729d Fix cast to localDate in getColloInGiac 2025-04-15 12:54:53 +02:00
bdee6f56e8 convertito int to short
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-15 12:45:46 +02:00
edceb013e4 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-15 12:05:05 +02:00
d7eff6686c inserito modulo di stampa Packing list di carico 2025-04-15 12:04:40 +02:00
0bd982d303 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-15 10:36:09 +02:00
41cea57194 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-15 10:36:09 +02:00
277116319c Fixate connessioni potenzialmente non chiuse su Biolevante Exchange 2025-04-15 10:35:55 +02:00
c2c280bbc1 Creato exchange per Distinte base 2025-04-15 10:35:12 +02:00
8685498594 Migliorata gestione versioni sql server in migrations
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-14 20:18:44 +02:00
cb9c7acde3 Disattivata chiamata ai macchinari se in debug o da server integry
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-14 18:39:12 +02:00
c97d3104e6 Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-14 16:00:27 +02:00
d641d4c910 Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-14 16:00:27 +02:00
af5e0c0905 corretta query MEs getWorkOrder 2025-04-14 16:00:06 +02:00
925ff81e92 Merge branch 'hotfix/Hotfix-3'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-14 15:40:33 +02:00
d3bfb56ac7 Merge branch 'hotfix/Hotfix-3' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-14 15:40:33 +02:00
f291395c87 corretta join su fase step ordini di lavorazione 2025-04-14 15:40:15 +02:00
74a8a857bd rimossa migration MES
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-14 15:38:04 +02:00
eacd16040d Modificato calcolo riga per fare in modo che funzioni anche nel caso di insert or update
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-14 15:31:26 +02:00
bcd9750829 varie migration
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-14 15:02:51 +02:00
2ea5efbbe1 Rimosso setDataProd su nuove partite agribook
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-14 12:03:23 +02:00
c49d9d8115 aggiunto lead time in mrp
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-14 11:27:39 +02:00
23e2586c33 Merge remote-tracking branch 'origin/feature/carelli_calendario_pv' into feature/carelli_calendario_pv 2025-04-14 11:10:05 +02:00
6d9c087fac gestione calendario PV carelli 2025-04-14 11:09:57 +02:00
7b182ede8e servizio che ritorna il iano logistico per il calendario 2025-04-14 11:09:57 +02:00
5131f95f71 [CARELLI - CalendarioPV]
- nuove entity e servizi
2025-04-14 11:09:21 +02:00
3caa832bd1 servizio che ritorna il iano logistico per il calendario 2025-04-14 11:07:18 +02:00
3d4ceba8fc migration piano logistico rrule 2025-04-14 11:07:18 +02:00
331c9b8f56 aggiunto tipo time 2025-04-14 11:07:18 +02:00
dda460e5d0 [CARELLI - CalendarioPV]
- nuove entity e servizi
2025-04-14 11:07:18 +02:00
59ea4adf9b Merge branch 'hotfix/Hotfix-2' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-14 10:59:04 +02:00
6d9f98af03 Merge branch 'hotfix/Hotfix-2'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-14 10:59:03 +02:00
8cc3a2bde0 [ROSSOGARGANO]
- fix rientro materia prima da lavorazione
2025-04-14 10:58:52 +02:00
4459394a58 Finish LottiScadMult
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-11 18:26:57 +02:00
67998c8af0 Merge branch 'develop' into feature/LottiScadMult 2025-04-11 18:26:43 +02:00
fef719b4da Gestito versamento con data scad ed aggiunta partita mag prod in mes getworkorders 2025-04-11 18:26:35 +02:00
b0524e4a2e Fix esportazione documenti intesa
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-11 17:48:38 +02:00
2511aabbdb Fix vari
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-11 17:04:19 +02:00
434478447e gestione calendario PV carelli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-11 16:52:35 +02:00
313fa6a8df Aggiunti controlli in createUDC
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-11 16:29:35 +02:00
b9bae53f7a Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-11 11:32:20 +02:00
0faefcd3ba variazione su gestione bene 2025-04-11 11:32:15 +02:00
9bb8751e21 Implementate nuove logiche di barcode_ul in rettifica giacenze
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-11 10:51:23 +02:00
7d09b2452f Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-11 10:11:34 +02:00
48cfc8a4c0 Modifica gestione nuova produzione 2025-04-11 10:11:29 +02:00
24c4935dad Fix after merge
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-11 09:35:27 +02:00
61d76b03c4 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-11 09:33:25 +02:00
0f973c962a Refactoring creazione UL da MES
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 20:08:38 +02:00
cffe9082db Fix su qta in righe di rettifica 2025-04-10 19:14:38 +02:00
689ce514c1 eliminato controllo su lotti in accettazione, sistemata esportazione di zucchetti ed eliminato invio email senza testo per le variazioni
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 18:15:39 +02:00
69a1a6906e Merge branch 'develop' into feature/LottiScadMult
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 18:08:22 +02:00
6c88b7b288 Fix barcode in versamento materiali MES
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 17:52:55 +02:00
d89217ee21 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 17:42:36 +02:00
a1ab837794 Modifica Invio fatture elettroniche x GRAMM 2025-04-10 17:42:30 +02:00
ea2121e111 Fix vari
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 17:01:23 +02:00
0b2b8aa608 creazione colli da gestione documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 16:19:16 +02:00
1191f98485 Sistemato codice deposito e posizione durante la getColloByBarcode (ora vengono letti gli ultimi validi dalla giacenza)
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 13:27:12 +02:00
0dcedf0e72 Finish Feature-cancellaColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 13:07:58 +02:00
38b82afa58 Merge branch 'develop' into feature/Feature-cancellaColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-10 13:07:44 +02:00
6c0e2d5259 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 12:52:49 +02:00
635077f439 Aggiunti controlli cache per UserCacheService
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 12:52:34 +02:00
894da40182 Cambiato IntegryCustomerDB per puntare a Rossogargano_peppe 2025-04-10 12:52:09 +02:00
a026796faa Merge branch 'develop' into feature/Feature-cancellaColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 12:48:13 +02:00
a6aa1865ed sistemato controllo su colli
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-04-10 12:48:00 +02:00
749a7e9750 Cambiato db RossoGargano in RossoGargano_peppe
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 12:27:17 +02:00
5ab37279ad Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 12:16:49 +02:00
bc89647602 modificata nome report Situazione partite a data con giorni di dilazione e abilitato solo a chi ha attivo report Partite clienti/fornitori 2025-04-10 12:16:39 +02:00
e5a66bfd15 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/production/service/OrtoFruttaProductionService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneBollaService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/documenti/service/WMSDocumentService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/inventario/service/WMSInventarioService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/dto/VersaMaterialiRequestDTO.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/vendita/service/WMSSpedizioneService.java
2025-04-10 12:03:36 +02:00
7841b6de85 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 11:53:20 +02:00
83e346f70e Prima parte del servizio di Versamento Materiali WMS.
Convertito campo MtbColt.dataColloRif in LocalDate.
2025-04-10 11:53:13 +02:00
897cbbf336 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 11:44:02 +02:00
ebdf7beb8d modificata voce cartella distinte di incasso 2025-04-10 11:43:52 +02:00
4fe9ea4aa0 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 10:12:08 +02:00
f765d10b28 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
2025-04-10 10:12:07 +02:00
9126e7a827 Aggiunto lock cache utenti in retrieveUserData 2025-04-10 10:11:52 +02:00
d11fa25b86 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 09:46:12 +02:00
55e7ceb72a aggiunto reprot Partite Clienti/Fornitori a data 2025-04-10 09:45:50 +02:00
4302f43cf1 Iniziata implementazione versamento materiali WMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-10 09:45:44 +02:00
d00246e903 Merge branch 'develop' into feature/Feature-cancellaColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 18:07:27 +02:00
5c753df93d Gestito il progressivo ul per i colli L per cod_mart-partita_mag_prod-cod_jfas
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 16:52:55 +02:00
ce23004413 Merge branch 'develop' into feature/LottiScadMult 2025-04-09 16:51:55 +02:00
9256771b28 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 15:33:10 +02:00
7207f6226d Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 15:33:10 +02:00
0a6c30218c sistemata regola 2025-04-09 15:33:05 +02:00
7f55026913 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 14:46:15 +02:00
2471efea61 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 14:46:15 +02:00
ab4ef7b20b sistemata query 2025-04-09 14:46:05 +02:00
34950677dc Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 12:59:51 +02:00
2b4e98ca80 Funzione relativeWorkDate 2025-04-09 12:59:45 +02:00
dd1c3e34e6 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-09 12:21:28 +02:00
b883d59809 Finish FixGetAuthorization
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 12:21:27 +02:00
14e9b043a5 Adattato metodo getAuthorization a modifiche PvmAuthorizationDTO 2025-04-09 12:21:21 +02:00
9761d05a8e Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 12:09:46 +02:00
ea208c9534 Aggiornato timing in WMSBarcodeOrdiniAcquistoHandlerService
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 12:09:25 +02:00
050e8bd19e Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 12:06:25 +02:00
d17e943eed Aggiornato looper in UserCacheService
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 12:05:38 +02:00
8aa1798286 Fix apertura tutti ordini di lav e disattivato spostamento in ordini da confermare
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 11:53:50 +02:00
ba6f508a96 Merge remote-tracking branch 'origin/develop' into develop 2025-04-09 11:53:50 +02:00
efe29d4a64 Fix fonts in docker 2025-04-09 11:53:49 +02:00
2db2ba192b Merge branch 'master' into develop 2025-04-09 11:53:49 +02:00
c26446a25a Iniziato refactoring servizi di versamento materiali 2025-04-09 11:53:49 +02:00
a0c3d3a6b3 Fix after merge
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 11:33:59 +02:00
f06117d5ef Merge branch 'develop' into feature/RefactoringGestioneColli
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGiacenzaULService.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/controller/WMSMaterialiController.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/dto/VersaMaterialiRequestDTO.java
#	ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSMaterialiService.java
2025-04-09 11:32:45 +02:00
b3f7ab53bc Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 11:22:03 +02:00
8635798a3b Gestione scala sconti sevenbar 2025-04-09 11:21:58 +02:00
fdcf4a5f40 Fix fonts in docker
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 11:20:20 +02:00
75262b5940 Fix in distribuzione colli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 10:53:12 +02:00
6ce86bc1f9 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 10:29:21 +02:00
71081f0504 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 10:29:21 +02:00
71a09392e1 sistemata query per restituire correttamente ragione sociale 2025-04-09 10:29:15 +02:00
065e6af637 Iniziato refactoring servizi di versamento materiali
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-09 09:11:20 +02:00
913f4c4bf3 Gestita creazione lotti con scadenza multipla e pianificata per duplicazione ordine al giorno dopo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 17:42:21 +02:00
d90abfc97d migration
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 17:33:28 +02:00
a81bd88f66 Merge remote-tracking branch 'origin/feature/carelli_calendario_pv' into feature/carelli_calendario_pv 2025-04-08 17:23:34 +02:00
6fc60c39c5 servizio che ritorna il iano logistico per il calendario 2025-04-08 17:12:09 +02:00
ff8350470b migration piano logistico rrule 2025-04-08 17:12:09 +02:00
8f0f64da9e aggiunto tipo time 2025-04-08 17:12:09 +02:00
e692bf91fd [CARELLI - CalendarioPV]
- nuove entity e servizi
2025-04-08 17:12:09 +02:00
256931739d Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 17:10:29 +02:00
da6af5cef0 Merge branch 'hotfix/Hotfix-1' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-08 17:10:29 +02:00
8791f09899 corretto controllo sul segno tipo documento in generazione documento di trasferimento 2025-04-08 17:10:16 +02:00
d973eeefa0 AGGIUNTO SERVIZIO CHE SCARICA LE SETUP
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 15:20:01 +02:00
bd98f523b7 modifiche a procedura di generazione ordine di lavorazione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 12:48:23 +02:00
b33b2f7ca9 Migrations Tosca_BA
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 12:38:59 +02:00
da33c01414 Migrations Tosca_BA 2025-04-08 12:38:54 +02:00
59eb651ec9 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 12:38:28 +02:00
4433b833e9 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 12:38:28 +02:00
3bd750bd38 Problema entityExportResponse = null 2025-04-08 12:38:10 +02:00
a30fc9128f Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 11:56:49 +02:00
991ea6c5e1 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 11:56:49 +02:00
ad69fff2b7 sistemata attribuzione flag_reg_acc 2025-04-08 11:56:41 +02:00
0b3f1ee9fc Aggiornato ems-settings docker
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 11:52:55 +02:00
7c19c93814 Aggiornato ems-settings docker
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 11:45:55 +02:00
a45b442c98 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 11:07:31 +02:00
ceeded6bfd Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-08 11:07:31 +02:00
526d7f276b Fix durante lo spostamento di articoli: se il collo destinatario è di tipo V non deve impostare la causale a versamento 2025-04-08 11:07:25 +02:00
532c12dd22 Iniziato refactoring VersamentoMateriali
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-08 09:04:17 +02:00
e81c2ac6b9 Merge branch 'refs/heads/develop' into feature/RefactoringGestioneColli 2025-04-08 09:04:01 +02:00
26e7757d12 Fix Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-07 19:02:36 +02:00
161ea5e5dd Fix Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-07 18:57:56 +02:00
260019d79f Fix Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-07 18:48:04 +02:00
ff46ceff62 Fix Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-07 18:34:59 +02:00
679b172ee9 Fix Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-07 18:32:56 +02:00
08b68781e9 Refactoring del servizio di versamento e rientro del materiale da MES
Some checks failed
IntegryManagementSystem_Multi/pipeline/head Something is wrong with the build of this commit
2025-04-07 18:27:25 +02:00
0fdad47a76 Ricreati trigger non presenti su tutti i db
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-07 18:04:13 +02:00
983dfb29ee Merge branch 'develop' into feature/Feature-cancellaColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-07 16:04:47 +02:00
037a2079d1 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-07 12:31:10 +02:00
2d8491c8da Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-07 12:31:09 +02:00
ee2ec04e3e esportazione zucchetti, aggiunto uppercase in controllo licenza 2025-04-07 12:28:04 +02:00
1bddcbd15c Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-07 09:41:43 +02:00
84c0c5c452 Finish Hotfix-101
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-07 09:41:43 +02:00
4abf024ca2 Migrations DMS 2025-04-07 09:41:29 +02:00
760be03b18 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java
2025-04-07 09:40:00 +02:00
148a4359b6 Fix null
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-07 09:39:15 +02:00
b65d35cfd6 Migliorato servizio di retrieve UL in posizione con relativo stato
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-05 12:14:11 +02:00
54eb75a420 Sistemato riposizionamento UL
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-04 19:28:50 +02:00
053abef620 Gestiti permessi su pvm per MES
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-04 19:10:12 +02:00
f464f4e418 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-04 18:28:55 +02:00
b71d3ae72a Modifica 2025-04-04 18:28:40 +02:00
7140c89155 Merge remote-tracking branch 'origin/develop' into develop
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
2025-04-04 18:26:10 +02:00
7d9560a6e2 Ripristinata setup creata in passato 2025-04-04 18:26:00 +02:00
0852f0cdf7 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-04 18:25:17 +02:00
e7e231b635 aggiunto campo cod_paga nella vista cvw_sospeso_clienti 2025-04-04 18:25:08 +02:00
370020aa66 servizio che ritorna il iano logistico per il calendario
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-04 18:20:37 +02:00
a441a44147 Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-04 17:32:23 +02:00
aeb538f7b5 Modifica migration per DMS 2025-04-04 17:32:03 +02:00
47e06d0bfa Modificata vista
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-04 16:34:43 +02:00
2f9ca48d5f -- fix in thread pool con processori > 20 core
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-04 16:06:36 +02:00
e9d28c6f63 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-04 12:50:52 +02:00
22b33c609f Aggiornato Jenkinsfile
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Sistemata migration di allineamento gramm
2025-04-04 12:49:43 +02:00
212f14db36 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-04 11:49:55 +02:00
cb074835e5 Aggiornata migration gramm
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-04-04 11:49:36 +02:00
b50e25a0ee Aggiornate migration gramm
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-04 11:48:18 +02:00
0a49695d7c Aggiornato servizio di SpostaArtsTraUl
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-04 10:49:20 +02:00
ede2d6e664 Sistemato default
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-04 10:11:06 +02:00
7269ac5ded migration piano logistico rrule
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-04 09:29:15 +02:00
ba8ae58380 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-03 18:26:57 +02:00
ab60a8bc1f Impostato valore not null e default su campi mtb_sart: qta_iniz, qta_car, qta_scar 2025-04-03 18:26:49 +02:00
9e5a2e8400 Merge branch 'develop' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-03 18:13:58 +02:00
294de12efd Implementata migration per allineamento barcode_ul di GRAMM
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-03 18:13:31 +02:00
f0fb85e6db Aggiunto servizio per il recupero dei barcode_ul in posizione e implementata migrazione per aggiornare i barcode_ul in mtb_colt e mtb_colr
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-03 17:44:59 +02:00
384aa0c34c aggiunto tipo time
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-03 15:14:22 +02:00
4eabb26793 [CARELLI - CalendarioPV]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
- nuove entity e servizi
2025-04-03 14:58:31 +02:00
8328440827 update setup IMPOSTA_DEPOSITO_DI_DEFAULT
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-03 13:10:49 +02:00
f984576496 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-03 12:47:39 +02:00
523944217c create setup su gestioni documenti per impostare o meno il deposito di default 2025-04-03 12:47:30 +02:00
cc07ae484a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-03 11:56:45 +02:00
ed29a91a70 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-03 11:56:45 +02:00
12b2efbc7e gestite anomalie come errori in modo che venga inviata la mail 2025-04-03 11:56:39 +02:00
9cf97e7a29 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-03 10:35:32 +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
46a59336c7 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-02 19:30:04 +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
86081ec113 Refactoring servizio di retrieve colli in giacenza
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-02 19:04:50 +02:00
abfc29818a Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-02 17:38:48 +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
ea0406bcc8 creato nuovo report Fatturato Agenti/Articoli/Clienti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-02 16:22:24 +02:00
6e91be2978 aggiunto campo perc_aliq nella vista dei contratti di acquisto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-02 12:33:28 +02:00
8da5d833ce Creato servizio WMS di cambio posizione
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-04-01 13:20:16 +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
f15787a61b Merge branch 'master' into develop
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
b7c72d7a47 Merge branch 'master' into develop
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
be2c9a8f39 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-31 18:25:22 +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
1d0521daca Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-31 18:04:39 +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
49a2ae0f02 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-31 16:33:06 +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
98eb9642c3 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-31 16:23:15 +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
4d31f09830 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-31 16:03:51 +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
b3763c19a4 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-31 14:11:50 +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
6b888fcc56 Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2025-03-31 12:10:30 +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
0085c1d276 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-31 09:58:49 +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
5b29aeb4df Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-31 09:02:23 +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
b0d45be618 cancellazione colli in documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-27 17:39:58 +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
53e159104d Merge branch 'develop' into feature/Feature-cancellaColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-27 17:02:20 +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
8c9f0d3d3d Merge branch 'develop' into feature/Feature-cancellaColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-27 16:54:39 +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
d84d47fde9 cancellazione colli dai documenti
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2025-03-11 12:26:31 +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
40649597f9 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-11 09:45:20 +02:00
e8c896466c [ROSSOGARGANO]
corretto controllo su operationType in importazione campi
[TOSCA]
migration per risolvere problema fornitori non sincronizzati
2024-10-11 09:45:12 +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
d495f5fc5c Finish Hotfix-87
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-10 13:19:29 +02:00
4e066fe104 aggiunta procedura che rinomina il file 2024-10-10 13:18:44 +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
eadc35561d Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-10 09:54:50 +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
2481dd3dc8 [JENKINS] Aggiunti script compilazione Jenkins 2024-10-10 09:54:44 +02:00
b619a14b13 Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
2024-10-10 09:51:38 +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
6f09c4903f [JENKINS] Aggiunti script compilazione Jenkins 2024-10-10 09:51:26 +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
f689531e18 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
2024-10-10 09:37:50 +02:00
b873013798 [JENKINS] Aggiunti script compilazione Jenkins 2024-10-10 09:37:37 +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
825c9c9827 Finish Hotfix-87 2024-10-09 17:34:16 +02:00
df5744466a Merge branch 'master' into develop 2024-10-09 17:34:16 +02:00
5ae0b44e99 esportazione docfinance 2024-10-09 17:33:59 +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
2284e54833 Finish Hotfix-1 2024-10-09 13:16:18 +02:00
d57e29e48e Merge branch 'master' into develop 2024-10-09 13:16:18 +02:00
8361ae1b83 [EXCHANGE] Fix su importazione documenti e partite magazzino 2024-10-09 13:16:05 +02:00
9426cffad6 Merge branch 'master' into develop 2024-10-09 13:07:03 +02:00
3181ae391d Finish Hotfix-1 2024-10-09 13:07:02 +02:00
e445b72f7d [ROSSOGARGANO]
- corretta vista progressivi colli lavorazione per partita
- rimossa cache forzata su biolevante
- aggiunta quantità in sincronizzazione valorizzazioni certificati
2024-10-09 13:06:54 +02:00
d95cca0d97 Merge branch 'master' into develop 2024-10-09 11:27:28 +02:00
3358989914 Finish Hotfix-87 2024-10-09 11:27:27 +02:00
5dddc7ae80 sistemate migration 2024-10-09 11:27:20 +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
c3d81765d3 Finish Hotfix-87 2024-10-08 16:32:14 +02:00
f48960ddb9 gestita modalità di "prelievo" diversa da contanti 2024-10-08 16:32:05 +02:00
f866d98e6b Merge branch 'master' into develop 2024-10-08 15:44:48 +02:00
adc02cc9fe Finish Hotfix-87 2024-10-08 15:44:48 +02:00
5287d0d779 risolvere problema task e rotture di stock steup 2024-10-08 15:44:37 +02:00
39a2c5170e Merge branch 'master' into develop 2024-10-08 15:38:23 +02:00
dbb0f2e03b Finish Hotfix-87 2024-10-08 15:38:23 +02:00
9f4543358d sistemato errore 2024-10-08 15:38:16 +02:00
f61905653f Merge tag 'Hotfix-86' into develop
Finish Hotfix-86
2024-10-08 14:39:12 +02:00
9607b0f91a Finish Hotfix-86 2024-10-08 14:39:12 +02:00
ce3c6faae4 Migration per ENABLE_POSITION_CHANGE_REQUEST 2024-10-08 14:38:04 +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
6953e339db Finish Hotfix-86 2024-10-08 09:10:38 +02:00
325545be5c sistemato salvataggio allegati elo anche quando non ci sono righe 2024-10-08 09:10:29 +02:00
c0c15f005b Merge branch 'master' into develop 2024-10-07 17:30:30 +02:00
85d787105f Finish Hotfix-86 2024-10-07 17:30:29 +02:00
0b3b21c73c invio email a responsabile sono se diverso da chi ha inserito, sistemata cancellazione movimenti rg 2024-10-07 17:16:25 +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
d9bbcd821e Finish Hotfix-86 2024-10-07 15:28:03 +02:00
36690c988c aggiunti dati banca su ctb_part di rossogargano e sistemata procedura di carelli 2024-10-07 15:27:04 +02:00
ca205959ae Merge branch 'master' into develop 2024-10-07 13:49:01 +02:00
044306ca0d Finish Hotfix-1 2024-10-07 13:49:01 +02:00
36cd762fc9 [EXCHANGE] Fix in caso di delete partita 2024-10-07 13:48:56 +02:00
8365d24c02 Merge branch 'master' into develop 2024-10-07 13:23:08 +02:00
7f0210e150 Finish Hotfix-1 2024-10-07 13:23:08 +02:00
aab5f154b4 Fix ricalcolo numCnf nelle regole dei doc nel caso in cui sia una UM di tipo imballo 2024-10-07 13:23:02 +02:00
b13b23eb53 Merge branch 'master' into develop 2024-10-07 12:23:18 +02:00
ff678bd97f Finish Hotfix-1 2024-10-07 12:23:18 +02:00
a0731205ff [EXCHANGE] Ripristinata cancellazione di partite di magazzino inesistenti 2024-10-07 12:23:11 +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
12ebad7ae2 Finish FixImportMancante 2024-10-07 09:47:43 +02:00
c5c4bb22e3 Merge branch 'master' into develop 2024-10-07 09:47:43 +02:00
10840631b7 Fix import mancante in ExchangeBancheImportService 2024-10-07 09:47:23 +02:00
07e86a3c91 Migliorie sistema EXCHANGE 2024-10-04 19:18:17 +02:00
0531b865c4 Importazione movimenti contabili docfinance 2024-10-04 17:28:07 +02:00
a24fab203e Merge remote-tracking branch 'origin/develop' into develop 2024-10-04 15:10:26 +02:00
8c9db78a2d modificate funzioni f_int2lettere e f_dec2lettere per trasformare numeri interi e decimali in lettere 2024-10-04 15:10:16 +02:00
6f81a86a7d Ottimizzazione improtazione listini apulia 2024-10-04 11:00:49 +02:00
41afab06d6 varie modifiche per improtazione e esportazioni rosso gargano 2024-10-04 11:00:33 +02:00
07f20765cb Merge remote-tracking branch 'origin/develop' into develop 2024-10-03 18:47:49 +02:00
509148632f Aggiunta gestione CCI 37 2024-10-03 18:47:43 +02:00
6c7ddef35c Merge remote-tracking branch 'origin/develop' into develop 2024-10-03 17:32:07 +02:00
7507fd4a9f create funzioni f_int2lettere e f_dec2lettere per trasformare numeri interi e decimali in lettere 2024-10-03 17:31:56 +02:00
bcbb2a9504 Merge branch 'master' into develop 2024-10-03 17:10:48 +02:00
7ba2b75864 Finish Hotfix-1 2024-10-03 17:10:48 +02:00
9f88e36b61 [TOSCA]
gestione impegnato
2024-10-03 17:10:39 +02:00
03d8960e5a Finita query exportDocFinance 2024-10-03 16:08:11 +02:00
ef463d31f5 Finish Hotfix-86 2024-10-03 16:07:25 +02:00
f904ee7040 Merge branch 'master' into develop 2024-10-03 16:07:25 +02:00
aabee3022c correzione blocco risto cash 2024-10-03 16:07:18 +02:00
ff5972298c Merge remote-tracking branch 'origin/develop' into develop 2024-10-03 14:14:45 +02:00
e064d63bce personalizzato datawindow "Fatturato Articoli/CLienti" per Gramm 2024-10-03 14:14:34 +02:00
5d4a9c0702 Merge branch 'master' into develop 2024-10-02 18:14:01 +02:00
ca82ea83e6 Finish Hotfix-1 2024-10-02 18:14:00 +02:00
27fa0aa24c Fix exchange documenti 2024-10-02 18:13:55 +02:00
01d955200f Merge branch 'master' into develop 2024-10-02 17:08:35 +02:00
ea779be68f Finish Hotfix-1 2024-10-02 17:08:35 +02:00
a10155a5fd Implementata sincronizzazione exchange DocumentiVendita 2024-10-02 17:07:21 +02:00
4491b932de Merge remote-tracking branch 'origin/develop' into develop 2024-10-02 17:02:03 +02:00
8736af3e55 Modifica importazione docfinance 2024-10-02 17:01:58 +02:00
c3dcaeb944 Finish Hotfix-1 2024-10-02 17:01:33 +02:00
8ed1527e95 Merge branch 'master' into develop 2024-10-02 17:01:33 +02:00
ad02a0e54c Implementata sincronizzazione exchange DocumentiVendita 2024-10-02 17:01:27 +02:00
0e64ff7c05 Finish Hotfix-1 2024-10-02 14:56:59 +02:00
74e356f3bb Merge branch 'master' into develop 2024-10-02 14:56:59 +02:00
dcdfb7e03d [MATERICA]
aggiunta gestione pdf documenti in creazione zip
2024-10-02 14:56:51 +02:00
4335c1b0f7 disabilita la lettura delle info sull'indirizzo quando si verifica la partita iva da wingest 2024-10-02 12:14:03 +02:00
b96479962c Merge tag 'Hotfix-85' into develop
Finish Hotfix-85
2024-10-02 10:52:03 +02:00
311b0a1705 Finish Hotfix-85 2024-10-02 10:52:02 +02:00
99a4df9256 Fix query in getOrdiniLavorazione 2024-10-02 10:51:53 +02:00
c010e6f3bc Merge tag 'Hotfix-84' into develop
Finish Hotfix-84
2024-10-02 10:23:17 +02:00
0a824da8c6 Finish Hotfix-84 2024-10-02 10:23:16 +02:00
090e5f6d94 Fix query in getOrdiniLavorazione 2024-10-02 10:23:06 +02:00
a4a172b069 varie per importazione ed esportazione dati rossogargano 2024-10-02 09:52:08 +02:00
21c8ffdf18 Merge remote-tracking branch 'origin/develop' into develop 2024-10-02 09:06:35 +02:00
c49c2aabe4 Migrations disattivazione importazione documenti trasporto 2024-10-02 09:06:27 +02:00
38a603ada6 Migrations disattivazione importazione documenti trasporto 2024-10-02 09:06:21 +02:00
cbb8e97d03 personalizzato datawindow "Fatturato CLienti" per Biolevante 2024-10-01 11:27:28 +02:00
0037360a36 Merge branch 'master' into develop 2024-09-30 17:20:03 +02:00
8ded3f4a91 Finish Hotfix-1 2024-09-30 17:20:02 +02:00
1553c3b457 Fix su delete documents in EXCHANGE 2024-09-30 17:19:55 +02:00
4763bc5965 Merge remote-tracking branch 'origin/develop' into develop 2024-09-30 16:02:11 +02:00
e467ebb5e2 aggiunto campo tipo_formato sulla gtb_nazi 2024-09-30 16:02:01 +02:00
a961d0bb63 Finish Hotfix-1 2024-09-30 15:23:55 +02:00
4cf0c42375 Merge branch 'master' into develop 2024-09-30 15:23:55 +02:00
495876bc65 [MIDEL]
corretto controllo su esistenza cliente generico agente
2024-09-30 15:23:46 +02:00
90e6e64c91 Merge branch 'master' into develop 2024-09-30 15:20:28 +02:00
42d0c68c7f Finish Hotfix-1 2024-09-30 15:20:27 +02:00
0a27df0352 Merge remote-tracking branch 'origin/develop' into develop 2024-09-30 15:20:16 +02:00
6e2a9e9743 Fix errore mergeDbToEntity in caso di delete 2024-09-30 15:19:32 +02:00
bfb33d0d1f Merge branch 'master' into develop 2024-09-30 15:15:26 +02:00
c8a31a10fe Finish Hotfix-84 2024-09-30 15:15:25 +02:00
5df5f3b662 aggiunto num_cmov in un messaggio di errore e modifiche su procedura di importazione dei movimenti contabili di rossogargano 2024-09-30 15:11:28 +02:00
b45154e486 Spostati log di svuotamento logdb in trace 2024-09-30 12:53:45 +02:00
352f0e31d1 Merge branch 'master' into develop 2024-09-30 12:48:59 +02:00
f674b9a359 Finish Hotfix-1 2024-09-30 12:48:58 +02:00
9a2bada3cd Fix su controllo date Exchange 2024-09-30 12:48:52 +02:00
10b0fad6a6 Merge remote-tracking branch 'origin/develop' into develop 2024-09-30 12:19:25 +02:00
c0d7fe5f8e Disabilitata cache per DEMO su pc aziendali 2024-09-30 12:19:13 +02:00
ff39e731de Finish Hotfix-84 2024-09-30 12:10:38 +02:00
bbf62915b5 Merge branch 'master' into develop 2024-09-30 12:10:38 +02:00
bf1e04997c aggiunto num_cmov in un messaggio di errore e modifiche su procedura di importazione dei movimenti contabili di rossogargano 2024-09-30 12:09:45 +02:00
d6bf039007 Merge branch 'master' into develop 2024-09-30 10:50:23 +02:00
56f9d2041e Finish Hotfix-1 2024-09-30 10:50:22 +02:00
f8004fab38 Migliorie su EXCHANGE 2024-09-30 10:50:16 +02:00
c6ff9bf898 Merge branch 'master' into develop 2024-09-30 10:07:21 +02:00
ad2b7b3905 Finish Hotfix-1 2024-09-30 10:07:20 +02:00
6c445cc0e4 [ROSSOGARGANO]
cambio ordine di raccolta su certificato
2024-09-30 10:07:12 +02:00
f8e857ab26 sistemati campi della query 2024-09-30 09:43:37 +02:00
b2df910a51 [Task] fix aggiornamento codJfas in modifica attività 2024-09-27 16:18:23 +02:00
af80a0711a Merge remote-tracking branch 'origin/develop' into develop 2024-09-27 15:19:54 +02:00
57e6bc8bf1 Merge branch 'master' into develop 2024-09-27 15:16:35 +02:00
2d07f7e23c Finish Hotfix-1 2024-09-27 15:16:35 +02:00
d42e6d9bc1 Migliorata gestione di Exchange dei colli per ridurne l'impatto sulle performance 2024-09-27 15:16:28 +02:00
0c06a2f04d sistemata importazione dei dati del scontrino di vendita nel reso 2024-09-27 15:16:11 +02:00
f3a2027fb1 Merge remote-tracking branch 'origin/develop' into develop 2024-09-27 15:15:07 +02:00
bdc4359ad0 Esportazione scadenze doc finance 2024-09-27 15:15:02 +02:00
2211fb890b Sistemata procedura di importazione delle griglie di vendita 2024-09-27 12:18:12 +02:00
3a0667df22 Esportazione anagrafiche DocFinance 2024-09-27 11:26:56 +02:00
87597ab83b Personalizzazione stampa lipe per visualizzare o meno il credito anno precedente (attivata visualizzazione solo per Carelli) 2024-09-27 09:58:01 +02:00
08144fd5ea Aggiunta percProv in fase di importazione ordini web 2024-09-27 09:03:39 +02:00
e417eb762c Importazione scadenze DocFinance 2024-09-27 09:02:55 +02:00
50ce405dd7 Merge remote-tracking branch 'origin/develop' into develop 2024-09-26 18:05:41 +02:00
d52ecd7457 Modifica riapertura ordine AGRICOPER 2024-09-26 18:05:32 +02:00
ef7e3624fd Merge branch 'master' into develop 2024-09-26 16:43:26 +02:00
17178edd4f Finish Hotfix-84 2024-09-26 16:43:25 +02:00
a168edc3c2 sistemata condizione per selezionare i documenti web accettati quando c'è un collo di rettifica 2024-09-26 16:43:14 +02:00
fb019fcd1a Merge branch 'master' into develop 2024-09-25 17:33:35 +02:00
d7541b5fa8 Finish Hotfix-84 2024-09-25 17:33:34 +02:00
9759e7b4d5 aggiunta invio email di errore 2024-09-25 17:31:51 +02:00
0c582d6a91 Merge remote-tracking branch 'origin/develop' into develop 2024-09-25 14:58:20 +02:00
af100ad02e Escluso DB DMS da aggiornamento 2024-09-25 14:58:05 +02:00
0deb7a519f Escluso DB DMS da aggiornamento 2024-09-25 14:57:55 +02:00
de6186895a Merge branch 'master' into develop 2024-09-25 13:44:57 +02:00
ed493ca159 Finish Hotfix-84 2024-09-25 13:44:56 +02:00
8547bbdd08 aggiunta l'importazione dei fornitori nella sincronizzazione dei movimenti contabili 2024-09-25 13:44:49 +02:00
c6ee4364a2 [Ordify] Inserito calcolo provigione in esportazione ordini 2024-09-25 11:31:12 +02:00
9561f42283 Merge remote-tracking branch 'origin/develop' into develop 2024-09-25 10:54:18 +02:00
a5faa8c671 personalizzazione datawindow "Report Scadenze Fornitori" Carelli 2024-09-25 10:54:10 +02:00
27a48d221c Merge branch 'master' into develop 2024-09-25 09:45:31 +02:00
b9b0caa9fd Finish Hotfix-1 2024-09-25 09:45:30 +02:00
daa9dc3116 [ROSSOGARGANO]
- aggiunto servizio eliminazione certificato
- corretta duplicazione mtb_partita_mag_carat in modifica certificato
[TOSCA]
- corretta importazione impegnato da excel
2024-09-25 09:45:21 +02:00
0859e13a22 Merge remote-tracking branch 'origin/develop' into develop 2024-09-24 18:17:04 +02:00
173c27d98a Importazione ordini PUDDY sevenbar 2024-09-24 18:16:56 +02:00
cdc00bf9d3 Modifica FILCONAD 2024-09-24 18:16:30 +02:00
060487d40f Merge remote-tracking branch 'origin/develop' into develop 2024-09-24 18:11:30 +02:00
676d411191 modificata entity jtb_flav 2024-09-24 18:11:20 +02:00
1f2bd32da9 Finish Hotfix-84 2024-09-24 17:05:58 +02:00
3c43ce55c4 Merge branch 'master' into develop 2024-09-24 17:05:58 +02:00
dbe0563dad controllo sul null 2024-09-24 17:05:51 +02:00
d604707800 Finish Hotfix-84 2024-09-24 16:59:12 +02:00
ebf84daf89 Merge branch 'master' into develop 2024-09-24 16:59:12 +02:00
a401490d4b controllo sul null 2024-09-24 16:59:05 +02:00
2bbddc0df5 Merge remote-tracking branch 'origin/develop' into develop 2024-09-24 15:38:10 +02:00
4022505656 Migliorata gestione di invalid token exception 2024-09-24 15:37:57 +02:00
ac785fc135 Merge remote-tracking branch 'origin/develop' into develop 2024-09-24 15:34:03 +02:00
74c69af243 inserito campo altre_mansioni nella jtb_flav 2024-09-24 15:33:54 +02:00
d155771914 Merge branch 'master' into develop
# Conflicts:
#	ems-core/src/main/java/it/integry/ems_model/entity/GtbBancAziIntercode.java
2024-09-24 15:31:55 +02:00
25a7acb865 Finish Hotfix-84 2024-09-24 15:31:15 +02:00
dd3d71a9e0 aggiunta tabella intercode 2024-09-24 15:30:48 +02:00
835633ca4c - inserito entity child gtb_tipi_paga_intercode in gtb_tipi_paga
- modificate entity GtbTipiPagaIntercode e GtbBancAziIntercode
2024-09-24 15:23:44 +02:00
cd76a5655b Finish Hotfix-84 2024-09-24 12:00:58 +02:00
617f28594d Merge branch 'master' into develop 2024-09-24 12:00:58 +02:00
35494375dc Aggiunto messaggio d'errore quando non troviamo il deposito 2024-09-24 11:55:23 +02:00
4822c68e32 Importazione packing list formato DESADV Vebad 2024-09-24 11:15:38 +02:00
787cbeacec Merge remote-tracking branch 'origin/develop' into develop 2024-09-24 09:32:51 +02:00
962e3c8208 Fix keygroup in authentication 2024-09-24 09:32:43 +02:00
a711305b13 Finish Hotfix-84 2024-09-24 09:23:21 +02:00
490defe829 Merge branch 'master' into develop 2024-09-24 09:23:21 +02:00
a557d59700 sistemata condizione per selezionare ec come deposito aggiuntivo su bz 2024-09-24 09:09:05 +02:00
d6125204dd Merge remote-tracking branch 'origin/develop' into develop 2024-09-23 19:02:44 +02:00
b8e03337ee Fix keygroup in authentication 2024-09-23 19:02:37 +02:00
b5b854851b Finish Hotfix-84 2024-09-23 17:46:57 +02:00
bda9427eb8 Merge branch 'master' into develop 2024-09-23 17:46:57 +02:00
789a73fa78 sistemato popolamento della giacenza di carelli 2024-09-23 17:46:13 +02:00
c6008c4171 Aggiunto controllo in openStep se FERMA_CREA_DOCS attivo 2024-09-23 17:13:16 +02:00
93832a5e60 Merge branch 'master' into develop 2024-09-23 13:13:55 +02:00
c1b9e900f4 Finish FixImportOrdiniOrdikids 2024-09-23 13:13:54 +02:00
5e2d3fb38c Aggiunta condizione user_name in verifica ordine già importato ordikids 2024-09-23 13:13:47 +02:00
1f351ae36f Gestito destinatario in pvm_getassortimentoCliente 2024-09-20 18:45:38 +02:00
fc8831799d Eliminato log di ProcessSql 2024-09-20 17:31:11 +02:00
38a270a5de Merge branch 'master' into develop 2024-09-20 15:35:55 +02:00
4296ab94f0 Finish Hotfix-84 2024-09-20 15:35:54 +02:00
2ed3438b0c sistremato errore in inserimento attività 2024-09-20 15:35:48 +02:00
17b70036a6 Merge branch 'master' into develop 2024-09-20 15:23:04 +02:00
e3321d83d0 Finish Hotfix-84 2024-09-20 15:23:03 +02:00
efeacadb33 sistemare la procedura di apulia affinchè possa lavorare in ascolto sulla directory 2024-09-20 15:22:18 +02:00
6e908c02a2 [WinClock] Fix su notifiche iOS 2024-09-20 13:49:19 +02:00
663acfee7e Finish Hotfix-85 2024-09-20 12:49:30 +02:00
d3b2ca57de Merge branch 'master' into develop 2024-09-20 12:49:30 +02:00
8b5645118f sistremato errore in inserimento attività 2024-09-20 12:49:24 +02:00
761f89d8a1 Finish Hotfix-84 2024-09-20 11:36:15 +02:00
2fcb5eab65 Merge branch 'master' into develop 2024-09-20 11:36:15 +02:00
d464948fc9 tornata indietro 2024-09-20 11:36:08 +02:00
d17208d158 tornata indietro 2024-09-20 11:35:27 +02:00
113be95c26 Gestito il deadlock in importGSEOrder 2024-09-20 10:46:35 +02:00
04a226859e Merge branch 'master' into develop
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/document/Import/service/DocumentiAcquistoImportService.java
2024-09-20 10:26:38 +02:00
fc9009072a Finish Hotfix-84 2024-09-20 10:26:11 +02:00
c0abde4fd0 eliminato riferimento dell'ordine dalle righe delle bolle di apulia 2024-09-20 10:26:04 +02:00
898a79a6a4 Merge tag 'Hotfix-83' into develop
Finish Hotfix-83
2024-09-19 16:50:39 +02:00
4579c64744 Finish Hotfix-83 2024-09-19 16:50:39 +02:00
a115c8e607 Fix null point in invio notifica 2024-09-19 16:50:22 +02:00
18acbfa324 Importazione ordini di vendita sevenbar 2024-09-19 16:41:10 +02:00
955e6d37c2 Merge remote-tracking branch 'origin/develop' into develop 2024-09-19 16:40:38 +02:00
f617edbf27 Importazione GSE 2024-09-19 16:40:31 +02:00
f97de2de08 Finish Hotfix-83 2024-09-19 14:00:44 +02:00
d2bf587d57 Merge branch 'master' into develop 2024-09-19 14:00:44 +02:00
941e5948c8 eliminato file filter 2024-09-19 14:00:35 +02:00
94a52168f7 Merge remote-tracking branch 'origin/develop' into develop 2024-09-19 12:43:49 +02:00
1d408a1460 eliminata disabilitazione gestione aliquote iva, abilitato inserimento ddt, eliminata attribuzione num_doc su importazione documenti apulia 2024-09-19 12:43:44 +02:00
63858fa63e Merge tag 'Hotfix-82' into develop
Finish Hotfix-82
2024-09-19 12:39:56 +02:00
8fd558360d Finish Hotfix-82 2024-09-19 12:39:55 +02:00
2f191e012d Fix ApuliaRifOrd 2024-09-19 12:39:37 +02:00
fcae5341bd aggiunto indice 2024-09-19 09:06:21 +02:00
5fa18833e7 Merge branch 'master' into develop 2024-09-18 16:39:31 +02:00
724c875f72 Finish Hotfix-1 2024-09-18 16:39:30 +02:00
30e599140d [ROSSOGARGANO]
corretta imoortazione certificati valorizzati
2024-09-18 16:39:22 +02:00
7ae54057a4 Merge branch 'master' into develop 2024-09-18 15:46:14 +02:00
b7f41fdd33 Finish Hotfix-1 2024-09-18 15:46:13 +02:00
a456690c89 [ROSSOGARGANO]
fix salvataggio certificati (tassoriduzione = 0)
2024-09-18 15:46:06 +02:00
ec5b635a13 Merge branch 'master' into develop 2024-09-18 12:57:21 +02:00
110ee85863 Finish Hotfix-1 2024-09-18 12:57:20 +02:00
175befb82f [ROSSOGARGANO]
fix creazione ddta in creazione certificato
2024-09-18 12:57:13 +02:00
17e8cad14b creata nuova tabella gtb_tipi_paga_intercode 2024-09-18 12:56:10 +02:00
d27b4ac4b7 Merge remote-tracking branch 'origin/develop' into develop 2024-09-18 12:46:28 +02:00
db37651a65 creata nuova tabella gtb_banc_azi_intercode 2024-09-18 12:46:17 +02:00
4da0144be7 Merge branch 'master' into develop 2024-09-18 12:28:13 +02:00
c1660b4821 Finish Hotfix-82 2024-09-18 12:28:13 +02:00
9db3002acc non far scaricare la griglia al termine dell'ispezione se si tratta di rotture di stock no freschi 2024-09-18 12:28:03 +02:00
10c69c022c Merge branch 'master' into develop 2024-09-18 12:02:01 +02:00
44f127ab9b Finish Hotfix-1 2024-09-18 12:02:00 +02:00
e7fcd977f7 Aggiunta implementazione che durante l'exchange dei Colli, se il collo è da cancellare ed è agganciato a documento allora provvede prima a sganciare il documento e successivamente a cancellare il collo 2024-09-18 12:01:54 +02:00
9892418137 Aggiunto profile db nei claim data del JWT Token 2024-09-18 11:57:10 +02:00
0b884b97ce Merge branch 'master' into develop 2024-09-18 10:12:09 +02:00
7bf36fcdf5 Finish Hotfix-1 2024-09-18 10:12:08 +02:00
d930c23677 corretto controllo in getordinilavorazione 2024-09-18 10:12:01 +02:00
409cee499d nuove classi per esportazione e impostazione scadenze 2024-09-18 09:22:53 +02:00
8f1cba7756 Merge branch 'master' into develop 2024-09-17 19:15:04 +02:00
32323a0323 Finish Hotfix-1 2024-09-17 19:15:03 +02:00
fac88c991b [DEMO]
messi dati MRP e MES in cache per biolevante !!TEMPORANEAMENTE!!
2024-09-17 19:14:55 +02:00
c6f6ca31f0 Create setup mancanti winaccess e setup etichetta rientro mes 2024-09-17 18:51:22 +02:00
9df7e2ad73 migration per disattivare setup attivata erroneamente 2024-09-17 17:33:47 +02:00
3ea63962a2 Merge branch 'master' into develop 2024-09-17 17:00:50 +02:00
2a657043d7 Finish Hotfix-82 2024-09-17 17:00:49 +02:00
450b458f29 aggiunto invio email a responsabile di commessa 2024-09-17 17:00:43 +02:00
8e862e3e41 Merge branch 'master' into develop 2024-09-17 15:58:46 +02:00
441804f254 Finish Hotfix-82 2024-09-17 15:58:45 +02:00
67c0ceefdd aggiunto invio email a responsabile di commessa 2024-09-17 15:49:35 +02:00
3647fb995d Merge remote-tracking branch 'origin/develop' into develop 2024-09-17 15:29:32 +02:00
9534dabdf1 sincronizzazione banche aziendali 2024-09-17 15:29:27 +02:00
31a123789a Refactor processReport 2024-09-17 14:56:57 +02:00
94625a04f1 Merge branch 'master' into develop
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeImportSchemaManagerService.java
2024-09-17 13:04:33 +02:00
fd52f5bf3a Finish Hotfix-1 2024-09-17 13:03:30 +02:00
aad189abb0 [TOSCA]
Servizio importazione ordini vendita
[ROSSOGARGANO]
Servizio sincornizzazione certificati
2024-09-17 13:03:22 +02:00
dac51332c4 Merge branch 'master' into develop 2024-09-17 12:50:32 +02:00
296e828f84 Finish Hotfix-82 2024-09-17 12:50:32 +02:00
2cf7e8896d aggiunto controllo per articoli con barcode null 2024-09-17 12:50:25 +02:00
7140170b01 servizio di sync banche aziendali 2024-09-17 12:30:08 +02:00
ac953a7668 [Ordify] Aggiunto metodo per il download dei report da ordify 2024-09-17 09:39:26 +02:00
1abf04e112 Merge remote-tracking branch 'origin/develop' into develop 2024-09-17 09:15:40 +02:00
c97ac8ef24 aggiunti campi data_iniz e data_fine nella gestione elenco note aggiuntive al documento 2024-09-17 09:15:30 +02:00
32c6fe13d1 Finish Hotfix-81 2024-09-16 10:55:36 +02:00
12210508cf Merge tag 'Hotfix-81' into develop
Finish Hotfix-81
2024-09-16 10:55:36 +02:00
517e614a67 Fix stato attività 2024-09-16 10:55:15 +02:00
29a0911889 [WMS] Implementati documenti scarico in CloseUDS del Picking Libero di Lavorazione 2024-09-16 10:13:29 +02:00
c109ba1d8f Merge remote-tracking branch 'origin/develop' into develop 2024-09-13 18:17:01 +02:00
1089324b48 Modifica 2024-09-13 18:16:50 +02:00
d35f1fd3e7 sistemato servizio di salvataggio delle immagini 2024-09-13 18:04:46 +02:00
98346a4263 Merge branch 'master' into develop 2024-09-13 17:42:07 +02:00
9f03ce827f Finish Hotfix-81 2024-09-13 17:42:07 +02:00
efebad843a sistemato servizio di salvataggio immagini su articolo da directory 2024-09-13 17:42:00 +02:00
89430c96e3 aggiunta migration setup 2024-09-13 17:40:49 +02:00
d5a8032514 creata nuova gestione elenco note aggiuntive al documento 2024-09-13 17:08:18 +02:00
26c18df76e aggiunta data inserimento e modifica su ctb_cont e aggiunta funzione per attivare velocemente il salvataggio con i servizi rest 2024-09-13 15:55:57 +02:00
eab51f4f81 aggiunta data inserimento e modifica su ctb_cont e aggiunta funzione per attivare velocemente il salvataggio con i servizi rest 2024-09-13 15:55:36 +02:00
ecd3e14cc5 Finish Hotfix-81 2024-09-13 13:55:23 +02:00
adccc2bb1a Merge branch 'master' into develop 2024-09-13 13:55:23 +02:00
3af2aefa47 modifica a servizio di salvataggio immagini da directory 2024-09-13 13:55:15 +02:00
2fd4d75df0 create entity DtbNoteDoc e DrlTipiNoteDoc 2024-09-13 12:38:59 +02:00
67904d5e78 create tabelle dtb_note_doc e drl_tipi_note_doc 2024-09-13 11:42:10 +02:00
bc90d0bb3c Merge branch 'refs/heads/develop' into GestioneDocumentiLavorazioneWMS 2024-09-13 10:36:01 +02:00
0246331940 Merge tag 'Hotfix-80' into develop
Finish Hotfix-80
2024-09-13 10:22:28 +02:00
450ab46281 Finish Hotfix-80 2024-09-13 10:22:27 +02:00
bee4ec324a socialweb 2024-09-13 10:22:06 +02:00
7c1c68f7d2 [WMS] Implementati documenti scarico in CloseUDS lavorazione 2024-09-13 09:22:17 +02:00
af1e06d765 Merge tag 'Hotfix-79' into develop
Finish Hotfix-79
2024-09-12 16:53:43 +02:00
d4b35cccd4 Finish Hotfix-79 2024-09-12 16:53:42 +02:00
46b8842db1 Modifica import GSE 2024-09-12 16:53:19 +02:00
9fa40e5e3c Merge branch 'master' into develop 2024-09-12 16:10:40 +02:00
1dc43f7760 Finish Hotfix-79 2024-09-12 16:10:40 +02:00
f37afb6e51 Controllo su ass, commessa a ordini acquisto textiles 2024-09-12 15:46:55 +02:00
f70130e7bd Controllo su ass, commessa a ordini acquisto textiles 2024-09-12 15:46:49 +02:00
11b6853979 modificata logica per attività pianificate 2024-09-12 15:44:32 +02:00
4236989e20 Merge remote-tracking branch 'origin/develop' into develop 2024-09-12 15:36:17 +02:00
772c69f7dc Controllo su ass, commessa a ordini acquisto textiles 2024-09-12 15:36:10 +02:00
83ee7eb720 Finish Hotfix-79 2024-09-12 14:41:50 +02:00
18d99158f5 Merge branch 'master' into develop 2024-09-12 14:41:50 +02:00
611560f365 modificata logica per attività pianificate 2024-09-12 14:41:36 +02:00
6c54599f1a Merge tag 'Hotfix-78' into develop
Finish Hotfix-78
2024-09-12 12:41:17 +02:00
132a4d176c Finish Hotfix-78 2024-09-12 12:41:16 +02:00
dbf79d9cc6 Modifica import GSE 2024-09-12 12:40:58 +02:00
40557913ba Merge remote-tracking branch 'origin/develop' into develop 2024-09-12 12:20:54 +02:00
b1f28f9462 Aggiunto controllo su esistenza lotto nella generazione degli ordini per il planning di produzione 2024-09-12 12:20:50 +02:00
3e14bafe61 sistemate migration e aggiunta condizione su accettazione da bolla 2024-09-12 11:52:48 +02:00
9e38f3da92 Aggiunta campo check exist lotto per cruscottto 2024-09-12 09:16:34 +02:00
fb690a3f2d Merge tag 'Hotfix-77' into develop
Finish Hotfix-77
2024-09-11 16:30:50 +02:00
3064ca55da Finish Hotfix-77 2024-09-11 16:30:49 +02:00
665f193692 Aggiunta gestione sconto contrattuale 2024-09-11 16:30:32 +02:00
043f424a80 Merge remote-tracking branch 'origin/develop' into develop 2024-09-11 16:28:46 +02:00
46df55e70e Controllo per planning 2024-09-11 16:28:30 +02:00
c396715e83 Merge tag 'Hotfix-76' into develop
Finish Hotfix-76
2024-09-11 16:21:38 +02:00
6177cfb56b Finish Hotfix-76 2024-09-11 16:21:37 +02:00
b3e7f76efc Fix importGSEOrder 2024-09-11 16:21:17 +02:00
08d75b06cb [WMS] Aggiunto metodo per permettere di suggerire i lotti in fase di generazione dei trasferimenti 2024-09-11 12:39:13 +02:00
7dbeb2ce91 [Ordify] Aggiunte setup: maxSconto, abilitaSecondoSconto 2024-09-11 12:36:01 +02:00
a4db651ec6 Finish Hotfix-1 2024-09-11 09:46:31 +02:00
8f921ecd13 Merge branch 'master' into develop 2024-09-11 09:46:31 +02:00
de9bcceb21 Fix su format data in SmartLogistic 2024-09-11 09:46:24 +02:00
a4a360ca90 modifiche per getlistinovendita e aggiunto nuovo campo in gtb_anag 2024-09-10 17:09:25 +02:00
dbeb142d6d Merge branch 'develop' into feature/Feature-FatturaDiffertita 2024-09-10 09:56:00 +02:00
d221eb16b5 Finish Feature-ORDL 2024-09-10 09:28:49 +02:00
17236668e7 Merge branch 'develop' into feature/Feature-ORDL 2024-09-10 09:07:21 +02:00
1030781c2d Merge remote-tracking branch 'origin/feature/Feature-ORDL' into feature/Feature-ORDL 2024-09-10 08:59:39 +02:00
27e60d558f Modifiche varie 2024-09-10 08:59:29 +02:00
872419006b Impostazione flag_ansi_null su tutti i clienti 2024-09-09 15:59:10 +02:00
2637081af7 Merge branch 'master' into develop 2024-09-09 14:39:30 +02:00
6a96c920f1 Finish Hotfix-76 2024-09-09 14:39:29 +02:00
c6d107465c aggiunta una distinct 2024-09-09 14:39:22 +02:00
bfa24280bf Aggiunto data_cons_prod_max in MES_GetWorkOrders 2024-09-09 11:43:00 +02:00
b2a572ea84 Merge branch 'develop' into feature/Feature-ORDL 2024-09-09 10:45:30 +02:00
cab6025e41 Merge remote-tracking branch 'origin/develop' into develop 2024-09-06 17:03:44 +02:00
91ee2082ab disabilitate nuove gestioni documenti e ordini tab 2024-09-06 17:03:35 +02:00
f79c311573 Sistemata importazione listini apulia in modo che inserisca correttamente la % promo annche sui listini futuri 2024-09-06 15:05:39 +02:00
183e794657 Merge remote-tracking branch 'origin/develop' into develop 2024-09-06 12:11:04 +02:00
e50e9b37c6 aggiunta voce menu gestione documenti di lavorazione tab 2024-09-06 12:10:54 +02:00
537dbe7695 Merge branch 'master' into develop 2024-09-06 10:37:46 +02:00
8c3ae2d854 Finish Hotfix-1 2024-09-06 10:37:46 +02:00
620b3daf5a Fix su importazione documenti Exchange 2024-09-06 10:37:39 +02:00
2e70316bc6 Modifica generazioe oridni 2024-09-05 18:12:43 +02:00
afc06b38b3 Merge remote-tracking branch 'origin/develop' into develop 2024-09-05 12:45:34 +02:00
1c7db830ea aggiunta voce menu gestione documenti di acquisto tab 2024-09-05 12:45:24 +02:00
5cf060920e Merge branch 'master' into develop 2024-09-05 10:27:41 +02:00
f7d6e527b9 Finish Hotfix-1 2024-09-05 10:27:40 +02:00
80a0d68fc3 [ROSSOGARGANO]
corretta importazione campi raccolta
gestito campo cod_vzon in certificati di raccolta
2024-09-05 10:27:32 +02:00
6498e2a123 Merge branch 'master' into develop 2024-09-04 15:40:42 +02:00
ace9cbe4a8 Finish Hotfix-76 2024-09-04 15:40:42 +02:00
a42c0e1ad9 sistemata condizione di Where 2024-09-04 15:40:27 +02:00
ba35c03032 Merge branch 'master' into develop
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/system/service/SystemService.java
2024-09-03 18:54:18 +02:00
550b2889f7 Modifica num_fase da decimal a integer 2024-09-03 18:53:24 +02:00
28a1c49d3a Finish Hotfix-1 2024-09-03 18:53:24 +02:00
1e97a37dd7 [EXCHANGE] Durante l'importazione dei colli è stata modificata l'operation delle MtbColr in INSERT_OR_UPDATE per sovrascrivere correttamente dei colli creati manualmente 2024-09-03 18:53:18 +02:00
dcb14913a6 Merge tag 'Hotfix-75' into develop
Finish Hotfix-75
2024-09-03 16:01:51 +02:00
cb380d090d Finish Hotfix-75 2024-09-03 16:01:50 +02:00
cbea692c05 Fix retrieveGiacenza 2024-09-03 15:59:50 +02:00
8e686ce633 Merge remote-tracking branch 'origin/develop' into develop 2024-09-03 15:58:25 +02:00
b05c52a668 aggiunta voce menu gestione ordini di produzione tab 2024-09-03 15:58:14 +02:00
9f901d1341 Finish Hotfix-1 2024-09-03 12:22:15 +02:00
9c3064ba82 Merge branch 'master' into develop 2024-09-03 12:22:15 +02:00
079854109f Fix su controllo getCodMdep 2024-09-03 12:22:05 +02:00
331eb1efb0 Fix su controllo getCodMdep 2024-09-03 12:21:33 +02:00
8578e2fa7c Implementata delete di file orfani di MinIO sfruttando le API disponibili 2024-09-03 12:21:05 +02:00
40b49300dc Migliorato documento di reso quando effettuano le perdite 2024-09-03 10:17:21 +02:00
f149d54350 Setup per fatture elettroniche 2024-09-02 18:00:25 +02:00
2e989c2752 Merge branch 'master' into develop 2024-09-02 17:06:40 +02:00
1bdb592755 Finish Hotfix-1 2024-09-02 17:06:39 +02:00
0d77488056 [ROSSOGARGANO]
modifica ordini di lavorazione
2024-09-02 17:06:30 +02:00
ae259cfc10 correzione su salvataggio delle bolle agganciate alla fattura passiva. 2024-09-02 15:01:59 +02:00
ecb45f2ccb sistemata divisione nel conversione dell'importo della scadenza 2024-09-02 12:34:03 +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
ebe93e2ca0 Merge branch 'develop' into feature/Feature-ORDL 2024-09-02 10:10:51 +02:00
859c50334a Merge remote-tracking branch 'origin/develop' into develop 2024-08-28 18:05:29 +02:00
982c3e4676 Assegnazione codice anagragico su ordine di produzione in pianificazione della produzione MAGGIO 2024-08-28 18:05:24 +02:00
b4ddf1f587 Rimosso aggiornamento codlang superfluo 2024-08-28 17:04:49 +02:00
d6bfb1efbc Aggiornamento last access datetime in nuova login ed aggiunto enum in typeExport JasperDTO 2024-08-28 16:56:33 +02:00
009a523aa9 Gestita esportazione documenti di vendita in excel e csv 2024-08-28 11:19:05 +02:00
05213c1053 Merge remote-tracking branch 'origin/develop' into develop 2024-08-27 15:58:28 +02:00
7c1cfa010f Modifica x esclusione da DMS 2024-08-27 15:58:23 +02:00
d2e9ee8f44 Merge branch 'master' into develop 2024-08-27 11:50:57 +02:00
e282fe5d0a Finish Hotfix-1 2024-08-27 11:50:57 +02:00
71652f0e55 hotfix: senza la proprietà trimspaces in stbuser la modifica di un utente cancella i numeri da in coda alla password 2024-08-27 11:50:49 +02:00
0e08fc2aa1 [LOG DB]
aggiunto log dei record eliminati
2024-08-27 10:49:47 +02:00
9409204e96 Merge remote-tracking branch 'origin/develop' into develop 2024-08-27 10:40:06 +02:00
6adce3e2f6 [LOG DB]
aggiunto controllo su maxSize null in ems_settings
2024-08-27 10:39:55 +02:00
395e8b8c34 Merge remote-tracking branch 'origin/develop' into develop 2024-08-27 10:29:38 +02:00
fef3901f63 Personalizzazione DW cruscotto produzione Agricoper 2024-08-27 10:29:29 +02:00
6d8e5baffe [LOG DB]
gestito spazio in dimensione massima log db
2024-08-26 16:53:56 +02:00
b714d66f2e [LOG DB]
configurazione dimensione massima db
2024-08-26 16:45:09 +02:00
1bd2a0ffb5 Merge branch 'Importazione_EBC' into develop 2024-08-26 09:54:31 +02:00
45989f6b0d Merge branch 'develop' into Importazione_EBC 2024-08-26 09:54:02 +02:00
4669c21085 Merge branch 'master' into develop 2024-08-23 15:18:40 +02:00
93b6cbdf6e Finish Hotfix-1 2024-08-23 15:18:40 +02:00
1e3cd71f0c Cambiato range di lettura dei colli in exchange 2024-08-23 15:18:13 +02:00
1500fb56a2 Aggiunto Unique in JtbFasiImpMesi ed ImportFromParent in JtbFasiImpMesiDett 2024-08-23 14:40:28 +02:00
0c20232661 Merge branch 'master' into develop 2024-08-23 10:50:56 +02:00
4a5dfa3c58 Finish Hotfix-1 2024-08-23 10:50:55 +02:00
351f0733a3 Rimossa gestione in equals() di ExchangeCampiRaccoltaDTO 2024-08-23 10:50:49 +02:00
dbf96ac0eb Modificati equals in gestione Exchange 2024-08-23 09:51:39 +02:00
fd0a686078 Refactoring del costruttore di EntityBase in modo che accetti in input il Logger non ne istanzi uno nuovo per ogni entity creata. Refactoring anche di tutte le Entity in modo che passino l'istanza statica privata del logger.
Valorizzate anche a compile time tutte le EntityChild che sono delle liste, in modo che il costruttore in EntityBase non usi le reflection per farlo.
2024-08-22 13:41:13 +02:00
2262b6db2e Vario 2024-08-22 12:21:47 +02:00
2b817b10a1 Aggiunto controller per exchange partite magazzino 2024-08-21 13:24:57 +02:00
52ccc41694 Merge branch 'master' into develop 2024-08-21 09:49:17 +02:00
d4648148ba Finish Hotfix-1 2024-08-21 09:49:16 +02:00
6fd583521b Modificata dataVersamento in LocalDate 2024-08-21 09:49:08 +02:00
201a556ad5 Fix generazione entity 2024-08-20 13:50:51 +02:00
f2b783d970 Finish Hotfix-1 2024-08-20 13:44:59 +02:00
6e66ce8dac Merge branch 'master' into develop 2024-08-20 13:44:59 +02:00
61c1c89dde Migliorie estreme su mapResultSetToList 2024-08-20 13:44:53 +02:00
aa080067df Migliorata gestione errori durante il salvataggio delle fatture passive 2024-08-19 17:47:12 +02:00
39760e5e94 Finish Hotfix-1 2024-08-19 17:16:28 +02:00
a5e1af3f54 Merge branch 'master' into develop 2024-08-19 17:16:28 +02:00
b28b27d8ae Migliorie su stream in EXCHANGE Colli 2024-08-19 17:16:23 +02:00
e2d50a4233 Merge branch 'master' into develop 2024-08-19 15:48:51 +02:00
3bcfd78adb Finish Hotfix-1 2024-08-19 15:48:50 +02:00
368154b80a Fix su ExchangeColli e job da caricare all'avvio 2024-08-19 15:48:42 +02:00
8bfd37d9aa Merge remote-tracking branch 'origin/develop' into develop 2024-08-19 12:53:41 +02:00
3b99091bfa Migliorata gestione errori durante il salvataggio delle fatture passive 2024-08-19 12:53:33 +02:00
2410b95969 Merge tag 'Hotfix-74' into develop
Finish Hotfix-74
2024-08-19 11:34:07 +02:00
077f002fbe Finish Hotfix-74 2024-08-19 11:34:06 +02:00
ebe5f91e45 Fix null point mail service 2024-08-19 11:33:53 +02:00
a162b6c3f8 Merge branch 'master' into develop 2024-08-19 10:22:57 +02:00
66d3fd4bc9 Finish Hotfix-1 2024-08-19 10:22:56 +02:00
2a5276cddb Migliorato log di fine esecuzione EXCHANGE 2024-08-19 10:22:51 +02:00
aba96c11b7 sistemata migration 2024-08-14 18:21:59 +02:00
48c8981015 abilitazione nuova gestione aliquote 2024-08-14 17:14:08 +02:00
05fc8d9d61 aggiunta voce menu gestione ordini di acquisto tab 2024-08-14 16:30:57 +02:00
1a685140b9 aggiunta voce menu gestione ordini di vendita tab 2024-08-14 12:45:38 +02:00
d344257b0c Popolamento giacenze riportate le movimentazioni di EC in BZ 2024-08-14 09:18:03 +02:00
46a4ef3f05 aggiunte migration 2024-08-13 17:31:29 +02:00
23beff9772 Merge remote-tracking branch 'origin/develop' into develop 2024-08-13 16:07:04 +02:00
8d53d0b825 Modificato messaggio di errore 2024-08-13 16:06:54 +02:00
e5014e602b Modificato retrieveGiacenza 2024-08-13 15:51:18 +02:00
61a6c58a8a Merge branch 'master' into develop 2024-08-13 15:36:53 +02:00
effd05cf46 Finish Hotfix-1 2024-08-13 15:36:52 +02:00
f01ea9470d Rimosse operazioni di delete su importazione exchange dei gruppi merceologici 2024-08-13 15:36:39 +02:00
3b33018019 aggiunta voce menu gestione ordini di lavorazione tab 2024-08-13 15:04:27 +02:00
23d061be0c Merge remote-tracking branch 'origin/develop' into develop 2024-08-13 15:01:11 +02:00
5f6669343b sistemata migratione 2024-08-13 15:00:45 +02:00
e33ac3f0cc Gestito update gest setup e cancellazione da stb_gest_setup_depo e wtb_gest_setup_user nelle migration 2024-08-13 13:06:05 +02:00
e64a3821b8 ricreate classi 2024-08-13 10:15:33 +02:00
95f4a99991 cancella classe 2024-08-13 09:43:27 +02:00
4f10590254 Merge branch 'master' into develop 2024-08-12 19:19:29 +02:00
7628f7325c Finish FixSaveProdPlan 2024-08-12 19:19:28 +02:00
81b2edde0c Fix ordine con data errata in saveProductionPlan 2024-08-12 19:19:23 +02:00
09a922098c create nuove tabelle: jtb_fasi_imp_mesi e jtb_fasi_imp_mesi_dett 2024-08-12 18:04:39 +02:00
5cf3d2c732 elimiazione trigger e varie modifiche su ordini di produzione 2024-08-12 13:45:13 +02:00
d80f1d1fb8 Merge branch 'develop' into feature/Feature-ORDL 2024-08-12 13:13:12 +02:00
54033ca781 Condivise configurazioni remote JVM Debug 2024-08-12 13:04:15 +02:00
b24182eb9e Merge remote-tracking branch 'origin/develop' into develop 2024-08-12 11:33:26 +02:00
50228dcb90 aggiunto setup 2024-08-12 11:33:23 +02:00
a698651c24 elimiazione trigger e varie modifiche su ordini di produzione 2024-08-12 10:40:25 +02:00
ba7c89e626 [IME]
aggiunta setup review cliente
2024-08-11 16:10:31 +02:00
09270bf4b8 sistemata decrizione migration 2024-08-09 18:23:41 +02:00
b9df8c14e3 Merge remote-tracking branch 'origin/develop' into develop 2024-08-09 17:50:25 +02:00
8194b4099d Migrations 2024-08-09 17:50:18 +02:00
bf1a1b6251 Merge branch 'develop' into feature/Feature-ORDL 2024-08-09 16:39:56 +02:00
da231585f3 elimiazione trigger e varie modifiche su ordini di produzione 2024-08-09 16:26:43 +02:00
2481bee5fa Aggiunti controlli in importazione ordini gse 2024-08-09 16:03:05 +02:00
48e54129d3 elimiazione trigger e varie modifiche su ordini di produzione 2024-08-09 15:08:44 +02:00
fc4edde981 abilitata voce menu aliquote iva (new) 2024-08-09 14:51:01 +02:00
f494126e97 abilitata voce menu aliquote iva (new) 2024-08-09 14:39:42 +02:00
b9fb539d02 inserita voce menu aliquote iva (new) 2024-08-09 14:34:06 +02:00
2e0086880f elimiazione trigger e varie modifiche su ordini di produzione 2024-08-09 12:15:24 +02:00
bfe72399fd Fix null point in MailService 2024-08-09 11:44:24 +02:00
d8dec26f5d Merge remote-tracking branch 'origin/develop' into develop 2024-08-09 10:32:55 +02:00
7b5366839c Fix path per download apk wms 2024-08-09 10:32:48 +02:00
6ee276be2c Merge remote-tracking branch 'origin/develop' into develop 2024-08-09 10:32:37 +02:00
03d5335909 Migrations setup Follies 2024-08-09 10:32:32 +02:00
8a85015f5f Migrations setup Follies 2024-08-09 10:32:26 +02:00
c1f432e8aa Importazione ordini di vendita GSE 2024-08-09 10:13:36 +02:00
f7b7b0c91f Merge branch 'master' into develop 2024-08-08 18:02:01 +02:00
622de7b531 Finish Hotfix-1 2024-08-08 18:02:01 +02:00
59da080298 Fix compilazione statica drools 2024-08-08 18:01:54 +02:00
b9d342901b Merge branch 'master' into develop
# Conflicts:
#	ems-core/pom.xml
#	ems-engine/pom.xml
2024-08-08 17:40:05 +02:00
aef2e68828 Finish Hotfix-1 2024-08-08 17:39:23 +02:00
f21085de30 Fix compilazione statica drools 2024-08-08 17:38:48 +02:00
5ca91469a5 disabilitata nuova gestione aliquote iva 2024-08-08 17:33:26 +02:00
ae7cc990a0 Fix compilazione statica drools 2024-08-08 17:27:25 +02:00
555f6d5dc4 Merge remote-tracking branch 'origin/develop' into develop 2024-08-08 17:13:38 +02:00
cad940bdff Fix compilazione statica drools 2024-08-08 17:13:25 +02:00
3e73c4e663 aggiunta nuova gestione aliquote iva 2024-08-08 17:09:58 +02:00
e66fc3d672 Fix compilazione statica drools 2024-08-08 17:00:03 +02:00
cd526f04c8 Merge remote-tracking branch 'origin/develop' into develop 2024-08-08 16:07:04 +02:00
1723a8fd86 Fix compilazione statica drools 2024-08-08 16:06:54 +02:00
b5d5d15072 Modifica decimali qtacol e numcnf in mail quarantena 2024-08-08 16:00:38 +02:00
2a52cbf3da Merge remote-tracking branch 'origin/develop' into develop 2024-08-08 15:39:24 +02:00
9b2749dff2 Modifica SocialWeb 2024-08-08 15:39:19 +02:00
a87814bf02 Aggiunto invio mail alla creazione di un collo in quarantena 2024-08-08 15:37:07 +02:00
99bc8fb39c Merge remote-tracking branch 'origin/develop' into develop 2024-08-08 13:49:04 +02:00
884dfd3400 Fix compilazione regole all'avvio 2024-08-08 13:48:53 +02:00
3b4935bd1d Fix compilazione statica drools 2024-08-08 13:41:45 +02:00
a3869198aa Fix compilazione statica drools 2024-08-08 13:25:07 +02:00
d7e97fd2fc Merge branch 'develop' into feature/Feature-ORDL 2024-08-08 13:01:35 +02:00
fac71baad3 Merge remote-tracking branch 'origin/develop' into develop 2024-08-08 13:01:12 +02:00
144ea8eaaa Aggiunto servizio che ci premette di modifcare solo prevista fat sui documenti di anni chiusi 2024-08-08 13:01:09 +02:00
12d6a6dc56 Merge remote-tracking branch 'origin/develop' into develop 2024-08-08 12:20:27 +02:00
7394ef79bd Fix compilazione statica drools 2024-08-08 12:20:18 +02:00
606a0ebdb7 Modifica registrazione effetti in contabilità per aziende che chiudono le partite automaticamente alla registrazione del documento 2024-08-08 11:00:13 +02:00
69902b7f6a Fix compilazione statica drools 2024-08-08 10:28:35 +02:00
91d1d202bf Fix compilazione statica drools 2024-08-08 10:22:17 +02:00
51668a9f25 Rimosso nuovamente file IPR 2024-08-08 10:01:53 +02:00
54c226c98a elimiazione trigger e varie modifiche su ordini di produzione 2024-08-07 18:15:07 +02:00
6027cef5b0 elimiazione trigger e varie modifiche su ordini di produzione 2024-08-07 18:09:32 +02:00
aad2aba9e2 Fix compilazione statica drools 2024-08-07 11:27:09 +02:00
9f7db88a4a Fix compilazione statica drools 2024-08-07 11:21:59 +02:00
7691c5018f Migrations per DMS 2024-08-07 10:47:26 +02:00
5dd158c824 Merge branch 'develop' into feature/Feature-ORDL 2024-08-07 09:27:04 +02:00
d930e2928f elimiazione trigger e varie modifiche su ordini di produzione 2024-08-07 09:26:06 +02:00
1ab0cf2d13 elimiazione trigger e varie modifiche su ordini di produzione 2024-08-06 19:27:32 +02:00
db73af8d91 elimiazione trigger e varie modifiche su ordini di produzione 2024-08-06 18:18:00 +02:00
676b58835a Aggiunta condizione su data chiusura lotto nel caso di ordini non evaso in MES_GetWorkOrders 2024-08-06 17:58:24 +02:00
5ae50ecf08 Nell'esportazione delle anagrafiche Slim2K inserita la scorta minima 2024-08-06 17:43:35 +02:00
52611d61d4 EBC 2024-08-06 17:19:11 +02:00
5b8b68dec1 EBC 2024-08-06 17:19:04 +02:00
2a0c6abff5 Merge remote-tracking branch 'origin/develop' into develop 2024-08-06 16:56:18 +02:00
01552d5335 Fix compilazione statica drools 2024-08-06 16:56:06 +02:00
7b93c6e0a3 Aggiunto flag per disattivare controllo deposito dei colli 2024-08-06 15:14:21 +02:00
e5df127ee0 Merge branch 'develop' into feature/Feature-ORDL 2024-08-06 15:05:30 +02:00
1fb9c25fae aggiunta migration 2024-08-06 13:04:03 +02:00
261f8c0877 modifica gestione vettori/spedizionieri 2024-08-06 12:43:21 +02:00
015820ccc4 elimiazione trigger e varie modifiche su ordini di produzione 2024-08-06 12:23:05 +02:00
f2d1f810f7 Gestita orientation AUTO e creato retrieveWtbJreptSetupOrientations 2024-08-06 12:15:00 +02:00
5cf7b89472 Merge remote-tracking branch 'origin/develop' into develop 2024-08-05 16:04:56 +02:00
7d002f2e56 modificata migration creazione tabella vtb_vett_targhe 2024-08-05 16:04:51 +02:00
1f925e5852 modificata classe vtb_vett 2024-08-05 16:04:26 +02:00
30d1c061e4 modificata migration mina 2024-08-05 16:04:09 +02:00
3a3c0ae1c3 creata nuova tabella vtb_vett_targhe 2024-08-05 16:03:50 +02:00
eb404a0872 Creata setup MOSTRA_VALORE_MERCE 2024-08-05 15:40:20 +02:00
abd823e6ef aggiunta gestione vettori/spedizionieri (new) 2024-08-05 13:02:05 +02:00
2b879d0356 Merge branch 'develop' into feature/Feature-ORDL
# Conflicts:
#	ems-core/src/main/java/it/integry/ems_model/business_logic/ProductionBusinessLogic.java
2024-08-05 11:19:15 +02:00
0d3028657b modificata setup 2024-08-05 11:15:03 +02:00
3684213b97 elimiazione trigger e varie modifiche su ordini di produzione 2024-08-05 10:47:52 +02:00
511ee19120 Merge branch 'develop' into feature/Feature-ORDL 2024-08-05 09:42:58 +02:00
3757315f08 Merge branch 'develop' into feature/Feature-FatturaDiffertita 2024-08-05 09:20:19 +02:00
37f38ed2f7 elimiazione trigger e varie modifiche su ordini di produzione 2024-08-02 18:22:04 +02:00
52816af36f EBC 2024-08-02 18:01:13 +02:00
c09c4ce194 Merge remote-tracking branch 'origin/develop' into develop 2024-08-02 17:06:21 +02:00
dd83ab2ad5 Migrations 2024-08-02 17:06:14 +02:00
aa8a0228b7 Impostata setup invio email distinte effetti per Maggio 2024-08-02 17:01:59 +02:00
169dcf3867 Aggiunta setup per abilitare invio email da distinte effetti attivi 2024-08-02 17:01:40 +02:00
2acac4fdcb Merge branch 'master' into develop 2024-08-02 13:00:53 +02:00
11b2c94064 Finish Hotfix-1 2024-08-02 13:00:52 +02:00
401eb4c28a Fix su import IDRiga in exchange documenti 2024-08-02 13:00:47 +02:00
8dcc672ff6 Merge branch 'master' into develop 2024-08-02 10:55:39 +02:00
86694bf5c5 Finish Hotfix-1 2024-08-02 10:55:38 +02:00
d1cb72b7b8 Fix su salvataggio stato importazione documenti lavorazione EXCHANGE 2024-08-02 10:55:33 +02:00
2cfd5ff050 elimizione trigger 2024-08-01 17:49:26 +02:00
e99d2daa45 Merge branch 'develop' into feature/Feature-ORDL 2024-08-01 16:29:15 +02:00
60fa52e62b Sistemato invio email customizzato 2024-08-01 16:25:57 +02:00
f0ffeb4e05 Riapertura scadenze 2024-08-01 16:05:27 +02:00
4eafcf7742 Finish Hotfix-1 2024-08-01 15:49:41 +02:00
525e521dbb Merge branch 'master' into develop 2024-08-01 15:49:41 +02:00
4bc7c5c678 Rimossa importazione partite ad ogni import di EXCHANGE 2024-08-01 15:47:14 +02:00
cd04fcc42e getMovMag 2024-08-01 14:47:13 +02:00
8626ced5ba Finish Hotfix-1 2024-08-01 13:49:09 +02:00
51ceb69192 Merge branch 'master' into develop 2024-08-01 13:49:09 +02:00
a08578a361 Fix su importazione documenti exchange 2024-08-01 13:49:04 +02:00
d80d843400 Merge branch 'develop' into feature/Feature-ORDL 2024-08-01 13:31:17 +02:00
c0321cc006 Finish Hotfix-74 2024-08-01 13:21:55 +02:00
d528bcbd72 Merge branch 'master' into develop 2024-08-01 13:21:55 +02:00
fb6d2f32a7 elimintata tabella inseistente dalla QUERY 2024-08-01 13:20:43 +02:00
c408580898 Finish Hotfix-1 2024-08-01 13:18:23 +02:00
1c7d9c1775 Merge branch 'master' into develop 2024-08-01 13:18:23 +02:00
86ea8ccc36 [ROSSOGARGANO]
fix creazione colli di scarico mp
fix creazione campi senza destinatario
2024-08-01 13:18:16 +02:00
a0be59c532 Merge branch 'develop' into feature/Feature-ORDL 2024-08-01 12:31:23 +02:00
6dedf90dcf salvataggio documenti differiti 2024-08-01 12:27:26 +02:00
7052434ff1 Finish Hotfix-1 2024-07-31 18:50:23 +02:00
42a69dd21b Merge branch 'master' into develop 2024-07-31 18:50:23 +02:00
96a10237ff [ROSSOGARGANO]
fix pianificata import campi raccolta da exchange
2024-07-31 18:50:15 +02:00
54ca8f193e Finish Hotfix-1 2024-07-31 18:09:59 +02:00
c6560933d5 Merge branch 'master' into develop 2024-07-31 18:09:59 +02:00
848efdc3e4 aggiunta sync campi raccolta in gestione exchange 2024-07-31 18:09:51 +02:00
4252d5faf9 Merge branch 'master' into develop 2024-07-31 17:11:41 +02:00
d257a00f67 Finish Hotfix-1 2024-07-31 17:11:40 +02:00
ffa6d4be7a [ROSSOGARGANO]
corretto servizio creazione campi raccolta
2024-07-31 17:11:32 +02:00
0cb0ac8aa5 Merge branch 'master' into develop 2024-07-31 13:17:00 +02:00
2a9bf4f18e Finish Hotfix-1 2024-07-31 13:17:00 +02:00
2949f5cf3a Fix su EXCHANGE 2024-07-31 13:16:54 +02:00
ce735aa5df Merge branch 'master' into develop 2024-07-31 13:07:13 +02:00
0377e1c73d Finish Hotfix-1 2024-07-31 13:07:12 +02:00
791dad2aed Fix username exchange 2024-07-31 13:07:07 +02:00
f941b63f54 Merge remote-tracking branch 'origin/develop' into develop 2024-07-31 09:18:41 +02:00
aa267a6b2c SP Impegni 2024-07-31 09:18:34 +02:00
d7d5c413a7 Finish Hotfix-1 2024-07-30 23:45:44 +02:00
7d39957614 Merge branch 'master' into develop 2024-07-30 23:45:44 +02:00
cb9ac26602 [ROSSOGARGANO]
gestione importazione campi di raccolta
[IME BA]
corretta funzione zip nel caso di file omonimi
2024-07-30 23:45:36 +02:00
f7e82b4089 Personalizzato report elenco forniture per Frudis 2024-07-30 09:11:17 +02:00
4098b1296e Finish Release-2 2024-07-29 12:34:40 +02:00
754a43a05f Finish Release-2 2024-07-29 12:34:39 +02:00
407fb28206 Merge remote-tracking branch 'origin/develop' into develop 2024-07-29 12:09:33 +02:00
f84e64ad5a Modifiche query per DMS 2024-07-29 12:09:27 +02:00
f2be08e500 Merge branch 'master' into develop 2024-07-29 11:46:49 +02:00
a5d596ae1c Finish Hotfix-74 2024-07-29 11:46:49 +02:00
15ac3df1ce Fix su EXCHANGE 2024-07-29 11:46:44 +02:00
7a86247e12 Fix generazione righe di scarico con datetime_row diversi 2024-07-26 18:13:52 +02:00
074506fa0c Creato servizio per la ricerca attività da task 2024-07-26 17:41:27 +02:00
c274ce3fcc Merge remote-tracking branch 'origin/develop' into develop 2024-07-26 17:30:24 +02:00
e81fa79d85 Fix query giacenza 2024-07-26 17:30:20 +02:00
e0b31bef6d movimenti contabili ripertura scadenze 2024-07-26 17:09:39 +02:00
50a9e940f1 Merge branch 'master' into develop 2024-07-26 16:58:08 +02:00
2d2cd07478 Finish Hotfix-74 2024-07-26 16:58:08 +02:00
9c8804d905 aggiunti nuovi dettagli in dto certificati sinfo one
cambiata numerazione documenti SRACC
2024-07-26 16:57:58 +02:00
0f80faaf0d serie documento di raccolta in campo (sracc) da setup 2024-07-26 16:57:18 +02:00
2c9e0ce455 Sistemato log delle regole se si abilita TRACE all'interno di ems_settings.json 2024-07-26 13:22:25 +02:00
dcb2af5c43 Finish Hotfix-74 2024-07-26 13:10:42 +02:00
c477d64413 Merge branch 'master' into develop 2024-07-26 13:10:42 +02:00
7a41e22ba4 Fix connection in regola documenti 2024-07-26 13:09:36 +02:00
3ef60fa238 Merge remote-tracking branch 'origin/develop' into develop 2024-07-26 13:05:12 +02:00
6f5442486d Creata procedura per cancellare le ispezioni di un periodo 2024-07-26 13:05:08 +02:00
01d39fd652 sistemato dato giornaliero su mrp 2024-07-26 11:49:26 +02:00
a67f8104c5 Finish Hotfix-74 2024-07-26 10:18:46 +02:00
cb6717fb93 Merge branch 'master' into develop 2024-07-26 10:18:46 +02:00
f229824dfa Migliorato log per errori exchange 2024-07-26 10:18:39 +02:00
fa5b0393eb gestita esportazione dei documenti di acquisto 2024-07-25 17:39:50 +02:00
e52b9896d0 Merge remote-tracking branch 'origin/develop' into develop 2024-07-25 16:41:22 +02:00
05204ed269 Mmigrations custom 2024-07-25 16:41:12 +02:00
4f08220893 Mmigrations custom 2024-07-25 16:41:06 +02:00
be536a9c38 aggiunto campo flag_tracciabilita nella mtb_grup 2024-07-25 16:40:50 +02:00
4c57f2ac34 Merge tag 'Hotfix-73' into develop
Finish Hotfix-73
2024-07-25 16:25:30 +02:00
6f54902862 Finish Hotfix-73 2024-07-25 16:25:28 +02:00
36afcc836c Importazione immagini 2024-07-25 16:25:12 +02:00
ddd70ecf64 Merge remote-tracking branch 'origin/develop' into develop 2024-07-25 15:28:27 +02:00
6a7ec32d66 Fix codJfas in modifica attività 2024-07-25 15:28:22 +02:00
fce0b0e81a Miglioramento vista CRP_OF_FabbisognoOre_JSON per lentezza da Agricoper 2024-07-25 15:08:37 +02:00
6f4d0f1072 RIPORTATE MODIFICHE FATTE NELL'HOTFIX 2024-07-25 13:19:00 +02:00
26dc422f3d Merge branch 'master' into develop
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/service/GiacenzaService.java
2024-07-25 13:17:43 +02:00
b8a9e2bcc1 Finish Hotfix-72 2024-07-25 13:11:30 +02:00
158269f6f3 correzioni su popolamento giacenza: errore di duplicazione di chiave nel salvataggio degli inventari e valorizzazione strana della data di inserimento 2024-07-25 13:11:07 +02:00
e3765a9638 Fix compileWordFile 2024-07-25 09:15:29 +02:00
0330046f69 Nella cancellazione della mtb_aart aggiunto controllo e cancellazione dei progressivi 2024-07-25 09:15:07 +02:00
bc03755afa Finish Hotfix-72 2024-07-24 19:10:39 +02:00
cd16233da5 Merge tag 'Hotfix-72' into develop
Finish Hotfix-72
2024-07-24 19:10:39 +02:00
67a320dac3 Modifica SolcialWEB insertProductSW 2024-07-24 19:10:10 +02:00
580b2257cc Merge remote-tracking branch 'origin/develop' into develop 2024-07-24 19:09:15 +02:00
52954b5a52 Modifica messagio ritorno Import ordini EURITMMO senza PARTITA_IVA 2024-07-24 19:09:00 +02:00
284f23bd83 Aggiunto flag quarantena in creazione collo mes 2024-07-24 15:20:02 +02:00
3a6eb612e0 Merge branch 'master' into develop 2024-07-24 11:40:29 +02:00
fd3b5bcdfd Finish Hotfix-72 2024-07-24 11:40:28 +02:00
2524d5442a sistemato thread nel popolameto giacenza 2024-07-24 11:40:09 +02:00
68ad7af07a Merge branch 'master' into develop 2024-07-23 17:23:29 +02:00
4ef27af2c0 Finish Hotfix-72 2024-07-23 17:23:29 +02:00
fdda76eb5c [ROSSOGARGANO]
gestione autorizzazioni section pvm
2024-07-23 17:23:20 +02:00
1857428cd0 correzione trigger 2024-07-23 17:02:13 +02:00
1e8b1ca28b Merge branch 'develop' into feature/Feature-ORDL 2024-07-23 16:26:43 +02:00
6fd6431f7e Fix recalc posizione viaggi ed aggiunto controllo ord L già creato in saveProductionPlan 2024-07-23 16:26:18 +02:00
66c41d10eb Finish Hotfix-72 2024-07-23 14:19:31 +02:00
8586308fde Merge branch 'master' into develop 2024-07-23 14:19:31 +02:00
bfe78c4a81 Fix replaceAll in mailtemplate 2024-07-23 14:19:23 +02:00
8bd8c94eff Merge branch 'master' into develop 2024-07-23 13:46:39 +02:00
30acf97b57 Finish Hotfix-72 2024-07-23 13:46:38 +02:00
9016f5956f Rimosso logger query problematico 2024-07-23 13:36:58 +02:00
e9c7e94db3 Merge branch 'master' into develop 2024-07-23 10:47:10 +02:00
471cf93d96 Finish Hotfix-72 2024-07-23 10:47:09 +02:00
644ea03201 Fix range import di Exchange 2024-07-23 10:47:04 +02:00
a9ab0a253a Merge branch 'master' into develop 2024-07-23 10:29:13 +02:00
ef47cc5616 Finish Hotfix-72 2024-07-23 10:29:13 +02:00
7795c6c248 Fix nel query logger 2024-07-23 10:29:08 +02:00
a11ef715a1 Merge branch 'master' into develop 2024-07-23 09:42:04 +02:00
7985811e71 Finish Hotfix-72 2024-07-23 09:42:04 +02:00
d4292fdb72 Fix log in caso di errore invio mail Migrations 2024-07-23 09:41:56 +02:00
980f541a18 Aggiunta la merce in arrivo al servizio che restituisce la giacenza 2024-07-23 09:37:25 +02:00
1fae705d64 Finish Hotfix-72 2024-07-22 12:10:40 +02:00
465e725782 Merge branch 'master' into develop 2024-07-22 12:10:40 +02:00
79d13dc1c7 modificato controllo su addortimento gastronomia 2024-07-22 12:10:34 +02:00
25abcbb869 modificato menu' aggiunta nuova gestione documenti di vendita 2024-07-22 11:55:40 +02:00
b553122d3e aggiunto campo flag_attivo nella mtb_tipi 2024-07-22 10:48:17 +02:00
10158cf46b Finish ModifCreateZipFromFiles 2024-07-22 10:18:14 +02:00
1dc0ddc5df Merge branch 'master' into develop 2024-07-22 10:18:14 +02:00
c91165dc96 Gestito caricamento da MtbAartLink 2024-07-22 10:18:07 +02:00
ac1cbff3ba Fix query giacenza 2024-07-22 10:16:02 +02:00
644010dbda Migrations 2024-07-22 10:12:09 +02:00
a5b6220a7e Merge remote-tracking branch 'origin/develop' into develop 2024-07-22 09:26:22 +02:00
a6d63a1f51 Migrations 2024-07-22 09:26:14 +02:00
45f53d5d80 Tracciato §EBC 2024-07-22 09:26:04 +02:00
fe84a31f66 Tracciato §EBC 2024-07-22 09:25:50 +02:00
1f09e82245 [ROSSOGARGANO]
corrette informazioni in colli accettazione pomodoro
2024-07-19 19:27:21 +02:00
205dce88b8 Corretto conteggio allegati commessa 2024-07-19 19:11:31 +02:00
1b6f7d6e35 Aggiunto retrieveAllPartitaMag 2024-07-19 17:54:10 +02:00
61f59ac4a3 Merge branch 'master' into develop 2024-07-19 13:32:53 +02:00
481471d9b6 Finish Hotfix-72 2024-07-19 13:32:52 +02:00
f0e587e1f3 Implementata importazione EXCHANGE per versamento grezzo 2024-07-19 13:32:47 +02:00
118e43b849 Merge branch 'master' into develop 2024-07-19 13:23:06 +02:00
19f5450243 Finish Hotfix-72 2024-07-19 13:23:06 +02:00
236d0dcdec Implementata importazione EXCHANGE per versamento grezzo 2024-07-19 13:23:00 +02:00
df8a1de401 Merge branch 'master' into develop 2024-07-19 13:22:03 +02:00
5fd3b5668a Finish Hotfix-72 2024-07-19 13:22:02 +02:00
489089b9a4 Implementata importazione EXCHANGE per versamento grezzo 2024-07-19 13:21:55 +02:00
54390e7198 sistemata lettura inevasi steup 2024-07-19 12:06:57 +02:00
b3acb22495 Impostata attività di creazione archivio come completata 2024-07-19 10:42:58 +02:00
8e2196d23f Merge branch 'master' into develop 2024-07-19 09:41:28 +02:00
99ad3d7b48 Finish Hotfix-72 2024-07-19 09:41:27 +02:00
d83e658a9c Fix generici su sistema EXCHANGE 2024-07-19 09:41:15 +02:00
0176176e84 sistemata migration 2024-07-18 13:40:28 +02:00
1cb33d1c99 Merge branch 'develop' into feature/Feature-ORDL
# Conflicts:
#	ems-core/src/main/java/it/integry/ems_model/rulescompleting/AgendaList.java
2024-07-18 13:40:00 +02:00
a05005edf9 miglioramenti a generazione migration 2024-07-18 13:38:15 +02:00
25f3b7710a Aggiunto scritura log dalle regole 2024-07-18 10:00:34 +02:00
dd06da4e2c Inserita chk_constraint su rap_conv2 e rap_conv3 2024-07-18 09:59:19 +02:00
74117a4ea2 Aggiunto userName in StbActivityNotification 2024-07-18 09:47:13 +02:00
65dce87abf Fix importazione scontrini e campo reso 2024-07-17 17:39:42 +02:00
0d175b693a correzione su popolamento giacenza, controllo su rapporto di conversione 0 e attivato invia email per servizio di invio variazioni 2024-07-17 17:25:53 +02:00
b47c8ecb7b aggiunto campo flag_attivo nella mtb_grup 2024-07-17 17:00:04 +02:00
8397e7c6aa Implementata gestione pianificazioni exchange 2024-07-17 10:21:48 +02:00
68a76ca0c2 Merge branch 'master' into develop 2024-07-16 20:28:42 +02:00
9ba1078d5a Finish Hotfix-72 2024-07-16 20:28:41 +02:00
043a8b62d8 [ROSSOGARGANO]
gestione vettore in import da exchange
2024-07-16 20:28:32 +02:00
3cb2b9d8e9 Merge remote-tracking branch 'origin/develop' into develop 2024-07-16 18:02:01 +02:00
dfb34df5e9 - Fix e modifiche minori 2024-07-16 18:01:55 +02:00
44c3721116 Fix modifica assenze 2024-07-16 17:33:51 +02:00
ba68f631a1 Fix getTreeView 2024-07-16 14:58:54 +02:00
7a6c81feb6 Completati servizi di modifica e cancellazione delle assenze 2024-07-16 14:57:54 +02:00
d27415fb7b Merge branch 'master' into develop 2024-07-16 12:55:03 +02:00
bd06beff71 Finish Hotfix-72 2024-07-16 12:55:02 +02:00
99234b2f94 modificata condizione per verificare se il listino è rifatturazione 2024-07-16 12:49:12 +02:00
74be9d3b20 eliminare trigger 2024-07-16 12:45:07 +02:00
9d15ebd65e Personalizzato report distinta effetti per Carelli 2024-07-16 10:35:11 +02:00
7716a01e81 Corretto nome setup report distinta effetti 2024-07-16 10:34:44 +02:00
3feb507013 Impostato salvataggio rest gestione scheda tecnica 2024-07-16 09:11:11 +02:00
9e682093ae Merge remote-tracking branch 'origin/develop' into develop 2024-07-15 17:22:46 +02:00
058334fb0b aggiunto campo causale_reso nella ntb_docr 2024-07-15 17:21:02 +02:00
aa0a69409c modifiche per eliminare trigger 2024-07-15 17:12:41 +02:00
225af5f087 Merge remote-tracking branch 'origin/develop' into develop 2024-07-15 13:52:26 +02:00
f66a3ccdfb aggiunto tipo per trigger 2024-07-15 13:52:22 +02:00
b981ece98a Finish Hotfix-72 2024-07-15 12:31:16 +02:00
3e8e44871d Merge branch 'master' into develop 2024-07-15 12:31:16 +02:00
75d4bdfc4d Test toolchain 2024-07-15 12:30:54 +02:00
b79c88c23c Test toolchain 2024-07-15 11:54:44 +02:00
3c945a4be5 Finish Hotfix-71 2024-07-15 11:44:17 +02:00
c300dff9f0 Merge tag 'Hotfix-71' into develop
Finish Hotfix-71
2024-07-15 11:44:17 +02:00
32ed6f1188 Fix variabili in DataSheetServices 2024-07-15 11:43:58 +02:00
a4fbf3138d Aggiunto maven toolchain plugin 2024-07-15 10:49:38 +02:00
6056e4dccc Merge branch 'master' into develop 2024-07-15 10:28:43 +02:00
493ca43226 Finish Hotfix-71 2024-07-15 10:28:42 +02:00
81394cc6fa eliminato controllo su esitenza setup 2024-07-15 10:28:36 +02:00
cd1f71952b Merge branch 'refs/heads/master' into develop
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java
2024-07-12 17:57:54 +02:00
432de33a60 Finish Hotfix-71
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/system/exchange/dto/CertificatiSinfoOneDTO.java
#	ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java
2024-07-12 17:55:17 +02:00
6078e9770e [RossoGargano] importazione certificati da sinfo 1 2024-07-12 17:53:57 +02:00
d6add3cf65 Fix nome variavile immagine scheda prodotto 2024-07-12 17:39:39 +02:00
6a03fd5010 Fix nome variavile immagine scheda prodotto 2024-07-12 17:20:56 +02:00
e04e5166ce scheda tecnica prodotto 2024-07-12 16:56:59 +02:00
012f27d460 Gestite eccezioni compileWordFile 2024-07-12 16:36:36 +02:00
d8a9337d30 Gestito valore hashmap null in replaceVariables 2024-07-12 15:06:08 +02:00
71f7a665c8 aggiunta fk 2024-07-12 13:39:11 +02:00
cc7db6a529 Merge branch 'refs/heads/develop' into feature/Feature-variazioni2
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/controller/RetailController.java
2024-07-12 12:58:44 +02:00
b2522ecc38 Merge remote-tracking branch 'origin/develop' into develop 2024-07-12 12:57:30 +02:00
356e1bdd12 Aggiunto parametro mancante su operazioni pianificate di default 2024-07-12 12:57:21 +02:00
4eae593bce Merge branch 'master' into develop
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java
2024-07-12 12:52:50 +02:00
40055a6c03 Finish Hotfix-71 2024-07-12 12:52:07 +02:00
48edcf2e9d [RossoGargano] importazione certificati da sinfo 1 2024-07-12 12:52:00 +02:00
49214b500e gestione scheda tecnica 2024-07-12 11:56:01 +02:00
d6d4c3583b modifica gestione elenco file scheda tecnica 2024-07-12 11:43:48 +02:00
049e1b4921 aggiunta gestione Elenco File Scheda Tecnica 2024-07-12 11:04:52 +02:00
672195fb4a Fix e migliorie su importazione Exchange 2024-07-11 16:14:58 +02:00
ffa3ea8cff correzione mrp controllo scorta minima 2024-07-11 13:38:01 +02:00
de3f04a6ca Merge remote-tracking branch 'origin/develop' into develop 2024-07-11 13:02:39 +02:00
d76fd941a8 Fix e migliorie su importazione Exchange 2024-07-11 13:02:33 +02:00
05a6b2b5d4 Aggiunto controllo per esclusione esecuzione da DMS 2024-07-11 11:09:31 +02:00
8e846a6598 Merge remote-tracking branch 'origin/develop' into develop 2024-07-11 10:47:11 +02:00
1f8252db21 Query MRP_ImpProx 2024-07-11 10:47:03 +02:00
08cae9e3bb Impostato salvataggio rest gestione scheda tecnica 2024-07-11 10:08:47 +02:00
513fa6f5f0 Finish Hotfix-70 2024-07-10 18:33:26 +02:00
9c1bb13d7a Merge tag 'Hotfix-70' into develop
Finish Hotfix-70
2024-07-10 18:33:26 +02:00
ab6a08ab60 Modifica tracciti MIRARCHI\DIPA\ROTUNNO 2024-07-10 18:33:11 +02:00
5793fd1908 Creato servizio che compila e scarica il file di word della scheda tecnica 2024-07-10 17:37:31 +02:00
641f39784c Merge remote-tracking branch 'origin/develop' into develop 2024-07-10 15:49:45 +02:00
64850e628a MIRARCHI 2024-07-10 15:49:40 +02:00
88d0d82544 aggiunti giorni per recupero scontrini 2024-07-10 12:09:02 +02:00
cabc38b216 Merge branch 'master' into develop 2024-07-10 11:53:08 +02:00
04841eec4e Finish Hotfix-70 2024-07-10 11:53:07 +02:00
3a12327b16 sistemata condizione su data inizio su recupera scontrini 2024-07-10 11:52:51 +02:00
1d3b96395e Modificato servizio getTreeView 2024-07-10 10:16:34 +02:00
7341cc625b Merge branch 'master' into develop 2024-07-09 18:47:46 +02:00
2ee729449d Finish Hotfix-70 2024-07-09 18:47:45 +02:00
87fb1868f0 correzione errore for input string 2024-07-09 18:47:39 +02:00
446db73fe7 Merge remote-tracking branch 'origin/develop' into develop 2024-07-09 18:32:10 +02:00
05a6e363c9 varie sian 2024-07-09 18:32:07 +02:00
0b91e53f96 Merge tag 'Hotfix-69' into develop
Finish Hotfix-69
2024-07-09 17:25:31 +02:00
a5518de1c1 Finish Hotfix-69 2024-07-09 17:25:30 +02:00
0dd3403946 Fix customer id null e fix target quantity 2024-07-09 17:25:12 +02:00
0e316cba9c nuova entitychild 2024-07-09 16:26:28 +02:00
27e14f99ee Merge remote-tracking branch 'origin/develop' into develop 2024-07-09 16:04:30 +02:00
79dcb073df Aggiunta tabella mrl_aart_sch_tec_set come figlia della mtb_aart 2024-07-09 16:03:26 +02:00
0d2b4c01f3 aggiunto controllo su promo già esistenti nel db 2024-07-09 15:46:57 +02:00
463dd423a0 query steup 2024-07-09 13:10:32 +02:00
d849ff54e7 Merge branch 'master' into develop 2024-07-09 12:32:15 +02:00
5148a4d571 Finish Hotfix-69 2024-07-09 12:32:14 +02:00
73d94f077e [ROSSOGARGANO]
Accettazione pomodori
2024-07-09 12:32:07 +02:00
cde50e6c57 Merge remote-tracking branch 'origin/develop' into develop 2024-07-08 18:01:11 +02:00
f7e9fca83f sistemato messaggio di errore 2024-07-08 18:01:08 +02:00
d88c7647db correzioni ad invio variazioni 2024-07-08 17:45:49 +02:00
d5f4d73dc4 Nuova tabella di relazione tra articoli e scheda tecnica 2024-07-08 16:15:29 +02:00
cf63edb453 Aggiunto campo id 2024-07-08 16:15:03 +02:00
f7b71cc4ee Aggiunto DB SicialiniDMS ed esclusi migrations DMS da escludere 2024-07-08 11:31:24 +02:00
971ea7bd7a Finish Hotfix-68 2024-07-08 10:28:15 +02:00
2e02fd38ad Merge tag 'Hotfix-68' into develop
Finish Hotfix-68
2024-07-08 10:28:15 +02:00
7cfc702ea0 Attivazione ROTUNNO 2024-07-08 10:27:30 +02:00
09bc88241d Merge tag 'Hotfix-67' into develop
Finish Hotfix-67
2024-07-08 09:53:54 +02:00
c702d7410b Finish Hotfix-67 2024-07-08 09:53:53 +02:00
fd67662dc2 Accise LICOR 2024-07-08 09:53:41 +02:00
08e4162620 Aggiunti servizi per modifica e cancellazione assenze 2024-07-05 18:01:09 +02:00
6c3fc25ef8 Migration per nuova setup "FLAG_USE_COLLI_PEDANA" 2024-07-05 17:55:01 +02:00
73c882684c Merge remote-tracking branch 'origin/develop' into develop 2024-07-05 16:59:58 +02:00
3336b4ce20 Aggiunta setup per chiusura senza verifica in modellini 2024-07-05 16:52:02 +02:00
41dd98e1f9 Creazione nuove tabelle per scheda tecnica 2024-07-05 15:47:07 +02:00
9f66f92984 Creazione nuove tabelle per scheda tecnica 2024-07-05 15:08:58 +02:00
5ef4cf2ff5 Aggiunta setup giorni aggiunta alla data fine stimata modellini 2024-07-05 11:56:14 +02:00
d97a7305cc Corretta chiave della tabella 2024-07-05 10:40:03 +02:00
0b60ab7a06 Aggiunta gestione scheda tecnica 2024-07-05 09:32:13 +02:00
ed30d129d5 Merge remote-tracking branch 'origin/develop' into develop 2024-07-05 09:18:39 +02:00
674c1ce5de Aggiunta gestione scheda tecnica 2024-07-05 09:00:32 +02:00
308f883b15 Aggiustata funzione getListinoVenditaPedane 2024-07-04 19:09:50 +02:00
8c9421325f Merge branch 'master' into develop 2024-07-04 18:56:27 +02:00
63e9f325f3 Finish FixImportClientiFP 2024-07-04 18:56:27 +02:00
706b4e3c21 Corretto invio di dati duplicati in FoodProcess 2024-07-04 18:55:10 +02:00
fb8aeea028 Merge remote-tracking branch 'origin/develop' into develop 2024-07-04 18:55:05 +02:00
41ee89c94e Migrations varie 2024-07-04 18:54:59 +02:00
21e2267340 aggiunto package 2024-07-04 17:22:38 +02:00
0b0a2ea918 aggiunto package 2024-07-04 17:14:15 +02:00
aef6b1e937 Merge remote-tracking branch 'origin/develop' into develop 2024-07-04 16:36:07 +02:00
ce5673cd24 nuove tabelle scheda tecnica 2024-07-04 16:33:11 +02:00
3045529df8 verifica articolo acquisto in shelflife 2024-07-04 16:15:59 +02:00
96cbf6f844 Aggiunta gestione elenco variabili scheda tecnica 2024-07-04 15:46:26 +02:00
fd09483123 migration e rename classi 2024-07-04 12:28:00 +02:00
832d411426 Finish FixEsportFoodProcess 2024-07-04 11:01:58 +02:00
fc8262a203 Merge branch 'master' into develop 2024-07-04 11:01:58 +02:00
6d8cba5d07 Fix max id su esportazione food process 2024-07-04 11:01:36 +02:00
4abf1c2b01 Merge remote-tracking branch 'origin/develop' into develop 2024-07-04 09:45:22 +02:00
12901abd2d Tracciato ROTUNNO 2024-07-04 09:45:16 +02:00
f93fa6678c Merge branch 'master' into develop 2024-07-03 18:09:56 +02:00
819f0c8ce0 Finish ModifPianProd 2024-07-03 18:09:56 +02:00
e13611a328 Aggiunta data esportazione in DtbOrdrPianProd 2024-07-03 18:09:47 +02:00
bb8bc2b7fd new migration 2024-07-03 11:53:56 +02:00
f13c81f119 Tracciato ROTUNNO 2024-07-03 11:03:41 +02:00
abdfb4c1ef Tracciato ROTUNNO 2024-07-03 11:03:29 +02:00
b435488b7d Sistemato invio variazioni 2024-07-03 09:37:43 +02:00
167183ac64 Merge remote-tracking branch 'origin/develop' into develop 2024-07-02 18:34:13 +02:00
43d101719c Export ROTUNNO 2024-07-02 18:34:07 +02:00
62a1e49e7c Merge branch 'develop' into feature/Feature-variazioni2 2024-07-02 17:38:25 +02:00
65fceec62e Merge branch 'develop' into feature/Feature-variazioni2
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/service/HttpRestWrapper.java
#	ems-engine/src/main/java/it/integry/ems/retail/export/service/VariazioniPvExportServices.java
#	ems-engine/src/main/java/it/integry/ems/retail/service/GiacenzaService.java
2024-07-02 17:18:13 +02:00
3e2dc62fba correzione a registrazione distinte raggruppate e sync rossogargano 2024-07-02 17:10:29 +02:00
a5b979f53d eliminata setup 2024-07-02 16:39:42 +02:00
5f59100142 Spostato output download files in ResponseEntity 2024-07-02 16:29:02 +02:00
4bbc909563 Aggiunto parametro anno in readActivity Agribook 2024-07-02 13:03:49 +02:00
2770cac483 Merge tag 'Hotfix-66' into develop
Finish Hotfix-66
2024-07-02 12:58:29 +02:00
702d529a8b Finish Hotfix-66 2024-07-02 12:58:28 +02:00
6b5a2cafaf Modifica DAS 2024-07-02 12:58:10 +02:00
255d82cec5 Merge remote-tracking branch 'origin/develop' into develop 2024-07-02 12:57:22 +02:00
66ac02a7a9 Modifica tracciato DIPA 2024-07-02 12:57:06 +02:00
32daa9fbe7 Ordify elenco clienti per gestore deposito esterno 2024-07-01 16:00:59 +02:00
349c47ce52 abilitata voce di menù 2024-07-01 15:41:59 +02:00
3828e5cbec Finish Hotfix-66 2024-07-01 15:30:39 +02:00
73f1b01fed Merge branch 'master' into develop 2024-07-01 15:30:39 +02:00
007e66aff7 inserito un controllo sull'esistenza del codice interno sugli articoli presenti in bolla. 2024-07-01 15:30:33 +02:00
a1ab5da08a Aggiunto partita iva e codice fiscale sede legale 2024-07-01 15:06:38 +02:00
5cb6e30ed6 Aggiunto partita iva e codice fiscale sede legale 2024-07-01 15:06:28 +02:00
ea82bff88a Finish IntegrazioneFoodProcess 2024-07-01 12:43:03 +02:00
cfad878bc2 Merge branch 'master' into develop 2024-07-01 12:43:03 +02:00
ac68ea4ea5 Aggiornamento resteasy ed integrazione servizi FoodProcess 2024-07-01 12:42:57 +02:00
e2ad0a7c65 Migliorate classi UtilityDocx e UtilityExcel 2024-07-01 10:14:54 +02:00
3e6c38b51f Aggiunto servizio che restituisce la giacenza in tempo reale a partire dalla tabella delle giacenze progressive 2024-07-01 10:03:48 +02:00
a0cd0cbec5 Aggiunta DMS come application 2024-06-28 18:51:50 +02:00
087189a0b0 [OrderImportService]
- Fixato il controllo sulla imp_min_ord, la setup non esisteva più da tempo ed il valore era presente direttamente sulla linea, adesso lo legge dalla linea
2024-06-28 17:00:25 +02:00
b2df536011 Merge tag 'Hotfix-65' into develop
Finish Hotfix-65
2024-06-27 12:21:13 +02:00
2f863e1489 Finish Hotfix-65 2024-06-27 12:21:13 +02:00
7705b8a5fd Aggiunta application DMS 2024-06-27 12:20:55 +02:00
5b2c5c2676 Merge remote-tracking branch 'origin/develop' into develop 2024-06-27 12:19:35 +02:00
3757f511e0 Modifica personalizzazione report riepilogo ordini 2024-06-27 12:19:25 +02:00
3842cc0f6e Fix multiply bigdecimal con null 2024-06-26 12:33:00 +02:00
747e2615b3 Finish Hotfix-65 2024-06-26 10:58:28 +02:00
fcea8f5267 Merge branch 'master' into develop 2024-06-26 10:58:28 +02:00
ea2b8c7593 [ROSSOGARGANO - accettazione da raccolta]
gestione scarichi
2024-06-26 10:58:20 +02:00
b144d84549 Finish Hotfix-65 2024-06-26 09:53:18 +02:00
48c7de51f7 Merge branch 'master' into develop 2024-06-26 09:53:18 +02:00
d7f1992154 Creata migration per sistemare ansi_padding, ecc. 2024-06-26 09:53:10 +02:00
11f5056fd0 Merge remote-tracking branch 'origin/develop' into develop 2024-06-26 09:50:54 +02:00
9147b6be27 Fix su importazione EXCHANGE 2024-06-26 09:50:46 +02:00
9492a646ba Creata classe per la gestione dei file docx 2024-06-25 16:23:25 +02:00
ec8b8547c5 Aggiornata libreria apache.poi e refactor 2024-06-25 16:22:23 +02:00
49dd2269af Merge remote-tracking branch 'origin/develop' into develop 2024-06-25 11:11:00 +02:00
ac5c3ff2dd Personalizzazione ordini WEB per Follies 2024-06-25 11:10:49 +02:00
069d497566 Rimosso parametro override in createSetupQuery (non più utilizzato) 2024-06-25 10:55:21 +02:00
207b557655 PErsonalizzazione report scadenze clienti fornirori per IME Bari 2024-06-24 12:23:27 +02:00
76fc878585 Merge remote-tracking branch 'origin/develop' into develop 2024-06-24 12:22:06 +02:00
80c41b1fcc PErsonalizzazione report scadenze clienti fornirori per IME Bari 2024-06-24 12:21:56 +02:00
94994d696f Merge remote-tracking branch 'origin/develop' into develop 2024-06-21 18:56:47 +02:00
d0065a1219 Creata importazione EXCHANGE documenti.
Fix su importazione EXCHANGE ordini di lavorazione/produzione.
2024-06-21 18:56:39 +02:00
eeba09920f AGGIUNTA MIGRATION 2024-06-21 18:29:10 +02:00
6d69f6c059 Merge remote-tracking branch 'origin/develop' into develop 2024-06-21 18:21:13 +02:00
2f7bd7596a procedura di controllo fatture dello sdi con fatture presenti al sistema 2024-06-21 18:21:10 +02:00
a3a99f687f Aggiunti filtri attività 2024-06-21 18:04:47 +02:00
0f96873847 AGGIUNTA MIGRATION 2024-06-21 17:58:10 +02:00
8f3406fa4d Merge remote-tracking branch 'origin/develop' into develop 2024-06-21 17:54:59 +02:00
b347cf1aff Permettere la duplicazione delle uds 2024-06-21 17:54:54 +02:00
b720b08088 Merge remote-tracking branch 'origin/develop' into develop 2024-06-21 17:30:18 +02:00
42169a5646 Modifica rifatturazione FILCONAD 2024-06-21 17:30:13 +02:00
c17cd3d83e Aggiunta setup importazione 2024-06-21 16:30:54 +02:00
1d92895df6 cambiata chiave della tabella mtb_depo_intercode 2024-06-21 14:46:37 +02:00
46c3419751 Merge remote-tracking branch 'origin/develop' into develop 2024-06-21 12:04:47 +02:00
69b0f37254 Creata importazione ordini EXCHANGE 2024-06-21 12:04:40 +02:00
efc38970ff varie migration 2024-06-21 11:57:36 +02:00
83156e8623 Merge remote-tracking branch 'origin/develop' into develop 2024-06-21 10:49:21 +02:00
3a2e6a405b Importazione DIPA 2024-06-21 10:49:16 +02:00
105309ef4f Importazione DIPA 2024-06-21 10:49:06 +02:00
7da201e24f aggiunta eccezione se distinta non presente 2024-06-20 17:13:41 +02:00
cb88dfbead aggiunto fatta nel mese, fatto mese precedente, fatto trimestre corrente, fatto trimestre prec 2024-06-20 16:59:52 +02:00
36efa1c628 Merge remote-tracking branch 'origin/develop' into develop 2024-06-20 15:08:45 +02:00
fb80695cba Importazione DIPA 2024-06-20 15:08:23 +02:00
ce1b0df102 Importazione DIPA 2024-06-20 15:08:14 +02:00
a713368d62 Merge remote-tracking branch 'origin/develop' into develop 2024-06-20 15:08:09 +02:00
bf32d9be5c apertura attività chiusa 2024-06-20 15:08:06 +02:00
e93d54c986 Migration per esportazione SIAN 2024-06-20 15:07:50 +02:00
a4caa25c05 Merge remote-tracking branch 'origin/develop' into develop 2024-06-20 12:15:48 +02:00
5db1aa0948 Fix log errori in DocumentController 2024-06-20 12:15:34 +02:00
95e18001ef Fix log errori in DocumentController 2024-06-20 12:14:42 +02:00
026a4890d1 Merge remote-tracking branch 'origin/develop' into develop 2024-06-20 12:08:19 +02:00
afa1342e8f Importazione DIPA 2024-06-20 09:39:49 +02:00
46692dd75e Importazione DIPA 2024-06-20 09:39:37 +02:00
dd23b7b7fb Merge branch 'master' into develop 2024-06-19 17:44:14 +02:00
9c1332f385 Finish Hotfix-65 2024-06-19 17:44:14 +02:00
63061e576a sistemato controllo su setup di steup 2024-06-19 17:38:36 +02:00
7b18f23794 Merge remote-tracking branch 'origin/develop' into develop 2024-06-19 17:29:59 +02:00
2e496d6b60 Metodo per duplicare le uds 2024-06-19 17:29:50 +02:00
4c148ccbd9 Merge branch 'master' into develop 2024-06-19 17:29:20 +02:00
c7b8cae326 Finish Hotfix-65 2024-06-19 17:29:19 +02:00
599df1fc16 sistemato controllo su inserimento promozione nello stesso periodo e controllato se i file di apulia sono vuoti 2024-06-19 17:29:14 +02:00
7175380045 Aggiunta eccezione in caso di file vuoto in importazione bulk file 2024-06-19 17:12:08 +02:00
33c9d32262 Merge branch 'master' into develop 2024-06-19 15:02:31 +02:00
8d09a02f1c Finish Hotfix-65 2024-06-19 15:02:30 +02:00
83d48df47d aggiunto controllo su wdtb_doct per i fRUMA 2024-06-19 15:02:24 +02:00
bd3d295f6f Merge remote-tracking branch 'origin/develop' into develop 2024-06-19 12:02:54 +02:00
9672fce01f Importazione DIPA 2024-06-19 12:02:44 +02:00
6b5274f2c3 aggironamento su MRP_UpdateQtaImpProx 2024-06-19 10:20:24 +02:00
fc3dfc13cf Merge branch 'master' into develop 2024-06-19 09:56:08 +02:00
f4b7eba1d8 Finish Hotfix-65 2024-06-19 09:56:07 +02:00
25fade5f48 impostato 0 nel valoneri nella procedura di importazione listini apulia 2024-06-19 09:51:42 +02:00
9fd75d10b6 Controllo se il barcode ul è già presente in un collo 2024-06-18 17:30:54 +02:00
25eabec6e6 Finish Hotfix-64 2024-06-18 16:59:31 +02:00
88c2f06386 Merge tag 'Hotfix-64' into develop
Finish Hotfix-64
2024-06-18 16:59:31 +02:00
f90ac6f64a Migrations controllo dichiarazione intento 2024-06-18 16:59:07 +02:00
fe414ec431 Merge remote-tracking branch 'origin/develop' into develop 2024-06-18 16:54:38 +02:00
5671ba07d5 Migrations 2024-06-18 16:54:30 +02:00
35e3e1447d Invertito controllo articoli esclusi wms in rettifica produzione licor 2024-06-18 15:59:06 +02:00
d4840aa672 Merge branch 'master' into develop 2024-06-18 14:14:09 +02:00
1d0711ebd4 Finish Hotfix-64 2024-06-18 14:14:08 +02:00
5bbbea25fa Nuovo campo per escludere articoli dalla logica di qta max per colore 2024-06-18 14:14:02 +02:00
5298ec4949 Merge branch 'master' into develop 2024-06-18 12:48:03 +02:00
61fc69ae89 Finish FixRecalcPosViaggi 2024-06-18 12:48:03 +02:00
4401c05464 Fix recalc posizione viaggi 2024-06-18 12:47:56 +02:00
a12d5198b1 Fix insSubactivity 2024-06-18 12:36:36 +02:00
1aa0f7518f Aggiornare il cod_jfas anche sui rapportini quando viene cambiato sulle attività, modificare l'utente quando vengono inserire le ore su attività su DEV, T0001, T0003 2024-06-18 11:15:46 +02:00
7423754900 Merge remote-tracking branch 'origin/develop' into develop 2024-06-18 10:04:55 +02:00
26b5c5b6a3 Merge remote-tracking branch 'origin/develop' into develop 2024-06-17 19:23:38 +02:00
b69d79381b Tracciato MIRARCHI 2024-06-17 19:23:29 +02:00
606a486f82 Aggiunto controllo se articolo escluso wms in rettifica produzione licor 2024-06-17 18:04:14 +02:00
ba0e4650ce DAS Elettronico 2024-06-17 16:19:03 +02:00
8c43abd739 Merge tag 'Hotfix-63' into develop
Finish Hotfix-63
2024-06-17 15:25:20 +02:00
1cbc9489f1 Finish Hotfix-63 2024-06-17 15:25:19 +02:00
0c14e7b987 Export DAS 2024-06-17 15:24:56 +02:00
4f33830879 aggiuti campi nella vista statistiche ordinato 2024-06-17 12:42:23 +02:00
500a39bbc9 Creato sistema di import colli tramite formato EXCHANGE 2024-06-17 12:01:31 +02:00
c04e08a575 Tracciato MIRARCHI 2024-06-17 09:37:44 +02:00
7b842ca014 sistemata chiusura tagli prezzo, aggiunte note_testata in promozioni 2024-06-14 17:49:26 +02:00
cd72eed0cc aggiunto controllo su data fine promozione, modificata vista per statistiche su ordinato, aggiunte nuove voci menu' 2024-06-14 15:22:57 +02:00
9fbcf5b074 [CARELLI] creazione xml per esportazione zucchetti 2024-06-14 13:00:47 +02:00
c041d3fc48 Merge remote-tracking branch 'origin/develop' into develop 2024-06-14 12:53:45 +02:00
3578afa37b Impostazione aggiorna dati modifica ordine orgcons 2024-06-14 12:53:37 +02:00
a030dd13b3 Fix creazione prima atb_offt per nuovo anno 2024-06-13 18:07:10 +02:00
bfe7e3c972 aggiunta pk 2024-06-13 16:57:14 +02:00
0b6a1b871f Sistemata cancellazione utenti 2024-06-13 13:31:43 +02:00
f301eacef3 Merge remote-tracking branch 'origin/develop' into develop 2024-06-13 13:23:57 +02:00
1b51013d0f sistemato contollo per errori esportazione 2024-06-13 13:17:16 +02:00
3dab6a9cf1 sistemata query per visulizzare ultima attività 2024-06-13 13:17:00 +02:00
8b56c4f136 Merge remote-tracking branch 'origin/develop' into develop 2024-06-13 10:05:33 +02:00
a14e9f85e1 [Smetar - Centri di lavoro]
- Aggiunto servizio per fetch allegati lotto
- Aggiunto invio eventi ordine al collector
2024-06-13 10:05:23 +02:00
56326bcb94 Merge tag 'Hotfix-61' into develop
Finish Hotfix-61
2024-06-12 15:25:47 +02:00
d2247e559c Finish Hotfix-61 2024-06-12 15:25:46 +02:00
d5059a49a9 Migration ordini acquisto Gioiella 2024-06-12 15:25:20 +02:00
5ff6412128 Merge branch 'master' into develop 2024-06-12 14:24:21 +02:00
25a08389df Finish Hotfix-61 2024-06-12 14:24:20 +02:00
2171dfc16c eliminata l'ora dalla data delle griglie di vendita 2024-06-12 14:24:00 +02:00
8346d16d7d Aggiunta possibilità di caricare attività di anni precedenti 2024-06-12 10:09:20 +02:00
bed96c9ed4 Aggiunta regola per ricalcolo posizione viaggi in giorno al salvataggio 2024-06-12 09:37:33 +02:00
e67ca853b8 Merge remote-tracking branch 'origin/develop' into develop 2024-06-11 17:45:08 +02:00
7ebf5af9f9 Configurazione gestione oneri/traporti 2024-06-11 17:45:03 +02:00
e626f1e1c2 aggiunto a Canone a Pagamento 2024-06-11 16:12:04 +02:00
8818d7c839 Merge remote-tracking branch 'origin/develop' into develop 2024-06-11 15:33:53 +02:00
c506709c33 Configurazione gestione oneri/traporti 2024-06-11 15:33:45 +02:00
97c458b674 Merge branch 'master' into develop 2024-06-11 15:28:03 +02:00
638ab3b5ed Finish Hotfix-61 2024-06-11 15:28:02 +02:00
414d62aa6c SISTEMATO POPOLAMENTO GIACENZE 2024-06-11 15:26:59 +02:00
917cf529d8 Aggiunta where su idBdg in RG_AnalisiVendite_KPI 2024-06-11 15:16:08 +02:00
6a39ca8972 Merge remote-tracking branch 'origin/develop' into develop 2024-06-11 11:55:24 +02:00
aaa03da726 aggiunta setup e getListinoVenditaRange 2024-06-11 11:55:17 +02:00
7115254c53 Merge remote-tracking branch 'origin/develop' into develop 2024-06-11 10:57:28 +02:00
8926fe4cf4 Elimnati due campi da VTB_VETT 2024-06-11 10:57:18 +02:00
777ab4c223 Elimnati due campi da VTB_VETT 2024-06-11 10:57:14 +02:00
fb66797fe0 Finish Hotfix-61 2024-06-11 10:00:48 +02:00
b1bed3bfab Merge branch 'master' into develop 2024-06-11 10:00:48 +02:00
ed7a2a0374 sistemare errore nella chiusura dei tagli prezzo 2024-06-11 10:00:37 +02:00
c9fb344849 Gestito flag includi tara in peso e tipologia ripartizione per pedana in costi trasporto/oneri 2024-06-10 19:33:31 +02:00
fcd45a187a Gestito flag includi tara in peso e tipologia ripartizione per pedana in costi trasporto/oneri 2024-06-10 19:33:23 +02:00
e6319eb7c8 - Migration per cancellare ABILITA_DUPLICA_ORDINE e creare ABILITA_CREA_DUPLICA_ORDINE 2024-06-10 13:10:30 +02:00
35702757b9 Merge remote-tracking branch 'origin/develop' into develop 2024-06-10 12:31:14 +02:00
2a59351e09 Gestione ALIAS nome_ditta in stampa etichette 2024-06-10 12:31:07 +02:00
5067eff40b Gestita creazione della commessa direttamente nel preventivo 2024-06-10 11:53:01 +02:00
b8c4caaa9b Sistemato getActivity per i clienti 2024-06-07 19:05:46 +02:00
fad75298f9 Fix link email creazione ticket 2024-06-07 19:05:03 +02:00
f125e339f5 [CARELLI] Importazione Griglie di Vendita 2024-06-07 19:04:22 +02:00
f69848f748 Quando si registra un nuovo utente inviare un'email a Helpdesk. 2024-06-07 19:02:40 +02:00
27a1c0efe9 Aggiunto controllo nella creazione dei FRUMA se il documento inserito esiste realmente. 2024-06-07 18:57:31 +02:00
2bed8730c5 - Aggiunto wtbJreptSetup 'STAMPA_LISTINI_VENDITA_RANGE_PEDANE' 2024-06-07 17:34:40 +02:00
cf56f61962 modifiche a mrp per gestire i fabbisogni a data 2024-06-06 18:14:00 +02:00
81d05fa0ae Export documenti DAS 2024-06-06 16:39:52 +02:00
067a059532 Export documenti DAS 2024-06-06 16:39:44 +02:00
94ac3fb90c aggiunta nuova colonna su mtb_part 2024-06-06 15:10:56 +02:00
cdc3bb92cc Controllo sul null 2024-06-06 15:10:10 +02:00
8153291184 Merge branch 'master' into develop 2024-06-06 11:34:47 +02:00
6f20b34196 Finish Hotfix-61 2024-06-06 11:34:46 +02:00
6d01cfd280 Fix json in response 2024-06-06 11:34:40 +02:00
1a1cbaed28 Merge branch 'master' into develop 2024-06-06 10:52:04 +02:00
d18f51ca6d Finish Hotfix-61 2024-06-06 10:52:04 +02:00
abd843ad7a Fix download allegati 2024-06-06 10:51:55 +02:00
43297555f0 filtrate le attività per persona di riferimento 2024-06-06 09:42:07 +02:00
a4717ba245 Merge remote-tracking branch 'origin/develop' into develop 2024-06-05 17:49:11 +02:00
a51325ede0 Fixato scheduler Spring 2024-06-05 17:47:21 +02:00
4a81d6e988 Modificata regola assegnazione commessa su righe ordine (Fatto in modo che sulle righe dell'ordine di produzione non venga assegnata la commessa) 2024-06-05 17:41:46 +02:00
c9f9c63ef2 Finish Hotfix-61 2024-06-05 17:19:07 +02:00
a6958eee39 Merge branch 'master' into develop 2024-06-05 17:19:07 +02:00
b6eec691f5 Aggiunto filtro che imposta l'encoding su request e response 2024-06-05 17:18:58 +02:00
90cbc94e6a Trying to fix content type 2024-06-05 17:11:15 +02:00
02ca6eea4a eliminato _ da pattern per cancellazione viste e tabelle temporanee 2024-06-05 12:37:14 +02:00
9629be196a Finish Hotfix-61 2024-06-05 11:24:14 +02:00
3e461bc692 Merge branch 'master' into develop 2024-06-05 11:24:14 +02:00
1878ce5673 [rOSSOGRAGANO]
provedura salvataggio ddt in massa
2024-06-05 11:24:06 +02:00
4b55c57da1 Merge branch 'master' into develop 2024-06-05 10:39:59 +02:00
7814e3c0db Finish Hotfix-61 2024-06-05 10:39:58 +02:00
129e52a116 Fix colli tosca 2024-06-05 10:36:22 +02:00
d97e582802 Merge branch 'master' into develop 2024-06-05 10:02:59 +02:00
e98bf98a3b Finish Hotfix-61 2024-06-05 10:02:59 +02:00
12b9e432aa aggiunto valore di default per il parametro requestMethod nelle pianificate 2024-06-05 10:02:42 +02:00
b411e331a9 Merge remote-tracking branch 'origin/develop' into develop 2024-06-05 09:58:35 +02:00
d1d5c7ca21 aggiunto valore di default per il parametro requestMethod nelle pianificate 2024-06-05 09:58:26 +02:00
c348be1365 Merge remote-tracking branch 'origin/develop' into develop 2024-06-05 09:08:07 +02:00
ddff8bb078 Gestione quantità multipla SMETAR 2024-06-05 09:07:58 +02:00
0b7ece1c48 Finish Hotfix-61 2024-06-04 22:16:08 +02:00
8722de1d68 Merge branch 'master' into develop 2024-06-04 22:16:08 +02:00
b1b2e00b87 Fix onlyPkMaster in sync entity 2024-06-04 22:16:01 +02:00
d895eccda3 Merge branch 'master' into develop 2024-06-04 21:25:37 +02:00
bf57c1442e Finish Hotfix-61 2024-06-04 21:25:36 +02:00
dbd9bad7e7 Fix onlyPkMaster in sync entity 2024-06-04 21:25:30 +02:00
c466abb836 Merge branch 'master' into develop 2024-06-04 21:01:25 +02:00
203808d323 Finish Hotfix-61 2024-06-04 21:01:24 +02:00
7189cae9e3 Fix onlyPkMaster in sync entity 2024-06-04 21:01:19 +02:00
ebce20e389 Merge branch 'master' into develop 2024-06-04 20:38:50 +02:00
d1c5d4d29f Finish Hotfix-61 2024-06-04 20:38:49 +02:00
90f5a08c50 Fix onlyPkMaster in sync entity 2024-06-04 20:38:41 +02:00
966bc1e9b3 Merge branch 'master' into develop 2024-06-04 20:34:59 +02:00
6179d07564 Finish Hotfix-61 2024-06-04 20:34:59 +02:00
946168517e Fix onlyPkMaster in sync entity 2024-06-04 20:34:53 +02:00
ec6b888840 Merge branch 'master' into develop 2024-06-04 20:14:45 +02:00
3fdf558b6c Finish Hotfix-61 2024-06-04 20:14:44 +02:00
c57344e334 Fix onlyPkMaster in sync entity 2024-06-04 20:14:37 +02:00
4c5b847c14 Merge branch 'master' into develop 2024-06-04 19:40:55 +02:00
30faa66519 Finish Hotfix-61 2024-06-04 19:40:54 +02:00
476ff92f30 [ROSSOGARGANO]
creato certificato di consegna anche se qtaCol = 0
2024-06-04 19:40:48 +02:00
18dd9dc8a3 Merge branch 'master' into develop 2024-06-04 18:59:24 +02:00
d292ab6ac0 Finish Hotfix-61 2024-06-04 18:59:24 +02:00
9a90387df6 Fix call pianificate 2024-06-04 18:59:18 +02:00
c1909b58ab Merge branch 'master' into develop 2024-06-04 18:37:25 +02:00
9b77c4a693 Finish Hotfix-61 2024-06-04 18:37:24 +02:00
cf672c349b Fix call pianificate 2024-06-04 18:37:18 +02:00
800f1d84d9 Merge branch 'master' into develop 2024-06-04 18:24:45 +02:00
f72c0962c8 Finish Hotfix-61 2024-06-04 18:24:45 +02:00
d4303b053f Fix call pianificate 2024-06-04 18:24:30 +02:00
6737226d91 sistemato salvataggio listini con listino di riferimento e varie migration 2024-06-04 18:11:07 +02:00
b0492de6d4 Merge remote-tracking branch 'origin/develop' into develop 2024-06-04 18:08:59 +02:00
4c4d608ac1 Merge remote-tracking branch 'origin/feature/Feature-variazioni2' into feature/Feature-variazioni2
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/export/service/VariazioniPvExportServices.java
2024-06-04 18:01:56 +02:00
6648d4f655 Fix after merge 2024-06-04 18:01:42 +02:00
2a4e57de0d Fix after merge 2024-06-04 18:00:37 +02:00
9ab0e5fc0f Merge branch 'master' into develop 2024-06-04 11:36:55 +02:00
6a605f9db0 Finish Hotfix-61 2024-06-04 11:36:54 +02:00
a7fbe6e491 Fix doppio slash in automation method call 2024-06-04 11:10:59 +02:00
b4252581b5 Merge remote-tracking branch 'origin/develop' into develop 2024-06-04 10:39:33 +02:00
fcde03ce4b Merge branch 'master' into develop 2024-06-03 19:26:04 +02:00
363258f6ac Finish Hotfix-61 2024-06-03 19:26:03 +02:00
06580f507b Fix getDTO in ResponseJSONObjectMapper 2024-06-03 19:25:57 +02:00
82db179601 Creazione servizio per archiviazione file allegati in zip 2024-06-03 18:31:39 +02:00
565336e454 piccoli miglioramenti a registrazione e verifica inventario 2024-06-03 16:23:24 +02:00
692a68d65e aggiunta setup per impedire la visualizzazione del report degli aggiornamenti agli utenti non amministratori 2024-06-03 13:02:40 +02:00
db819a69f1 Merge remote-tracking branch 'origin/develop' into develop 2024-06-03 12:23:22 +02:00
6fe25e1405 aggiunto modificato da nella procedura di importazione listini di pazienza 2024-06-03 12:23:19 +02:00
165770699e Merge branch 'master' into develop 2024-06-03 10:26:45 +02:00
3ae6180584 Finish Hotfix-61 2024-06-03 10:26:44 +02:00
bb11ae9d36 Fix su invio email di errore in caso di headless delle export 2024-06-03 10:26:24 +02:00
8e56d53796 Merge branch 'master' into develop 2024-06-03 10:14:24 +02:00
6d2f268ff3 Finish FixJacksonValNull 2024-06-03 10:14:24 +02:00
5362c4f39a Fix jackson inclusione valori null in risposte 2024-06-03 10:14:17 +02:00
875821df08 Merge branch 'master' into develop 2024-06-03 09:54:07 +02:00
51ae525983 Finish Hotfix-61 2024-06-03 09:54:07 +02:00
141f7b6751 se ora ins act è nulla inserire data ins act 2024-06-03 09:54:00 +02:00
4c5c628d23 nuova funzione di suggestCode ean14 2024-05-31 17:39:13 +02:00
1d8449773d [Migrations]
- Aggiunto "REPORT_NAME" a "RILEVAZIONI_STEUP" per la stampa dell'ispezioni di Carelli
- Fix setup_query "ATTACH_LIBERI", problema con la query, campi data_doc e num_doc
2024-05-31 16:32:01 +02:00
5479e9dbcd Personalizzazione importo ordini EDI per data decorrenza CONAD GRAMM 2024-05-30 17:50:12 +02:00
52a0b1df5c Merge remote-tracking branch 'origin/develop' into develop 2024-05-30 16:32:47 +02:00
e0f5c9814a Modifica procedura chiusura commessa MAGGIO 2024-05-30 16:32:43 +02:00
39b928b118 Merge remote-tracking branch 'origin/develop' into develop 2024-05-30 15:51:47 +02:00
378fc24198 [ROSSOGARGANO - Piano accettazione]
fix stampa con calibro null
2024-05-30 15:51:25 +02:00
b6737aca0f visualizzare descrizione sottoattivtà solo se aperta 2024-05-30 15:10:42 +02:00
12115880a1 Merge remote-tracking branch 'origin/develop' into develop 2024-05-30 13:20:09 +02:00
b3a248d754 Fix procedura esportazione tracciato tosca 2024-05-30 13:19:51 +02:00
c41502a829 Aggiunto controllo su null 2024-05-30 13:18:05 +02:00
47f3ebcf4d Creata procedura di esportazione ordini per Gioiella 2024-05-30 09:48:47 +02:00
b7646d8ce3 Modifica tracciato EURITMO e GS per gestione data decorrenza per clienti GRAMM (CONAD, ASPIAG, GS e IPERMONTEBELLO) 2024-05-30 09:39:01 +02:00
e2e2e09bbb Modifica tracciato EURITMO e GS per gestione data decorrenza per clienti GRAMM (CONAD, ASPIAG, GS e IPERMONTEBELLO) 2024-05-30 09:38:25 +02:00
98e024ed5a Modifica tracciato EURITMO e GS per gestione data decorrenza per clienti GRAMM (CONAD, ASPIAG, GS e IPERMONTEBELLO) 2024-05-30 09:12:26 +02:00
a2fe597ed6 Merge remote-tracking branch 'origin/develop' into develop 2024-05-29 18:24:18 +02:00
946089e307 Gestione tara nel calcolo del peso in Gestione documenti/trasporto 2024-05-29 18:24:10 +02:00
990e0e7fdc Merge branch 'master' into develop 2024-05-29 16:33:49 +02:00
d16225e111 Finish Hotfix-61 2024-05-29 16:33:49 +02:00
d4530567d7 sistemata lettura campo in esportazione slim2k 2024-05-29 16:33:25 +02:00
a82106edf0 Merge remote-tracking branch 'origin/develop' into develop 2024-05-29 13:04:24 +02:00
5c3e25b41c Aggiunta descrizione su campo flag_sezione in MSSQL 2024-05-29 13:04:17 +02:00
ce74ff45d7 Configurazione SUIT_PUGLIA_FARMES 2024-05-29 13:04:00 +02:00
b66938e367 Configurazione SUIT_PUGLIA_FARMES 2024-05-29 13:03:52 +02:00
067c7c24fc [ROSSOGARGANO - Piano accettazione]
Gestione calibri e stampe etichette
2024-05-29 12:31:19 +02:00
ebb9db1b92 Merge tag 'Hotfix-62' into develop
Finish Hotfix-62
2024-05-28 18:10:27 +02:00
c5ef5c6f83 Finish Hotfix-62 2024-05-28 18:10:25 +02:00
ff96e73483 [CARELLI] Fix path in importazione listini e promozioni di vendita 2024-05-28 18:09:32 +02:00
6fe75d1b57 aggiunto controllo su inevasi per le rotture di stock 2024-05-28 18:01:26 +02:00
f306d53d3a Fix data in esportazione tracciato tosca 2024-05-28 17:26:35 +02:00
d7c73745ff [GRAMM] Aggiunta setup che consente di disabilitare il picking libero quando si spara un'etichetta cartone 2024-05-28 17:25:55 +02:00
d479180337 [ORDIFY] Aggiunta setup abilitare l'inserimento del codice hash dispositivo nel campo rif_ord in fase di esportazione dell'ordine 2024-05-28 17:24:22 +02:00
a664c1b7e5 Merge remote-tracking branch 'origin/develop' into develop 2024-05-28 17:12:05 +02:00
f89eb0fc2f Implementata clean delle tabelle e delle viste temporanee 2024-05-28 17:11:16 +02:00
9d403f87f4 aggiunto campo tipo_codice_imballo nella tabella mtb_aart
aggiunto campo tipo_cod_barre nella tabella mtb_aart_bar_code
2024-05-28 16:03:23 +02:00
6b47fb3ad3 Merge branch 'master' into develop 2024-05-28 14:45:40 +02:00
b78180374e Finish Hotfix-61 2024-05-28 14:45:39 +02:00
d148de7617 modificata procedura di esportazione ordini per slim2k 2024-05-28 14:45:31 +02:00
a6fd50b523 Merge branch 'master' into develop 2024-05-27 15:27:59 +02:00
95a49495c3 Finish Hotfix-61 2024-05-27 15:27:59 +02:00
457e9e2a45 ritornare indietro con la regola perché per le logiche di Steup questa regola non va bene 2024-05-27 15:27:52 +02:00
b30d0deeda [ROSSOGARGANO]
Aggiunta setup per suggerimento lotto in creazione ordine da mrp
2024-05-27 12:11:09 +02:00
34c441eaff Merge tag 'Carelli_Inventari_FixCodMdep' into develop
Finish Carelli_Inventari_FixCodMdep
2024-05-27 12:02:00 +02:00
4f3b0c81c7 Finish Carelli_Inventari_FixCodMdep 2024-05-27 12:01:59 +02:00
6729807363 [PvmService]
- Fix condizione where su cod_mdep
2024-05-27 12:01:41 +02:00
cdedd25c23 Unificata e migliorata logica di creazione delle mail di errore con un template unico 2024-05-27 10:40:53 +02:00
c0ae8f98f8 Merge remote-tracking branch 'origin/develop' into develop 2024-05-27 10:13:25 +02:00
83e770fb00 DAS 2024-05-27 10:13:21 +02:00
a2de1582cc Merge branch 'refs/heads/develop' into feature/Spring5
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/sync/SyncManager.java
2024-05-27 09:42:13 +02:00
0296fc1666 [ROSSSOGARGANO]
- inserimento automatico barcode_ul
[CARELLI - STEUP]
gestiti nuovi campi segnalazioni
2024-05-27 09:40:56 +02:00
4fd700d771 [ROSSSOGARGANO]
- inserimento automatico barcode_ul
[CARELLI - STEUP]
gestiti nuovi campi segnalazioni
2024-05-27 09:40:50 +02:00
cc5401f193 Unificata e migliorata logica di creazione delle mail di errore con un template unico 2024-05-24 18:50:11 +02:00
c0654f4ab3 Merge remote-tracking branch 'origin/develop' into develop 2024-05-24 17:56:54 +02:00
475fbe7c2c Finish MRP_RimossoCodMdep 2024-05-24 17:33:26 +02:00
842cece89f Merge branch 'develop' into feature/MRP_RimossoCodMdep 2024-05-24 17:33:07 +02:00
035fe7c8bc [MrpDailyMaterialReqService]
- Commentato toMatch con il codMdep
2024-05-24 17:32:59 +02:00
7e54ca7b92 Merge tag 'Materica_CrmService_FixSalvaAttivita' into develop
Finish Materica_CrmService_FixSalvaAttivita
2024-05-24 17:30:23 +02:00
4892d75946 Finish Materica_CrmService_FixSalvaAttivita 2024-05-24 17:30:22 +02:00
3c821317f5 [CrmService]
- Fix effectiveTime null
- Pulizia codice
2024-05-24 17:30:09 +02:00
8073f9cd28 Merge branch 'develop' into feature/MRP_RimossoCodMdep 2024-05-24 17:26:35 +02:00
55933b974e [VGALIMENTI] Creato tracciato per tosca 2024-05-24 15:29:33 +02:00
29e4748521 Migliorie servizio variazioni 2024-05-24 11:50:04 +02:00
b192f0db5d Finish StampaOrdineTwoB 2024-05-24 11:09:58 +02:00
5e975a62b9 Merge branch 'develop' into feature/StampaOrdineTwoB 2024-05-24 11:09:53 +02:00
9eec9b81ae Merge branch 'refs/heads/develop' into feature/Feature-variazioni2 2024-05-24 10:43:11 +02:00
65cbe8644b [AGRIBOOK] Fix query cronologia raccolte 2024-05-24 09:28:05 +02:00
997cd9ee31 Gestito correttamente ritorno importazione listino MS 2024-05-23 16:29:52 +02:00
78b68dc135 Merge remote-tracking branch 'origin/develop' into develop 2024-05-23 15:30:29 +02:00
0b62b93484 Modifica messaggio errorre import documenti STEF 2024-05-23 15:30:22 +02:00
3831cfd4c7 Esportazione documenti DAS Accise 2024-05-23 15:30:15 +02:00
efa2b3a8af Modifica messaggio errorre import documenti STEF 2024-05-23 15:29:43 +02:00
862ca8fbbd Merge remote-tracking branch 'origin/develop' into develop 2024-05-23 15:19:18 +02:00
6cca2bf89e Importazione packing list Eviosys 2024-05-23 15:19:09 +02:00
2620d061b4 sistemate note listino nella procedura di aggiornamento massiva 2024-05-23 15:17:02 +02:00
bf4a4359f7 Merge remote-tracking branch 'origin/develop' into develop 2024-05-23 12:32:43 +02:00
075d441ecc aggiunto campo iban nella tabella jtb_flav 2024-05-23 12:30:40 +02:00
ed0a654e9a Merge branch 'develop' into feature/MRP_RimossoCodMdep 2024-05-23 12:23:59 +02:00
a37a878c92 Finish OrdiKids 2024-05-23 12:00:31 +02:00
32d888472f Merge branch 'develop' into feature/OrdiKids 2024-05-23 11:36:47 +02:00
68f7123eec - Aggiunto NomeNegozioRequired nei settings di Ordikids
- Creazione migration setup NomeNegozioRequired
2024-05-23 11:36:32 +02:00
099093c66a Aggiornato metodo di lettura file xlsx 2024-05-23 10:56:46 +02:00
921ca80eef Merge branch 'refs/heads/develop' into feature/Feature-variazioni2 2024-05-23 10:47:53 +02:00
8796b14d39 Modifica procedura Trasporti Verttore 2024-05-22 18:16:22 +02:00
01737e7fa8 Merge remote-tracking branch 'origin/develop' into develop 2024-05-22 18:16:05 +02:00
2cb14e2452 Modifica Maggio chiusura commessa 2024-05-22 18:15:59 +02:00
f18aacd809 stampa ordine con immagini 2024-05-22 17:05:41 +02:00
a805edc181 Merge branch 'develop' into feature/OrdiKids 2024-05-22 09:36:39 +02:00
1bb2416059 Merge branch 'master' into develop 2024-05-21 18:27:23 +02:00
2342bbf4d4 Finish FixBooleanDefaultValue 2024-05-21 18:27:22 +02:00
13bc0e665e Corretto valore default per campi boolean nelle entity 2024-05-21 18:27:16 +02:00
396b6b7d80 Merge tag 'Hotfix-60' into develop
Finish Hotfix-60
2024-05-21 17:45:47 +02:00
9c09c36a0b Finish Hotfix-60 2024-05-21 17:45:46 +02:00
c4dae52dff Sistemato problema default su flag_add_trasp 2024-05-21 17:45:28 +02:00
5f96e7b0dd sistemata migration 2024-05-21 16:11:20 +02:00
5a2e7b75b4 Aggiunto nuovo campo nella lista degli articoli 2024-05-21 15:51:43 +02:00
1d39fb8ad1 Query Custom Qtà multipla su smetar 2024-05-21 15:07:38 +02:00
9c0e1258a3 Aggiunto numero minimo di capi ordinabile per colore 2024-05-21 13:51:23 +02:00
513a3ad610 Merge branch 'develop' into feature/MRP_RimossoCodMdep 2024-05-21 11:40:10 +02:00
c7f17f771b aggiunta linea dell'ordine di lavoro 2024-05-21 11:39:48 +02:00
a9fd75ff52 - Commentato setCodMdep 2024-05-21 09:45:22 +02:00
ef3e7d0fa6 Merge branch 'master' into develop 2024-05-20 16:46:04 +02:00
9c802252c6 Finish ModifVtbViaggi 2024-05-20 16:46:03 +02:00
4928fd1f0c Aggiunte colonne posizione e confermato in vtb_viaggi 2024-05-20 16:45:55 +02:00
9d80c66605 modificato report riepilogo documenti di vendita 2024-05-20 13:22:15 +02:00
8607c70bbe Finish Hotfix-59 2024-05-20 12:31:55 +02:00
a7d235e53a Merge tag 'Hotfix-59' into develop
Finish Hotfix-59
2024-05-20 12:31:55 +02:00
0ca0182687 Set flag_calc_peso_intra a N 2024-05-20 12:31:44 +02:00
2190cf2221 Set flag_calc_peso_intra a N 2024-05-20 12:31:31 +02:00
e86fdce970 Merge branch 'refs/heads/develop' into feature/Feature-variazioni2 2024-05-20 10:07:30 +02:00
63b067cb7e Corretti nomi colonne in MtbLisv 2024-05-17 19:02:27 +02:00
abf274f0c5 Kit mannutenzione SMETAR 2024-05-17 18:43:35 +02:00
fd01e0446d Sistemata importazione promozioni apulia 2024-05-17 13:52:32 +02:00
4a371cda80 se l'attività viene pianificata ad un solo utente modificare l'utete sull'attività 2024-05-17 13:35:07 +02:00
d1da0d0f9e Merge remote-tracking branch 'origin/develop' into develop 2024-05-17 12:41:42 +02:00
6fe356bad7 sistemata query 2024-05-17 12:41:38 +02:00
40d9aa1790 Aggiunta parametro per permettere stampa di più copie in pdf 2024-05-17 10:37:57 +02:00
b7cac443c1 sistemata sintassi 2024-05-17 10:29:16 +02:00
93fbd9d154 Fix query storico raccolte agribook 2024-05-17 09:48:39 +02:00
13a5ce024e Merge branch 'refs/heads/develop' into feature/Feature-variazioni2 2024-05-16 18:59:18 +02:00
a60a6c028c Merge branch 'master' into develop 2024-05-16 15:12:58 +02:00
37bb46db79 Finish Hotfix-59 2024-05-16 15:12:57 +02:00
db56a05559 sistemata query per giacenza progressiva 2024-05-16 15:12:51 +02:00
a35003d750 migration getlistiniVendita 2024-05-16 15:12:25 +02:00
cd3caf9b76 [Inventario]
- Aggiunto userName nella RowInventarioDto per mostrarlo nel modulo inventario
- Creata join sulla getInventari
2024-05-16 13:11:17 +02:00
864f4303a0 Finish Hotfix-59 2024-05-16 13:06:38 +02:00
c4eadb03b9 Merge branch 'master' into develop 2024-05-16 13:06:38 +02:00
a9e7ccb870 -risolta verifica inventario
-inserite cancellazioni listini di apulia
2024-05-16 13:06:32 +02:00
ff518e3525 aggiunti nuovi campi nei listini e sistemata verifica inventario 2024-05-16 11:00:45 +02:00
03b03e8831 Merge branch 'develop' into feature/Spring5 2024-05-15 17:17:22 +02:00
ee96e8e91b aggiunta cancellazione movimenti contabili 2024-05-15 16:39:30 +02:00
31e1df6786 Migliorato recupero scontrini 2024-05-15 16:39:14 +02:00
f75c2c7fc9 Aggiunta campo flag_calc_peso_intra su tipi documento e flag_sezione su dtb_docr 2024-05-15 16:11:00 +02:00
3b115b5e08 Aggiunta campo flag_calc_peso_intra su tipi documento e flag_sezione su dtb_docr 2024-05-15 16:10:52 +02:00
542a0d7a8a Finish Hotfix-58 2024-05-15 10:38:33 +02:00
0c869066b4 Merge tag 'Hotfix-58' into develop
Finish Hotfix-58
2024-05-15 10:38:33 +02:00
6ec4bf91e0 Modifica CMR per problema su note contatto mancanti 2024-05-15 10:38:17 +02:00
e8d316cb83 Finish Hotfix-58 2024-05-15 09:42:21 +02:00
0c8d4e2dc4 Merge branch 'master' into develop 2024-05-15 09:42:21 +02:00
63c7ed7faf aggiunta regola per completare cod_art_for anche nella mtb_lisa 2024-05-15 09:42:15 +02:00
82bcf9ee15 Fix deserializzazione entity 2024-05-14 17:33:19 +02:00
e8d116cbb8 Merge branch 'develop' into feature/Spring5 2024-05-14 17:33:15 +02:00
eeac0a0348 Finish Hotfix-58 2024-05-14 16:44:06 +02:00
2a01d0ed7d Merge branch 'master' into develop 2024-05-14 16:44:06 +02:00
0567665ca1 Fix su salvataggio elementi object storage 2024-05-14 16:44:00 +02:00
1b38a00056 Riattivato filtro per conversione entity in json 2024-05-14 16:06:04 +02:00
47cfdb6e7f Merge branch 'master' into develop 2024-05-14 12:19:12 +02:00
a86664ee2e Finish Hotfix-58 2024-05-14 12:19:11 +02:00
e420cd2d54 Fix menu 2024-05-14 12:19:06 +02:00
b1d1c548b4 Merge branch 'develop' into feature/Spring5 2024-05-14 12:02:34 +02:00
3a99747e2a [WMS]
- corrette sottrazioni di variabile null
[CARELLI - STEUP]
- download descrizioni attivita in login
- salvataggio priorita e persona rif
2024-05-14 12:02:08 +02:00
66a3d9c140 Cose 2024-05-14 11:51:39 +02:00
f92e35ccc6 Merge branch 'refs/heads/develop' into feature/Feature-variazioni2 2024-05-14 11:44:47 +02:00
1d859f3c73 Merge branch 'refs/heads/develop' into feature/Spring5 2024-05-14 11:43:11 +02:00
55c97f3441 Finish Hotfix-58 2024-05-14 11:39:12 +02:00
c6d88346d1 Merge branch 'master' into develop 2024-05-14 11:39:12 +02:00
03b3a25b86 Migration per AnsiPadding 2024-05-14 11:39:05 +02:00
5c46e4aed5 Aggiunta campo Flag_calc_peso_intra 2024-05-13 18:33:06 +02:00
7743569034 Aggiunta campo Flag_calc_peso_intra 2024-05-13 18:32:59 +02:00
b1d10af821 Aggiunta campo Flag_calc_peso_intra 2024-05-13 18:20:34 +02:00
cf526b8003 Aggiunta campo Flag_calc_peso_intra 2024-05-13 18:02:03 +02:00
4311b93611 Merge remote-tracking branch 'origin/develop' into develop 2024-05-13 18:01:53 +02:00
432e52536b Aggiunta campo Flag_calc_peso_intra 2024-05-13 18:01:44 +02:00
3f062c9370 Finish FixMES 2024-05-13 17:50:11 +02:00
9cc3abe964 Merge branch 'master' into develop 2024-05-13 17:50:11 +02:00
b1a7ea4482 Corretto inserimento data chiusura lotto in caso di terminazione linea 2024-05-13 17:50:00 +02:00
37219b4fb6 [AGRIBOOK] Modificate logiche gestione previsione raccolta 2024-05-13 17:30:58 +02:00
4d38fd8fb3 Aggiunta campo Flag_calc_peso_intra 2024-05-13 15:27:14 +02:00
0376b4c790 Aggiunta campo Flag_calc_peso_intra 2024-05-13 15:27:02 +02:00
88b73f950d Merge branch 'master' into develop 2024-05-13 11:17:12 +02:00
21ab0fdc0d Finish Hotfix-58 2024-05-13 11:17:11 +02:00
21021cec1f Aggiunta setup per controllo ordini multipli su mes 2024-05-13 11:17:02 +02:00
4187aabd11 Modifiche spring5 2024-05-13 11:07:19 +02:00
7d23d4c288 Merge branch 'develop' into feature/Spring5 2024-05-13 09:22:24 +02:00
d7da677fdb [Monitoraggio Linee]
- Migration per FLAG_SUGGESTCODEPARTITAMAG_ORDLAV
- Migration per COD_MART_SFRIDO, ANNOTAZIONI_SFRIDO, ETICHETTA_SFRIDO
2024-05-10 18:16:07 +02:00
53d546f99a upload allegati 2024-05-10 17:19:37 +02:00
8fce6a446f Gestione quantità multipla 2024-05-10 16:33:34 +02:00
08d48a4601 Aggiunto controllo per qta lav null in dtb ord steps 2024-05-10 15:45:29 +02:00
d31d55b00e [AGRIBOOK] Aggiunta lista prevRaccNumeroSettimane in retrieveOrders 2024-05-10 15:43:14 +02:00
ec4d0076b6 Settato dateTimeRow in fase di salvataggio colli 2024-05-10 15:40:04 +02:00
1365aadaf0 Aggiunta importazione sugli scontrini di reso il riferimento dello scontrino di vendita 2024-05-10 15:31:01 +02:00
957bcfb52f Ripristinato update jackson 2024-05-10 13:04:14 +02:00
007f0c5808 Merge branch 'refs/heads/develop' into feature/Spring5 2024-05-10 11:44:55 +02:00
fa9c1f83eb Sostituito check di annotation Master tramite il nuovo scan mapping 2024-05-10 11:11:09 +02:00
98d479e82c Merge branch 'develop' into feature/Spring5
# Conflicts:
#	pom.xml
2024-05-10 11:03:27 +02:00
9fa386ea8c Ricostruito metodo di calcolo dei query fields da inserire nel prepared statement in fase di insert entity 2024-05-10 10:51:05 +02:00
df20c13204 Aggiunta vista per fabbisogni sfusi biolevante 2024-05-09 17:08:49 +02:00
2d24a1beb3 Aggiornato swagger2 alla versione 3 2024-05-09 15:45:06 +02:00
ecb6175c64 Merge remote-tracking branch 'origin/develop' into develop 2024-05-09 15:12:48 +02:00
5b1a866996 Revert versione di Jackson 2024-05-09 15:12:40 +02:00
1004c66965 Aggiunta quantità multipla ordinabile in importazione listini di acquisto 2024-05-09 13:20:01 +02:00
1fbf875c16 Gestita assegnazione data consegna del cliente per MERCADONA 2024-05-09 13:19:02 +02:00
ad8109ed65 Gestito ordinamento DESC su acquisizione cliente in allega fatture passive 2024-05-09 13:18:17 +02:00
05ae4be472 Merge remote-tracking branch 'origin/develop' into develop 2024-05-09 13:18:06 +02:00
406513488b Gestito ordinamento DESC su acquisizione cliente in allega fatture passive 2024-05-09 13:18:01 +02:00
71fdc5c9ea Merge branch 'develop' into feature/Spring5 2024-05-09 11:52:23 +02:00
d2e68c7c9b [IMPORTANT] Aggiornamento di Sping Framework alla versione 5 2024-05-09 11:42:44 +02:00
2bdbbcfa75 aggiunte note ordine 2024-05-09 10:53:03 +02:00
6ba4d0d310 Configurazione per swagger 2.9.2 2024-05-08 19:32:14 +02:00
e14cbb49c3 [IMPORTANT] Aggiornamento di alcune librerie (MinIO, Guava, Firebase, Jackson) 2024-05-08 18:15:32 +02:00
b5a7ba0054 Controllo regola checkCanDeleteOrder se steps non presenti 2024-05-08 16:44:24 +02:00
74ec8ff9eb Aggiunta voce di menu fabb_olio_linea 2024-05-08 11:04:39 +02:00
d1726b65ff [WMS] Refactoring per autenticatione OAuth 2024-05-07 18:55:12 +02:00
91994256d7 Correzione query getRowDb 2024-05-07 18:08:26 +02:00
cdc3f0076a Update su funzione f_getCostSpes e aggiunta setup per escludere i colli dalla giacenza mrp 2024-05-07 16:57:03 +02:00
0fa7eb5568 Spostata modifica MES_GetWorkOrders in nuova migrazione 2024-05-07 15:50:06 +02:00
ca0559bf7f Eliminta valorizzazione di data doc nella registrazione delle distinte perché a causa delle importFromParent andava a sovrascrivere ( solo nel caso di scadenze già chiuse prima della registrazione delle distinte) la data scad presente nella ctb_scad 2024-05-07 13:55:09 +02:00
1a02d73154 aggiunta setup 2024-05-07 13:39:34 +02:00
e899ea74b9 Aggiunto controllo su import ordini EDI che permette al cliente MERCADONA di assegnare la data consegna del file piuttosto che calcolarla 2024-05-06 16:35:32 +02:00
f8623173cb modifiche a procedura di allinemanto posture 2024-05-06 16:15:31 +02:00
67c9211123 Modifiche creazione ordini mes smetar e regole di cancellazione lotto 2024-05-06 12:47:07 +02:00
e76bc1e38e correzioni creazione documenti di carico scarico e accettazione ortofrutta 2024-05-03 19:38:28 +02:00
49576b0558 Gestione note fattura in generazione xml fattura elettronica 2024-05-03 18:50:27 +02:00
9a6b6f88d9 Fix query attività da installare 2024-05-03 10:10:32 +02:00
8388e939d3 Servizio accettazione materia prima ortofrutta 2024-05-02 20:02:26 +02:00
932bc290d4 salvato json che arriva da Tuidi 2024-05-02 18:59:18 +02:00
fdc7f9bf10 nuova gestione cespiti 2024-05-02 17:06:29 +02:00
e88489166b Aggiunta setup 2024-05-02 16:49:58 +02:00
83ae87b5d4 Merge remote-tracking branch 'origin/develop' into develop 2024-04-30 18:53:33 +02:00
1e278e4d7b [AGRIBOOK] Implementate settings 2024-04-30 18:53:24 +02:00
9cb671fc43 Aggiunto ordinamento per cod_anag desc in acquisizione codice fornitore fatture passive 2024-04-30 17:33:18 +02:00
aedf5cde77 Merge remote-tracking branch 'origin/develop' into develop 2024-04-29 16:52:57 +02:00
2a5831c971 Modifica export documenti STEF 2024-04-29 16:52:52 +02:00
84cc42cc40 modifiche a procedura di importazione listini di apulia 2024-04-26 17:11:16 +02:00
4cf9437688 nuovo invio variazioni pianificabile 2024-04-26 14:45:39 +02:00
eb15585c03 Merge branch 'develop' into feature/Feature-variazioni2 2024-04-26 12:56:21 +02:00
144b26bd5d modificata regola affinchè parta anche quando codJfas è valorizzato 2024-04-26 12:56:04 +02:00
0fbfffbdea aggiunta vista 2024-04-26 12:55:22 +02:00
892733b66d Export variazione 2024-04-26 12:49:35 +02:00
54735e3476 Merge branch 'develop' into feature/Feature-variazioni2 2024-04-26 10:03:21 +02:00
a599c46cfc Merge remote-tracking branch 'origin/develop' into develop 2024-04-24 19:46:48 +02:00
1c2ec14677 Aggiunto parametro lotto in CreateUDSRequestDTO 2024-04-24 19:46:41 +02:00
b0d18a151d Nascosto esegui per stato skipped in migrazioni 2024-04-24 17:00:45 +02:00
2d2d5d6bae Aggiunto pulsante per eseguire migrazioni su profilo specifico 2024-04-24 16:50:31 +02:00
374fe08fe2 Gestione criterio prod modificato 2024-04-24 13:02:43 +02:00
3f8bb86e15 Migrations Gestione criterio prod modificato 2024-04-24 11:52:44 +02:00
1e2190b1ad Aggiunto controllo su esistenza trigger in migration 2024-04-23 19:36:05 +02:00
09bb658367 Merge tag 'Biolevante_MRP_ReverseOrderGestione' into develop
Finish Biolevante_MRP_ReverseOrderGestione
2024-04-23 18:14:30 +02:00
c91e4f83e0 Finish Biolevante_MRP_ReverseOrderGestione 2024-04-23 18:14:30 +02:00
8c0fbede36 Migrations Gestione criterio prod modificato 2024-04-23 18:06:51 +02:00
61788b2c7f Fix registrazione imballi WMS 2024-04-23 18:04:51 +02:00
8ff0ed5756 nuovo invio variazioni pianificabile 2024-04-23 17:41:06 +02:00
e242956c61 nuovo invio variazioni pianificabile 2024-04-23 17:29:24 +02:00
58e8c56d37 [MrpDailyMaterialReq]
- Reso l'ordinamendo gestione DESC come da richiesta
- Pulizia codice
2024-04-23 16:35:31 +02:00
9b615738f3 Registrazione imballi WMS 2024-04-23 16:31:20 +02:00
26b19bb545 invio variazioni pianificato 2024-04-23 15:15:30 +02:00
8577366285 revisione file 2024-04-23 15:00:34 +02:00
65b82c29d4 aggiunta setup 2024-04-23 13:44:39 +02:00
e86d728acd Merge tag 'Biolevante_MRP_AggiuntaPriorita' into develop
Finish Biolevante_MRP_AggiuntaPriorita
2024-04-23 13:18:24 +02:00
87b3030b9e Finish Biolevante_MRP_AggiuntaPriorita 2024-04-23 13:18:23 +02:00
dfc61ec50c [MrpDailyMaterialReq]
- Aggiunto Priorita al DTO
- Inserito nelle varie query il campo priorita come numero fisso per impostare l'ordine come da richiesta
2024-04-23 13:18:12 +02:00
70b72d950a Finish Feature-ListinoRif 2024-04-23 12:38:48 +02:00
6302fbd5a9 Merge branch 'develop' into feature/Feature-ListinoRif 2024-04-23 12:38:42 +02:00
e1a3dc034e modificata logica dei listini di riferimento aggiunta versione del listino rif 2024-04-23 12:38:29 +02:00
4e934ed31c Aggiunto campo flag_esclusi_gruppo in fabbisogni 2024-04-23 11:49:10 +02:00
3f5d3a9d64 Aggiunto campo flag_esclusi_gruppo in fabbisogni 2024-04-23 11:49:02 +02:00
e72b00fe17 Sistemato problema valorizzazione cod_barre_imb 2024-04-23 09:38:30 +02:00
5e73631377 Sistemato problema valorizzazione cod_barre_imb 2024-04-23 09:38:21 +02:00
df04dba03f Finish Hotfix-57 2024-04-22 17:22:06 +02:00
ed35819ae5 Merge tag 'Hotfix-57' into develop
Finish Hotfix-57
2024-04-22 17:22:06 +02:00
2aac7353e2 Salvataggio invenatario in Farmmes Scrofaie 2024-04-22 17:21:47 +02:00
1cb380de45 Carelli: aggiunto intercode per alcune tipologie di promozioni 2024-04-22 15:31:27 +02:00
27bc8a2b32 Finish Hotfix-56 2024-04-22 12:55:48 +02:00
2e367f398f Merge tag 'Hotfix-56' into develop
Finish Hotfix-56
2024-04-22 12:55:48 +02:00
f022e89a73 Salvataggio TRASFERIMENTO_A_CESPITE in Farmmes Scrofaie 2024-04-22 12:55:29 +02:00
5b46046b87 Finish Hotfix-56 2024-04-22 12:02:34 +02:00
b62104ae91 Merge branch 'master' into develop 2024-04-22 12:02:34 +02:00
76a2e5b8ba Sistemato invio variazioni nel caso in cui nello stesso giorno c'è un inizio e una fine promo 2024-04-22 10:44:51 +02:00
4f9eb6ea13 Merge branch 'master' into develop 2024-04-22 09:58:04 +02:00
0c0e0d2ba6 Finish Hotfix-56 2024-04-22 09:58:03 +02:00
fc51f4fc74 Fix check versione menu 2024-04-22 09:57:54 +02:00
8583f29082 Gestita cancellazione TRASFERIMENTO_A_CESPITE in Farmmes Scrofaie 2024-04-19 18:20:26 +02:00
fc6a944f61 Merge remote-tracking branch 'origin/develop' into develop 2024-04-19 17:30:57 +02:00
1d0234f9ed Registrazione imballi WMS 2024-04-19 17:30:48 +02:00
75bd2abe12 Finish feature/Carelli_Inventari_FixOrdinamentoERimozionePagination 2024-04-19 16:42:50 +02:00
06bce9f7e2 [Inventario]
- Fix ordinamento inventari (prima erano ordinati ma per profilo/db e non globalmente)
- Rimozione pagination
2024-04-19 16:42:40 +02:00
2a9bebc416 Merge remote-tracking branch 'origin/develop' into develop 2024-04-19 15:57:16 +02:00
0a021baf09 Gestione utente su CLATV 2024-04-19 15:57:10 +02:00
34331c2312 Fix query ArtsInGiacenza 2024-04-19 15:54:00 +02:00
8eef4083c8 In aggiunta cronologia delle raccolte in retrieveOrders di Agribook 2024-04-19 15:47:04 +02:00
869da4fa6c Ingrandita mtb_partita_mag.descrizione, sistemato report scheda costi aggiunta percentuale provvigioni, aggiunta nuova voce di menù 2024-04-19 13:54:00 +02:00
7048d0a4d9 varie migration per modifiche ordini di acquisto carelli 2024-04-18 18:57:06 +02:00
e029bb2e89 Fix data StampaSchedaCosti 2024-04-18 16:02:27 +02:00
6cd612fbb8 Modifica query getActivity 2024-04-18 15:40:40 +02:00
41c9f25c6b Merge remote-tracking branch 'origin/develop' into develop 2024-04-18 15:23:57 +02:00
3b4ade02a5 Aggiunto dataIniz in stampaSchedaCosti 2024-04-18 15:21:57 +02:00
bf4a70b0e5 Merge remote-tracking branch 'origin/develop' into develop 2024-04-18 15:16:15 +02:00
30ec953aa1 Scarichi manuali da WINGEST 2024-04-18 15:16:05 +02:00
5edade9076 Merge remote-tracking branch 'origin/develop' into develop 2024-04-18 15:06:35 +02:00
225501b1a5 Fix query stampaSchedaCosti 2024-04-18 15:06:32 +02:00
9df682b4ef Merge branch 'master' into develop 2024-04-18 13:27:21 +02:00
9d6a23658f Finish Hotfix-56 2024-04-18 13:27:21 +02:00
408b106c2f tornare indietro con la modifica della getlistinoacquisto 2024-04-18 13:27:15 +02:00
713989bcb9 Modificato tipo di errore 2024-04-18 12:25:16 +02:00
7ce4703235 Merge branch 'master' into develop 2024-04-18 11:03:18 +02:00
a1013c878a Finish Hotfix-56 2024-04-18 11:03:18 +02:00
27ff4b1d69 sistemata setup 2024-04-18 11:03:13 +02:00
61d03a9ece aggiornamento getListiniAcquisto 2024-04-18 11:02:30 +02:00
baf5d9151f Finish Hotfix-56 2024-04-18 10:10:35 +02:00
eb02131482 Merge branch 'master' into develop 2024-04-18 10:10:35 +02:00
504910cbc7 Import Gelorent: aggiunta setup con codice fornitore e gestita nuova tabella per intercode.
Cambio tipo documento modificata la data di registrazione del movimento alla data di importazione
2024-04-18 10:10:29 +02:00
47c0fadb40 Calcolo disponbilità e ANSI NULL a Follies 2024-04-18 09:03:17 +02:00
203b14064f Calcolo disponbilità e ANSI NULL a Follies 2024-04-17 18:31:19 +02:00
fe7e9aee68 Calcolo disponbilità e ANSI NULL a Follies 2024-04-17 18:21:16 +02:00
bf1307c3a8 Calcolo disponbilità 2024-04-17 18:21:00 +02:00
e65a9eab8f Fix harvestHystoryDto 2024-04-17 17:54:06 +02:00
fb27d1a17c In inserimento tiket aggiunto esito "DA FARE" per sotto attività 2024-04-17 17:05:19 +02:00
6ffc809fac Finish Hotfix-56 2024-04-16 18:01:42 +02:00
8a11d7b4b6 Merge branch 'master' into develop 2024-04-16 18:01:42 +02:00
1336cbda98 sistemata cast 2024-04-16 18:01:29 +02:00
f30cf71f27 Finish Hotfix-56 2024-04-16 16:14:55 +02:00
8ff6dc4cd4 Merge branch 'master' into develop 2024-04-16 16:14:55 +02:00
4a9681ae26 corretta numerazione del reverse 2024-04-16 16:14:49 +02:00
bf80b77374 Merge branch 'master' into develop 2024-04-16 13:57:27 +02:00
c9c8450cbb Finish Hotfix-56 2024-04-16 13:57:26 +02:00
df0d3d4972 modificata la lettura della qta_cnf e inserita setup per leggere la qta presente nel listino anche quando è 1 2024-04-16 13:56:02 +02:00
026f76cb4a Rimosso suffisso QM al last upd menu 2024-04-16 11:18:47 +02:00
338c13947d Modifica vista analisi costi produzione 2024-04-15 19:10:53 +02:00
81eb1ec9a5 Lanci produzione: Filtro su num_fase in visualizzazione materiali 2024-04-15 13:17:04 +02:00
4b625ab9ea Personalizzazione stampa report ordine di produzione di default 2024-04-12 17:57:07 +02:00
9f76cf6762 Passare parametri obbligatori 2024-04-12 12:52:35 +02:00
427839fe52 Merge remote-tracking branch 'origin/develop' into develop 2024-04-12 09:58:32 +02:00
6146eb074b aggiunta migration 2024-04-12 09:58:30 +02:00
69309bf40b Merge branch 'master' into develop 2024-04-11 17:04:18 +02:00
d863468175 cancellata migration 2024-04-11 16:36:12 +02:00
abf19e0c0d sistemata migration 2024-04-11 16:27:39 +02:00
4d6998371f Varie migration 2024-04-11 16:04:43 +02:00
ce600f5bd0 PIG-UP: sistemato problema righe duplicate 2024-04-11 11:25:41 +02:00
912a208dfe gestito correttamente il cambio del tipo documento nella generazione dell'autofattura 2024-04-11 10:19:26 +02:00
cf5f52e696 inserimenti setup 2024-04-10 19:18:44 +02:00
bc9de1344d Merge branch 'master' into develop 2024-04-10 17:51:07 +02:00
5c7254a827 migliorato messaggio d'errore 2024-04-10 16:02:01 +02:00
10508da2f4 Merge remote-tracking branch 'origin/develop' into develop 2024-04-10 15:10:18 +02:00
248ecaf778 [WMSGenericService]
- Se presente viene presa la maxDataCollo dei colli di carico, altrimenti la data odierna, come data_collo degli ordini di scarico
2024-04-10 15:10:07 +02:00
d42c139490 Merge branch 'master' into develop 2024-04-10 13:14:32 +02:00
446a57b1e2 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240408151803.java
2024-04-10 10:45:43 +02:00
22d812a305 Migration per AnsiPadding 2024-04-10 10:45:09 +02:00
21cc84f7a1 Migration per AnsiPadding 2024-04-10 10:45:00 +02:00
7604bd0b4a Merge branch 'master' into develop 2024-04-10 10:34:31 +02:00
d8e4f45827 Piccola utility db 2024-04-10 10:30:17 +02:00
9a75993848 cvw_mov_black_list 2024-04-09 18:44:34 +02:00
daf4bc347e Sistemati controlli su anno contabile a cavallo, aggiunga migration per setupGest, importazione Rosso gargano 2024-04-09 18:12:45 +02:00
840805f39f Merge remote-tracking branch 'origin/develop' into develop 2024-04-09 18:12:01 +02:00
4c4a3a99c2 Sistemato problema codice EAN imballo su EAN 128 della funzione f_getEAN128UL 2024-04-09 17:02:18 +02:00
6f0ec7ad47 Sistemato problema codice EAN imballo su EAN 128 della funzione f_getEAN128UL 2024-04-09 17:02:01 +02:00
92c10d50c8 [UtilityService]
- Fix se il currentObject è null
2024-04-09 15:39:42 +02:00
44e78b336f aggiornamento vista 2024-04-09 14:45:45 +02:00
688af6c815 Refactor UtilityController 2024-04-09 13:19:57 +02:00
19bdd5e160 Merge branch 'master' into develop 2024-04-09 12:07:31 +02:00
5ae6961b2f Aumentata dimensione descrizione CTB_BENI 2024-04-09 10:40:18 +02:00
b2f7dd77bb Merge remote-tracking branch 'origin/develop' into develop 2024-04-09 10:38:17 +02:00
1ebb61c1b4 Aumentata dimensione descrizione CTB_BENI 2024-04-09 10:38:08 +02:00
ea4d196ca2 Aumentata dimensione descrizione CTB_BENI 2024-04-09 10:37:52 +02:00
caad874c62 Merge remote-tracking branch 'origin/develop' into develop 2024-04-09 09:57:30 +02:00
bd8942617f Aggiunto servizio per permettere all'utente di registrarsi da task 2024-04-09 09:57:24 +02:00
033dee9393 Merge remote-tracking branch 'origin/develop' into develop 2024-04-08 17:39:29 +02:00
bdafc2ad36 allineamento query setup 2024-04-08 17:39:25 +02:00
e0e233b50e Fix user service 2024-04-08 15:30:45 +02:00
79022c1612 Merge branch 'master' into develop 2024-04-08 15:22:13 +02:00
961a7bd278 allineamento query setup 2024-04-08 15:19:00 +02:00
efd595f45b Merge remote-tracking branch 'origin/develop' into develop 2024-04-08 12:25:14 +02:00
d683d75924 modifiche per permettere all'utene di accedere a task 2024-04-08 12:13:14 +02:00
119bcd82bf Attivata paginazione in tabella migrazioni 2024-04-08 12:05:33 +02:00
4fa27e5ec0 Modifica gitignore 2024-04-08 09:42:36 +02:00
3518 changed files with 278499 additions and 117290 deletions

21
.gitignore vendored
View File

@@ -35,14 +35,14 @@
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
.idea/artifacts
.idea/compiler.xml
.idea/jarRepositories.xml
.idea/modules.xml
.idea/*.iml
.idea/modules
*.iml
*.ipr
.idea/artifacts
.idea/compiler.xml
.idea/jarRepositories.xml
.idea/modules.xml
.idea/*.iml
.idea/modules
*.iml
*.ipr
# CMake
cmake-build-*/
@@ -119,5 +119,8 @@ fabric.properties
# Integry
*/target/*
*.ckie
/ts
/temp
/docker/tomcat/conf/integry/logs.db
/docker/tomcat/conf/integry/logs.db-journal
copilot.*.xml
/.idea/dataSources.xml

8
.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,8 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

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

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

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 {
}
}

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

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

View File

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

View File

@@ -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" />

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

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Jenkins.Application.Settings">
<option name="serverUrl" value="https://ci.studioml.it" />
</component>
</project>

3
.idea/misc.xml generated
View File

@@ -8,5 +8,8 @@
</list>
</option>
</component>
<component name="PWA">
<option name="wasEnabledAtLeastOnce" value="true" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>

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

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

View File

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

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat9Import ( TomcatSrv)" type="Remote" folderName="Carelli">
<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="172.16.30.239" />
<option name="PORT" value="8003" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="8003" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>

View File

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<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" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="172.16.30.238" />
<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>

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="localhost" />
<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 (GestSRV)" type="Remote" folderName="Carelli">
<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="172.16.30.238" />
<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="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

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat 9 #1 (Server-01)" type="Remote" folderName="VgAlimenti">
<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="10.107.107.15" />
<option name="PORT" value="5005" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="5005" />
<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 #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

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat 9 (AnydeskTunnel)" type="Remote">
<module name="ems-engine" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="localhost" />
<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,15 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat #1 (Gramm)" type="Remote" folderName="Gramm">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="192.168.50.17" />
<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="Tomcat #1 (Rosso Gargano)" type="Remote" folderName="Rosso Gargano">
<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="172.16.10.51" />
<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,12 +1,16 @@
<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">
<option name="DEBUG_PORT" value="8000" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>

View File

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

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

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

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tosca Cloud" type="Remote" folderName="Tosca">
<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="4.232.161.31" />
<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>

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

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tosca Verona" type="Remote" folderName="Tosca">
<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="10.19.178.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

@@ -0,0 +1,12 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="docker-compose.yml: Compose Deployment" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
<deployment type="docker-compose.yml">
<settings>
<option name="envFilePath" value="" />
<option name="commandLineOptions" value="--build" />
<option name="sourceFilePath" value="docker-compose.yml" />
</settings>
</deployment>
<method v="2" />
</configuration>
</component>

View File

@@ -0,0 +1,15 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="tomcat9 ( TomcatSrv)" type="Remote" folderName="Carelli">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="172.16.30.239" />
<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>

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

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

18
Containerfile Normal file
View File

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

18
Dockerfile Normal file
View File

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

210
build/Jenkinsfile.groovy Normal file
View File

@@ -0,0 +1,210 @@
pipeline {
agent any
options {
buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10'))
disableConcurrentBuilds()
}
stages {
stage('PreBuild Steps (Master)') {
when {
expression {
return env.GIT_BRANCH == "master" || env.GIT_BRANCH == "feature/RefactoringGestioneColli"
}
}
steps {
echo "Creo version tag su Git"
script {
def date = new Date()
def formattedDate = date.format('yyyyMMdd_HHmm')
def tagName = "${env.GIT_BRANCH.toLowerCase().replace('/', '-')}-${formattedDate}"
def tagMessage = "Build #${env.BUILD_NUMBER} - ${env.GIT_BRANCH}"
def envPropertiesText = "project.version=${formattedDate}"
writeFile(
'file': 'ems-core\\src\\main\\resources\\configs\\env.properties',
'text': envPropertiesText
)
bat "git add . -A"
bat "git tag -a ${tagName} -m \"${tagMessage}\""
bat "git push origin ${tagName}"
}
}
}
stage('Maven Build') {
steps {
echo "${WORKSPACE}"
withMaven(traceability: true, maven: 'Maven 3.9.5', options: [artifactsPublisher(disabled: true)]) {
bat(script: 'mvn clean install -t toolchains-jenkins.xml', returnStdout: true)
archiveArtifacts(artifacts: 'ems-engine/target/ems-api.war', onlyIfSuccessful: true)
}
stash includes: 'ems-engine/target/ems-api.war,docker/**,Containerfile', name: 'container-files'
}
}
stage('Publish') {
parallel {
stage('Publish Develop') {
when {
expression {
return env.GIT_BRANCH == "develop"
}
}
stages {
stage('Update Tomcat 1') {
steps {
echo "Updating Tomcat9 from ${WORKSPACE}"
powershell returnStdout: true, script: "build\\update_tomcat.ps1 -serviceName \"Tomcat9\" -httpPort \"8081\" -updatedArtifactPath \"${WORKSPACE}\\ems-engine\\target\\ems-api.war\""
}
}
stage('Update Tomcat 2') {
steps {
echo "Updating Tomcat9 from ${WORKSPACE}"
powershell returnStdout: true, script: "build\\update_tomcat.ps1 -serviceName \"Tomcat9Backup\" -httpPort \"8082\" -updatedArtifactPath \"${WORKSPACE}\\ems-engine\\target\\ems-api.war\""
bat 'curl -k "https://devservices.studioml.it/ems-api/updateWMSApp?overrideForced=false"'
bat 'curl -k "https://devservices.studioml.it/ems-api/updateWMSApp?overrideForced=false&suffix=beta"'
}
}
}
}
stage('Publish Master') {
when {
expression {
return env.GIT_BRANCH == "master"
}
}
stages {
stage('Update Tomcat 1') {
steps {
echo "Updating Tomcat9 from ${WORKSPACE}"
sshPublisher(publishers: [sshPublisherDesc(configName: 'Production Linux Tomcat Server (192.168.3.16)', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '''sudo /usr/bin/systemctl stop tomcat9
rm -R tomcat9/webapps/ems-api
sudo /usr/bin/systemctl start tomcat9
/home/studioml/./wait_tomcat_startup.sh 8081''', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/tomcat9/webapps', remoteDirectorySDF: false, removePrefix: 'ems-engine/target/', sourceFiles: 'ems-engine/target/*.war*')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
}
}
stage('Update Tomcat 2') {
steps {
echo "Updating Tomcat9 from ${WORKSPACE}"
sshPublisher(publishers: [sshPublisherDesc(configName: 'Production Linux Tomcat Server (192.168.3.16)', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '''sudo /usr/bin/systemctl stop tomcat9backup
rm -R tomcat9backup/webapps/ems-api
sudo /usr/bin/systemctl start tomcat9backup
/home/studioml/./wait_tomcat_startup.sh 8082
sleep 10''', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/tomcat9backup/webapps', remoteDirectorySDF: false, removePrefix: 'ems-engine/target/', sourceFiles: 'ems-engine/target/*.war*')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
bat 'curl -k "https://services.studioml.it/ems-api/updateWMSApp?overrideForced=false"'
bat 'curl -k "https://services.studioml.it/ems-api/updateWMSApp?overrideForced=false&suffix=beta"'
}
}
}
}
stage('Publish Branch on Azure') {
steps {
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/${env.GIT_BRANCH}"
}
}
stage('Docker Build') {
steps {
node('server-build') {
echo "Building Docker image"
unstash 'container-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\" ."
bat "podman build -f .\\Containerfile -t \"git.studioml.it/integry/ems-api${branchVersion}:latest\" ."
bat "podman push \"git.studioml.it/integry/ems-api${branchVersion}:latest\""
//containerImageLink "git.studioml.it/integry/ems-api-${env.GIT_BRANCH.toLowerCase().replace('/', '-')}:latest}"
}
}
}
}
stage('Publish TypeScript modules') {
when {
expression {
return env.GIT_BRANCH == "master" || env.GIT_BRANCH == "develop"
}
}
steps {
script {
bat "IF EXIST IntegryManagementSystemTSModules RMDIR IntegryManagementSystemTSModules /S /Q"
// Clona la repository di destinazione
echo "Clonazione della repository di destinazione..."
bat 'git clone https://git.studioml.it/Integry/IntegryManagementSystemTSModules.git'
// Entra nella directory della repository di destinazione
dir('IntegryManagementSystemTSModules') {
if(env.GIT_BRANCH != "master") {
// Crea un nuovo branch se non è master o develop
bat "git checkout -b ${env.GIT_BRANCH} origin/${env.GIT_BRANCH}"
} else {
// Altrimenti, torna al branch master o develop
bat "git checkout ${env.GIT_BRANCH}"
}
//bat "git checkout -b ${env.GIT_BRANCH}"
bat "git pull origin ${env.GIT_BRANCH}"
// Copia i file .ts nella repository di destinazione
echo "Copia dei file .ts nella repository di destinazione..."
bat 'copy ..\\ts\\*.ts .'
// Aggiungi i file modificati
bat 'git add *.ts'
// Commit e push
bat 'git commit -m "Aggiornamento file .ts"'
bat 'git push https://git.studioml.it/Integry/IntegryManagementSystemTSModules.git --all'
}
}
}
}
}
}
}
post {
success {
script {
if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "develop") {
office365ConnectorSend adaptiveCards: true, color: '#008000', message: 'EMS-API è stato compilato con successo', status: 'SUCCESS', webhookUrl: 'https://prod-197.westeurope.logic.azure.com:443/workflows/69a7b8ee3c284175bd6da7127c7eb3cf/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=_-eMfvsQGkIidHWzzlhGFgiZG28ujHZ41QqzuqD9YGw'
}
}
}
unstable {
script {
if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "develop") {
office365ConnectorSend adaptiveCards: true, color: '#FFDE21', message: 'EMS-API è 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'
}
}
}
}
}

153
build/update_tomcat.ps1 Normal file
View File

@@ -0,0 +1,153 @@
Param(
[string]$serviceName, #Argomento passato dal chiamante
[Int32]$httpPort, #Argomento passato dal chiamante
[string]$updatedArtifactPath #Argomento passato dal chiamante
)
$max_attempts = 48
$attempt = 0
$webappsPath = "C:\Program Files\$serviceName\webapps"
# Funzione per eseguire la chiamata GET e controllare lo status code
function Check-Status {
try {
$request = Invoke-WebRequest -Uri "http://localhost:$httpPort/ems-api/system/ok" -Method Get -ErrorAction Stop -UseBasicParsing
$statusCode = $request.StatusCode
if ($statusCode -eq 200) {
Write-Host "Status code 200 ricevuto, processo completato."
exit 0
} else {
Write-Host "Status code $statusCode ricevuto, continuo a provare..."
}
} catch {
Write-Host "Errore: $_"
}
}
# Funzione per cancellare una cartella e un file
function Delete-FilesAndFolder
{
param (
[string]$folderPath,
[string]$filePath
)
try {
# Cancellare la cartella specificata
if (Test-Path -Path $folderPath) {
Remove-Item -Path $folderPath -Recurse -Force
Write-Host "Cartella $folderPath eliminata con successo."
} else {
Write-Host "La cartella $folderPath non esiste."
}
# Cancellare il file specificato
if (Test-Path -Path $filePath) {
Remove-Item -Path $filePath -Force
Write-Host "File $filePath eliminato con successo."
} else {
Write-Host "Il file $filePath non esiste."
}
} catch {
Write-Host "Errore nella cancellazione di file o cartella: $_"
exit 1
}
}
# Funzione per copiare un file
function Copy-File {
param (
[string]$sourceFilePath,
[string]$destinationFilePath
)
try {
if (Test-Path -Path $sourceFilePath) {
Copy-Item -Path $sourceFilePath -Destination $destinationFilePath -Force
Write-Host "File copiato da $sourceFilePath a $destinationFilePath con successo."
} else {
Write-Host "Il file sorgente $sourceFilePath non esiste."
}
} catch {
Write-Host "Errore nella copia del file: $_"
exit 1
}
}
# Funzione per stoppare un servizio e attendere che sia completamente fermato
function Stop-ServiceAndWait {
param (
[string]$serviceName
)
# Tentativo di stoppare il servizio
try {
Write-Host "Sto stoppando il servizio $serviceName..."
Stop-Service -Name $serviceName -Force
# Attesa finché il servizio non viene stoppato
$service = Get-Service -Name $serviceName
while ($service.Status -ne 'Stopped') {
Write-Host "Attendo che il servizio $serviceName si fermi..."
Start-Sleep -Seconds 5
$service = Get-Service -Name $serviceName
}
Write-Host "Il servizio $serviceName è stato fermato con successo."
} catch {
Write-Host "Errore nello stoppare il servizio ${serviceName}: $_"
exit 1
}
}
# Funzione per avviare nuovamente un servizio e attendere che sia in esecuzione
function Start-ServiceAndWait {
param (
[string]$serviceName
)
try {
Write-Host "Sto avviando il servizio $serviceName..."
Start-Service -Name $serviceName
# Attesa finché il servizio non viene avviato
$service = Get-Service -Name $serviceName
while ($service.Status -ne 'Running') {
Write-Host "Attendo che il servizio $serviceName si avvii..."
Start-Sleep -Seconds 5
$service = Get-Service -Name $serviceName
}
Write-Host "Il servizio $serviceName è stato avviato con successo."
} catch {
Write-Host "Errore nell'avvio del servizio ${serviceName}: $_"
exit 1
}
}
# Chiamare la funzione per stoppare il servizio
Stop-ServiceAndWait -serviceName $serviceName
# Subito dopo lo stop, cancellare la cartella e il file
$emsApiPath = "$webappsPath\ems-api"
$emsWarFilePath = "$webappsPath\ems-api.war"
Delete-FilesAndFolder -folderPath $emsApiPath -filePath $emsWarFilePath
# Chiamare la funzione per copiare il file
Write-Host "Copio $updatedArtifactPath in $emsWarFilePath"
Copy-File -sourceFilePath $updatedArtifactPath -destinationFilePath $emsWarFilePath
# Avvia nuovamente il servizio
Start-ServiceAndWait -serviceName $serviceName
# Ciclo fino a quando lo status code non è 200 o superiamo il numero massimo di tentativi
while ($attempt -lt $max_attempts) {
$attempt++
Check-Status
Start-Sleep -Seconds 5 # Attendere per 5 secondi prima di fare un altro tentativo
}
Write-Host "Numero massimo di tentativi superato. Nessuna risposta 200 ricevuta."
exit 1

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

BIN
docker/FontTest.class Normal file

Binary file not shown.

14
docker/FontTest.java Normal file
View File

@@ -0,0 +1,14 @@
import java.awt.*;
public class FontTest {
public static void main(String[] args) {
String[] names = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
System.out.println("Found " + names.length + " fonts:");
for (String name : names) {
System.out.println(name);
}
}
}

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" : "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" : "RESINA_COLOR",
"connectionType" : "MSSQL",
"dbName" : "RESINACOLOR",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "RESINA_COLOR_PASQUALE",
"connectionType" : "MSSQL",
"dbName" : "RESINACOLOR_PASQUALE",
"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_peppe",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "MAGGIOSRL",
"connectionType" : "MSSQL",
"dbName" : "MaggioSRL",
"username" : "sa",
"password" : "sZ",
"host" : "192.168.2.214",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "IDROTECNICA",
"connectionType" : "MSSQL",
"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_peppe",
"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>
@@ -42,85 +24,62 @@
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.4.0</version>
<configuration>
<skip>true</skip>
<mainClass>it.integry.ems_model.rulescompleting.KieStaticCompiler</mainClass>
<longClasspath>true</longClasspath>
<longModulepath>true</longModulepath>
<toolchain>jdk</toolchain>
<executable>java</executable>
<cleanupDaemonThreads>false</cleanupDaemonThreads>
<skip>false</skip>
<arguments>
<argument>-classpath</argument>
<!-- automatically creates the classpath using all project dependencies,
also adding the project build directory -->
<classpath/>
<argument>it.integry.ems_model.rulescompleting.KieStaticCompiler</argument>
<argument>src/main/resources/rules/</argument>
<argument>../ems-engine/src/main/resources/drools/</argument>
</arguments>
<systemProperties>
<projectProperties/>
<exec.longClasspath>true</exec.longClasspath>
</systemProperties>
</configuration>
<executions>
<execution>
<phase>post-clean</phase>
<goals>
<goal>java</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>cz.habarta.typescript-generator</groupId>
<artifactId>typescript-generator-maven-plugin</artifactId>
<version>2.37.1128</version>
<executions>
<execution>
<id>generate</id>
<goals>
<goal>generate</goal>
</goals>
<phase>process-classes</phase>
<goals>
<goal>exec</goal>
</goals>
</execution>
</executions>
<configuration>
<jsonLibrary>jackson2</jsonLibrary>
<classPatterns>it.integry.ems_model.entity.*</classPatterns>
<classes>
<class>it.integry.ems.response.ServiceRestResponse</class>
</classes>
<excludeClasses>
<excludeClass>it.integry.ems_model.base.EntityInterface</excludeClass>
</excludeClasses>
<outputFile>../ts/ems-core.module.ts</outputFile>
<outputKind>module</outputKind>
<outputFileType>implementationFile</outputFileType>
<customTypeNaming>
<naming>it.integry.ems_model.entity.AtbOfft$StatoOfferta:AtbOfftStatoOfferta</naming>
<naming>it.integry.ems_model.entity.VtbOfft$StatoOfferta:VtbOfftStatoOfferta</naming>
<naming>it.integry.ems_model.entity.GrlAnagJrept$Tipo:GrlAnagJreptTipo</naming>
<naming>it.integry.ems_model.entity.WtbJreptSetup$Tipo:WtbJreptSetupTipo</naming>
<naming>it.integry.ems_model.entity.MtbColr$Causale:MtbColrCausale</naming>
<naming>it.integry.ems_model.entity.MtbCols$Causale:MtbColsCausale</naming>
</customTypeNaming>
<generateConstructors>true</generateConstructors>
<mapClasses>asClasses</mapClasses>
<mapEnum>asEnum</mapEnum>
<optionalProperties>useLibraryDefinition</optionalProperties>
</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.25.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.2</version>
<version>2.16.1</version>
<scope>compile</scope>
</dependency>
@@ -141,7 +100,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>
@@ -154,19 +113,24 @@
<version>1.13</version>
</dependency>
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
<version>8.5.14</version>
</dependency>
<!-- SWAGGER
<!-- SWAGGER -->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<artifactId>springfox-oas</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency> -->
</dependency>
<!-- REST CLIENT -->
<dependency>
@@ -181,42 +145,20 @@
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson-provider</artifactId>
<artifactId>resteasy-jackson2-provider</artifactId>
<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>
<version>20200518</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.9.10</version>
<version>0.10.2</version>
</dependency>
<!-- Mail -->
@@ -226,49 +168,42 @@
<version>1.4.7</version>
</dependency>
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>2.3.0</version>
</dependency>
<!-- JASPER REPORT -->
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>6.16.0</version>
<exclusions>
<exclusion>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.lowagie</groupId>
<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>
<version>${jaspersoft.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.lowagie</groupId>-->
<!-- <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-fonts</artifactId>
<version>6.16.0</version>
<version>${jaspersoft.version}</version>
</dependency>
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports-functions</artifactId>
<version>6.16.0</version>
<version>${jaspersoft.version}</version>
</dependency>
<dependency>
<groupId>it.integry.font</groupId>
<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>
@@ -289,83 +224,88 @@
<artifactId>Tahoma</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>it.integry.font</groupId>
<artifactId>arial-rounded</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.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>3.9</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>3.9</version>
<version>5.2.5</version>
</dependency>
<dependency>
@@ -402,13 +342,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>
@@ -426,11 +360,15 @@
<artifactId>jackson-dataformat-csv</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.47</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.20</version> <!-- Versione scritta a mano perché qui non hanno usato lo 0 finale -->
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>
<!-- Spring -->
@@ -443,13 +381,14 @@
<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>
<groupId>org.springframework</groupId>
<artifactId>spring-instrument-tomcat</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
@@ -499,21 +438,36 @@
<version>${drools.version}</version>
</dependency>
<!-- log4j -->
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
<version>3.4.4</version>
<scope>runtime</scope>
</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>
@@ -531,39 +485,26 @@
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.39.2.0</version>
<version>3.41.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<version>3.14.0</version>
</dependency>
<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>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.8.0</version>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>javax</groupId>
@@ -575,30 +516,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 -->
@@ -636,7 +567,7 @@
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
<version>0.11.5</version>
<scope>runtime</scope>
<scope>compile</scope>
</dependency>
<!--Expiring Map-->
@@ -648,18 +579,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>
@@ -669,26 +600,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>7.0.1</version>
<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>
@@ -711,13 +635,13 @@
<dependency>
<groupId>com.hierynomus</groupId>
<artifactId>sshj</artifactId>
<version>0.27.0</version>
<version>0.39.0</version>
</dependency>
<dependency>
<groupId>com.github.javaparser</groupId>
<artifactId>javaparser-symbol-solver-core</artifactId>
<version>3.25.9</version>
<version>3.26.1</version>
</dependency>
</dependencies>

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

@@ -0,0 +1,18 @@
package it.integry.FoodProcess.api;
import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientRequestFilter;
import java.io.IOException;
public class AddApiKeyHeaderRequestFilter implements ClientRequestFilter {
private final String apiKey;
public AddApiKeyHeaderRequestFilter(String apiKey) {
this.apiKey = apiKey;
}
@Override
public void filter(ClientRequestContext clientRequestContext) throws IOException {
clientRequestContext.getHeaders().add("X-Api-Key", apiKey);
}
}

View File

@@ -0,0 +1,62 @@
package it.integry.FoodProcess.api;
import com.fasterxml.jackson.databind.ObjectMapper;
import it.integry.FoodProcess.dto.response.ErrorResponse;
import javax.ws.rs.*;
import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientResponseContext;
import javax.ws.rs.client.ClientResponseFilter;
import javax.ws.rs.core.Response;
import java.io.IOException;
public class ErrorMessageResponseFilter implements ClientResponseFilter {
private static final ObjectMapper objectMapper = new ObjectMapper();
@Override
public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {
if (responseContext.getStatus() != Response.Status.OK.getStatusCode()) {
if (responseContext.hasEntity()) {
ErrorResponse error = objectMapper.readValue(responseContext.getEntityStream(), ErrorResponse.class);
String message = error.getErrorMessage();
Response.Status status = Response.Status.fromStatusCode(responseContext.getStatus());
WebApplicationException webAppException;
switch (status) {
case BAD_REQUEST:
webAppException = new BadRequestException(message);
break;
case UNAUTHORIZED:
webAppException = new NotAuthorizedException(message, Response.status(Response.Status.UNAUTHORIZED).build());
break;
case FORBIDDEN:
webAppException = new ForbiddenException(message);
break;
case NOT_FOUND:
webAppException = new NotFoundException(message);
break;
case METHOD_NOT_ALLOWED:
webAppException = new NotAllowedException(message);
break;
case NOT_ACCEPTABLE:
webAppException = new NotAcceptableException(message);
break;
case UNSUPPORTED_MEDIA_TYPE:
webAppException = new NotSupportedException(message);
break;
case INTERNAL_SERVER_ERROR:
webAppException = new InternalServerErrorException(message);
break;
case SERVICE_UNAVAILABLE:
webAppException = new ServiceUnavailableException(message);
break;
default:
webAppException = new WebApplicationException(message);
}
throw webAppException;
}
}
}
}

View File

@@ -0,0 +1,69 @@
package it.integry.FoodProcess.api;
import it.integry.FoodProcess.dto.*;
import it.integry.FoodProcess.dto.response.*;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import java.util.List;
public interface FoodProcessClient {
// Orders
@GET
@Path("/getorderstatuses")
@Produces(MediaType.APPLICATION_JSON)
List<OrderStatusResponse> getOrderStatuses(@QueryParam("order_ids") List<String> orderIds);
@POST
@Path("/importorders")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
ImportOrdersResponse importOrders(ImportOrdersRequest importOrdersRequest);
// Master data
@GET
@Path("/getarticles")
@Produces(MediaType.APPLICATION_JSON)
List<Article> getArticles();
@POST
@Path("/importarticles")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
ImportArticlesResponse importArticles(ImportArticlesRequest importArticlesRequest);
@GET
@Path("/getbusinesspartners")
@Produces(MediaType.APPLICATION_JSON)
List<BusinessPartner> getBusinessPartners();
@POST
@Path("/importbusinesspartners")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
ImportBusinessPartnersResponse importBusinessPartners(ImportBusinessPartnersRequest importBusinessPartnersRequest);
@GET
@Path("/getpackagingmaterials")
@Produces(MediaType.APPLICATION_JSON)
List<PackagingMaterial> getPackagingMaterials();
@POST
@Path("/importpackagingmaterials")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
ImportPackagingMaterialsResponse importPackagingMaterials(ImportPackagingMaterialsRequest importPackagingMaterialsRequest);
@GET
@Path("/getrawmaterials")
@Produces(MediaType.APPLICATION_JSON)
List<RawMaterial> getRawMaterials();
@POST
@Path("/importrawmaterials")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
ImportRawMaterialsResponse importRawMaterials(ImportRawMaterialsRequest importRawMaterialsRequest);
}

View File

@@ -0,0 +1,25 @@
package it.integry.FoodProcess.api;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.jboss.resteasy.plugins.providers.jackson.ResteasyJackson2Provider;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.Provider;
import java.io.IOException;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
@Provider
public class JacksonProvider extends ResteasyJackson2Provider {
@Override
public void writeTo(Object value, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException {
ObjectMapper mapper = locateMapper(type, MediaType.APPLICATION_JSON_TYPE);
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
super.writeTo(value, type, genericType, annotations, mediaType, httpHeaders, entityStream);
}
}

View File

@@ -0,0 +1,116 @@
package it.integry.FoodProcess.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import it.integry.ems_model.annotation.SqlField;
import java.util.List;
public class Article {
@SqlField
private String id;
@SqlField
private String code;
@SqlField
private String name;
@JsonProperty("raw_materials")
private List<ArticleRawMaterial> rawMaterials;
@JsonProperty("packaging_material_id")
private String packagingMaterialId;
@JsonProperty("packaging_material_code")
private String packagingMaterialCode;
@JsonProperty("packaging_material_name")
private String packagingMaterialName;
@SqlField
private String note;
@JsonProperty("is_archived")
private boolean isArchived;
public String getId() {
return id;
}
public Article setId(String id) {
this.id = id;
return this;
}
public String getCode() {
return code;
}
public Article setCode(String code) {
this.code = code;
return this;
}
public String getName() {
return name;
}
public Article setName(String name) {
this.name = name;
return this;
}
public List<ArticleRawMaterial> getRawMaterials() {
return rawMaterials;
}
public Article setRawMaterials(List<ArticleRawMaterial> rawMaterials) {
this.rawMaterials = rawMaterials;
return this;
}
public String getPackagingMaterialId() {
return packagingMaterialId;
}
public Article setPackagingMaterialId(String packagingMaterialId) {
this.packagingMaterialId = packagingMaterialId;
return this;
}
public String getPackagingMaterialCode() {
return packagingMaterialCode;
}
public Article setPackagingMaterialCode(String packagingMaterialCode) {
this.packagingMaterialCode = packagingMaterialCode;
return this;
}
public String getPackagingMaterialName() {
return packagingMaterialName;
}
public Article setPackagingMaterialName(String packagingMaterialName) {
this.packagingMaterialName = packagingMaterialName;
return this;
}
public String getNote() {
return note;
}
public Article setNote(String note) {
this.note = note;
return this;
}
public boolean getIsArchived() {
return isArchived;
}
public Article setIsArchived(boolean isArchived) {
this.isArchived = isArchived;
return this;
}
}

View File

@@ -0,0 +1,50 @@
package it.integry.FoodProcess.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
public class ArticleRawMaterial {
private String id;
private String code;
private String name;
@JsonProperty("weight_kg")
private Double weightKg;
public String getId() {
return id;
}
public ArticleRawMaterial setId(String id) {
this.id = id;
return this;
}
public String getCode() {
return code;
}
public ArticleRawMaterial setCode(String code) {
this.code = code;
return this;
}
public String getName() {
return name;
}
public ArticleRawMaterial setName(String name) {
this.name = name;
return this;
}
public Double getWeightKg() {
return weightKg;
}
public ArticleRawMaterial setWeightKg(Double weightKg) {
this.weightKg = weightKg;
return this;
}
}

View File

@@ -0,0 +1,93 @@
package it.integry.FoodProcess.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import it.integry.ems_model.annotation.SqlField;
public class BusinessPartner {
@SqlField
private String id;
@SqlField
private String code;
@SqlField
private String name;
@SqlField
@JsonProperty("is_customer")
private boolean isCustomer;
@SqlField
@JsonProperty("is_supplier")
private boolean isSupplier;
@SqlField
private String note;
@SqlField
@JsonProperty("is_archived")
private boolean isArchived;
public String getId() {
return id;
}
public BusinessPartner setId(String id) {
this.id = id;
return this;
}
public String getCode() {
return code;
}
public BusinessPartner setCode(String code) {
this.code = code;
return this;
}
public String getName() {
return name;
}
public BusinessPartner setName(String name) {
this.name = name;
return this;
}
public boolean getIsCustomer() {
return isCustomer;
}
public BusinessPartner setIsCustomer(boolean isCustomer) {
this.isCustomer = isCustomer;
return this;
}
public boolean getIsSupplier() {
return isSupplier;
}
public BusinessPartner setIsSupplier(boolean isSupplier) {
this.isSupplier = isSupplier;
return this;
}
public String getNote() {
return note;
}
public BusinessPartner setNote(String note) {
this.note = note;
return this;
}
public boolean getIsArchived() {
return isArchived;
}
public BusinessPartner setIsArchived(boolean isArchived) {
this.isArchived = isArchived;
return this;
}
}

View File

@@ -0,0 +1,16 @@
package it.integry.FoodProcess.dto;
import java.util.List;
public class ImportArticlesRequest {
private List<Article> articles;
public List<Article> getArticles() {
return articles;
}
public ImportArticlesRequest setArticles(List<Article> articles) {
this.articles = articles;
return this;
}
}

View File

@@ -0,0 +1,19 @@
package it.integry.FoodProcess.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
public class ImportBusinessPartnersRequest {
@JsonProperty("business_partners")
private List<BusinessPartner> businessPartners;
public List<BusinessPartner> getBusinessPartners() {
return businessPartners;
}
public ImportBusinessPartnersRequest setBusinessPartners(List<BusinessPartner> businessPartners) {
this.businessPartners = businessPartners;
return this;
}
}

View File

@@ -0,0 +1,16 @@
package it.integry.FoodProcess.dto;
import java.util.List;
public class ImportOrdersRequest {
private List<RequestOrder> orders;
public List<RequestOrder> getOrders() {
return orders;
}
public ImportOrdersRequest setOrders(List<RequestOrder> orders) {
this.orders = orders;
return this;
}
}

View File

@@ -0,0 +1,19 @@
package it.integry.FoodProcess.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
public class ImportPackagingMaterialsRequest {
@JsonProperty("packaging_materials")
private List<PackagingMaterial> packagingMaterials;
public List<PackagingMaterial> getPackagingMaterials() {
return packagingMaterials;
}
public ImportPackagingMaterialsRequest setPackagingMaterials(List<PackagingMaterial> packagingMaterials) {
this.packagingMaterials = packagingMaterials;
return this;
}
}

View File

@@ -0,0 +1,19 @@
package it.integry.FoodProcess.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
public class ImportRawMaterialsRequest {
@JsonProperty("raw_materials")
private List<RawMaterial> rawMaterials;
public List<RawMaterial> getRawMaterials() {
return rawMaterials;
}
public ImportRawMaterialsRequest setRawMaterials(List<RawMaterial> rawMaterials) {
this.rawMaterials = rawMaterials;
return this;
}
}

View File

@@ -0,0 +1,120 @@
package it.integry.FoodProcess.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
public class PackagingMaterial {
private String id;
private String code;
private String name;
private PackagingMaterialType type;
@JsonProperty("weight_kg")
private Double weightKg;
@JsonProperty("length_mm")
private Double lengthMm;
@JsonProperty("width_mm")
private Double widthMm;
@JsonProperty("height_mm")
private Double heightMm;
private String note;
@JsonProperty("is_archived")
private boolean isArchived;
public String getId() {
return id;
}
public PackagingMaterial setId(String id) {
this.id = id;
return this;
}
public String getCode() {
return code;
}
public PackagingMaterial setCode(String code) {
this.code = code;
return this;
}
public String getName() {
return name;
}
public PackagingMaterial setName(String name) {
this.name = name;
return this;
}
public PackagingMaterialType getType() {
return type;
}
public PackagingMaterial setType(PackagingMaterialType type) {
this.type = type;
return this;
}
public Double getWeightKg() {
return weightKg;
}
public PackagingMaterial setWeightKg(Double weightKg) {
this.weightKg = weightKg;
return this;
}
public Double getLengthMm() {
return lengthMm;
}
public PackagingMaterial setLengthMm(Double lengthMm) {
this.lengthMm = lengthMm;
return this;
}
public Double getWidthMm() {
return widthMm;
}
public PackagingMaterial setWidthMm(Double widthMm) {
this.widthMm = widthMm;
return this;
}
public Double getHeightMm() {
return heightMm;
}
public PackagingMaterial setHeightMm(Double heightMm) {
this.heightMm = heightMm;
return this;
}
public String getNote() {
return note;
}
public PackagingMaterial setNote(String note) {
this.note = note;
return this;
}
public boolean getIsArchived() {
return isArchived;
}
public PackagingMaterial setIsArchived(boolean isArchived) {
this.isArchived = isArchived;
return this;
}
}

View File

@@ -0,0 +1,10 @@
package it.integry.FoodProcess.dto;
public enum PackagingMaterialType {
PUNNET,
TRAY,
BAG,
CARTON,
CRATE,
PALLET
}

View File

@@ -0,0 +1,61 @@
package it.integry.FoodProcess.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
public class RawMaterial {
private String id;
private String code;
private String name;
private String note;
@JsonProperty("is_archived")
private boolean isArchived;
public String getId() {
return id;
}
public RawMaterial setId(String id) {
this.id = id;
return this;
}
public String getCode() {
return code;
}
public RawMaterial setCode(String code) {
this.code = code;
return this;
}
public String getName() {
return name;
}
public RawMaterial setName(String name) {
this.name = name;
return this;
}
public String getNote() {
return note;
}
public RawMaterial setNote(String note) {
this.note = note;
return this;
}
public boolean getIsArchived() {
return isArchived;
}
public RawMaterial setIsArchived(boolean isArchived) {
this.isArchived = isArchived;
return this;
}
}

View File

@@ -0,0 +1,234 @@
package it.integry.FoodProcess.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.time.LocalDate;
import java.time.LocalDateTime;
public class RequestOrder {
private String id;
private String type;
@JsonProperty("article_id")
private String articleId;
@JsonProperty("article_code")
private String articleCode;
@JsonProperty("customer_id")
private String customerId;
@JsonProperty("customer_code")
private String customerCode;
@JsonProperty("secondary_packaging_material_id")
private String secondaryPackagingMaterialId;
@JsonProperty("secondary_packaging_material_code")
private String secondaryPackagingMaterialCode;
@JsonProperty("tertiary_packaging_material_id")
private String tertiaryPackagingMaterialId;
@JsonProperty("tertiary_packaging_material_code")
private String tertiaryPackagingMaterialCode;
@JsonProperty("units_per_secondary_packaging")
private int unitsPerSecondaryPackaging;
@JsonProperty("units_per_pallet_layer")
private int unitsPerPalletLayer;
@JsonProperty("pallet_layer_quantity")
private int palletLayerQuantity;
@JsonProperty("target_quantity")
private double targetQuantity;
@JsonProperty("target_quantity_unit")
private TargetQuantityUnit targetQuantityUnit;
@JsonProperty("scheduled_for")
private LocalDateTime scheduledFor;
@JsonProperty("to_be_completed_until")
private LocalDateTime toBeCompletedUntil;
@JsonProperty("best_before_date")
private LocalDate bestBeforeDate;
@JsonProperty("production_lot")
private String productionLot;
public String getId() {
return id;
}
public RequestOrder setId(String id) {
this.id = id;
return this;
}
public String getType() {
return type;
}
public RequestOrder setType(String type) {
this.type = type;
return this;
}
public String getArticleId() {
return articleId;
}
public RequestOrder setArticleId(String articleId) {
this.articleId = articleId;
return this;
}
public String getArticleCode() {
return articleCode;
}
public RequestOrder setArticleCode(String articleCode) {
this.articleCode = articleCode;
return this;
}
public String getCustomerId() {
return customerId;
}
public RequestOrder setCustomerId(String customerId) {
this.customerId = customerId;
return this;
}
public String getCustomerCode() {
return customerCode;
}
public RequestOrder setCustomerCode(String customerCode) {
this.customerCode = customerCode;
return this;
}
public String getSecondaryPackagingMaterialId() {
return secondaryPackagingMaterialId;
}
public RequestOrder setSecondaryPackagingMaterialId(String secondaryPackagingMaterialId) {
this.secondaryPackagingMaterialId = secondaryPackagingMaterialId;
return this;
}
public String getSecondaryPackagingMaterialCode() {
return secondaryPackagingMaterialCode;
}
public RequestOrder setSecondaryPackagingMaterialCode(String secondaryPackagingMaterialCode) {
this.secondaryPackagingMaterialCode = secondaryPackagingMaterialCode;
return this;
}
public String getTertiaryPackagingMaterialId() {
return tertiaryPackagingMaterialId;
}
public RequestOrder setTertiaryPackagingMaterialId(String tertiaryPackagingMaterialId) {
this.tertiaryPackagingMaterialId = tertiaryPackagingMaterialId;
return this;
}
public String getTertiaryPackagingMaterialCode() {
return tertiaryPackagingMaterialCode;
}
public RequestOrder setTertiaryPackagingMaterialCode(String tertiaryPackagingMaterialCode) {
this.tertiaryPackagingMaterialCode = tertiaryPackagingMaterialCode;
return this;
}
public int getUnitsPerSecondaryPackaging() {
return unitsPerSecondaryPackaging;
}
public RequestOrder setUnitsPerSecondaryPackaging(int unitsPerSecondaryPackaging) {
this.unitsPerSecondaryPackaging = unitsPerSecondaryPackaging;
return this;
}
public int getUnitsPerPalletLayer() {
return unitsPerPalletLayer;
}
public RequestOrder setUnitsPerPalletLayer(int unitsPerPalletLayer) {
this.unitsPerPalletLayer = unitsPerPalletLayer;
return this;
}
public int getPalletLayerQuantity() {
return palletLayerQuantity;
}
public RequestOrder setPalletLayerQuantity(int palletLayerQuantity) {
this.palletLayerQuantity = palletLayerQuantity;
return this;
}
public double getTargetQuantity() {
return targetQuantity;
}
public RequestOrder setTargetQuantity(double targetQuantity) {
this.targetQuantity = targetQuantity;
return this;
}
public TargetQuantityUnit getTargetQuantityUnit() {
return targetQuantityUnit;
}
public RequestOrder setTargetQuantityUnit(TargetQuantityUnit targetQuantityUnit) {
this.targetQuantityUnit = targetQuantityUnit;
return this;
}
public LocalDateTime getScheduledFor() {
return scheduledFor;
}
public RequestOrder setScheduledFor(LocalDateTime scheduledFor) {
this.scheduledFor = scheduledFor;
return this;
}
public LocalDateTime getToBeCompletedUntil() {
return toBeCompletedUntil;
}
public RequestOrder setToBeCompletedUntil(LocalDateTime toBeCompletedUntil) {
this.toBeCompletedUntil = toBeCompletedUntil;
return this;
}
public LocalDate getBestBeforeDate() {
return bestBeforeDate;
}
public RequestOrder setBestBeforeDate(LocalDate bestBeforeDate) {
this.bestBeforeDate = bestBeforeDate;
return this;
}
public String getProductionLot() {
return productionLot;
}
public RequestOrder setProductionLot(String productionLot) {
this.productionLot = productionLot;
return this;
}
}

View File

@@ -0,0 +1,8 @@
package it.integry.FoodProcess.dto;
public enum TargetQuantityUnit {
PIECE,
SECONDARY_PACKAGING,
TERTIARY_PACKAGING,
KILOGRAM
}

View File

@@ -0,0 +1,17 @@
package it.integry.FoodProcess.dto.response;
import com.fasterxml.jackson.annotation.JsonProperty;
public class ErrorResponse {
@JsonProperty("error_message")
private String errorMessage;
public String getErrorMessage() {
return errorMessage;
}
public ErrorResponse setErrorMessage(String errorMessage) {
this.errorMessage = errorMessage;
return this;
}
}

View File

@@ -0,0 +1,17 @@
package it.integry.FoodProcess.dto.response;
import com.fasterxml.jackson.annotation.JsonProperty;
public class ImportArticleStatus extends ResponseStatus {
@JsonProperty("article_id")
private String articleId;
public String getArticleId() {
return articleId;
}
public ImportArticleStatus setArticleId(String articleId) {
this.articleId = articleId;
return this;
}
}

View File

@@ -0,0 +1,16 @@
package it.integry.FoodProcess.dto.response;
import java.util.List;
public class ImportArticlesResponse {
private List<ImportArticleStatus> statuses;
public List<ImportArticleStatus> getStatuses() {
return statuses;
}
public ImportArticlesResponse setStatuses(List<ImportArticleStatus> statuses) {
this.statuses = statuses;
return this;
}
}

View File

@@ -0,0 +1,17 @@
package it.integry.FoodProcess.dto.response;
import com.fasterxml.jackson.annotation.JsonProperty;
public class ImportBusinessPartnerStatus extends ResponseStatus {
@JsonProperty("business_partner_id")
private String businessPartnerId;
public String getBusinessPartnerId() {
return businessPartnerId;
}
public ImportBusinessPartnerStatus setBusinessPartnerId(String businessPartnerId) {
this.businessPartnerId = businessPartnerId;
return this;
}
}

View File

@@ -0,0 +1,16 @@
package it.integry.FoodProcess.dto.response;
import java.util.List;
public class ImportBusinessPartnersResponse {
private List<ImportBusinessPartnerStatus> statuses;
public List<ImportBusinessPartnerStatus> getStatuses() {
return statuses;
}
public ImportBusinessPartnersResponse setStatuses(List<ImportBusinessPartnerStatus> statuses) {
this.statuses = statuses;
return this;
}
}

View File

@@ -0,0 +1,17 @@
package it.integry.FoodProcess.dto.response;
import com.fasterxml.jackson.annotation.JsonProperty;
public class ImportOrderStatus extends ResponseStatus {
@JsonProperty("order_id")
private String orderId;
public String getOrderId() {
return orderId;
}
public ImportOrderStatus setOrderId(String orderId) {
this.orderId = orderId;
return this;
}
}

View File

@@ -0,0 +1,16 @@
package it.integry.FoodProcess.dto.response;
import java.util.List;
public class ImportOrdersResponse {
private List<ImportOrderStatus> statuses;
public List<ImportOrderStatus> getStatuses() {
return statuses;
}
public ImportOrdersResponse setStatuses(List<ImportOrderStatus> statuses) {
this.statuses = statuses;
return this;
}
}

View File

@@ -0,0 +1,17 @@
package it.integry.FoodProcess.dto.response;
import com.fasterxml.jackson.annotation.JsonProperty;
public class ImportPackagingMaterialStatus extends ResponseStatus {
@JsonProperty("packaging_material_id")
private String packagingMaterialId;
public String getPackagingMaterialId() {
return packagingMaterialId;
}
public ImportPackagingMaterialStatus setPackagingMaterialId(String packagingMaterialId) {
this.packagingMaterialId = packagingMaterialId;
return this;
}
}

View File

@@ -0,0 +1,16 @@
package it.integry.FoodProcess.dto.response;
import java.util.List;
public class ImportPackagingMaterialsResponse {
private List<ImportPackagingMaterialStatus> statuses;
public List<ImportPackagingMaterialStatus> getStatuses() {
return statuses;
}
public ImportPackagingMaterialsResponse setStatuses(List<ImportPackagingMaterialStatus> statuses) {
this.statuses = statuses;
return this;
}
}

View File

@@ -0,0 +1,17 @@
package it.integry.FoodProcess.dto.response;
import com.fasterxml.jackson.annotation.JsonProperty;
public class ImportRawMaterialStatus extends ResponseStatus {
@JsonProperty("raw_material_id")
private String rawMaterialId;
public String getRawMaterialId() {
return rawMaterialId;
}
public ImportRawMaterialStatus setRawMaterialId(String rawMaterialId) {
this.rawMaterialId = rawMaterialId;
return this;
}
}

View File

@@ -0,0 +1,16 @@
package it.integry.FoodProcess.dto.response;
import java.util.List;
public class ImportRawMaterialsResponse {
private List<ImportRawMaterialStatus> statuses;
public List<ImportRawMaterialStatus> getStatuses() {
return statuses;
}
public ImportRawMaterialsResponse setStatuses(List<ImportRawMaterialStatus> statuses) {
this.statuses = statuses;
return this;
}
}

View File

@@ -0,0 +1,9 @@
package it.integry.FoodProcess.dto.response;
public enum OrderStatus {
NEW,
ASSIGNED,
ACTIVE,
CLOSED,
CANCELED
}

View File

@@ -0,0 +1,29 @@
package it.integry.FoodProcess.dto.response;
import com.fasterxml.jackson.annotation.JsonProperty;
public class OrderStatusResponse {
@JsonProperty("order_id")
private String orderId;
@JsonProperty("order_status")
private OrderStatus orderStatus;
public String getOrderId() {
return orderId;
}
public OrderStatusResponse setOrderId(String orderId) {
this.orderId = orderId;
return this;
}
public OrderStatus getOrderStatus() {
return orderStatus;
}
public OrderStatusResponse setOrderStatus(OrderStatus orderStatus) {
this.orderStatus = orderStatus;
return this;
}
}

View File

@@ -0,0 +1,24 @@
package it.integry.FoodProcess.dto.response;
public class ResponseStatus {
private boolean success;
private String message;
public boolean isSuccess() {
return success;
}
public ResponseStatus setSuccess(boolean success) {
this.success = success;
return this;
}
public String getMessage() {
return message;
}
public ResponseStatus setMessage(String message) {
this.message = message;
return this;
}
}

View File

@@ -0,0 +1,175 @@
package it.integry.FoodProcess.service;
import it.integry.FoodProcess.api.AddApiKeyHeaderRequestFilter;
import it.integry.FoodProcess.api.ErrorMessageResponseFilter;
import it.integry.FoodProcess.api.FoodProcessClient;
import it.integry.FoodProcess.api.JacksonProvider;
import it.integry.FoodProcess.dto.Article;
import it.integry.FoodProcess.dto.ImportArticlesRequest;
import it.integry.FoodProcess.dto.response.ImportArticlesResponse;
import it.integry.ems.service.EntityProcessor;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.utility.UtilityEntity;
import it.integry.ems_model.entity.MtbAart;
import it.integry.ems_model.entity.MtbAartAnag;
import it.integry.ems_model.service.SetupGest;
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.UtilityList;
import it.integry.ems_model.utility.UtilityString;
import org.jboss.resteasy.client.jaxrs.ResteasyClient;
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.regex.Pattern;
@Service
@Scope("request")
public class FoodProcessRestService {
private final Pattern ID_REGEX = Pattern.compile("^[0-9A-Fa-f]{1,}$");
private final SetupGest setupGest;
private final MultiDBTransactionManager multiDBTransactionManager;
private final EntityProcessor entityProcessor;
public FoodProcessRestService(SetupGest setupGest, MultiDBTransactionManager multiDBTransactionManager, EntityProcessor entityProcessor) {
this.setupGest = setupGest;
this.multiDBTransactionManager = multiDBTransactionManager;
this.entityProcessor = entityProcessor;
}
public FoodProcessClient makeInstance() throws Exception {
String endpoint = setupGest.getSetup("FOODPROCESS", "SETUP", "ENDPOINT");
if (UtilityString.isNullOrEmpty(endpoint)) {
throw new Exception("Endpoint per il servizio di FoodProcess non configurato.\nImpostarlo in FOODPROCESS->SETUP->ENDPOINT.");
}
String apiKey = setupGest.getSetup("FOODPROCESS", "SETUP", "API_KEY");
if (UtilityString.isNullOrEmpty(apiKey)) {
throw new Exception("Api key per il servizio di FoodProcess non configurato.\nImpostarlo in FOODPROCESS->SETUP->API_KEY.");
}
ResteasyClient client = new ResteasyClientBuilder().build();
client.register(new JacksonProvider());
client.register(new ErrorMessageResponseFilter());
client.register(new AddApiKeyHeaderRequestFilter(apiKey));
ResteasyWebTarget target = client.target(endpoint);
return target.proxy(FoodProcessClient.class);
}
public ImportArticlesResponse importArticles(ImportArticlesRequest importArticlesRequest) throws Exception {
if (UtilityList.isNullOrEmpty(importArticlesRequest.getArticles())) {
return null;
}
String codAnagTopControl = setupGest.getSetup("FOODPROCESS", "SETUP", "TOPCONTROL_CODANAG");
if (UtilityString.isNullOrEmpty(codAnagTopControl)) {
throw new Exception("Cod. anag. di Top Control non configurato.\nImpostarlo in FOODPROCESS->SETUP->TOPCONTROL_CODANAG.");
}
FoodProcessClient client = makeInstance();
List<Article> foodProcessArticles = client.getArticles();
List<MtbAart> entityList = new ArrayList<>();
for (Article article : importArticlesRequest.getArticles()) {
if (UtilityString.isNullOrEmpty(article.getId()) || !ID_REGEX.matcher(article.getId()).matches()) {
String sql;
MtbAartAnag mtbAartAnag = null;
// Cerco negli articoli loro
Optional<Article> optionalFoodProcessArticle = foodProcessArticles.stream()
.filter(x -> !x.getIsArchived())
.filter(x -> x.getCode().equalsIgnoreCase(article.getCode()))
.findFirst();
if (optionalFoodProcessArticle.isPresent()) {
Article foodProcessArticle = optionalFoodProcessArticle.get();
mtbAartAnag = new MtbAartAnag()
.setCodAnag(codAnagTopControl)
.setCodMartAnag(foodProcessArticle.getId())
.setCodMart(article.getId());
mtbAartAnag.setOperation(OperationType.INSERT_OR_UPDATE);
}
// Cerco id in nostra anagrafica
if (mtbAartAnag == null && !UtilityString.isNullOrEmpty(article.getId())) {
sql = Query.format(
"SELECT id, cod_mart_anag\n" +
"FROM mtb_aart_anag\n" +
"WHERE cod_anag = %s\n" +
" AND cod_mart = %s",
codAnagTopControl,
article.getId()
);
mtbAartAnag = UtilityDB.executeSimpleQueryOnlyFirstRowDTO(multiDBTransactionManager.getPrimaryConnection(), sql, MtbAartAnag.class);
}
// Articolo nuovo, creo un nuovo id
if (mtbAartAnag == null) {
sql = Query.format(
"SELECT CAST(ISNULL(MAX(CAST(cod_mart_anag AS INT)), 0) + 1 AS VARCHAR) AS cod_mart_anag\n" +
"FROM mtb_aart_anag\n" +
"WHERE cod_anag = %s",
codAnagTopControl
);
String codMartAnag = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
mtbAartAnag = new MtbAartAnag()
.setCodAnag(codAnagTopControl)
.setCodMartAnag(codMartAnag);
mtbAartAnag.setOperation(OperationType.INSERT_OR_UPDATE);
}
if (!UtilityString.isNullOrEmpty(mtbAartAnag)) {
if (!mtbAartAnag.getOperation().equals(OperationType.SELECT_OBJECT)) {
MtbAart mtbAart = entityList.stream()
.filter(x -> x.getCodMart().equalsIgnoreCase(article.getId()))
.findFirst()
.orElseGet(() -> {
MtbAart newMtbAart = new MtbAart()
.setCodMart(article.getId())
.setMtbAartAnag(new ArrayList<>());
newMtbAart.setOperation(OperationType.NO_OP);
entityList.add(newMtbAart);
return newMtbAart;
});
mtbAart.getMtbAartAnag().add(mtbAartAnag);
}
article.setId(mtbAartAnag.getCodMartAnag());
}
}
}
if (!UtilityList.isNullOrEmpty(entityList)) {
entityProcessor.processEntityList(entityList, false);
UtilityEntity.throwEntitiesException(entityList);
}
return client.importArticles(importArticlesRequest);
}
}

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

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import it.integry.WooCommerce.dto.order.WooCommerceOrderDTO;
import it.integry.WooCommerce.service.WooCommerceService;
import it.integry.common.var.CommonConstants;
import it.integry.ems.json.JSONObjectMapper;
import it.integry.ems.json.ResponseJSONObjectMapper;
import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems_model.config.EmsRestConstants;
import org.apache.logging.log4j.LogManager;
@@ -26,7 +26,7 @@ public class WooCommerceController {
@Autowired
private WooCommerceService wooService;
@Autowired
private JSONObjectMapper jsonObjectMapper;
private ResponseJSONObjectMapper jsonObjectMapper;
@RequestMapping(value = EmsRestConstants.PATH_WOO_NEW_ORDER, method = RequestMethod.POST)

View File

@@ -1,7 +1,7 @@
package it.integry.WooCommerce.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import it.integry.ems_model.annotation.SqlField;
import org.codehaus.jackson.annotate.JsonProperty;
public class AttributeDTO {
@SqlField("attributo")

View File

@@ -1,8 +1,8 @@
package it.integry.WooCommerce.dto.order;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;
import it.integry.WooCommerce.enums.OrderStatus;
import org.codehaus.jackson.JsonNode;
import java.util.Arrays;
import java.util.List;

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

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

View File

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

View File

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

View File

@@ -1,12 +1,13 @@
package it.integry.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@Retention(RUNTIME)
@Target(FIELD)
@Target({ElementType.CONSTRUCTOR, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
public @interface PostContextAutowired {
}

View File

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

View File

@@ -1,33 +1,52 @@
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();
if (!datiAziendaBindingTable.containsKey(aziendaUp)) {
datiAziendaBindingTable.put(aziendaUp, new Const());
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();
try {
if (!datiAziendaBindingTable.containsKey(aziendaUp)) {
datiAziendaBindingTable.put(aziendaUp, new Const());
}
return datiAziendaBindingTable.get(aziendaUp);
} finally {
datiAziendaLock.unlock();
}
return datiAziendaBindingTable.get(aziendaUp);
}
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

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

View File

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

View File

@@ -8,21 +8,25 @@ public enum EntityImportType {
ORDINI("ORDINI"),
ORDINI_WEB("ORDINI WEB"),
ORDINI_ACQUISTO("ORDINI ACQUISTO"),
ORDINI_VENDITA("ORDINI VENDITA"),
DOCUMENTI("DOCUMENTI"),
DOCUMENTI_ACQUISTO("DOCUMENTI ACQUISTO"),
DOCUMENTI_LAVORAZIONE("DOCUMENTI LAVORAZIONE"),
DOCUMENTI_VENDITA("DOCUMENTI VENDITA"),
PROSPECT("PROSPECT"),
LISTINI_ACQUISTO("LISTINI ACQUISTO"),
LISTINI_VENDITA("LISTINI VENDITA"),
ACK("ACK"),
INVENTARIO("INVENTARIO"),
RAPPORTINI("RAPPORTINI"),
RAPPORTINI_FG("RAPPORTINI FG"),
SCONTRINI("SCONTRINI"),
MOVIMENTI_CONTABILI("MOVIMENTI CONTABILI"),
GRIGLIA_ACQUISTO("GRIGLIA ACQUISTO");
GRIGLIA_VENDITA("GRIGLIA VENDITA"),
GRIGLIA_ACQUISTO("GRIGLIA ACQUISTO"),
SCADENZE("SCADENZE"),
BILANCE("BILANCE"),
BANCA("BANCA");
private String text;

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

@@ -5,27 +5,16 @@ import com.microsoft.sqlserver.jdbc.SQLServerDriver;
import it.integry.annotations.PostContextAutowired;
import it.integry.annotations.PostContextConstruct;
import it.integry.annotations.PostWebServerConstruct;
import it.integry.ems.properties.EmsProperties;
import it.integry.ems.schedule.new_cron_job.dto.AutomatedOperationTypeEnum;
import it.integry.ems.schedule.new_cron_job.dto.operations.ServiceCallAutomatedOperationDTO;
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.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.MultiDBTransactionManager;
import it.integry.ems.utility.UtilityDebug;
import org.apache.logging.log4j.LogManager;
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,16 +22,24 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.sql.DriverManager;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutorService;
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;
@@ -53,12 +50,11 @@ public class EmsCoreContext implements ApplicationListener<ContextRefreshedEvent
@Autowired
private SettingsModel settingsModel;
@Autowired
private EmsProperties emsProperties;
private boolean contextInitialized = false;
private boolean firstStart = true;
@Autowired
private ExecutorService taskExecutor;
@PostConstruct
@@ -68,6 +64,7 @@ public class EmsCoreContext implements ApplicationListener<ContextRefreshedEvent
DriverManager.registerDriver(new Driver());
settingsController.init();
onApplicationEvent();
} catch (Exception e) {
logger.error(EmsCoreContext.class.getSimpleName(), e);
}
@@ -76,20 +73,33 @@ public class EmsCoreContext implements ApplicationListener<ContextRefreshedEvent
@PreDestroy
public void preDestroy() {
contextInitialized = false;
ClassLoader cl = Thread.currentThread().getContextClassLoader();
Enumeration<java.sql.Driver> drivers = DriverManager.getDrivers();
logger.info("Deregister DB Drivers");
while (drivers.hasMoreElements()) {
java.sql.Driver driver = drivers.nextElement();
if (driver.getClass().getClassLoader() == cl) {
try {
DriverManager.deregisterDriver(driver);
} catch (Exception ex) {
// log error
}
}
}
}
@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();
emsCoreDBLoader.load(this::onPostDBLoaded);
} catch (Exception e) {
logger.error(EmsCoreContext.class.getSimpleName(), e);
@@ -98,31 +108,20 @@ public class EmsCoreContext implements ApplicationListener<ContextRefreshedEvent
}
private void onPostDBLoaded(MultiDBTransactionManager multiDBTransactionManager) {
try {
dispatchPostContextConstruct(multiDBTransactionManager);
contextInitialized = true;
dispatchPostWebServerConstruct(multiDBTransactionManager);
} catch (Exception e) {
e.printStackTrace();
logger.error("EmsCoreContext.onPostDBLoaded", e);
}
private void onPostDBLoaded(MultiDBTransactionManager multiDBTransactionManager) throws InvocationTargetException, IllegalAccessException {
dispatchPostContextConstruct(multiDBTransactionManager);
contextInitialized = true;
dispatchPostWebServerConstruct(multiDBTransactionManager);
}
private void dispatchPostContextConstruct(MultiDBTransactionManager multiDBTransactionManager) throws InvocationTargetException, IllegalAccessException {
Reflections reflections = new Reflections("it.integry");
final Set<Class<?>> typesAnnotatedWith = reflections.getTypesAnnotatedWith(Component.class);
typesAnnotatedWith.addAll(reflections.getTypesAnnotatedWith(Service.class));
final Set<Class<?>> typesAnnotatedWith = reflections.get(TypesAnnotated.with(Component.class, Service.class).asClass());
List<Class<?>> classesWithPostContextConstruct = Stream.of(typesAnnotatedWith)
.filter(x -> Stream.of(x.getDeclaredMethods()).anyMatch(y -> y.isAnnotationPresent(PostContextConstruct.class)))
.sortBy(x -> Stream.of(x.getDeclaredMethods())
.filter(x -> Arrays.stream(x.getDeclaredMethods()).anyMatch(y -> y.isAnnotationPresent(PostContextConstruct.class)))
.sortBy(x -> Arrays.stream(x.getDeclaredMethods())
.filter(y -> y.isAnnotationPresent(PostContextConstruct.class))
.findFirst()
.get()
@@ -132,11 +131,11 @@ 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 = Stream.of(classType.getDeclaredFields())
List<Field> fieldsToInject = Arrays.stream(classType.getDeclaredFields())
.filter(y -> y.isAnnotationPresent(PostContextAutowired.class))
.toList();
.collect(Collectors.toList());
for (Field fieldToInject : fieldsToInject) {
fieldToInject.setAccessible(true);
@@ -146,7 +145,7 @@ public class EmsCoreContext implements ApplicationListener<ContextRefreshedEvent
}
}
Method constructor = Stream.of(classType.getDeclaredMethods())
Method constructor = Arrays.stream(classType.getDeclaredMethods())
.filter(y -> y.isAnnotationPresent(PostContextConstruct.class))
.findFirst()
.get();
@@ -159,13 +158,11 @@ public class EmsCoreContext implements ApplicationListener<ContextRefreshedEvent
private void dispatchPostWebServerConstruct(MultiDBTransactionManager multiDBTransactionManager) throws InvocationTargetException, IllegalAccessException {
Reflections reflections = new Reflections("it.integry");
final Set<Class<?>> typesAnnotatedWith = reflections.getTypesAnnotatedWith(Component.class);
typesAnnotatedWith.addAll(reflections.getTypesAnnotatedWith(Service.class));
final Set<Class<?>> typesAnnotatedWith = reflections.get(TypesAnnotated.with(Component.class, Service.class).asClass());
List<Class<?>> classesWithPostWebServerConstruct = Stream.of(typesAnnotatedWith)
.filter(x -> Stream.of(x.getDeclaredMethods()).anyMatch(y -> y.isAnnotationPresent(PostWebServerConstruct.class)))
.sortBy(x -> Stream.of(x.getDeclaredMethods())
.filter(x -> Arrays.stream(x.getDeclaredMethods()).anyMatch(y -> y.isAnnotationPresent(PostWebServerConstruct.class)))
.sortBy(x -> Arrays.stream(x.getDeclaredMethods())
.filter(y -> y.isAnnotationPresent(PostWebServerConstruct.class))
.findFirst()
.get()
@@ -175,11 +172,11 @@ 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 = Stream.of(classType.getDeclaredFields())
List<Field> fieldsToInject = Arrays.stream(classType.getDeclaredFields())
.filter(y -> y.isAnnotationPresent(PostContextAutowired.class))
.toList();
.collect(Collectors.toList());
for (Field fieldToInject : fieldsToInject) {
fieldToInject.setAccessible(true);
@@ -189,7 +186,7 @@ public class EmsCoreContext implements ApplicationListener<ContextRefreshedEvent
}
}
Method constructor = Stream.of(classType.getDeclaredMethods())
Method constructor = Arrays.stream(classType.getDeclaredMethods())
.filter(y -> y.isAnnotationPresent(PostWebServerConstruct.class))
.findFirst()
.get();

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