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:
Lisa Sportelli
2024-07-04 16:36:07 +02:00
parent 96cbf6f844 ce5673cd24
commit aef6b1e937
14 changed files with 303 additions and 17 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

@@ -124,7 +124,7 @@ public class FoodProcessRestService {
// Articolo nuovo, creo un nuovo id
if (mtbAartAnag == null) {
sql = Query.format(
"SELECT CAST(ISNULL(MAX(cod_mart_anag), 0) + 1 AS VARCHAR) AS cod_mart_anag\n" +
"SELECT CAST(ISNULL(MAX(CAST(cod_mart_anag AS INT)), 0) + 1 AS VARCHAR) AS cod_mart_anag\n" +
"FROM mtb_aart_anag\n" +
"WHERE cod_anag = %s",
codAnagTopControl

2
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240703110043.java
View File

@@ -10,7 +10,7 @@ public class Migration_20240703110043 extends BaseMigration implements Migration
if (isHistoryDB())
return;
executeStatement("UPDATE stb_gest_setup set value = 'd_vwordt_textiles_linea_el' where gest_name = 'w_vwordt_el' and section = 'DATAWINDOW' and key_section = 'D_VWORDT_EL'");
executeStatement("UPDATE stb_gest_setup set value = 'd_vwordt_textiles_linea_el' where gest_name = 'w_vwordt_el' and section = 'DATAWINDOW' and key_section = 'D_VWORDT_EL' and value = 'd_vwordt_textiles_follies_el';");
}

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

@@ -0,0 +1,28 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.IntegryCustomerDB;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20240703151401 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
if (!isCustomerDb(IntegryCustomerDB.Gramm_Gramm))
return;
updateSetupValue("IMPORT_DOCUMENTI_TRASPORTO", "ROTUNNO", "ELENCO_TIPI_DOC_DA_ESCLUDERE", "D.D.T|DDTAV|DDTRC");
updateSetupValue("IMPORT_DOCUMENTI_TRASPORTO", "DIPA", "ELENCO_TIPI_DOC_DA_ESCLUDERE", "D.D.T|DDTAV|DDTRC");
updateSetupValue("IMPORT_DOCUMENTI_TRASPORTO", "MIRACHI", "ELENCO_TIPI_DOC_DA_ESCLUDERE", "D.D.T|DDTAV|DDTRC");
}
@Override
public void down() throws Exception {
}
}

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

@@ -0,0 +1,22 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20240703180609 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
createSetup("IMPORT_DOCUMENTI_TRASPORTO", "ROTUNNO", "TIPO_CALC", "PEDANE", "Impostazione tipologia calcolo oneri ", false, null, false, false, false, false, false, null, false, null);
}
@Override
public void down() throws Exception {
}
}

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

@@ -0,0 +1,22 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20240703180834 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
createSetup("IMPORT_DOCUMENTI_TRASPORTO", "ROTUNNO", "SET_ESLUDI_ONERI_ZERO", "S", "Se impostato a S, durante l''importazione le righe con oneri pari a zero nel file vengono escluse", false, null, false, false, false, false, false, null, false, null);
}
@Override
public void down() throws Exception {
}
}

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

@@ -0,0 +1,23 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20240704101817 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
executeStatement(
"UPDATE mtb_aart_link SET descrizione_link = path_link\n" +
"where descrizione_link = 'ALLEGATO'");
}
@Override
public void down() throws Exception {
}
}

73
ems-core/src/main/java/it/integry/ems_model/entity/MtbSchTecSetr.java Normal file
View File

@@ -0,0 +1,73 @@
package it.integry.ems_model.entity;
import it.integry.ems_model.annotation.EntityChild;
import it.integry.ems_model.annotation.Master;
import it.integry.ems_model.annotation.PK;
import it.integry.ems_model.annotation.SqlField;
import it.integry.ems_model.annotation.Table;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.types.OperationType;
import org.kie.api.definition.type.PropertyReactive;
import com.fasterxml.jackson.annotation.JsonTypeName;
@PropertyReactive
@Table(MtbSchTecSetr.ENTITY)
@JsonTypeName(MtbSchTecSetr.ENTITY)
public class MtbSchTecSetr extends EntityBase {
public MtbSchTecSetr() {
super();
}
private static final long serialVersionUID = 1L;
public static final String ENTITY = "mtb_sch_tec_setr";
@PK
@SqlField(value = "cod_sch")
private String codSch;
@SqlField(value = "cod_var")
private String codVar;
@SqlField(value = "descrizione")
private String descrizione;
@SqlField(value = "descrizione_eng")
private String descrizioneEng;
@Override
public void checkPreSave() throws Exception {}
public String getCodSch() {
return codSch;
}
public MtbSchTecSetr setCodSch(String codSch) {
this.codSch = codSch;
return this;
}
public String getCodVar() {
return codVar;
}
public MtbSchTecSetr setCodVar(String codVar) {
this.codVar = codVar;
return this;
}
public String getDescrizione() {
return descrizione;
}
public MtbSchTecSetr setDescrizione(String descrizione) {
this.descrizione = descrizione;
return this;
}
public String getDescrizioneEng() {
return descrizioneEng;
}
public MtbSchTecSetr setDescrizioneEng(String descrizioneEng) {
this.descrizioneEng = descrizioneEng;
return this;
}
}

