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

Valorizzato id flag sulla registrazione contabile delle paghe
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Mina Ruggiero
2024-11-22 13:15:18 +01:00
parent 6ea3b56fdb
commit 6104a5c597
5 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,19 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20241122122341 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
renameColumn("ctb_movr_coan", "id_lav" , "id_flav");
}
@Override
public void down() throws Exception {
}
}

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

@@ -670,7 +670,8 @@ public class AccountingRules extends QueryRules {
.setImpDare(ctbMovr.getImpDare())
.setImpAvere(ctbMovr.getImpAvere())
.setCodProd(ctbMovr.getCodProd())
.setPartitaMagProd(ctbMovr.getPartitaMagProd());
.setPartitaMagProd(ctbMovr.getPartitaMagProd())
.setIdFlav(ctbMovr.getIdFlav());
ctbMovrCoan.setOperation(OperationType.INSERT);
elencoCoan = new ArrayList<>();
elencoCoan.add(ctbMovrCoan);

11
ems-core/src/main/java/it/integry/ems_model/entity/CtbMovr.java
View File

@@ -119,6 +119,8 @@ public class CtbMovr extends EntityBase {
private Integer azioneSuPartita;
private String idFlav;
@EntityChild
private List<CtbMovrCoan> ctbMovrCoan = new ArrayList<>();
@@ -413,6 +415,15 @@ public class CtbMovr extends EntityBase {
return this;
}
public String getIdFlav() {
return idFlav;
}
public CtbMovr setIdFlav(String idFlav) {
this.idFlav = idFlav;
return this;
}
public List<CtbMovrIntercode> getCtbMovrIntercode() {
return ctbMovrIntercode;
}

13
ems-core/src/main/java/it/integry/ems_model/entity/CtbMovrCoan.java
View File

@@ -68,8 +68,8 @@ public class CtbMovrCoan extends EntityBase {
@SqlField(value = "partita_mag_prod", maxLength = 20)
private String partitaMagProd;
@SqlField(value = "id_lav", maxLength = 40)
private String idLav;
@SqlField(value = "id_flav", maxLength = 40)
private String idFlav;
public CtbMovrCoan() {
super(logger);
@@ -201,11 +201,12 @@ public class CtbMovrCoan extends EntityBase {
return this;
}
public String getIdLav() {
return idLav;
public String getIdFlav() {
return idFlav;
}
public void setIdLav(String idLav) {
this.idLav = idLav;
public CtbMovrCoan setIdFlav(String idFlav) {
this.idFlav = idFlav;
return this;
}
}

27
ems-engine/src/main/java/it/integry/ems/contabil/Import/service/ContabilImportService.java
View File

@@ -301,12 +301,14 @@ public class ContabilImportService {
}
desAgg.toUpperCase();
CtbMovr movr = new CtbMovr();
movr.setCodCcon(mov.getCodCcon());
movr.setImpDare(mov.getDareCalc());
movr.setImpAvere(mov.getAvereCalc());
movr.setCodJfas(mov.getCodJfas());
movr.setDesAgg(desAgg);
CtbMovr movr =
new CtbMovr()
.setCodCcon(mov.getCodCcon())
.setImpDare(mov.getDareCalc())
.setImpAvere(mov.getAvereCalc())
.setCodJfas(mov.getCodJfas())
.setDesAgg(desAgg)
.setIdFlav(mov.getSel_2());
if (mov.isCostoCC()) {
movr.setDataInizCompRisc(dataIniz);
movr.setDataFineCompRisc(dataReg);
@@ -315,11 +317,13 @@ public class ContabilImportService {
totAvere = totAvere.add(movr.getImpAvere());
ctbMovrList.add(movr);
if (!UtilityString.isNullOrEmpty(mov.getCodCconCp())) {
CtbMovr movr_cp = new CtbMovr();
movr_cp.setCodCcon(mov.getCodCconCp());
movr_cp.setImpDare(mov.getAvereCalc());
movr_cp.setImpAvere(mov.getDareCalc());
movr_cp.setCodJfas(mov.getCodJfas());
CtbMovr movr_cp =
new CtbMovr()
.setCodCcon(mov.getCodCconCp())
.setImpDare(mov.getAvereCalc())
.setImpAvere(mov.getDareCalc())
.setCodJfas(mov.getCodJfas());
movr_cp.setDesAgg(desAgg);
if (mov.isCostoCP()) {
movr.setDataInizCompRisc(dataIniz);
@@ -329,7 +333,6 @@ public class ContabilImportService {
totAvere = totAvere.add(movr_cp.getImpAvere());
ctbMovrList.add(movr_cp);
}
}
if (totDare.compareTo(totAvere) != 0) {