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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Valerio Castellana
2024-02-06 11:05:07 +01:00
parent 9f9165c780 585e5dcc44
commit 0f4410c931
2 changed files with 58 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ems-engine/src/main/java/it/integry/ems/customizations/production/service/ToscaProductionService.java
View File

@@ -77,7 +77,7 @@ public class ToscaProductionService {
"FROM dtb_ord_steps\n" +
"WHERE gestione = 'L'\n" +
" AND cod_jfas = " + UtilityDB.valueToString(codJfas) +
" ORDER BY data_ord DESC, num_ord DESC";
" ORDER BY data_ord DESC, num_ord DESC, id_riga desc";
final HashMap<String, Object> stringObjectHashMap = UtilityDB.executeSimpleQueryOnlyFirstRow(multiDBTransactionManager.getPrimaryConnection(), sqlLastWorkedOrder);
String lastFormato = UtilityHashMap.getValueIfExists(stringObjectHashMap, "descrizione_attivita");
String lastTurno = UtilityHashMap.getValueIfExists(stringObjectHashMap, "note");

115
ems-engine/src/main/java/it/integry/ems/retail/wms/ordini_acquisto/service/WMSOrdiniAcquistoService.java
View File

@@ -96,52 +96,52 @@ public class WMSOrdiniAcquistoService {
if (!viewPropostaOrdine || !UtilityString.isNullOrEmpty(barcodeArt)) {
sql =
"SELECT griglia.cod_mdep,\n" +
" griglia.cod_mart,\n" +
" griglia.cod_alis, \n" +
" griglia.cod_art_for \n" +
" from dbo.getGrigliaAcquisto(" + UtilityDB.valueDateToString(dataOrd, DATE_FORMAT_YMD) + ","
+ UtilityDB.valueToString(codAlis) + ", "
+ UtilityDB.valueToString(codMdep) + ", null, null ) griglia\n" +
" WHERE tipo_variazione <> 'D'";
" griglia.cod_mart,\n" +
" griglia.cod_alis, \n" +
" griglia.cod_art_for \n" +
" from dbo.getGrigliaAcquisto(" + UtilityDB.valueDateToString(dataOrd, DATE_FORMAT_YMD) + ","
+ UtilityDB.valueToString(codAlis) + ", "
+ UtilityDB.valueToString(codMdep) + ", null, null ) griglia\n" +
" WHERE tipo_variazione <> 'D'";
if (!UtilityString.isNullOrEmpty(barcodeArt)) {
List<BarcodeOrdiniAcquistoDTO> listBarcode = Stream.of(barcodeOrdiniAcquistoHandlerService.getBarcode())
.filter(x -> x.getCodBarre().equalsIgnoreCase(barcodeArt)).toList();
sql += " AND ( griglia.cod_mart in (" +
(listBarcode.size() > 0?
StringUtils.join(Stream.of(listBarcode).map(x -> UtilityDB.valueToString(x.getCodMart())).distinct().toList(), ","): "''" ) + ") OR\n"+
"griglia.cod_art_for = " + UtilityDB.valueToString(barcodeArt) +")";
(listBarcode.size() > 0 ?
StringUtils.join(Stream.of(listBarcode).map(x -> UtilityDB.valueToString(x.getCodMart())).distinct().toList(), ",") : "''") + ") OR\n" +
"griglia.cod_art_for = " + UtilityDB.valueToString(barcodeArt) + ")";
}
} else {
sql =
"SELECT proposta.cod_mdep,\n" +
" proposta.cod_mart,\n" +
" proposta.qta_esistente,\n" +
" Cast(proposta.qta_prevista as numeric(20,5)) as qta_prevista,\n" +
" proposta.qta_proposta,\n" +
" CAST(proposta.new_no_promo as BIT) as new_no_promo,\n" +
" proposta.qta_ord_auto,\n" +
" proposta.cod_alis, \n" +
" proposta.cod_art_for \n" +
" from dbo.WMS_getPropostaOrdine_new(" + UtilityDB.valueToString(codMdep) + ", "
+ UtilityDB.valueToString(codAlis) + " , "
+ UtilityDB.valueDateToString(dataOrd, DATE_FORMAT_YMD) + ", " + UtilityDB.valueToString(insArtNew) + " ) proposta\n";
" proposta.cod_mart,\n" +
" proposta.qta_esistente,\n" +
" Cast(proposta.qta_prevista as numeric(20,5)) as qta_prevista,\n" +
" proposta.qta_proposta,\n" +
" CAST(proposta.new_no_promo as BIT) as new_no_promo,\n" +
" proposta.qta_ord_auto,\n" +
" proposta.cod_alis, \n" +
" proposta.cod_art_for \n" +
" from dbo.WMS_getPropostaOrdine_new(" + UtilityDB.valueToString(codMdep) + ", "
+ UtilityDB.valueToString(codAlis) + " , "
+ UtilityDB.valueDateToString(dataOrd, DATE_FORMAT_YMD) + ", " + UtilityDB.valueToString(insArtNew) + " ) proposta\n";
}
sql =
"SELECT d.*, \n" +
" mtb_aart.descrizione,\n" +
" mtb_aart.unt_mis as unt_mis,\n" +
" mtb_aart.flag_qta_cnf_fissa,\n" +
" mtb_aart.qta_cnf,\n" +
" mtb_aart.gg_scad_partita as gg_scadenza,\n" +
" ct_ord.ct_max_ord,\n" +
" d.cod_art_for\n" +
" FROM (" + sql + ") d \n" +
" INNER JOIN mtb_aart ON d.cod_mart = mtb_aart.cod_mart\n"+
" LEFT OUTER JOIN dbo.getCartoniMaxOrdinabili(" + UtilityDB.valueDateToString(dataOrd, DATE_FORMAT_YMD) + ") ct_ord ON d.cod_mart = ct_ord.cod_mart AND ct_ord.cod_mdep = " + UtilityDB.valueToString(codMdep) +
"\n ORDER BY d.cod_alis, d.cod_art_for";
" mtb_aart.descrizione,\n" +
" mtb_aart.unt_mis as unt_mis,\n" +
" mtb_aart.flag_qta_cnf_fissa,\n" +
" mtb_aart.qta_cnf,\n" +
" mtb_aart.gg_scad_partita as gg_scadenza,\n" +
" ct_ord.ct_max_ord,\n" +
" d.cod_art_for\n" +
" FROM (" + sql + ") d \n" +
" INNER JOIN mtb_aart ON d.cod_mart = mtb_aart.cod_mart\n" +
" LEFT OUTER JOIN dbo.getCartoniMaxOrdinabili(" + UtilityDB.valueDateToString(dataOrd, DATE_FORMAT_YMD) + ") ct_ord ON d.cod_mart = ct_ord.cod_mart AND ct_ord.cod_mdep = " + UtilityDB.valueToString(codMdep) +
"\n ORDER BY d.cod_alis, d.cod_art_for";
List<OrdiniAcquistoGrigliaDTO.ArticoliDTO> articoli = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, OrdiniAcquistoGrigliaDTO.ArticoliDTO.class);
@@ -155,7 +155,7 @@ public class WMSOrdiniAcquistoService {
for (OrdiniAcquistoGrigliaDTO.ArticoliDTO art : articoli) {
String codMart = art.getCodMart();
if (!UtilityString.isNullOrEmpty(art.getCodArtFor()) ) {
if (!UtilityString.isNullOrEmpty(art.getCodArtFor())) {
List<String> codArtFor = new ArrayList<>();
codArtFor.add(art.getCodArtFor());
@@ -166,22 +166,22 @@ public class WMSOrdiniAcquistoService {
com.annimon.stream.Optional<ListiniOrdiniAcquistoDTO> lisa = Stream.of(listiniOrdiniAcquistoHandlerService.getListini())
.filter(x -> x.getCodAlis().equalsIgnoreCase(art.getCodAlis()) && x.getCodArtFor().equalsIgnoreCase(art.getCodArtFor()) && x.getCodMart().equalsIgnoreCase(art.getCodMart())).findFirst();
if (lisa.isPresent()){
if (lisa.isPresent()) {
art
.setUntMis(UtilityString.isNull(lisa.get().getUntMisAcq(), art.getUntMis()))
.setQtaCnf(UtilityBigDecimal.isNullOrZero(lisa.get().getQtaCnf())?art.getQtaCnf():lisa.get().getQtaCnf())
.setQtaCnf(UtilityBigDecimal.isNullOrZero(lisa.get().getQtaCnf()) ? art.getQtaCnf() : lisa.get().getQtaCnf())
.setFlagQtaMultipla(lisa.get().getFlagQtaMultipla())
.setQtaMinOrdinabile(lisa.get().getQtaMinOrd())
.setDescrAlis(lisa.get().getDescrizione());
}
if(!merce.isEmpty()){
if (!merce.isEmpty()) {
com.annimon.stream.Optional<BigDecimal> first =
Stream.of(merce)
.filter(x-> x.getCodMart() != null)
.filter(x -> x.getCodMart() != null)
.filter(x -> x.getCodMart().equalsIgnoreCase(codMart) && x.getListino().equalsIgnoreCase(art.getCodAlis()))
.map(MerceOrdiniAcquistoDTO::getQtaOrd).findFirst();
if(first.isPresent()){
if (first.isPresent()) {
art.setMerceDaRic(first.get());
}
}
@@ -218,7 +218,7 @@ public class WMSOrdiniAcquistoService {
public OrdiniAcquistoGrigliaDTO getElencoArticoliOrdini(String codMdep, String chiaveGriglia, String barcodeArt) throws Exception {
boolean readDatiCache = setupGest.getSetupDepoBoolean(multiDBTransactionManager.getPrimaryConnection(), "PVM", "ORDINI_A", "DATA_CACHE", codMdep);
if(readDatiCache){
if (readDatiCache) {
return getElencoArticoliOrdiniNew(codMdep, chiaveGriglia, barcodeArt);
}
@@ -267,9 +267,9 @@ public class WMSOrdiniAcquistoService {
barcodeArt = UtilityDB.valueToString(barcodeArt);
List<HashMap<String, Object>> listBarcode = getListBarcode(null, barcodeArt);
sql += " AND ( griglia.cod_mart in (" +
(listBarcode.size() > 0?
StringUtils.join(Stream.of(listBarcode).map(x -> UtilityDB.valueToString(x.get("cod_mart"))).distinct().toList(), ","): "''" ) + ") OR\n"+
"griglia.cod_art_for = " + barcodeArt +")";
(listBarcode.size() > 0 ?
StringUtils.join(Stream.of(listBarcode).map(x -> UtilityDB.valueToString(x.get("cod_mart"))).distinct().toList(), ",") : "''") + ") OR\n" +
"griglia.cod_art_for = " + barcodeArt + ")";
}
} else {
@@ -294,7 +294,7 @@ public class WMSOrdiniAcquistoService {
"FROM dbo.getlistinoacquisto(NULL, %s, NULL, NULL, 'N', NULL) lisa\n" +
"WHERE lisa.tipo_variazione IS NOT NULL\n" +
" OR lisa.tipo_variazione <> 'D'",
(UtilityString.isNullOrEmpty(codAlis)?"NULL": UtilityDB.valueToString(codAlis)));
(UtilityString.isNullOrEmpty(codAlis) ? "NULL" : UtilityDB.valueToString(codAlis)));
sql =
"SELECT d.*, \n" +
@@ -304,13 +304,13 @@ public class WMSOrdiniAcquistoService {
" case when nullif(lisa.qta_cnf, 0) is null then mtb_aart.qta_cnf ELSE lisa.qta_cnf END as qta_cnf,\n" +
" mtb_aart.gg_scad_partita as gg_scadenza,\n" +
" ct_ord.ct_max_ord,\n" +
(viewMerceDaRic ?"merce.qta_ord":"0") + " as 'merce_da_ric',\n " +
(viewMerceDaRic ? "merce.qta_ord" : "0") + " as 'merce_da_ric',\n " +
" lisa.cod_art_for as 'cod_art_for',\n " +
" lisa.descrizione as 'descr_alis',\n " +
" lisa.flag_qta_multipla as 'flag_qta_multipla',\n " +
" lisa.qta_min_ord as 'qta_min_ord'\n " +
" FROM (" + sql + ") d \n" +
" INNER JOIN mtb_aart ON d.cod_mart = mtb_aart.cod_mart\n"+
" INNER JOIN mtb_aart ON d.cod_mart = mtb_aart.cod_mart\n" +
" LEFT OUTER JOIN (" + sqlLisa + ") lisa on d.cod_mart = lisa.cod_mart AND d.cod_alis = lisa.cod_alis and lisa.cod_art_for = d.cod_art_for \n" +
" LEFT OUTER JOIN dbo.getCartoniMaxOrdinabili(" + UtilityDB.valueDateToString(dataOrd, DATE_FORMAT_YMD) + ") ct_ord ON d.cod_mart = ct_ord.cod_mart AND ct_ord.cod_mdep = " + UtilityDB.valueToString(codMdep) + "\n" +
(viewMerceDaRic ? " LEFT OUTER JOIN dbo.getMerceDaRicevere (" + UtilityDB.valueToString(codAlis) + "," + UtilityDB.valueToString(codMdep) + ", null) merce on merce.cod_mart = d.cod_mart" : "");
@@ -333,7 +333,7 @@ public class WMSOrdiniAcquistoService {
.chunkBy(x -> counter.getAndIncrement() / limitArt).toList();
List<HashMap<String, Object>> listBarcode = new ArrayList<>();
for (List<String> art: listaArt) {
for (List<String> art : listaArt) {
String codArt = "'" + StringUtils.join(art, "','") + "'";
listBarcode.addAll(getListBarcode(codArt, null));
}
@@ -341,7 +341,7 @@ public class WMSOrdiniAcquistoService {
for (OrdiniAcquistoGrigliaDTO.ArticoliDTO art : articoli) {
String codMart = art.getCodMart();
if (!UtilityString.isNullOrEmpty(art.getCodArtFor()) ) {
if (!UtilityString.isNullOrEmpty(art.getCodArtFor())) {
List<String> codArtFor = new ArrayList<>();
codArtFor.add(art.getCodArtFor());
@@ -459,7 +459,7 @@ public class WMSOrdiniAcquistoService {
UtilityEntity.throwEntitiesException(savedOrders);
Stream.of(savedOrders)
.forEach(x->x.setFlagSospeso("N").setDtbOrdr(new ArrayList<>()).setOperation(OperationType.UPDATE));
.forEach(x -> x.setFlagSospeso("N").setDtbOrdr(new ArrayList<>()).setOperation(OperationType.UPDATE));
savedEntities = entityProcessor.processEntityList(savedOrders, true);
@@ -505,7 +505,7 @@ public class WMSOrdiniAcquistoService {
BigDecimal qtaCnf = currentRow.getQtaCnf();
BigDecimal qtaOrd = currentRow.getQta();
BigDecimal numCnf = currentRow.getColli();
if (!UtilityBigDecimal.equalsTo(numCnf , BigDecimal.ZERO)) {
if (!UtilityBigDecimal.equalsTo(numCnf, BigDecimal.ZERO)) {
qtaCnf = qtaOrd.divide(numCnf, MathContext.DECIMAL32);
} else if (qtaCnf == null || UtilityBigDecimal.equalsTo(qtaCnf, BigDecimal.ZERO)) {
sql = "SELECT qta_cnf FROM mtb_aart WHERE cod_mart = %s";
@@ -518,12 +518,11 @@ public class WMSOrdiniAcquistoService {
qtaCnf = BigDecimal.ONE;
//Verichiamo se il barcode e un codice articolo del fornitore
sql =
"SELECT cod_art_for " +
" FROM getGrigliaAcquisto(null, %s, %s, %s, null) griglia " +
" WHERE tipo_variazione <> 'D' ";
"SELECT cod_art_for " +
" FROM getGrigliaAcquisto(null, %s, %s, %s, null) griglia " +
" WHERE tipo_variazione <> 'D' ";
sql = String.format(sql,
UtilityDB.valueToString(codAlis),
UtilityDB.valueToString(codMdep),
@@ -534,8 +533,8 @@ public class WMSOrdiniAcquistoService {
if (UtilityString.isNullOrEmpty(codArtFor)) {
sql =
"SELECT cod_art_for " +
" FROM getGrigliaAcquisto(null, %s, %s, null, %s) griglia " +
" WHERE tipo_variazione <> 'D' ";
" FROM getGrigliaAcquisto(null, %s, %s, null, %s) griglia " +
" WHERE tipo_variazione <> 'D' ";
sql = String.format(sql,
UtilityDB.valueToString(codAlis),
UtilityDB.valueToString(codMdep),
@@ -546,9 +545,9 @@ public class WMSOrdiniAcquistoService {
if (UtilityString.isNullOrEmpty(codArtFor)) {
sql =
" SELECT cod_art_for FROM mtb_lisa "
+ " WHERE cod_art_for = %s AND "
+ " cod_alis = %s AND " + " flag_attivo = 'S' ";
" SELECT cod_art_for FROM mtb_lisa "
+ " WHERE cod_art_for = %s AND "
+ " cod_alis = %s AND " + " flag_attivo = 'S' ";
sql = String.format(sql, UtilityDB.valueToString(currentRow.getBarcode()), UtilityDB.valueToString(codAlis));
codArtFor = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);