70
ems-core/src/main/java/it/integry/ems_model/entity/MtbSchTecSett.java Normal file
View File

@@ -0,0 +1,70 @@
package it.integry.ems_model.entity;
import it.integry.ems_model.annotation.EntityChild;
import it.integry.ems_model.annotation.Master;
import it.integry.ems_model.annotation.PK;
import it.integry.ems_model.annotation.SqlField;
import it.integry.ems_model.annotation.Table;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.types.OperationType;
import org.kie.api.definition.type.PropertyReactive;
import com.fasterxml.jackson.annotation.JsonTypeName;
import java.util.List;
@Master
@PropertyReactive
@Table(MtbSchTecSett.ENTITY)
@JsonTypeName(MtbSchTecSett.ENTITY)
public class MtbSchTecSett extends EntityBase {
public MtbSchTecSett() {
super();
}
private static final long serialVersionUID = 1L;
public static final String ENTITY = "mtb_sch_tec_sett";
@PK
@SqlField(value = "cod_sch")
private String codSch;
@SqlField(value = "descrizione")
private String descrizione;
@EntityChild
private List<MtbSchTecSetr> mtbSchTecSetr;
@Override
public void checkPreSave() throws Exception {}
public String getCodSch() {
return codSch;
}
public MtbSchTecSett setCodSch(String codSch) {
this.codSch = codSch;
return this;
}
public String getDescrizione() {
return descrizione;
}
public MtbSchTecSett setDescrizione(String descrizione) {
this.descrizione = descrizione;
return this;
}
public List<MtbSchTecSetr> getMtbSchTecSetr() {
return mtbSchTecSetr;
}
public MtbSchTecSett setMtbSchTecSetr(List<MtbSchTecSetr> mtbSchTecSetr) {
this.mtbSchTecSetr = mtbSchTecSetr;
return this;
}
@Override
protected void deleteChilds() throws Exception {
MtbSchTecSetr mtbSchTecSetr = new MtbSchTecSetr();
mtbSchTecSetr.deleteAllEntities(connection, this);
}
}

53
ems-core/src/main/java/it/integry/ems_model/entity/MtbSchTecVar.java Normal file
View File

@@ -0,0 +1,53 @@
package it.integry.ems_model.entity;
import it.integry.ems_model.annotation.EntityChild;
import it.integry.ems_model.annotation.Master;
import it.integry.ems_model.annotation.PK;
import it.integry.ems_model.annotation.SqlField;
import it.integry.ems_model.annotation.Table;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.types.OperationType;
import org.kie.api.definition.type.PropertyReactive;
import com.fasterxml.jackson.annotation.JsonTypeName;
@Master
@PropertyReactive
@Table(MtbSchTecVar.ENTITY)
@JsonTypeName(MtbSchTecVar.ENTITY)
public class MtbSchTecVar extends EntityBase {
public MtbSchTecVar() {
super();
}
private static final long serialVersionUID = 1L;
public static final String ENTITY = "mtb_sch_tec_var";
@PK
@SqlField(value = "cod_var")
private String codVar;
@SqlField(value = "descrizione")
private String descrizione;
public String getCodVar() {
return codVar;
}
public MtbSchTecVar setCodVar(String codVar) {
this.codVar = codVar;
return this;
}
public String getDescrizione() {
return descrizione;
}
public MtbSchTecVar setDescrizione(String descrizione) {
this.descrizione = descrizione;
return this;
}
@Override
public void checkPreSave() throws Exception {}
}

6
ems-engine/src/main/java/it/integry/ems/retail/Import/ScontriniImporter.java
View File

