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-21 11:36:37 +01:00
parent 5252a0d522 1bf6f776e9
commit 83acc13fe9
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,7 +150,9 @@ public class WMSAccettazioneService {
}
if (createUDCRequestDTO.getOrders() == null) {
if (UtilityString.isNullOrEmpty(createUDCRequestDTO.getCodAnag())) {
boolean useCodAnagAziendale = setupGest.getSetupBoolean("PICKING", "SETUP", "FLAG_USE_COD_ANAG_AZIENDALE");
if (UtilityString.isNullOrEmpty(createUDCRequestDTO.getCodAnag()) && useCodAnagAziendale) {
String defaultCodAnag = wmsGenericService.retrieveInternalCodAnagFornitore();
udcMtbColt.setCodAnag(defaultCodAnag);
} else

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

@@ -524,7 +524,9 @@ public class WMSLavorazioneService {
if (createUDCRequestDTO.getOrders() == null) {
if (UtilityString.isNullOrEmpty(createUDCRequestDTO.getCodAnag())) {
boolean useCodAnagAziendale = setupGest.getSetupBoolean("PICKING", "SETUP", "FLAG_USE_COD_ANAG_AZIENDALE");
if (UtilityString.isNullOrEmpty(createUDCRequestDTO.getCodAnag()) && useCodAnagAziendale) {
String defaultCodAnag = wmsGenericService.retrieveInternalCodAnagFornitore();
udcMtbColt.setCodAnag(defaultCodAnag);
} else
@@ -535,6 +537,7 @@ public class WMSLavorazioneService {
entityProcessor.processEntity(udcMtbColt, true, multiDBTransactionManager);
udcMtbColt.setOnlyPkMaster(false);
udcMtbColt.setOperation(OperationType.SELECT);
return udcMtbColt;
}