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

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

Browse Source
This commit is contained in:
jenkins
2025-08-05 15:49:44 +02:00
parent dac6f5d07f 1f3517a10b
commit d79f0984ed
4 changed files with 57 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250805133609.java Normal file
View File

@@ -0,0 +1,15 @@
package it.integry.ems.migration.model;import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20250805133609 extends BaseMigration implements MigrationModelInterface{
@Override
public void up()throws Exception {
if(isHistoryDB())
return;
}
@Override
public void down()throws Exception {
}
}

21
ems-core/src/main/java/it/integry/ems/rules/completing/AccountingRules.java
View File

@@ -174,12 +174,15 @@ public class AccountingRules extends QueryRules {
String codBiva = getCodBiva(connection, codAnag);
List<CtbMovi> movi = new ArrayList<>();
for (CtbMovi ctbMovi : ctbMovt.getCtbMovi()) {
if (UtilityString.isNullOrEmpty(ctbMovi.getCodBiva())) {
ctbMovi.setCodBiva(codBiva);
if (!UtilityString.isNullOrEmpty(codBiva)) {
for (CtbMovi ctbMovi : ctbMovt.getCtbMovi()) {
if (UtilityString.isNullOrEmpty(ctbMovi.getCodBiva())) {
ctbMovi.setCodBiva(codBiva);
}
movi.add(ctbMovi);
}
movi.add(ctbMovi);
}
} else
movi = ctbMovt.getCtbMovi();
return movi;
}
@@ -609,8 +612,8 @@ public class AccountingRules extends QueryRules {
// impAvere = ctbScad.getImpAvere().divide(cambioScad).setScale(5, RoundingMode.HALF_UP);
// }
Boolean riperta = ctbScad.getRiaperta()==null?false:ctbScad.getRiaperta();
if ( tipoPartita == 0 || (riperta && tipoPartita == 1)){
Boolean riperta = ctbScad.getRiaperta() == null ? false : ctbScad.getRiaperta();
if (tipoPartita == 0 || (riperta && tipoPartita == 1)) {
if (ctbScad.getImpDare() == null)
impDare = ctbMovr.getImpDare();
else
@@ -765,10 +768,10 @@ public class AccountingRules extends QueryRules {
}
public static void setImportoMov(CtbMovt ctbMovt) throws Exception {
if ( UtilityBigDecimal.isNullOrZero(ctbMovt.getImporto() )) {
if (UtilityBigDecimal.isNullOrZero(ctbMovt.getImporto())) {
ctbMovt.getCtbMovr()
.stream()
.filter(x->x.getOperation() != OperationType.DELETE).forEach(x->{
.filter(x -> x.getOperation() != OperationType.DELETE).forEach(x -> {
BigDecimal impDare = x.getImpDare() == null ? BigDecimal.ZERO : x.getImpDare();
ctbMovt.setImporto(ctbMovt.getImporto().add(impDare));
});

14
ems-engine/src/main/java/it/integry/ems/contabil/controller/MovimentiContabiliController.java
View File

@@ -20,10 +20,20 @@ public class MovimentiContabiliController {
@PostMapping(value = "save")
public @ResponseBody
ServiceRestResponse save(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody CtbMovt ctbMovt) throws Exception {
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody CtbMovt ctbMovt) throws Exception {
return ServiceRestResponse.createPositiveResponse(movimentiContabiliServices.save(ctbMovt));
}
@PostMapping(value = "setTipoBene")
public @ResponseBody
ServiceRestResponse setTipoBene(HttpServletRequest request,
@RequestParam Integer numCmov,
@RequestParam Integer riga,
@RequestParam (required = false) String tipoBene) throws Exception {
return ServiceRestResponse.createPositiveResponse(movimentiContabiliServices.setTipoBene(numCmov, riga, tipoBene));
}
}

26
ems-engine/src/main/java/it/integry/ems/contabil/service/MovimentiContabiliServices.java
View File

@@ -7,16 +7,11 @@ import it.integry.ems.utility.UtilityDebug;
import it.integry.ems.utility.UtilityEntity;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.base.EntityInterface;
import it.integry.ems_model.entity.CtbMovt;
import it.integry.ems_model.entity.CtbParr;
import it.integry.ems_model.entity.CtbPart;
import it.integry.ems_model.entity.DtbDoct;
import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.entity.*;
import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.Query;
import it.integry.ems_model.utility.UtilityBigDecimal;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityDate;
import it.integry.ems_model.utility.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
@@ -79,4 +74,19 @@ public class MovimentiContabiliServices {
CtbMovt ctbMovtRet = entityRet.stream().filter(x->x instanceof CtbMovt).map(x->(CtbMovt)x).findFirst().orElse(null);
return ctbMovtRet;
}
public CtbMovt setTipoBene(Integer numCmov, Integer riga, String tipoBene) throws Exception {
CtbMovt ctbMovt = new CtbMovt()
.setNumCmov(numCmov);
if (UtilityString.isNullOrEmpty(tipoBene)) tipoBene = EmsRestConstants.NULL;
CtbMovi ctbMovi = new CtbMovi()
.setRiga(riga)
.setCodBiva(tipoBene);
ctbMovi.setOperation(OperationType.UPDATE);
ctbMovt.getCtbMovi().add(ctbMovi);
return save(ctbMovt);
}
}