Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -0,0 +1,28 @@
|
||||
package it.integry.ems.migration.model;
|
||||
|
||||
import it.integry.ems.migration._base.BaseMigration;
|
||||
import it.integry.ems.migration._base.MigrationModelInterface;
|
||||
|
||||
public class Migration_20240426125037 extends BaseMigration implements MigrationModelInterface {
|
||||
|
||||
@Override
|
||||
public void up() throws Exception {
|
||||
if (isHistoryDB())
|
||||
return;
|
||||
|
||||
|
||||
createOrUpdateView("avw_scheda_acc_count_row", "create view avw_scheda_acc_count_row as \n" +
|
||||
"SELECT id_scheda,\n" +
|
||||
" COUNT(*) as row_tot,\n" +
|
||||
" SUM(CASE WHEN atb_scheda_accr.flag_registrato = 'S' THEN 1 ELSE 0 END) as row_reg,\n" +
|
||||
" SUM(CASE WHEN atb_scheda_accr.costo_med <> 0 THEN 1 ELSE 0 END) AS row_costo\n" +
|
||||
" FROM atb_scheda_accr\n" +
|
||||
" GROUP BY id_scheda");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void down() throws Exception {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -41,7 +41,7 @@ rule "completeCodJfas"
|
||||
no-loop
|
||||
when
|
||||
eval(completeRulesEnabled)
|
||||
$entity : StbActivity(codJfas == null && activityTypeId != null && flagTipologia != null)
|
||||
$entity : StbActivity(activityTypeId != null && flagTipologia != null)
|
||||
then
|
||||
String codJfas= ConfigActivityRules.completeCodJFasAct(conn, $entity.getActivityTypeId(), $entity.getFlagTipologia());
|
||||
modify ( $entity ) { setCodJfas(codJfas) }
|
||||
|
||||
@@ -15,6 +15,7 @@ import it.integry.ems_model.db.ResultSetMapper;
|
||||
import it.integry.ems_model.entity.AtbList;
|
||||
import it.integry.ems_model.entity.AtbListData;
|
||||
import it.integry.ems_model.entity.MtbLisaData;
|
||||
import it.integry.ems_model.exception.DataConverterNotFoundException;
|
||||
import it.integry.ems_model.service.SetupGest;
|
||||
import it.integry.ems_model.types.OperationType;
|
||||
import it.integry.ems_model.types.TypeDbObject;
|
||||
@@ -97,105 +98,7 @@ public class ImportListiniAcquistoApuliaCarrefourService {
|
||||
* la logica del prezzo netto netto.
|
||||
*/
|
||||
|
||||
BigDecimal percOneri = new BigDecimal(UtilityHashMap.getValueIfExists(setup, "PERC_ONERI:DIR", "0"));
|
||||
BigDecimal percOneriRif = new BigDecimal(UtilityHashMap.getValueIfExists(setup, "PERC_ONERI:RIF", "0"));
|
||||
|
||||
boolean setDataOdierna = UtilityHashMap.getValueIfExists(setup, "DATA_VAR_ODIERNA", "N").equalsIgnoreCase("S");
|
||||
|
||||
String calcDataIniz;
|
||||
if ( setDataOdierna ) {
|
||||
calcDataIniz = UtilityDB.valueDateToString(dataImport, CommonConstants.DATE_FORMAT_YMD);
|
||||
} else {
|
||||
calcDataIniz =
|
||||
"CASE "
|
||||
+ "WHEN lisa.tipo_variazione = 'I' AND "
|
||||
+ "lisa.tipo_variazione IS not null AND "
|
||||
+ "lisa.data_iniz > apulia.data_prz_acq THEN lisa.data_iniz "
|
||||
+ "WHEN lisa.cod_art_for IS NULL AND mtb_lisa.cod_art_for IS NOT NULL THEN " + UtilityDB.valueDateToString(dataImport, CommonConstants.DATE_FORMAT_YMD) + " "
|
||||
+ "WHEN apulia.data_prz_acq < '2020/01/01' THEN '2020/01/01' "
|
||||
+ "ELSE IsNull(apulia.data_prz_acq, " + UtilityDB.valueDateToString(dataImport, CommonConstants.DATE_FORMAT_YMD) + ") END ";
|
||||
}
|
||||
|
||||
sql =
|
||||
"SELECT IsNull(apulia.cod_alis, lisa.cod_alis) as cod_alis, "
|
||||
+ calcDataIniz + " AS data_iniz, "
|
||||
+ " IsNull(apulia.cod_art_for, lisa.cod_art_for) as cod_art_for,"
|
||||
+ " CASE WHEN apulia.cod_alis is not null THEN apulia.prz_acq else null end as prz_acq,"
|
||||
+ " apulia.descrizione AS descrizione, "
|
||||
+ " apulia.barcode AS barcode,"
|
||||
+ " apulia.unt_mis_acq AS unt_mis_acq,"
|
||||
+ " apulia.qta_cnf AS qta_cnf,"
|
||||
+ " apulia.colli_x_pedane AS colli_x_pedane,"
|
||||
+ " CASE WHEN lisa.cod_art_for IS NULL THEN apulia.prz_base_prop ELSE NULL END AS prz_ven_sug,"
|
||||
+ " CASE WHEN lisa.cod_art_for IS NULL AND apulia.cod_art_for is not null THEN 'I' "
|
||||
+ "WHEN lisa.cod_art_for IS NOT NULL AND apulia.cod_art_for is null THEN 'D' "
|
||||
+ "ELSE 'U' END AS tipo_variazione, "
|
||||
+ " lisa.data_iniz as data_iniz_lisa, "
|
||||
+ " IsNull(oneri.perc_oneri, CASE WHEN apulia.tipo_listino = 'RIF' THEN " + UtilityDB.valueToString(percOneriRif) + " ELSE " + UtilityDB.valueToString(percOneri) + " END ) as perc_oneri, "
|
||||
+ " count(*) over (partition by IsNull(apulia.cod_alis, lisa.cod_alis), "
|
||||
+ calcDataIniz + ", "
|
||||
+ " IsNull(apulia.cod_art_for, lisa.cod_art_for)) as count_art_for, "
|
||||
+ " apulia.cod_aliq, "
|
||||
+ " apulia.prz_base_prop, "
|
||||
+ " apulia.perc_premio as prec_promo,"
|
||||
+ " ISNULL(apulia.val_premio, 0) as val_promo "
|
||||
+ "FROM (SELECT DISTINCT mtb_lisa_apulia_succ.cod_alis, "
|
||||
+ " mtb_lisa_apulia_succ.data_prz_acq,"
|
||||
+ " mtb_lisa_apulia_succ.cod_art_for AS cod_art_for,"
|
||||
+ " mtb_lisa_apulia_succ.prz_acq AS prz_acq, "
|
||||
+ " mtb_lisa_apulia_succ.descrizione,"
|
||||
+ " mtb_lisa_apulia_succ.barcode,"
|
||||
+ " mtb_lisa_apulia_succ.descrizione_divisione_forn,"
|
||||
+ " mtb_lisa_apulia_succ.partita_iva_forn,"
|
||||
+ " mtb_lisa_apulia_succ.unt_mis_acq,"
|
||||
+ " mtb_lisa_apulia_succ.qta_cnf,"
|
||||
+ " mtb_lisa_apulia_succ.colli_x_pedane,"
|
||||
+ " mtb_lisa_apulia_succ.linea,"
|
||||
+ " CASE WHEN mtb_lisa_apulia_succ.cod_alis LIKE 'AP%[0-9]%' THEN 'RIF' ELSE 'DIR' END tipo_listino ,"
|
||||
+ " mtb_lisa_apulia_succ.anno_contratto,"
|
||||
+ " mtb_lisa_apulia_succ.perc_contratto,"
|
||||
+ " mtb_lisa_apulia_succ.rag_soc_forn,"
|
||||
+ " mtb_lisa_apulia_succ.prz_ven_sugg,"
|
||||
+ " mtb_lisa_apulia_succ.cod_forn,"
|
||||
+ " mtb_lisa_apulia_succ.cod_aliq, "
|
||||
+ " mtb_lisa_apulia_succ.prz_base_prop, "
|
||||
+ " mtb_lisa_apulia_succ.perc_premio, "
|
||||
+ " mtb_lisa_apulia_succ.val_premio "
|
||||
+ " FROM mtb_lisa_apulia_succ "
|
||||
+ " WHERE mtb_lisa_apulia_succ.data_prz_acq <= " + UtilityDB.valueDateToString(dataImport, CommonConstants.DATE_FORMAT_YMD) + " AND "
|
||||
+ " mtb_lisa_apulia_succ.cod_alis NOT IN (SELECT value_string AS cod_alis "
|
||||
+ " FROM dbo.ParseStringIntoArray((SELECT dbo.getGestSetup('IMPORT_" + type + "', " + UtilityDB.valueToString(format) + ", 'LISTINI_DA_ESCLUDERE')), '|'))) apulia "
|
||||
+ "FULL OUTER JOIN (SELECT lisa.cod_alis,"
|
||||
+ " cod_art_for, "
|
||||
+ " prz_acq, "
|
||||
+ " val_promo, "
|
||||
+ " perc_oneri, "
|
||||
+ " prz_ven_sug, "
|
||||
+ " CASE WHEN data_iniz < '2020/01/01' THEN '2020/01/01' ELSE data_iniz END as data_iniz, "
|
||||
+ " tipo_variazione "
|
||||
+ " FROM dbo.getListinoAcquisto(" + UtilityDB.valueDateToString(dataImport, CommonConstants.DATE_FORMAT_YMD) + ", NULL, NULL, NULL, 'N', NULL) lisa LEFT OUTER JOIN "
|
||||
+ " (SELECT value_string AS cod_alis FROM dbo.ParseStringIntoArray((SELECT dbo.getGestSetup('IMPORT_" + type + "', " + UtilityDB.valueToString(format) + ", 'LISTINI_DA_ESCLUDERE')), '|')) listini_esclusi "
|
||||
+ " ON lisa.cod_alis = listini_esclusi.cod_alis "
|
||||
+ "WHERE lisa.cod_alis LIKE 'AP%' AND "
|
||||
+ " lisa.tipo_variazione <> 'D' AND lisa.tipo_variazione is not null and "
|
||||
+ " listini_esclusi.cod_alis IS NULL ) lisa ON apulia.cod_alis = lisa.cod_alis AND apulia.cod_art_for = lisa.cod_art_for "
|
||||
+ "LEFT OUTER JOIN mtb_lisa ON apulia.cod_alis = mtb_lisa.cod_alis AND "
|
||||
+ "apulia.cod_art_for = mtb_lisa.cod_art_for "
|
||||
+ "LEFT OUTER JOIN mtb_aart ON mtb_lisa.cod_mart = mtb_aart.cod_mart "
|
||||
+ "LEFT OUTER JOIN (SELECT mtb_grup.cod_mgrp,"
|
||||
+ " REPLACE(key_section, 'PERC_ONERI:', '') AS tipo_listino, "
|
||||
+ " IsNull(Convert(numeric(20,5), stb_gest_setup_det.value ), 0) AS perc_oneri "
|
||||
+ " FROM mtb_grup LEFT OUTER JOIN stb_gest_setup_det ON gest_name = 'IMPORT_" + type + "' AND "
|
||||
+ " section = " + UtilityDB.valueToString(format) + " AND KEY_SECTION LIKE 'PERC_ONERI%' and"
|
||||
+ " mtb_grup.cod_mgrp = stb_gest_setup_det.val_col_rif ) oneri on apulia.tipo_listino= oneri.tipo_listino And mtb_aart.cod_mgrp = oneri.cod_mgrp "
|
||||
+ " WHERE ((apulia.data_prz_acq >= " + UtilityDB.valueDateToString(dataInizVarizioni, CommonConstants.DATE_FORMAT_YMD) + " AND "
|
||||
+ "(ISNULL(lisa.prz_acq, 0) <> ISNULL(apulia.prz_acq, 0) OR "
|
||||
+ "ISNULL(lisa.perc_oneri, 0) <> IsNull(oneri.perc_oneri, CASE WHEN apulia.tipo_listino = 'RIF' THEN " + UtilityDB.valueToString(percOneriRif) + " ELSE " + UtilityDB.valueToString(percOneri) + " END ) OR "
|
||||
+ "ISNULL(lisa.prz_ven_sug, 0) <> ISNULL(apulia.prz_base_prop, 0)) OR "
|
||||
+ "ISNULL(lisa.val_promo, 0) <> ISNULL(apulia.val_premio, 0)) OR "
|
||||
+ "IsNull(lisa.cod_art_for, '') <> IsNull(apulia.cod_art_for, '')) ";
|
||||
|
||||
List<ListinoApuliaCarrefourDTO> variazioniListini = UtilityDB.executeSimpleQueryDTO(conn, sql, ListinoApuliaCarrefourDTO.class);
|
||||
List<ListinoApuliaCarrefourDTO> variazioniListini = getVariazioni(type, format, setup, dataImport, dataInizVarizioni, conn);
|
||||
|
||||
Date dataOraImport = new Date();
|
||||
List<MtbLisaData> righeListino =
|
||||
@@ -359,6 +262,135 @@ public class ImportListiniAcquistoApuliaCarrefourService {
|
||||
return entityRet;
|
||||
}
|
||||
|
||||
private static List<ListinoApuliaCarrefourDTO> getVariazioni(String type, String format, Map<String, String> setup, Date dataImport, Date dataInizVarizioni, Connection conn) throws SQLException, DataConverterNotFoundException, InstantiationException, IllegalAccessException {
|
||||
String sql;
|
||||
BigDecimal percOneri = new BigDecimal(UtilityHashMap.getValueIfExists(setup, "PERC_ONERI:DIR", "0"));
|
||||
BigDecimal percOneriRif = new BigDecimal(UtilityHashMap.getValueIfExists(setup, "PERC_ONERI:RIF", "0"));
|
||||
|
||||
String columnPercOneri =
|
||||
"ISNULL(oneri.perc_oneri, CASE\n" +
|
||||
" WHEN apulia.tipo_listino = 'RIF' THEN " + UtilityDB.valueToString(percOneriRif) + "\n" +
|
||||
" ELSE "+UtilityDB.valueToString(percOneri) +" END) ";
|
||||
|
||||
boolean setDataOdierna = UtilityHashMap.getValueIfExists(setup, "DATA_VAR_ODIERNA", "N").equalsIgnoreCase("S");
|
||||
|
||||
String calcDataIniz;
|
||||
if ( setDataOdierna ) {
|
||||
calcDataIniz = UtilityDB.valueDateToString(dataImport, CommonConstants.DATE_FORMAT_YMD);
|
||||
} else {
|
||||
calcDataIniz =
|
||||
"CASE "
|
||||
+ "WHEN lisa.tipo_variazione = 'I' AND "
|
||||
+ "lisa.tipo_variazione IS not null AND "
|
||||
+ "lisa.data_iniz > apulia.data_prz_acq THEN lisa.data_iniz "
|
||||
+ "WHEN lisa.cod_art_for IS NULL AND mtb_lisa.cod_art_for IS NOT NULL THEN " + UtilityDB.valueDateToString(dataImport, CommonConstants.DATE_FORMAT_YMD) + " "
|
||||
+ "WHEN apulia.data_prz_acq < '2020/01/01' THEN '2020/01/01' "
|
||||
+ "ELSE IsNull(apulia.data_prz_acq, " + UtilityDB.valueDateToString(dataImport, CommonConstants.DATE_FORMAT_YMD) + ") END ";
|
||||
}
|
||||
|
||||
sql =
|
||||
("SELECT ISNULL(apulia.cod_alis, lisa.cod_alis) AS cod_alis,\n" +
|
||||
" [COLUMN_DATA_INIZ] AS data_iniz,\n" +
|
||||
" ISNULL(apulia.cod_art_for, lisa.cod_art_for) AS cod_art_for,\n" +
|
||||
" CASE WHEN apulia.cod_alis IS NOT NULL THEN apulia.prz_acq ELSE NULL END AS prz_acq,\n" +
|
||||
" apulia.descrizione AS descrizione,\n" +
|
||||
" apulia.barcode AS barcode,\n" +
|
||||
" apulia.unt_mis_acq AS unt_mis_acq,\n" +
|
||||
" apulia.qta_cnf AS qta_cnf,\n" +
|
||||
" apulia.colli_x_pedane AS colli_x_pedane,\n" +
|
||||
" CASE\n" +
|
||||
" WHEN lisa.cod_art_for IS NULL THEN apulia.prz_base_prop\n" +
|
||||
" ELSE lisa.prz_ven_sug END AS prz_ven_sug,\n" +
|
||||
" CASE\n" +
|
||||
" WHEN lisa.cod_art_for IS NULL AND apulia.cod_art_for IS NOT NULL THEN 'I'\n" +
|
||||
" WHEN lisa.cod_art_for IS NOT NULL AND apulia.cod_art_for IS NULL THEN 'D'\n" +
|
||||
" ELSE 'U' END AS tipo_variazione,\n" +
|
||||
" lisa.data_iniz AS data_iniz_lisa,\n" +
|
||||
" [COLUMN_PERC_ONERI] AS perc_oneri,\n" +
|
||||
" COUNT(*)\n" +
|
||||
" OVER (PARTITION BY ISNULL(apulia.cod_alis, lisa.cod_alis), [COLUMN_DATA_INIZ], ISNULL(apulia.cod_art_for, lisa.cod_art_for)) AS count_art_for,\n" +
|
||||
" apulia.cod_aliq,\n" +
|
||||
" apulia.prz_base_prop,\n" +
|
||||
" apulia.perc_premio AS prec_promo,\n" +
|
||||
" ISNULL(apulia.val_premio, 0) AS val_promo\n" +
|
||||
"FROM (SELECT DISTINCT mtb_lisa_apulia_succ.cod_alis,\n" +
|
||||
" mtb_lisa_apulia_succ.data_prz_acq,\n" +
|
||||
" mtb_lisa_apulia_succ.cod_art_for AS cod_art_for,\n" +
|
||||
" mtb_lisa_apulia_succ.prz_acq AS prz_acq,\n" +
|
||||
" mtb_lisa_apulia_succ.descrizione,\n" +
|
||||
" mtb_lisa_apulia_succ.barcode,\n" +
|
||||
" mtb_lisa_apulia_succ.descrizione_divisione_forn,\n" +
|
||||
" mtb_lisa_apulia_succ.partita_iva_forn,\n" +
|
||||
" mtb_lisa_apulia_succ.unt_mis_acq,\n" +
|
||||
" mtb_lisa_apulia_succ.qta_cnf,\n" +
|
||||
" mtb_lisa_apulia_succ.colli_x_pedane,\n" +
|
||||
" mtb_lisa_apulia_succ.linea,\n" +
|
||||
" CASE WHEN mtb_lisa_apulia_succ.cod_alis LIKE 'AP%[0-9]%' THEN 'RIF' ELSE 'DIR' END tipo_listino,\n" +
|
||||
" mtb_lisa_apulia_succ.anno_contratto,\n" +
|
||||
" mtb_lisa_apulia_succ.perc_contratto,\n" +
|
||||
" mtb_lisa_apulia_succ.rag_soc_forn,\n" +
|
||||
" mtb_lisa_apulia_succ.prz_ven_sugg,\n" +
|
||||
" mtb_lisa_apulia_succ.cod_forn,\n" +
|
||||
" mtb_lisa_apulia_succ.cod_aliq,\n" +
|
||||
" mtb_lisa_apulia_succ.prz_base_prop,\n" +
|
||||
" mtb_lisa_apulia_succ.perc_premio,\n" +
|
||||
" mtb_lisa_apulia_succ.val_premio\n" +
|
||||
" FROM mtb_lisa_apulia_succ\n" +
|
||||
" WHERE mtb_lisa_apulia_succ.data_prz_acq <= [DATA_IMPORT]\n" +
|
||||
" AND mtb_lisa_apulia_succ.cod_alis NOT IN (SELECT value_string AS cod_alis\n" +
|
||||
" FROM dbo.parsestringintoarray(\n" +
|
||||
" (SELECT dbo.getgestsetup('IMPORT_[TYPE]',\n" +
|
||||
" '[FORMAT]',\n" +
|
||||
" 'LISTINI_DA_ESCLUDERE')),\n" +
|
||||
" '|'))) apulia\n" +
|
||||
" FULL OUTER JOIN (SELECT lisa.cod_alis,\n" +
|
||||
" cod_art_for,\n" +
|
||||
" prz_acq,\n" +
|
||||
" val_promo,\n" +
|
||||
" perc_oneri,\n" +
|
||||
" prz_ven_sug,\n" +
|
||||
" CASE WHEN data_iniz < '2020/01/01' THEN '2020/01/01' ELSE data_iniz END AS data_iniz,\n" +
|
||||
" tipo_variazione\n" +
|
||||
" FROM dbo.getlistinoacquisto([DATA_IMPORT], NULL, NULL, NULL, 'N', NULL) lisa\n" +
|
||||
" LEFT OUTER JOIN (SELECT value_string AS cod_alis\n" +
|
||||
" FROM dbo.parsestringintoarray(\n" +
|
||||
" (SELECT dbo.getgestsetup('IMPORT_[TYPE]',\n" +
|
||||
" '[FORMAT]',\n" +
|
||||
" 'LISTINI_DA_ESCLUDERE')),\n" +
|
||||
" '|')) listini_esclusi\n" +
|
||||
" ON lisa.cod_alis = listini_esclusi.cod_alis\n" +
|
||||
" WHERE lisa.cod_alis LIKE 'AP%'\n" +
|
||||
" AND lisa.tipo_variazione <> 'D'\n" +
|
||||
" AND lisa.tipo_variazione IS NOT NULL\n" +
|
||||
" AND listini_esclusi.cod_alis IS NULL) lisa\n" +
|
||||
" ON apulia.cod_alis = lisa.cod_alis AND apulia.cod_art_for = lisa.cod_art_for\n" +
|
||||
" LEFT OUTER JOIN mtb_lisa ON apulia.cod_alis = mtb_lisa.cod_alis AND apulia.cod_art_for = mtb_lisa.cod_art_for\n" +
|
||||
" LEFT OUTER JOIN mtb_aart ON mtb_lisa.cod_mart = mtb_aart.cod_mart\n" +
|
||||
" LEFT OUTER JOIN (SELECT mtb_grup.cod_mgrp,\n" +
|
||||
" REPLACE(key_section, 'PERC_ONERI:', '') AS tipo_listino,\n" +
|
||||
" ISNULL(CONVERT(NUMERIC(20, 5), stb_gest_setup_det.value), 0) AS perc_oneri\n" +
|
||||
" FROM mtb_grup\n" +
|
||||
" LEFT OUTER JOIN stb_gest_setup_det ON gest_name = 'IMPORT_[TYPE]' AND\n" +
|
||||
" section = '[FORMAT]' AND\n" +
|
||||
" key_section LIKE 'PERC_ONERI%' AND\n" +
|
||||
" mtb_grup.cod_mgrp =\n" +
|
||||
" stb_gest_setup_det.val_col_rif) oneri\n" +
|
||||
" ON apulia.tipo_listino = oneri.tipo_listino AND mtb_aart.cod_mgrp = oneri.cod_mgrp\n" +
|
||||
"WHERE (apulia.data_prz_acq >= [DATA_INIZ_VAR] AND (ISNULL(lisa.prz_acq, 0) <> ISNULL(apulia.prz_acq, 0) OR\n" +
|
||||
" ISNULL(lisa.perc_oneri, 0) <> [COLUMN_PERC_ONERI] OR\n" +
|
||||
" ISNULL(lisa.val_promo, 0) <> ISNULL(apulia.val_premio, 0) OR\n" +
|
||||
" ISNULL(lisa.cod_art_for, '') <> ISNULL(apulia.cod_art_for, '')))")
|
||||
.replace("[COLUMN_DATA_INIZ]", calcDataIniz)
|
||||
.replace("[TYPE]", type)
|
||||
.replace("[FORMAT]", format)
|
||||
.replace("[COLUMN_PERC_ONERI]", columnPercOneri)
|
||||
.replace("[DATA_INIZ_VAR]",UtilityDB.valueDateToString(dataInizVarizioni, CommonConstants.DATE_FORMAT_YMD) )
|
||||
.replace("[DATA_IMPORT]", UtilityDB.valueDateToString(dataImport, CommonConstants.DATE_FORMAT_YMD));
|
||||
|
||||
List<ListinoApuliaCarrefourDTO> variazioniListini = UtilityDB.executeSimpleQueryDTO(conn, sql, ListinoApuliaCarrefourDTO.class);
|
||||
return variazioniListini;
|
||||
}
|
||||
|
||||
private void importFileCsv(Connection conn, String pathFile, String type, String format, Map<String, String> setup) throws Exception {
|
||||
String sql = null, tableName = null;
|
||||
final String tableListRif = "apuliac_listino_rif_csv";
|
||||
|
||||
@@ -20,6 +20,7 @@ public class CreateUDSRequestDTO {
|
||||
private String codAnag;
|
||||
private String codVdes;
|
||||
|
||||
private Integer idLotto;
|
||||
private String rifOrd;
|
||||
|
||||
private boolean orderRequired;
|
||||
@@ -153,6 +154,15 @@ public class CreateUDSRequestDTO {
|
||||
return this;
|
||||
}
|
||||
|
||||
public Integer getIdLotto() {
|
||||
return idLotto;
|
||||
}
|
||||
|
||||
public CreateUDSRequestDTO setIdLotto(Integer idLotto) {
|
||||
this.idLotto = idLotto;
|
||||
return this;
|
||||
}
|
||||
|
||||
public enum Causale implements IBaseEnum {
|
||||
SCARICO(0),
|
||||
POSIZIONAMENTO(1);
|
||||
|
||||
@@ -160,14 +160,12 @@ public class WMSLavorazioneService {
|
||||
.distinct().
|
||||
toList();
|
||||
|
||||
if (idLotto.size() > 1) {
|
||||
throw new Exception("Trovato più di 1 id lotto in corso.");
|
||||
if (idLotto.size() == 1) {
|
||||
//Assegnare l'ordine o l'id lotto al collo appena creato
|
||||
udsMtbColt
|
||||
.setIdLotto(idLotto.get(0));
|
||||
}
|
||||
|
||||
//Assegnare l'ordine o l'id lotto al collo appena creato
|
||||
udsMtbColt
|
||||
.setIdLotto(idLotto.get(0));
|
||||
|
||||
final List<Integer> foundInCorsoOrders = ordiniLavorazioneInCorso.stream()
|
||||
.map(OrdineLavorazioneDTO::getNumOrd)
|
||||
.distinct()
|
||||
|
||||
@@ -1 +1 @@
|
||||
import{_ as b,d as C,q as v,X as w,u as k,c as n,w as L,b as h,e as s,g as y,h as g,A as _,r as d,o as l,B as f,a as S,i as B}from"./index.997ca0cc.js";import{D}from"./DynamicForm.6c9b686b.js";const N=C({name:"SchedulerCreate",components:{DynamicForm:D},setup(){const e=v(),m=w(),t=k(),o=n(()=>e.params.type);L(o,()=>r());function r(){t.dispatch("scheduler/setCurrentCategory",o.value)}r();const p=n(()=>t.getters["scheduler/getCurrentCategory"]),i=n(()=>t.getters["main/isLoading"]),a=n(()=>t.getters["scheduler/getError"]);async function c(u){await t.dispatch("scheduler/saveAutomation",{category:o.value,...u}),a.value||await m.push({name:"scheduler.show",params:{type:o.value}})}return{type:o,currentCategory:p,onSubmit:c,isLoading:i,error:a}}}),R={class:"intro-y flex items-center mt-8"},V={class:"text-lg font-medium mr-auto"},$={key:0,class:"alert alert-danger show my-2",role:"alert"},A={class:"text-right mt-5"},F=["disabled","onClick"],E=["disabled"],I=B(" Salva ");function q(e,m,t,o,r,p){const i=d("RouterLink"),a=d("LoadingIcon"),c=d("DynamicForm");return l(),h("div",null,[s("div",R,[s("h2",V," Nuova Pianificata "+y(e.type),1)]),g(c,{fields:e.currentCategory,onSubmit:e.onSubmit,class:"intro-y"},{default:_(()=>[e.error?(l(),h("div",$,y(e.error.message),1)):f("",!0),s("div",A,[g(i,{to:{name:"scheduler.show",params:{type:e.type}},custom:""},{default:_(({navigate:u})=>[s("button",{type:"button",class:"btn btn-outline-secondary w-24 mr-1",disabled:e.isLoading,onClick:u}," Annulla ",8,F)]),_:1},8,["to"]),s("button",{type:"submit",class:"btn btn-primary w-24",disabled:e.isLoading},[I,e.isLoading?(l(),S(a,{key:0,icon:"oval",color:"white",class:"w-4 h-4 ml-2"})):f("",!0)],8,E)])]),_:1},8,["fields","onSubmit"])])}const X=b(N,[["render",q]]);export{X as default};
|
||||
import{_ as b,d as C,q as v,X as w,u as k,c as n,w as L,b as h,e as s,g as y,h as g,A as _,r as d,o as l,B as f,a as S,i as B}from"./index.83c1a587.js";import{D}from"./DynamicForm.682971b5.js";const N=C({name:"SchedulerCreate",components:{DynamicForm:D},setup(){const e=v(),m=w(),t=k(),o=n(()=>e.params.type);L(o,()=>r());function r(){t.dispatch("scheduler/setCurrentCategory",o.value)}r();const p=n(()=>t.getters["scheduler/getCurrentCategory"]),i=n(()=>t.getters["main/isLoading"]),a=n(()=>t.getters["scheduler/getError"]);async function c(u){await t.dispatch("scheduler/saveAutomation",{category:o.value,...u}),a.value||await m.push({name:"scheduler.show",params:{type:o.value}})}return{type:o,currentCategory:p,onSubmit:c,isLoading:i,error:a}}}),R={class:"intro-y flex items-center mt-8"},V={class:"text-lg font-medium mr-auto"},$={key:0,class:"alert alert-danger show my-2",role:"alert"},A={class:"text-right mt-5"},F=["disabled","onClick"],E=["disabled"],I=B(" Salva ");function q(e,m,t,o,r,p){const i=d("RouterLink"),a=d("LoadingIcon"),c=d("DynamicForm");return l(),h("div",null,[s("div",R,[s("h2",V," Nuova Pianificata "+y(e.type),1)]),g(c,{fields:e.currentCategory,onSubmit:e.onSubmit,class:"intro-y"},{default:_(()=>[e.error?(l(),h("div",$,y(e.error.message),1)):f("",!0),s("div",A,[g(i,{to:{name:"scheduler.show",params:{type:e.type}},custom:""},{default:_(({navigate:u})=>[s("button",{type:"button",class:"btn btn-outline-secondary w-24 mr-1",disabled:e.isLoading,onClick:u}," Annulla ",8,F)]),_:1},8,["to"]),s("button",{type:"submit",class:"btn btn-primary w-24",disabled:e.isLoading},[I,e.isLoading?(l(),S(a,{key:0,icon:"oval",color:"white",class:"w-4 h-4 ml-2"})):f("",!0)],8,E)])]),_:1},8,["fields","onSubmit"])])}const X=b(N,[["render",q]]);export{X as default};
|
||||
File diff suppressed because one or more lines are too long
@@ -1 +1 @@
|
||||
import{_ as S,d as B,q as D,X as N,u as E,c as a,w as g,v as R,b as y,e as n,g as v,h as _,A as b,r as l,o as m,B as C,a as V,i as $}from"./index.997ca0cc.js";import{D as F}from"./DynamicForm.6c9b686b.js";const I=B({name:"SchedulerEdit",components:{DynamicForm:F},setup(){const e=D(),h=N(),t=E(),o=a(()=>e.params.type);g(o,()=>i()),i();async function p(){await t.dispatch("scheduler/fetchAutomations",o.value)}p();function i(){t.dispatch("scheduler/setCurrentCategory",o.value)}const c=a(()=>t.getters["scheduler/getCurrentCategory"]),s=a(()=>e.params.id);g(s,()=>r());const u=a(()=>e.name);function r(){t.dispatch("scheduler/setCurrentAutomation",s.value)}r();const w=a(()=>t.getters["scheduler/getCurrentAutomation"]),d=R(w.value);d.value&&u.value==="scheduler.duplicate"&&(d.value.id=void 0);const A=a(()=>t.getters["main/isLoading"]),f=a(()=>t.getters["scheduler/getError"]);async function k(L){await t.dispatch("scheduler/saveAutomation",{category:o.value,...L}),f.value||await h.push({name:"scheduler.show",params:{type:o.value}})}return{type:o,id:s,currentCategory:c,currentAutomation:d,onSubmit:k,isLoading:A,error:f}}}),q={class:"intro-y flex items-center mt-8"},M={class:"text-lg font-medium mr-auto"},P={key:0,class:"alert alert-danger show my-2",role:"alert"},T={class:"text-right mt-5"},X=["disabled","onClick"],j=["disabled"],z=$(" Salva ");function G(e,h,t,o,p,i){const c=l("RouterLink"),s=l("LoadingIcon"),u=l("DynamicForm");return m(),y("div",null,[n("div",q,[n("h2",M," Modifica Pianificata "+v(e.currentAutomation.name),1)]),_(u,{fields:e.currentCategory,"initial-values":e.currentAutomation,onSubmit:e.onSubmit,class:"intro-y"},{default:b(()=>[e.error?(m(),y("div",P,v(e.error.message),1)):C("",!0),n("div",T,[_(c,{to:{name:"scheduler.show",params:{type:e.type}},custom:""},{default:b(({navigate:r})=>[n("button",{type:"button",class:"btn btn-outline-secondary w-24 mr-1",disabled:e.isLoading,onClick:r}," Annulla ",8,X)]),_:1},8,["to"]),n("button",{type:"submit",class:"btn btn-primary w-24",disabled:e.isLoading},[z,e.isLoading?(m(),V(s,{key:0,icon:"oval",color:"white",class:"w-4 h-4 ml-2"})):C("",!0)],8,j)])]),_:1},8,["fields","initial-values","onSubmit"])])}const K=S(I,[["render",G]]);export{K as default};
|
||||
import{_ as S,d as B,q as D,X as N,u as E,c as a,w as g,v as R,b as y,e as n,g as v,h as _,A as b,r as l,o as m,B as C,a as V,i as $}from"./index.83c1a587.js";import{D as F}from"./DynamicForm.682971b5.js";const I=B({name:"SchedulerEdit",components:{DynamicForm:F},setup(){const e=D(),h=N(),t=E(),o=a(()=>e.params.type);g(o,()=>i()),i();async function p(){await t.dispatch("scheduler/fetchAutomations",o.value)}p();function i(){t.dispatch("scheduler/setCurrentCategory",o.value)}const c=a(()=>t.getters["scheduler/getCurrentCategory"]),s=a(()=>e.params.id);g(s,()=>r());const u=a(()=>e.name);function r(){t.dispatch("scheduler/setCurrentAutomation",s.value)}r();const w=a(()=>t.getters["scheduler/getCurrentAutomation"]),d=R(w.value);d.value&&u.value==="scheduler.duplicate"&&(d.value.id=void 0);const A=a(()=>t.getters["main/isLoading"]),f=a(()=>t.getters["scheduler/getError"]);async function k(L){await t.dispatch("scheduler/saveAutomation",{category:o.value,...L}),f.value||await h.push({name:"scheduler.show",params:{type:o.value}})}return{type:o,id:s,currentCategory:c,currentAutomation:d,onSubmit:k,isLoading:A,error:f}}}),q={class:"intro-y flex items-center mt-8"},M={class:"text-lg font-medium mr-auto"},P={key:0,class:"alert alert-danger show my-2",role:"alert"},T={class:"text-right mt-5"},X=["disabled","onClick"],j=["disabled"],z=$(" Salva ");function G(e,h,t,o,p,i){const c=l("RouterLink"),s=l("LoadingIcon"),u=l("DynamicForm");return m(),y("div",null,[n("div",q,[n("h2",M," Modifica Pianificata "+v(e.currentAutomation.name),1)]),_(u,{fields:e.currentCategory,"initial-values":e.currentAutomation,onSubmit:e.onSubmit,class:"intro-y"},{default:b(()=>[e.error?(m(),y("div",P,v(e.error.message),1)):C("",!0),n("div",T,[_(c,{to:{name:"scheduler.show",params:{type:e.type}},custom:""},{default:b(({navigate:r})=>[n("button",{type:"button",class:"btn btn-outline-secondary w-24 mr-1",disabled:e.isLoading,onClick:r}," Annulla ",8,X)]),_:1},8,["to"]),n("button",{type:"submit",class:"btn btn-primary w-24",disabled:e.isLoading},[z,e.isLoading?(m(),V(s,{key:0,icon:"oval",color:"white",class:"w-4 h-4 ml-2"})):C("",!0)],8,j)])]),_:1},8,["fields","initial-values","onSubmit"])])}const K=S(I,[["render",G]]);export{K as default};
|
||||
@@ -1 +1 @@
|
||||
import{_ as s,d as n,u as r,c as i,w as u,a as d,o as p,r as l}from"./index.997ca0cc.js";const h=n({name:"SchedulerIndex",setup(){const e=r(),o=i(()=>e.getters["scheduler/getAutomationCategories"]);e.dispatch("scheduler/initStore"),u(()=>o.value,()=>{e.dispatch("main/clearMenuButton",{button:"Pianificate",child:!0}),Object.keys(o.value).forEach(t=>{e.dispatch("main/addMenuButton",{child:"Pianificate",button:{title:t,icon:"ActivityIcon",routeName:"scheduler.show",params:{type:t},child:[{routeName:"scheduler.create",params:{type:t}}]}})})})}});function m(e,o,a,t,_,f){const c=l("router-view");return p(),d(c)}const w=s(h,[["render",m]]);export{w as default};
|
||||
import{_ as s,d as n,u as r,c as i,w as u,a as d,o as p,r as l}from"./index.83c1a587.js";const h=n({name:"SchedulerIndex",setup(){const e=r(),o=i(()=>e.getters["scheduler/getAutomationCategories"]);e.dispatch("scheduler/initStore"),u(()=>o.value,()=>{e.dispatch("main/clearMenuButton",{button:"Pianificate",child:!0}),Object.keys(o.value).forEach(t=>{e.dispatch("main/addMenuButton",{child:"Pianificate",button:{title:t,icon:"ActivityIcon",routeName:"scheduler.show",params:{type:t},child:[{routeName:"scheduler.create",params:{type:t}}]}})})})}});function m(e,o,a,t,_,f){const c=l("router-view");return p(),d(c)}const w=s(h,[["render",m]]);export{w as default};
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1 +0,0 @@
|
||||
import{a8 as a,a9 as r}from"./index.997ca0cc.js";import{a8 as o}from"./index.997ca0cc.js";a.register(...r);export{o as default};
|
||||
1
ems-engine/src/main/webapp/assets/auto.f8cdb841.js
Normal file
1
ems-engine/src/main/webapp/assets/auto.f8cdb841.js
Normal file
@@ -0,0 +1 @@
|
||||
import{a8 as a,a9 as r}from"./index.83c1a587.js";import{a8 as o}from"./index.83c1a587.js";a.register(...r);export{o as default};
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -17,7 +17,7 @@
|
||||
/>
|
||||
<!-- <link rel="preload" href="/font/Inter-italic.var.woff2" as="font" type="font/woff2" crossorigin="anonymous"> -->
|
||||
<link rel="stylesheet" href="./font/inter.css"/>
|
||||
<script type="module" crossorigin src="./assets/index.997ca0cc.js"></script>
|
||||
<script type="module" crossorigin src="./assets/index.83c1a587.js"></script>
|
||||
<link rel="stylesheet" href="./assets/index.58ae021f.css">
|
||||
</head>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user