Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity
21,153 Commits 8 Branches 1,460 Tags
3215b7e09aa000f17b434112fc43de875499c88c
Commit Graph

21153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GiuseppeS
3215b7e09a Migliorata gestione DBMS Change Tracking in caso di disallineamento min valid version
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
feature-refactoringgestionecolli-20251127_1723 		2025-11-27 17:22:34 +01:00
GiuseppeS
38897d7693 Sistemato flag recuperaUl in Spedizione WMS
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details 
(cherry picked from commit 34985c9fd3)
feature-refactoringgestionecolli-20251127_1259 		2025-11-27 12:58:40 +01:00
GiuseppeS
febb3bf10b Fix su insertUdsRows
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
feature-refactoringgestionecolli-20251126_1543 		2025-11-26 15:42:53 +01:00
AnthonyS
40199884f2 Fix import mancanti in WSMUtility
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
feature-refactoringgestionecolli-20251124_1751 		2025-11-24 17:50:53 +01:00
GiuseppeS
84d78a8f93 Merge branch 'master' into feature/RefactoringGestioneColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Details 
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java
feature-refactoringgestionecolli-20251124_1720 		2025-11-24 17:18:27 +01:00
GiuseppeS
33f24290a9 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
Details
master-20251124_1721 		2025-11-24 17:17:07 +01:00
GiuseppeS
dc83e89392 Fix su retrieve mtbAarts wms 2025-11-24 17:16:56 +01:00
AnthonyS
ca4c3c3412 Finish FixProcGeneraOrdLav
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
Details
master-20251124_1711 		2025-11-24 17:10:26 +01:00
AnthonyS
e5c16c6e4e Corretta funzione getMaterialiDistinta ed arrotondamento riproporzione qta ord 2025-11-24 17:09:03 +01:00
Valerio Castellana
c515b2da04 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details 
# Conflicts:
#	ems-core/src/main/java/it/integry/ems_model/entity/DtbOrdt.java
#	ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
#	ems-engine/src/main/java/it/integry/ems/production/service/ProductionOrdersLifecycleService.java
feature-refactoringgestionecolli-20251124_1712 		2025-11-24 17:07:39 +01:00
Valerio Castellana
44e3de6a0f Merge branch 'hotfix/Hotfix-1'
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
master-20251124_1704 		2025-11-24 17:04:01 +01:00
Valerio Castellana
9942f92440 Merge branch 'master' into hotfix/Hotfix-1 2025-11-24 17:03:46 +01:00
Valerio Castellana
e34bb01aea - fix ripianificazione ordini di lavoro 2025-11-24 17:03:27 +01:00
MarcoE
dfb26ef92f Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
feature-refactoringgestionecolli-20251124_1641 		2025-11-24 16:41:18 +01:00
MarcoE
aa9529f551 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
Details
master-20251124_1641 		2025-11-24 16:40:46 +01:00
MarcoE
bcb8f4475d Fix regola checkDeleteMtbColrWithoutDoc 2025-11-24 16:40:31 +01:00
MarcoE
9f065b17c0 Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
feature-refactoringgestionecolli-20251124_1202 		2025-11-24 12:01:21 +01:00
MarcoE
9d82cbc610 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
master-20251124_1201 		2025-11-24 12:01:00 +01:00
MarcoE
0a12dc23f2 Fix check quantità nelle regole di MtbColr 2025-11-24 12:00:42 +01:00
MarcoE
ac5a0d0356 Merge branch 'master' into feature/RefactoringGestioneColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Details
feature-refactoringgestionecolli-20251124_1155 		2025-11-24 11:54:57 +01:00
MarcoE
ddd9c73f49 Finish Hotfix-1
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Details
master-20251124_1154 		2025-11-24 11:54:01 +01:00
MarcoE
1b0f5d5d29 Fix check quantità nelle regole di MtbColr 2025-11-24 11:53:51 +01:00
Valerio Castellana
68eadae6fa - fix classe dataOrd in regole ordini
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
feature-refactoringgestionecolli-20251124_1000 		2025-11-24 09:59:55 +01:00
Valerio Castellana
cbb50132da - risolti conflitti merge master
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Details
feature-refactoringgestionecolli-20251124_0944 		2025-11-24 09:44:06 +01:00
Valerio Castellana
b9b4ce9a85 Merge branch 'master' into feature/RefactoringGestioneColli
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Details 
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/rules/businessLogic/AccountingBusinessLogic.java
#	ems-core/src/main/java/it/integry/ems_model/entity/MtbColr.java
#	ems-core/src/main/resources/rules/contabilita.drl
#	ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java
#	ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeClientiImportService.java
feature-refactoringgestionecolli-20251124_0936 		2025-11-24 09:24:37 +01:00
MinaR
0058373710 Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
master-20251124_0913 		2025-11-24 09:12:45 +01:00
MinaR
dea6b14323 modifiche a procedura di salvataggio 2025-11-24 09:12:36 +01:00
MinaR
d01b4aef8f aggiunta migratione e corretto servizio per selezione conto
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
master-20251123_0742 		2025-11-21 18:52:03 +01:00
CarlaD
b2c3008464 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
2025-11-21 18:05:48 +01:00
CarlaD
d02f44237e modificata funzione getSchedaCosti 2025-11-21 18:05:40 +01:00
Valerio Castellana
eb0f2e3bcb Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
feature-refactoringgestionecolli-20251121_1734 		2025-11-21 17:33:54 +01:00
Valerio Castellana
5fc6be6acf [MES ] 
- nuovo servizio di retrieve materiali ordine di lavorazione
 2025-11-21 17:33:47 +01:00
