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

aggiunti nuovi campi nei listini e sistemata verifica inventario

Browse Source
This commit is contained in:
Mina Ruggiero
2024-05-16 11:00:45 +02:00
parent ee96e8e91b
commit ff518e3525
7 changed files with 118 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240510172417.java
View File

@@ -1,17 +1,30 @@
package it.integry.ems.migration.model;import it.integry.ems.migration._base.BaseMigration;
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_20240510172417 extends BaseMigration implements MigrationModelInterface{
public class Migration_20240510172417 extends BaseMigration implements MigrationModelInterface {
@Override
public void up()throws Exception {
if(isHistoryDB())
public void up() throws Exception {
if (isHistoryDB())
return;
executeStatement(
"alter table mtb_lisv add flag_add_ric_spese bit default 0 not null",
"alter table mtb_lisv add flag_add_val_spese bit default 0 not null",
"alter table mtb_lisv add flag_add_sco_spese bit default 0 not null");
if (isCustomerDb(
IntegryCustomerDB.RossoGargano_RossoGargano)) {
executeStatement("UPDATE mtb_lisv set flag_add_ric_spese = 1, flag_add_val_spese = 1, flag_add_sco_spese = 1");
}
}
@Override
public void down()throws Exception{
public void down() throws Exception {
}
}

17
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240515124626.java
View File

@@ -1,16 +1,23 @@
package it.integry.ems.migration.model;import it.integry.ems.migration._base.BaseMigration;
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20240515124626 extends BaseMigration implements MigrationModelInterface{
public class Migration_20240515124626 extends BaseMigration implements MigrationModelInterface {
@Override
public void up()throws Exception {
if(isHistoryDB())
public void up() throws Exception {
if (isHistoryDB())
return;
executeStatement(
"exec sp_rename 'mtb_lisv.flag_add_ric_spese', 'add_ric_spese'",
"exec sp_rename 'mtb_lisv.flag_add_val_spese', 'add_val_spese'",
"exec sp_rename 'mtb_lisv.flag_add_sco_spese', 'add_sco_spese'");
}
@Override
public void down()throws Exception{
public void down() throws Exception {
}

56
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240515144229.java
View File

@@ -1,56 +0,0 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20240515144229 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
createOrUpdateFunction("getListaScontriniMancanti", "-- =============================================\n" +
"-- Author: <Author,,Name>\n" +
"-- Create date: <Create Date,,>\n" +
"-- Description: <Description,,>\n" +
"-- =============================================\n" +
"CREATE FUNCTION getListaScontriniMancanti(@codMdep varchar(5), @codCassa varchar(5), @dataDoc datetime) \n" +
"\n" +
"RETURNS TABLE \n" +
"AS\n" +
"RETURN \n" +
"(\n" +
" SELECT T1.ID+1 AS Da,\n" +
" (SELECT TOP 1 ID\n" +
" FROM (select id_scontr as id from ntb_doct where ntb_doct.date_only_doc = @dataDoc and ntb_doct.causale = 'V' and ntb_doct.cod_mdep = @codMdep and ntb_doct.cod_cassa = @codCassa ) Tab1\n" +
" WHERE ID>T1.ID+1\n" +
" ORDER BY ID)-1 AS A\n" +
" FROM (SELECT ID\n" +
" FROM (select id_scontr as id from ntb_doct where ntb_doct.date_only_doc = @dataDoc and ntb_doct.causale = 'V' and ntb_doct.cod_mdep = @codMdep and ntb_doct.cod_cassa = @codCassa )Tab1\n" +
" UNION SELECT 0) AS T1 LEFT JOIN (select id_scontr as id from ntb_doct where ntb_doct.date_only_doc = @dataDoc and ntb_doct.causale = 'V' and ntb_doct.cod_mdep = @codMdep and ntb_doct.cod_cassa = @codCassa ) AS T2 ON T1.ID+1=T2.ID\n" +
" WHERE T2.ID IS NULL and (SELECT TOP 1 ID\n" +
" FROM (select id_scontr as id from ntb_doct where ntb_doct.date_only_doc = @dataDoc and ntb_doct.causale = 'V' and ntb_doct.cod_mdep = @codMdep and ntb_doct.cod_cassa = @codCassa )TAB1\n" +
" WHERE ID>T1.ID+1\n" +
" ORDER BY ID)-1 is not null\n" +
")");
createOrUpdateFunction("f_listaScontriniMancanti", "CREATE FUNCTION [dbo].[f_listaScontriniMancanti](@codMdep varchar(5), @codCassa varchar(5), @dataDoc datetime) \n" +
"RETURNS varchar(8000)\n" +
"AS\n" +
"BEGIN\n" +
" DECLARE @lista varchar(8000); \n" +
" SELECT @lista=COALESCE(@lista,'')+ (case when tmp.Da = tmp.a then cast(tmp.da as varchar) else cast(tmp.da as varchar) + '-' + cast (tmp.a as varchar) end) + ', '\n" +
" from ( \n" +
" SELECT * from dbo.getListaScontriniMancanti(@codMdep, @codCassa, @dataDoc)) tmp;\n" +
" \n" +
" RETURN left(@lista, len(@lista) - 1)\n" +
"END");
}
@Override
public void down() throws Exception {
}
}

19
ems-core/src/main/java/it/integry/ems/rules/completing/SalesRules.java
View File

@@ -967,16 +967,27 @@ public class SalesRules extends QueryRules {
" WHERE cod_vlis = " + UtilityDB.valueToString(mtbLisvData.getCodVlis()) + " AND " +
"cod_mart = " + UtilityDB.valueToString(mtbLisvData.getCodMart());
boolean existLiv = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
MtbLisv mtbLisv = new MtbLisv()
.setCodMart(mtbLisvData.getCodMart())
.setCodVlis(mtbLisvData.getCodVlis());
mtbLisv.setOperation(OperationType.NO_OP);
if (!existLiv) {
MtbLisv mtbLisv = new MtbLisv()
.setCodMart(mtbLisvData.getCodMart())
.setCodVlis(mtbLisvData.getCodVlis())
mtbLisv
.setUntMisVen(mtbLisvData.getUntMisVen())
.setDataAggPrz(new Date())
.setAggiornatoDa(mtbLisvData.getAggiornatoDa());
mtbLisv.setOperation(OperationType.INSERT_OR_UPDATE);
mtbLisvData.setMtbLisv(mtbLisv);
}
if (mtbLisvData.getAddRicSpese() != null || mtbLisvData.getAddScoSpese() !=null || mtbLisvData.getAddValSpese() != null){
mtbLisv
.setAddRicSpese(mtbLisvData.getAddRicSpese())
.setAddScoSpese(mtbLisvData.getAddScoSpese())
.setAddValSpese(mtbLisvData.getAddValSpese());
mtbLisv.setOperation(OperationType.INSERT_OR_UPDATE);
}
mtbLisvData.setMtbLisv(mtbLisv);
}
public static void updArtEqui(Connection conn, VtbListData testata) throws Exception {

34
ems-core/src/main/java/it/integry/ems_model/entity/MtbLisv.java
View File

@@ -118,6 +118,13 @@ public class MtbLisv extends EntityBase {
@SqlField(value = "val_promo", defaultObjectValue = "0")
private BigDecimal valPromo;
@SqlField(value = "add_ric_spese", defaultObjectValue = "false", nullable = false)
private Boolean addRicSpese;
@SqlField(value = "flag_add_val_spese", defaultObjectValue = "false", nullable = false)
private Boolean addValSpese;
@SqlField(value = "add_soc_spese", defaultObjectValue = "false", nullable = false)
private Boolean addScoSpese;
public String getCodMart() {
return codMart;
}
@@ -387,4 +394,31 @@ public class MtbLisv extends EntityBase {
this.valPromo = valPromo;
return this;
}
public Boolean getAddRicSpese() {
return addRicSpese;
}
public MtbLisv setAddRicSpese(Boolean addRicSpese) {
this.addRicSpese = addRicSpese;
return this;
}
public Boolean getAddValSpese() {
return addValSpese;
}
public MtbLisv setAddValSpese(Boolean addValSpese) {
this.addValSpese = addValSpese;
return this;
}
public Boolean getAddScoSpese() {
return addScoSpese;
}
public MtbLisv setAddScoSpese(Boolean addScoSpese) {
this.addScoSpese = addScoSpese;
return this;
}
}

31
ems-core/src/main/java/it/integry/ems_model/entity/MtbLisvData.java
View File

@@ -161,6 +161,10 @@ public class MtbLisvData extends EntityBase {
private String flagEquiPrezzo;
private Boolean addRicSpese;
private Boolean addValSpese;
private Boolean addScoSpese;
@ImportFromParent
@MapToTable("data_iniz")
private Date dataIniz;
@@ -643,6 +647,33 @@ public class MtbLisvData extends EntityBase {
return this;
}
public Boolean getAddRicSpese() {
return addRicSpese;
}
public MtbLisvData setAddRicSpese(Boolean addRicSpese) {
this.addRicSpese = addRicSpese;
return this;
}
public Boolean getAddValSpese() {
return addValSpese;
}
public MtbLisvData setAddValSpese(Boolean addValSpese) {
this.addValSpese = addValSpese;
return this;
}
public Boolean getAddScoSpese() {
return addScoSpese;
}
public MtbLisvData setAddScoSpese(Boolean addScoSpese) {
this.addScoSpese = addScoSpese;
return this;
}
public List<TtbLisvTaglieData> getTtbLisvTaglieData() {
return ttbLisvTaglieData;
}

14
ems-engine/src/main/java/it/integry/ems/logistic/service/InventarioService.java
View File

@@ -524,19 +524,19 @@ public class InventarioService {
nomeCampo = ls_cond[0];
valoreCampo = ls_cond[1];
if (nomeCampo.compareTo("sle_mtb_aart-cod_mgrp") == 0) {
if (nomeCampo.equalsIgnoreCase("sle_mtb_aart-cod_mgrp")) {
condCampo = SqlFieldHolder.getSqlCond("mtb_aart", "cod_mgrp", valoreCampo, "V");
} else if (nomeCampo.compareTo("sle_mtb_aart-cod_msgr") == 0) {
} else if (nomeCampo.equalsIgnoreCase("sle_mtb_aart-cod_msgr") ) {
condCampo = SqlFieldHolder.getSqlCond("mtb_aart", "cod_msgr", valoreCampo, "V");
} else if (nomeCampo.compareTo("sle_mtb_aart-cod_mtip") == 0) {
} else if (nomeCampo.equalsIgnoreCase("sle_mtb_aart-cod_mtip") ) {
condCampo = SqlFieldHolder.getSqlCond("mtb_aart", "cod_mtip", valoreCampo, "V");
} else if (nomeCampo.compareTo("sle_mtb_aart-cod_mstp") == 0) {
} else if (nomeCampo.equalsIgnoreCase("sle_mtb_aart-cod_mstp")) {
condCampo = SqlFieldHolder.getSqlCond("mtb_aart", "cod_mstp", valoreCampo, "V");
} else if (nomeCampo.compareTo("sle_mtb_aart-cod_mart") == 0) {
} else if (nomeCampo.equalsIgnoreCase("sle_mtb_aart-cod_mart")) {
condCampo = SqlFieldHolder.getSqlCond("mtb_aart", "cod_mart", valoreCampo, "V");
} else if (nomeCampo.compareTo("sle_ttb_style-cod_line") == 0) {
} else if (nomeCampo.equalsIgnoreCase("sle_ttb_style-cod_line")) {
condCampo = SqlFieldHolder.getSqlCond("ttb_style", "cod_line", valoreCampo, "V");
} else if (nomeCampo.compareTo("ddlb_anno_stag") == 0) {
} else if (nomeCampo.equalsIgnoreCase("ddlb_anno_stag")) {
condCampo = SqlFieldHolder.getSqlCond("ttb_style", "anno_stag", valoreCampo, "V");
}
whereCond = SqlFieldHolder.andCond(whereCond + ";" + condCampo, ";");