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

Cambiate altre chiamate alla gest setup (inclusa connection)
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-12-12 10:19:01 +01:00
parent a5c31098a1
commit fbec278804
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java
View File

@@ -151,7 +151,7 @@ public class WMSAccettazioneService {
} }
if (createUDCRequestDTO.getOrders() == null) { if (createUDCRequestDTO.getOrders() == null) {
boolean useCodAnagAziendale = setupGest.getSetupBoolean("PICKING", "SETUP", "FLAG_USE_COD_ANAG_AZIENDALE"); boolean useCodAnagAziendale = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "SETUP", "FLAG_USE_COD_ANAG_AZIENDALE");
if (UtilityString.isNullOrEmpty(createUDCRequestDTO.getCodAnag()) && useCodAnagAziendale) { if (UtilityString.isNullOrEmpty(createUDCRequestDTO.getCodAnag()) && useCodAnagAziendale) {
String defaultCodAnag = aziendaService.retrieveInternalCodAnagFornitore(); String defaultCodAnag = aziendaService.retrieveInternalCodAnagFornitore();

5
ems-engine/src/main/java/it/integry/ems/retail/wms/colli/controller/WMSColliController.java
View File

@@ -6,6 +6,7 @@ import it.integry.ems.logistic.service.LogisticService;
import it.integry.ems.response.EsitoType; import it.integry.ems.response.EsitoType;
import it.integry.ems.response.ServiceRestResponse; import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems.retail.wms.colli.service.WMSColliService; import it.integry.ems.retail.wms.colli.service.WMSColliService;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.config.EmsRestConstants; import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.entity.MtbColt; import it.integry.ems_model.entity.MtbColt;
@@ -35,6 +36,8 @@ public class WMSColliController {
@Autowired @Autowired
private SetupGest setupGest; private SetupGest setupGest;
@Autowired
private MultiDBTransactionManager multiDBTransactionManager;
@RequestMapping(value = { @RequestMapping(value = {
EmsRestConstants.PATH_SMART_ENTERPRISE_DISTRIBUZIONE_RIGHE_COLLO, EmsRestConstants.PATH_SMART_ENTERPRISE_DISTRIBUZIONE_RIGHE_COLLO,
@@ -48,7 +51,7 @@ public class WMSColliController {
try { try {
response = new ServiceRestResponse(EsitoType.OK); response = new ServiceRestResponse(EsitoType.OK);
boolean useNewDistribution = setupGest.getSetupBoolean("PICKING", "LOGISTICA", "FLAG_USA_NUOVA_DISTRIBUZIONE"); boolean useNewDistribution = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "LOGISTICA", "FLAG_USA_NUOVA_DISTRIBUZIONE");
if (useNewDistribution) if (useNewDistribution)

6
ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
View File

@@ -574,7 +574,7 @@ public class WMSGenericService {
public List<SitArtOrdDTO> getArticoliFromOrdini(List<GetPickingListSpedizioneDTO> pickingListDTOs, String codMdep) throws Exception { public List<SitArtOrdDTO> getArticoliFromOrdini(List<GetPickingListSpedizioneDTO> pickingListDTOs, String codMdep) throws Exception {
final boolean enableCheckCodJcom = setupGest.getSetupBoolean("PICKING", "SPEDIZIONE", "ENABLE_CHECK_COD_JCOM_PICKING_LIST"); final boolean enableCheckCodJcom = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "SPEDIZIONE", "ENABLE_CHECK_COD_JCOM_PICKING_LIST");
final boolean enableScanArt = setupGest.getSetupDepoBoolean("PICKING", "SPEDIZIONE", "ENABLE_SCAN_ART", codMdep); final boolean enableScanArt = setupGest.getSetupDepoBoolean("PICKING", "SPEDIZIONE", "ENABLE_SCAN_ART", codMdep);
String gestioneOrd = pickingListDTOs.get(0).getGestione(); String gestioneOrd = pickingListDTOs.get(0).getGestione();
@@ -749,8 +749,8 @@ public class WMSGenericService {
public List<PickingObjectDTO> getSuggestedPickingList(List<SitArtOrdDTO> sourceOrders, String codMdep) throws Exception { public List<PickingObjectDTO> getSuggestedPickingList(List<SitArtOrdDTO> sourceOrders, String codMdep) throws Exception {
List<PickingObjectDTO> pickingListToReturn = new ArrayList<>(); List<PickingObjectDTO> pickingListToReturn = new ArrayList<>();
final boolean enableCheckCodJcom = setupGest.getSetupBoolean("PICKING", "SPEDIZIONE", "ENABLE_CHECK_COD_JCOM_PICKING_LIST"); final boolean enableCheckCodJcom = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "SPEDIZIONE", "ENABLE_CHECK_COD_JCOM_PICKING_LIST");
final boolean enableCheckCodMdep = setupGest.getSetupBoolean("PICKING", "SPEDIZIONE", "ENABLE_CHECK_DEPOSITO"); final boolean enableCheckCodMdep = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "SPEDIZIONE", "ENABLE_CHECK_DEPOSITO");
final String commessaMagazzino = setupGest.getSetup("PICKING", "SETUP", "COMMESSA_MAGAZZINO"); final String commessaMagazzino = setupGest.getSetup("PICKING", "SETUP", "COMMESSA_MAGAZZINO");
//Carico tutte le informazioni riguardanti gli articoli //Carico tutte le informazioni riguardanti gli articoli

3
ems-engine/src/main/java/it/integry/ems/retail/wms/inventario/service/WMSInventarioService.java
View File

@@ -15,7 +15,6 @@ import it.integry.ems_model.entity.MtbInvenr;
import it.integry.ems_model.entity.MtbInvent; import it.integry.ems_model.entity.MtbInvent;
import it.integry.ems_model.entity.MtbUntMis; import it.integry.ems_model.entity.MtbUntMis;
import it.integry.ems_model.entity._enum.GestioneEnum; import it.integry.ems_model.entity._enum.GestioneEnum;
import it.integry.ems_model.resolver.SqlFieldHolder;
import it.integry.ems_model.service.SetupGest; import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.OperationType; import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.Query; import it.integry.ems_model.utility.Query;
@@ -61,7 +60,7 @@ public class WMSInventarioService {
public MtbInvent loadInventarioIfExists(int inventoryId, String codMdep) throws Exception { public MtbInvent loadInventarioIfExists(int inventoryId, String codMdep) throws Exception {
boolean loadDailyInv = setupGest.getSetupBoolean("PICKING", "INVENTARIO", "LOAD_DAILY_INV"); boolean loadDailyInv = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "INVENTARIO", "LOAD_DAILY_INV");
MtbInvent mtbInvent = new MtbInvent() MtbInvent mtbInvent = new MtbInvent()
.setIdInventario(inventoryId) .setIdInventario(inventoryId)
.setCodMdep(codMdep); .setCodMdep(codMdep);

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

@@ -563,7 +563,7 @@ public class WMSLavorazioneService {
if (createUDCRequestDTO.getOrders() == null) { if (createUDCRequestDTO.getOrders() == null) {
boolean useCodAnagAziendale = setupGest.getSetupBoolean("PICKING", "SETUP", "FLAG_USE_COD_ANAG_AZIENDALE"); boolean useCodAnagAziendale = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "SETUP", "FLAG_USE_COD_ANAG_AZIENDALE");
if (UtilityString.isNullOrEmpty(createUDCRequestDTO.getCodAnag()) && useCodAnagAziendale) { if (UtilityString.isNullOrEmpty(createUDCRequestDTO.getCodAnag()) && useCodAnagAziendale) {
String defaultCodAnag = aziendaService.retrieveInternalCodAnagFornitore(); String defaultCodAnag = aziendaService.retrieveInternalCodAnagFornitore();

4
ems-engine/src/main/java/it/integry/ems/retail/wms/vendita/service/WMSSpedizioneService.java
View File

@@ -150,7 +150,7 @@ public class WMSSpedizioneService {
udsMtbColt udsMtbColt
.setCodAnag(foundCodAnagOrds.get(0)); .setCodAnag(foundCodAnagOrds.get(0));
boolean dataConsInFiltro = setupGest.getSetupBoolean("PICKING", "SPEDIZIONE", "ADD_DATACONS_IN_FILTRO"); boolean dataConsInFiltro = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "SPEDIZIONE", "ADD_DATACONS_IN_FILTRO");
String filtroOrdini = MtbColtUtils.generaFiltroOrdini(null, String filtroOrdini = MtbColtUtils.generaFiltroOrdini(null,
createUDSRequestDTO.getOrders().stream() createUDSRequestDTO.getOrders().stream()
@@ -205,7 +205,7 @@ public class WMSSpedizioneService {
.setNumCollo(mtbColtToClose.getNumCollo()) .setNumCollo(mtbColtToClose.getNumCollo())
.setCriterioDistribuzione(criterioDistribuzione.getText()), false); .setCriterioDistribuzione(criterioDistribuzione.getText()), false);
boolean generaDoc = setupGest.getSetupBoolean("PICKING", "SPEDIZIONE", "GENERA_DOC"); boolean generaDoc = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PICKING", "SPEDIZIONE", "GENERA_DOC");
if (generaDoc) if (generaDoc)
generaDoc(distributedUDS); generaDoc(distributedUDS);