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:
Mina Ruggiero
2024-07-09 18:32:10 +02:00
parent 05a6e363c9 0b91e53f96
commit 446db73fe7
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1160,6 +1160,8 @@ public class ProductionPlanService {
// Import clienti // Import clienti
List<BusinessPartnerData> businessPartners = new ArrayList<>();
List<String> listCodJcom = dtbOrdrPianProdList.stream() List<String> listCodJcom = dtbOrdrPianProdList.stream()
.map(DtbOrdrPianProd::getCodJcom) .map(DtbOrdrPianProd::getCodJcom)
.filter(codJcom -> !UtilityString.isNullOrEmpty(codJcom)) .filter(codJcom -> !UtilityString.isNullOrEmpty(codJcom))
@@ -1176,20 +1178,33 @@ public class ProductionPlanService {
"WHERE cod_jcom IN (%s)", "WHERE cod_jcom IN (%s)",
UtilityQuery.concatStringFieldsWithSeparator(listCodJcom, ",") UtilityQuery.concatStringFieldsWithSeparator(listCodJcom, ",")
); );
} else {
List<BusinessPartnerData> tempBusinessPartners = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, BusinessPartnerData.class);
if (!UtilityList.isNullOrEmpty(tempBusinessPartners)) {
businessPartners.addAll(tempBusinessPartners);
}
}
if (businessPartners.size() < dtbOrdrPianProdList.size()) {
String codJfasSede = setupGest.getSetup(multiDBTransactionManager.getPrimaryConnection(), "PVM", "PIANIFICAZIONE_PRODUZIONE_ORTO", "COD_JFAS"); String codJfasSede = setupGest.getSetup(multiDBTransactionManager.getPrimaryConnection(), "PVM", "PIANIFICAZIONE_PRODUZIONE_ORTO", "COD_JFAS");
sql = Query.format( sql = Query.format(
"SELECT ga.cod_anag AS id,\n" + "SELECT ga.cod_anag AS id,\n" +
" ga.cod_anag AS code,\n" + " ga.cod_anag AS code,\n" +
" ga.rag_soc AS name\n" + " ga.rag_soc AS name,\n" +
" CAST(NULL AS VARCHAR) AS cod_jcom\n" +
"FROM gtb_anag ga\n" + "FROM gtb_anag ga\n" +
" INNER JOIN mtb_depo md ON ga.cod_anag = md.cod_anag AND md.cod_jfas = %s", " INNER JOIN mtb_depo md ON ga.cod_anag = md.cod_anag AND md.cod_jfas = %s",
codJfasSede codJfasSede
); );
}
List<BusinessPartnerData> businessPartners = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, BusinessPartnerData.class); List<BusinessPartnerData> tempBusinessPartners = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, BusinessPartnerData.class);
if (!UtilityList.isNullOrEmpty(tempBusinessPartners)) {
businessPartners.addAll(tempBusinessPartners);
}
}
if (!UtilityList.isNullOrEmpty(businessPartners)) { if (!UtilityList.isNullOrEmpty(businessPartners)) {
businessPartners.forEach(businessPartner -> businessPartner.setIsCustomer(true)); businessPartners.forEach(businessPartner -> businessPartner.setIsCustomer(true));
@@ -1441,10 +1456,9 @@ public class ProductionPlanService {
.divide(BigDecimal.valueOf(requestOrder.getUnitsPerPalletLayer()), RoundingMode.HALF_EVEN).intValue()) .divide(BigDecimal.valueOf(requestOrder.getUnitsPerPalletLayer()), RoundingMode.HALF_EVEN).intValue())
.setTargetQuantity(dtbOrdrPianProd.getQtaOrd() .setTargetQuantity(dtbOrdrPianProd.getQtaOrd()
.divide(UtilityBigDecimal.isNull(article.getQtaCnf(), BigDecimal.ONE), RoundingMode.HALF_EVEN) .divide(UtilityBigDecimal.isNull(article.getQtaCnf(), BigDecimal.ONE), RoundingMode.HALF_EVEN)
.divide(UtilityBigDecimal.isNull(article.getColliPedana(), BigDecimal.ONE), RoundingMode.HALF_EVEN)
.doubleValue() .doubleValue()
) )
.setTargetQuantityUnit(TargetQuantityUnit.TERTIARY_PACKAGING); .setTargetQuantityUnit(TargetQuantityUnit.SECONDARY_PACKAGING);
}); });
} }