Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge branch 'develop' into feature/JDK11
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
jenkins
2025-04-24 17:05:47 +02:00
parent 56043a41fc 063e8f5e71
commit 364ad1ebbb
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
View File

@@ -462,6 +462,10 @@ public class MesProductionServiceV2 {
}
public void closeStep(Date dataOrd, Integer numOrd, String gestioneOrd, String codJfas, Integer idStep, Integer idRiga, Date closeDate) throws Exception {
closeStep(dataOrd, numOrd, gestioneOrd, codJfas, idStep, idRiga, closeDate, false);
}
public void closeStep(Date dataOrd, Integer numOrd, String gestioneOrd, String codJfas, Integer idStep, Integer idRiga, Date closeDate, Boolean skipCommit) throws Exception {
String whereCondCodJfas = "";
String whereCondIdStep = "";
@@ -506,7 +510,7 @@ public class MesProductionServiceV2 {
}
}
entityProcessor.processEntityList(dtbOrdtList, false);
entityProcessor.processEntityList(dtbOrdtList, skipCommit);
UtilityEntity.throwEntitiesException(UtilityEntity.toEntityBaseList(dtbOrdtList));
}
@@ -1315,9 +1319,9 @@ public class MesProductionServiceV2 {
CheckMaterialeBarcodeInOrdineResponseDTO response = new CheckMaterialeBarcodeInOrdineResponseDTO();
MtbColt collo;
try{
try {
collo = pvmService.getColloByBarcode(dto.getBarcode(), true);
}catch (Exception e){
} catch (Exception e) {
collo = null;
}
@@ -2198,7 +2202,7 @@ public class MesProductionServiceV2 {
entityProcessor.processEntity(ordProd, true, multiDBTransactionManager);
this.closeStep(ordine.getDataOrd(), ordine.getNumOrd(), ordine.getGestione(), ordine.getCodJfas(), null, null);
this.closeStep(ordine.getDataOrd(), ordine.getNumOrd(), ordine.getGestione(), ordine.getCodJfas(), null, null, new Date(), true);
// CaricoProdFinLavDTO caricoProdFinLavDTO = new CaricoProdFinLavDTO();
//
@@ -2213,8 +2217,6 @@ public class MesProductionServiceV2 {
ordiniSalvati.addAll(ordLav.getOrdLav());
}
multiDBTransactionManager.commitAll();
if (!ordiniSalvati.isEmpty()) {
sql = String.format(
"SELECT gestione,\n" +
@@ -2238,10 +2240,12 @@ public class MesProductionServiceV2 {
if (dtbOrdStepsToOpen != null && !dtbOrdStepsToOpen.isEmpty()) {
for (DtbOrdSteps dtbOrdSteps : dtbOrdStepsToOpen) {
this.openStep(dtbOrdSteps.getDataOrd(), dtbOrdSteps.getNumOrd(), dtbOrdSteps.getGestione(), dtbOrdSteps.getCodJfas(), dtbOrdSteps.getHrNum());
this.openStep(dtbOrdSteps.getDataOrd(), dtbOrdSteps.getNumOrd(), dtbOrdSteps.getGestione(), dtbOrdSteps.getCodJfas(), dtbOrdSteps.getHrNum(), null, null, null, true);
}
}
}
multiDBTransactionManager.commitAll();
} catch (Exception e) {
multiDBTransactionManager.rollbackAll();
throw e;