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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Marco Elefante
2024-02-21 11:39:49 +01:00
parent 7c7be3a89c 83acc13fe9
commit 167feef6be
3 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ems-core/src/main/java/it/integry/ems/json/ResponseJSONObjectMapper.java
View File

@@ -38,35 +38,40 @@ public class ResponseJSONObjectMapper extends CommonObjectMapper {
writer.serializeAsField(pojo, jgen, provider);
return;
} else {
boolean isEntityBase = false;
boolean onlyPkMaster = true;
EntityBase entityBase = null;
Boolean onlyPkMaster = true;
if (pojo instanceof EntityBase) {
onlyPkMaster = ((EntityBase) pojo).getOnlyPkMaster();
isEntityBase = true;
entityBase = (EntityBase) pojo;
}
if (isEntityBase){
onlyPkMaster = entityBase.getOnlyPkMaster();
if(onlyPkMaster &&
(entityBase.getOperation() == OperationType.SELECT_OBJECT ||
entityBase.getOperation() == OperationType.SELECT))
onlyPkMaster = false;
}
Field f = pojo.getClass().getDeclaredField(writer.getName());
if (f != null) {
PK pk = f.getAnnotation(PK.class);
SqlField sqlField = f.getAnnotation(SqlField.class);
EntityChild child = f.getAnnotation(EntityChild.class);
if (((EntityBase) pojo).getOperation() == OperationType.SELECT ||
((EntityBase) pojo).getOperation() == OperationType.SELECT_OBJECT) {
if (f.getGenericType() != null) {
writer.serializeAsField(pojo, jgen, provider);
}
if (!onlyPkMaster) {
writer.serializeAsField(pojo, jgen, provider);
} else {
if (onlyPkMaster && child != null)
return;
if (pk != null || child != null || (sqlField != null && sqlField.isReturned())) {
writer.serializeAsField(pojo, jgen, provider);
}
}
return;
}
}
} catch (Exception e) {

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;
}