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

Iniziato refactoring VersamentoMateriali
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-04-08 09:04:17 +02:00
parent e81c2ac6b9
commit 532c12dd22
6 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docker/tomcat/conf/integry/ems_settings.json
View File

@@ -248,6 +248,15 @@
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "GRAMM_PEPPE",
"connectionType" : "MSSQL",
"dbName" : "gramm_peppe",
"username" : "SA",
"password" : "sZ",
"host" : "192.168.2.220",
"encryptedDbPsw" : true,
"internalDb" : true
}, {
"profileName" : "IDROTECNICA",
"connectionType" : "MSSQL",

22
ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/controller/WMSMaterialiController.java
View File

@@ -3,7 +3,8 @@ package it.integry.ems.retail.wms.lavorazione.controller;
import it.integry.common.var.CommonConstants;
import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems.retail.wms.lavorazione.dto.RecuperaMaterialiRequestDTO;
import it.integry.ems.retail.wms.lavorazione.dto.RecuperaMaterialiResponseDTO;
import it.integry.ems.retail.wms.lavorazione.dto.VersaMaterialiRequestDTO;
import it.integry.ems.retail.wms.lavorazione.dto.VersaMaterialiResponseDTO;
import it.integry.ems.retail.wms.lavorazione.service.WMSMaterialiService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
@@ -20,13 +21,20 @@ public class WMSMaterialiController {
@RequestMapping(value = "recupera", method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse recupera(@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestBody RecuperaMaterialiRequestDTO recuperaMaterialiRequestDTO) throws Exception {
RecuperaMaterialiResponseDTO responseDto = new RecuperaMaterialiResponseDTO()
.setUpdatedMtbColtScarico(wmsMaterialiService.recupera(recuperaMaterialiRequestDTO));
@PostMapping(value = "versa")
public @ResponseBody ServiceRestResponse versa(@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestBody VersaMaterialiRequestDTO versaMaterialiRequestDTO) throws Exception {
VersaMaterialiResponseDTO responseDto = new VersaMaterialiResponseDTO();
// .setUpdatedMtbColtScarico(wmsMaterialiService.versa(recuperaMaterialiRequestDTO));
return ServiceRestResponse.createPositiveResponse(responseDto);
}
@PostMapping(value = "recupera")
public @ResponseBody ServiceRestResponse recupera(@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestBody RecuperaMaterialiRequestDTO recuperaMaterialiRequestDTO) throws Exception {
return ServiceRestResponse.createPositiveResponse(wmsMaterialiService.recupera(recuperaMaterialiRequestDTO));
}
}

10
ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/dto/RecuperaMaterialiResponseDTO.java
View File

@@ -4,14 +4,14 @@ import it.integry.ems_model.entity.MtbColt;
public class RecuperaMaterialiResponseDTO {
private MtbColt updatedMtbColtScarico;
private final MtbColt updatedMtbColtScarico;
public RecuperaMaterialiResponseDTO(MtbColt updatedMtbColtScarico) {
this.updatedMtbColtScarico = updatedMtbColtScarico;
}
public MtbColt getUpdatedMtbColtScarico() {
return updatedMtbColtScarico;
}
public RecuperaMaterialiResponseDTO setUpdatedMtbColtScarico(MtbColt updatedMtbColtScarico) {
this.updatedMtbColtScarico = updatedMtbColtScarico;
return this;
}
}

4
ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/dto/VersaMaterialiRequestDTO.java Normal file
View File

@@ -0,0 +1,4 @@
package it.integry.ems.retail.wms.lavorazione.dto;
public class VersaMaterialiRequestDTO {
}

4
ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/dto/VersaMaterialiResponseDTO.java Normal file
View File

@@ -0,0 +1,4 @@
package it.integry.ems.retail.wms.lavorazione.dto;
public class VersaMaterialiResponseDTO {
}

13
ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSMaterialiService.java
View File

@@ -4,6 +4,9 @@ import it.integry.ems.product.importaz.service.ProductServices;
import it.integry.ems.retail.wms.Utility.WMSUtility;
import it.integry.ems.retail.wms.exceptions.InvalidArticoloException;
import it.integry.ems.retail.wms.lavorazione.dto.RecuperaMaterialiRequestDTO;
import it.integry.ems.retail.wms.lavorazione.dto.RecuperaMaterialiResponseDTO;
import it.integry.ems.retail.wms.lavorazione.dto.VersaMaterialiRequestDTO;
import it.integry.ems.retail.wms.lavorazione.dto.VersaMaterialiResponseDTO;
import it.integry.ems.service.EntityProcessor;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.utility.UtilityEntity;
@@ -43,7 +46,13 @@ public class WMSMaterialiService {
private final Logger logger = LogManager.getLogger();
public MtbColt recupera(RecuperaMaterialiRequestDTO request) throws Exception {
public VersaMaterialiResponseDTO versa(VersaMaterialiRequestDTO request) throws Exception {
return null;
}
public RecuperaMaterialiResponseDTO recupera(RecuperaMaterialiRequestDTO request) throws Exception {
final boolean versamentoDirettoEnabled = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "PRODUZIONE", "FLAG_VERSAMENTO_DIRETTO");
final boolean forceAllToColli = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "SETUP", "FLAG_FORCE_ALL_TO_COLLI");
@@ -267,7 +276,7 @@ public class WMSMaterialiService {
final List<EntityBase> savedEntities = entityProcessor.processEntityList(entitiesToSave, true);
UtilityEntity.throwEntitiesException(savedEntities);
return mtbColtScarico;
return new RecuperaMaterialiResponseDTO(mtbColtScarico);
}