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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-02-19 15:09:40 +01:00
parent be8dc47a94 6e55d3f4af
commit 407d9231e3
3 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
IntegryManagementSystem.ipr
View File

@@ -951,6 +951,44 @@
</option>
</method>
</configuration>
<configuration default="false" name="Tomcat 7 #1 (ServerDev)" 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="serverdev" />
<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>
<configuration default="false" name="Tomcat 9 #2 (ServerDev)" 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="serverdev" />
<option name="PORT" value="8002" />
<option name="AUTO_RESTART" value="false" />
<method v="2" />
</configuration>
<configuration default="false" name="Tomcat #1 (ServerTomcat)" 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="servertomcat" />
<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>
<component name="PropertiesComponent">
<property name="settings.editor.selected.configurable" value="configurable.group.editor" />

6
ems-engine/src/main/java/it/integry/ems/logistic/service/DistribuzioneColliService.java
View File

@@ -81,14 +81,14 @@ public class DistribuzioneColliService {
psRemoveOrdRifsFromMtbColrs.executeUpdate();
psRemoveOrdRifsFromMtbColrs.close();
EntityBase[] result = entityProcessor.processEntity(sourceMtbColt, multiDBTransactionManager);
List<EntityBase> result = entityProcessor.processEntity(sourceMtbColt, multiDBTransactionManager);
if (result == null || result.length == 0)
if (result == null || result.isEmpty())
throw new EntityNotFoundException(String.format("Il collo numero %d del %s non esiste",
filtroDistribuzioneColloDTO.getNumCollo(),
UtilityDate.formatDate(filtroDistribuzioneColloDTO.getDataCollo(), CommonConstants.DATE_FORMAT_DMY)));
sourceMtbColt = (MtbColt) result[0];
sourceMtbColt = (MtbColt) result.get(0);
//Lettura delle righe del collo in ingresso
final List<HashMap<String, Object>> mtbColtData = new ArrayList<>();

4
ems-engine/src/main/java/it/integry/ems/product/importaz/service/ProductServices.java
View File

@@ -1029,10 +1029,10 @@ public class ProductServices {
searchArtLink.setOperation(OperationType.SELECT);
searchArtLink.setNativeSql("select * from mtb_aart_link where cod_mart = " + UtilityDB.valueToString(codMart) + "and path_link = " + UtilityDB.valueToString(fileName));
EntityBase[] artLinkResult = entityProcessor.processEntity(searchArtLink, multiDBTransactionManager);
List<EntityBase> artLinkResult = entityProcessor.processEntity(searchArtLink, multiDBTransactionManager);
if (artLinkResult == null || artLinkResult.length == 0) {
if (artLinkResult == null || artLinkResult.isEmpty()) {
MtbAartLink mtbAartLink = new MtbAartLink();
mtbAartLink.setCodMart(codMart);
mtbAartLink.setPathLink(fileName);