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

Finish FixImportClientiFP

Browse Source
This commit is contained in:
Anthony Santoro
2024-07-04 18:56:27 +02:00
parent 832d411426 706b4e3c21
commit 63e9f325f3
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ems-core/src/main/java/it/integry/FoodProcess/service/FoodProcessRestService.java
View File

@@ -68,7 +68,7 @@ public class FoodProcessRestService {
return target.proxy(FoodProcessClient.class); return target.proxy(FoodProcessClient.class);
} }
public Object importArticles(ImportArticlesRequest importArticlesRequest) throws Exception { public ImportArticlesResponse importArticles(ImportArticlesRequest importArticlesRequest) throws Exception {
if (UtilityList.isNullOrEmpty(importArticlesRequest.getArticles())) { if (UtilityList.isNullOrEmpty(importArticlesRequest.getArticles())) {
return null; return null;
} }

20
ems-engine/src/main/java/it/integry/ems/production/Import/service/ProductionPlanService.java
View File

@@ -1195,7 +1195,10 @@ public class ProductionPlanService {
businessPartners.forEach(businessPartner -> businessPartner.setIsCustomer(true)); businessPartners.forEach(businessPartner -> businessPartner.setIsCustomer(true));
ImportBusinessPartnersRequest importBusinessPartnersRequest = new ImportBusinessPartnersRequest() ImportBusinessPartnersRequest importBusinessPartnersRequest = new ImportBusinessPartnersRequest()
.setBusinessPartners(businessPartners.stream().map(BusinessPartnerData::toBusinessPartner).collect(Collectors.toList())); .setBusinessPartners(Stream.of(businessPartners)
.distinctBy(BusinessPartnerData::getId)
.map(BusinessPartnerData::toBusinessPartner)
.toList());
returnData.add(foodProcessClient.importBusinessPartners(importBusinessPartnersRequest)); returnData.add(foodProcessClient.importBusinessPartners(importBusinessPartnersRequest));
} }
@@ -1256,7 +1259,10 @@ public class ProductionPlanService {
if (!UtilityList.isNullOrEmpty(packagingMaterials)) { if (!UtilityList.isNullOrEmpty(packagingMaterials)) {
importPackagingMaterialsRequest.getPackagingMaterials() importPackagingMaterialsRequest.getPackagingMaterials()
.addAll(packagingMaterials.stream().map(PackagingMaterialData::toPackagingMaterial).collect(Collectors.toList())); .addAll(Stream.of(packagingMaterials)
.distinctBy(PackagingMaterialData::getId)
.map(PackagingMaterialData::toPackagingMaterial)
.toList());
} }
// Import secondary packaging // Import secondary packaging
@@ -1284,7 +1290,10 @@ public class ProductionPlanService {
if (!UtilityList.isNullOrEmpty(secondaryPackagingMaterials)) { if (!UtilityList.isNullOrEmpty(secondaryPackagingMaterials)) {
importPackagingMaterialsRequest.getPackagingMaterials() importPackagingMaterialsRequest.getPackagingMaterials()
.addAll(secondaryPackagingMaterials.stream().map(PackagingMaterialData::toPackagingMaterial).collect(Collectors.toList())); .addAll(Stream.of(secondaryPackagingMaterials)
.distinctBy(PackagingMaterialData::getId)
.map(PackagingMaterialData::toPackagingMaterial)
.toList());
} }
// Import tertiary packaging // Import tertiary packaging
@@ -1308,7 +1317,10 @@ public class ProductionPlanService {
if (!UtilityList.isNullOrEmpty(tertiaryPackagingMaterials)) { if (!UtilityList.isNullOrEmpty(tertiaryPackagingMaterials)) {
importPackagingMaterialsRequest.getPackagingMaterials() importPackagingMaterialsRequest.getPackagingMaterials()
.addAll(tertiaryPackagingMaterials.stream().map(PackagingMaterialData::toPackagingMaterial).collect(Collectors.toList())); .addAll(Stream.of(tertiaryPackagingMaterials)
.distinctBy(PackagingMaterialData::getId)
.map(PackagingMaterialData::toPackagingMaterial)
.toList());
} }
if (!importPackagingMaterialsRequest.getPackagingMaterials().isEmpty()) { if (!importPackagingMaterialsRequest.getPackagingMaterials().isEmpty()) {