MinaR
675e919652 correzione importazione scontrini mmpos forno
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
2025-11-21 16:22:35 +01:00
GiuseppeS
034f3bd0a9 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
feature-refactoringgestionecolli-20251121_1616 		2025-11-21 16:16:37 +01:00
GiuseppeS
4bb7182871 Fix su operation testata insertUdsRow/insertUdcRow 2025-11-21 16:16:29 +01:00
MarcoE
e388497c52 Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
feature-refactoringgestionecolli-20251121_1550 		2025-11-21 15:49:44 +01:00
MarcoE
d0e7993fa1 In getColloInGiac popolata MtbColr tramite executeSimpleQueryOnlyFirstRowDTO 2025-11-21 15:49:25 +01:00
MarcoE
9d9d4e3d87 Aggiunta setup wms
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
2025-11-21 15:48:11 +01:00
MinaR
19e17f76d4 migration getMaggiorazioneSpese
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
2025-11-21 15:03:23 +01:00
MinaR
df18330a01 Merge remote-tracking branch 'origin/develop' into develop 2025-11-21 15:03:10 +01:00
MinaR
da61cb5439 setup listini 2025-11-21 14:02:59 +01:00
GiuseppeS
89e4067877 Fix su operation testata insertUdsRow/insertUdcRow
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
feature-refactoringgestionecolli-20251121_1329 		2025-11-21 13:28:47 +01:00
MinaR
975e4f2be4 aggiunti default 2025-11-21 13:18:21 +01:00
MinaR
e31b0bc1a0 Eliminata viene fatta 2 volte 2025-11-21 13:18:06 +01:00
CarlaD
84ccdafd90 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
2025-11-21 12:19:27 +01:00
CarlaD
97de2f0e71 create entity mtb_marchio_linea, mtb_marchio_slinea, mtb_marchio_sslinea e inserite come entitychild nella mtb_marchio_linea 2025-11-21 12:19:13 +01:00
GiuseppeS
e6d0f236c3 Fix su flagSetNumProt
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details 
(cherry picked from commit ecd8bca2aa)
feature-refactoringgestionecolli-20251121_1036 		2025-11-21 10:36:04 +01:00
GiuseppeS
1ee321b253 Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
2025-11-21 10:34:55 +01:00
GiuseppeS
7912d29f00 Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details
master-20251121_1035 		2025-11-21 10:34:54 +01:00
GiuseppeS
ecd8bca2aa Fix su flagSetNumProt 2025-11-21 10:34:44 +01:00