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

Merge branch 'develop' into feature/Insert_promo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Mina Ruggiero
2025-05-02 12:43:49 +02:00
parent f8caa35eee fbae847e7a
commit d495ea05d7
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdRules.java
View File

@@ -28,7 +28,7 @@ import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import static it.integry.ems.rules.completing.CommonRules.completeValUntULTC; import static it.integry.ems.rules.completing.CommonRules.*;
public class DocOrdRules extends QueryRules { public class DocOrdRules extends QueryRules {
/*Acquisizione IdViaggio da assegnare alle righe dell'ordine se l'azienda non prevede la gestione degli stralci*/ /*Acquisizione IdViaggio da assegnare alle righe dell'ordine se l'azienda non prevede la gestione degli stralci*/
@@ -530,7 +530,17 @@ public class DocOrdRules extends QueryRules {
BigDecimal valUnt = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql); BigDecimal valUnt = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
if (UtilityBigDecimal.isNullOrZero(valUnt)) { if (UtilityBigDecimal.isNullOrZero(valUnt)) {
valUnt = completeValUntULTC(conn, entity); switch (entity.getListino()) {
case "DIST":
valUnt = completeValUntDIST(conn, entity);
break;
case "CMED":
valUnt = completeValUntCMED(conn, entity);
break;
default:
valUnt = completeValUntULTC(conn, entity);
break;
}
} else { } else {
valUnt = valUnt.setScale(5, RoundingMode.HALF_UP); valUnt = valUnt.setScale(5, RoundingMode.HALF_UP);
} }

2
ems-core/src/main/resources/menus/menu_config.json
View File

File diff suppressed because one or more lines are too long

3
ems-engine/src/main/java/it/integry/ems/document/service/DocumentService.java
View File

@@ -2264,6 +2264,7 @@ public class DocumentService {
Connection conn = multiDBTransactionManager.getPrimaryConnection(); Connection conn = multiDBTransactionManager.getPrimaryConnection();
String sql = it.integry.ems_model.utility.Query.format( String sql = it.integry.ems_model.utility.Query.format(
"select dtb_inum.cod_ireg,\n" + "select dtb_inum.cod_ireg,\n" +
"dtb_inum.num_ireg,\n" +
"dtb_inum.ser_doc,\n" + "dtb_inum.ser_doc,\n" +
"MAX_DOC.anno, max_doc.num_doc\n" + "MAX_DOC.anno, max_doc.num_doc\n" +
"FROM dtb_inum\n" + "FROM dtb_inum\n" +
@@ -2299,7 +2300,7 @@ public class DocumentService {
List<DtbInum> dtbInumList = UtilityDB.executeSimpleQueryDTO(conn, sql, DtbInum.class); List<DtbInum> dtbInumList = UtilityDB.executeSimpleQueryDTO(conn, sql, DtbInum.class);
if (dtbInumList == null) return null; if (dtbInumList == null) return null;
dtbInumList.forEach(x -> x.setOperation(OperationType.UPDATE)); dtbInumList.forEach(x -> x.setOperation(OperationType.INSERT_OR_UPDATE));
return entityProcessor.processEntityList(dtbInumList, true); return entityProcessor.processEntityList(dtbInumList, true);
} }