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

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

Browse Source
This commit is contained in:
jenkins
2025-04-27 07:41:29 +02:00
parent 322e3264c0 063e8f5e71
commit ad3276d67f
6 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/misc.xml generated
View File

@@ -9,7 +9,6 @@
</option>
</component>
<component name="PWA">
<option name="enabled" value="true" />
<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" />

16
.idea/runConfigurations/Tomcat_9__1__Server_01_.xml generated Normal file
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>

15
.idea/runConfigurations/Tomcat__1__Gramm_.xml generated Normal file
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>

1
ems-core/src/main/java/it/integry/ems/entity_logger/db_schema_manager/dto/DatabaseTableColumn.java
View File

@@ -24,6 +24,7 @@ public class DatabaseTableColumn {
private ArrayList<DatabaseForeignKey> foreignKeys;
public String getColumnName() {
if (!columnName.startsWith("[")) columnName = "["+columnName +"]";
return columnName;
}

1
ems-core/src/main/java/it/integry/ems/service/EmsServices.java
View File

@@ -283,6 +283,7 @@ public class EmsServices {
File file = new File(fileName);
FileUtils.writeByteArrayToFile(file, fileContent);
moveFileImported(type, format, file, entityImporter, tmpResult);
file.delete();
}
} catch (Exception ex) {

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;