@@ -2,7 +2,7 @@ package it.integry.ems.retail.Import;
import it.integry.ems.Import.base.BaseEntityImporter;
import it.integry.ems.Import.base.IEntityImporter;
import it.integry.ems.retail.Scontrini.service.ScontriniService;
import it.integry.ems.retail.Scontrini.service.ScontriniImportService;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.entity.NtbDoct;
import org.springframework.web.context.ContextLoader;
@@ -23,8 +23,8 @@ public class ScontriniImporter extends BaseEntityImporter implements IEntityImpo
case MMPOS_SERVICES:
case FRONT_ST:
case SELF_SERVICE:
ScontriniService scontriniService = ContextLoader.getCurrentWebApplicationContext().getBean(ScontriniService.class);
entities = scontriniService.receiptsImport(type, format, requestDto, anomalie, headless);
ScontriniImportService scontriniImportService = ContextLoader.getCurrentWebApplicationContext().getBean(ScontriniImportService.class);
entities = scontriniImportService.receiptsImport(type, format, requestDto, anomalie, headless);
break;
default:

2
ems-engine/src/main/java/it/integry/ems/retail/Scontrini/service/ScontriniService.java → ems-engine/src/main/java/it/integry/ems/retail/Scontrini/service/ScontriniImportService.java
View File

@@ -26,7 +26,7 @@ import java.util.List;
@Service
@Scope("request")
public class ScontriniService {
public class ScontriniImportService {
private final Logger logger = LogManager.getLogger();

11
ems-engine/src/main/java/it/integry/ems/retail/controller/RetailController.java
View File

@@ -10,11 +10,11 @@ import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems.response.StatusResponse;
import it.integry.ems.retail.ReportVariazioni.dto.Variazioni.VariazioniPvInputDTO;
import it.integry.ems.retail.ReportVariazioni.service.VariazioniPVService;
import it.integry.ems.retail.Scontrini.service.ScontriniService;
import it.integry.ems.retail.Scontrini.service.ScontriniImportService;
import it.integry.ems.retail.dto.IntegRetailRequestDTO;
import it.integry.ems.retail.export.VariazioniExporter;
import it.integry.ems.retail.pvmRetail.controller.PvmController;
import it.integry.ems.retail.service.ScontriniImportService;
import it.integry.ems.retail.service.ScontriniService;
import it.integry.ems.service.EmsServices;
import it.integry.ems.status.ServiceChecker;
import it.integry.ems_model.base.EntityBase;
@@ -50,9 +50,6 @@ public class RetailController {
@Autowired
private EmsServices emsServices;
@Autowired
private ScontriniImportService scontriniImportService;
@Autowired
private ServiceChecker serviceChecker;
@@ -161,7 +158,7 @@ public class RetailController {
ServiceRestResponse response = null;
try {
scontriniImportService.recuperoScontriniIntegretail(requestDTO);
scontriniService.recuperoScontriniIntegretail(requestDTO);
response = ServiceRestResponse.createPositiveResponse();
@@ -180,7 +177,7 @@ public class RetailController {
ServiceRestResponse response = null;
try {
List<EntityBase> entityList = scontriniImportService.receiptChecked(dataScontrini, whereCond);
List<EntityBase> entityList = scontriniService.receiptChecked(dataScontrini, whereCond);
response = new ServiceRestResponse(EsitoType.OK, null, entityList);
} catch (Exception e) {

2
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java
View File

@@ -2767,7 +2767,7 @@ public class PvmService {
" movi AS (SELECT doc.cod_mdep,\n" +
" doc.cod_anag,\n" +
" art.cod_comp,\n" +
" MIN(doc.data_doc) AS data_doc,\n" +
" MAX(doc.data_doc) AS data_doc,\n" +
" doc.data_scad,\n" +
" SUM(doc.qta_doc) AS qta_car,\n" +
" CAST(CASE WHEN MAX(dtb_ordt.serie) = 'SU' THEN 1 ELSE 0 END AS BIT) AS suddivisione\n" +

4
ems-engine/src/main/java/it/integry/ems/retail/service/ScontriniImportService.java → ems-engine/src/main/java/it/integry/ems/retail/service/ScontriniService.java
View File

@@ -22,15 +22,13 @@ import org.springframework.stereotype.Service;
import java.io.File;
import java.io.FileOutputStream;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.text.SimpleDateFormat;
import java.util.*;
@Service
@Scope("request")
public class ScontriniImportService {
public class ScontriniService {
private Logger logger = LogManager.getLogger();