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

Fix after merge
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-11-17 09:56:44 +01:00
parent 04f1a9e2e6
commit 35621cadf2
7 changed files with 42 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,8 +100,8 @@ public class SalesRules extends QueryRules {
if (dataFine.isBefore(dataIniz))
throw new Exception(String.format("Impossibile inserire//modificare una promozione con data fine (%s) antecedente a data inizio ( %s )",
UtilityLocalDate.formatDate(vtbListData.getDataFine(), CommonConstants.DATE_FORMAT_DMY),
UtilityLocalDate.formatDate(vtbListData.getDataIniz(), CommonConstants.DATE_FORMAT_DMY)));
UtilityLocalDate.formatDate(vtbListData.getDataFine(), CommonConstants.DATE_FORMAT_DMY_SLASHED),
UtilityLocalDate.formatDate(vtbListData.getDataIniz(), CommonConstants.DATE_FORMAT_DMY_SLASHED)));
String promoEscluse = setupGest.getSetup(conn, "VTB_LIST", "CHECK_DATA_FINE", "PROMO_ESCLUSE");
if (!UtilityString.isNullOrEmpty(promoEscluse)) {
@@ -113,7 +113,7 @@ public class SalesRules extends QueryRules {
if (vtbListData.getCheckDataFine() != null && vtbListData.getCheckDataFine()) {
if (UtilityLocalDate.isBeforeToday(dataFine))
throw new Exception(String.format("Impossibile inserire//modificare una promozione con data fine (%s) antecedente ad oggi",
UtilityLocalDate.formatDate(vtbListData.getDataFine(), CommonConstants.DATE_FORMAT_DMY)));
UtilityLocalDate.formatDate(vtbListData.getDataFine(), CommonConstants.DATE_FORMAT_DMY_SLASHED)));
}
if (vtbListData.getCheckDataFine() != null && vtbListData.getCheckDataFine()) {
@@ -255,8 +255,8 @@ public class SalesRules extends QueryRules {
public static String completeCodPromo(Connection connection, VtbListData vtbListData) throws Exception {
String partialCode =
vtbListData.getCodVlis() + ";" +
UtilityLocalDate.formatDate(vtbListData.getDataIniz(), CommonConstants.DATE_FORMAT_YMD) + ";" +
UtilityLocalDate.formatDate(vtbListData.getDataFine(), CommonConstants.DATE_FORMAT_YMD);
UtilityLocalDate.formatDate(vtbListData.getDataIniz(), CommonConstants.DATE_FORMAT_DMY_SLASHED) + ";" +
UtilityLocalDate.formatDate(vtbListData.getDataFine(), CommonConstants.DATE_FORMAT_DMY_SLASHED);
String sql = "SELECT dbo.f_suggestCodeCodPromoVend( " + UtilityDB.valueToString(partialCode) + " ) ";
String codPromo = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);

12
ems-core/src/main/java/it/integry/ems_model/entity/key/DtbOrdtKey.java
View File

@@ -15,18 +15,6 @@ public class DtbOrdtKey {
this.numOrd = numOrd;
}
public String getGestione() {
return gestione;
}
public Date getDataOrd() {
return dataOrd;
}
public Integer getNumOrd() {
return numOrd;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;

4
ems-engine/src/main/java/it/integry/ems/customizations/sales/service/ToscaSalesService.java
View File

@@ -348,10 +348,10 @@ public class ToscaSalesService {
List<DtbOrdtKey> ordiniDaPubblicare = righeOrdiniDaPubblicare.stream().map(row -> new DtbOrdtKey(row.getGestione(), row.getDataOrd(), row.getNumOrd())).collect(Collectors.toList());
for (DtbOrdtKey key : ordiniDaPubblicare) {
DtbOrdt ordt = new DtbOrdt(key.getGestione(), UtilityLocalDate.localDateFromDate(key.getDataOrd()), key.getNumOrd());
DtbOrdt ordt = new DtbOrdt(key.getGestione(), key.getDataOrd(), key.getNumOrd());
ordt.setOperation(OperationType.SELECT_OBJECT);
entityProcessor.processEntity(ordt, true, multiDBTransactionManager);
GtbAnag anag = new GtbAnag();
anag.setCodAnag(ordt.getCodAnag())
.setOperation(OperationType.SELECT_OBJECT);

54
ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
View File

@@ -689,19 +689,19 @@ public class MesProductionServiceV2 {
}};
MtbColt createdUdc = wmsLavorazioneService.createUDC(new CreateUDCRequestDTO()
.setDataCollo(request.getDataCollo())
.setCodMdep(request.getCodMdep())
.setCodJfas(request.getCodJfas())
.setCodAnag(request.getCodAnag())
.setCodVdes(request.getCodVdes())
.setPosizione(request.getPosizione())
.setCodTcol(request.getCodTcol())
.setRifOrd(request.getRifOrd())
.setDataVersamento(request.getDataVersamento())
.setProgressivoUl(request.getProgressivoUl())
.setBarcodeUl(request.getBarcodeUl())
.setCodDtipProvv(request.getCodDtipProvv())
.setOrders(orders))
.setDataCollo(request.getDataCollo())
.setCodMdep(request.getCodMdep())
.setCodJfas(request.getCodJfas())
.setCodAnag(request.getCodAnag())
.setCodVdes(request.getCodVdes())
.setPosizione(request.getPosizione())
.setCodTcol(request.getCodTcol())
.setRifOrd(request.getRifOrd())
.setDataVersamento(request.getDataVersamento())
.setProgressivoUl(request.getProgressivoUl())
.setBarcodeUl(request.getBarcodeUl())
.setCodDtipProvv(request.getCodDtipProvv())
.setOrders(orders))
.setPreparatoDa(request.getPreparatoDa());
final InsertUDCRowResponseDTO insertUDCRowResponse = wmsAccettazioneService.insertUDCRow(new InsertUDCRowRequestDTO()
@@ -716,7 +716,7 @@ public class MesProductionServiceV2 {
.setQtaCnf(request.getQtaCnf())
.setNumCnf(request.getNumCnf())
.setDatetimeRow(request.getDataVersamento())
.setNote(request.getNote())
.setAnnotazioni(request.getAnnotazioni())
.setNumEtich(Math.max(request.getNumEtich(), 0)));
@@ -2509,14 +2509,14 @@ public class MesProductionServiceV2 {
}
public List<DtbOrdCqr> updateCqrOrdine(MultiDBTransactionManager multiDBTransactionManager,UpdateCqrRequestDTO dto) throws Exception {
public List<DtbOrdCqr> updateCqrOrdine(MultiDBTransactionManager multiDBTransactionManager, UpdateCqrRequestDTO dto) throws Exception {
if (dto.getDtbOrdCqr() == null)
throw new Exception("Nessun controllo disponibile per il salvataggio!");
DtbOrdCqr cqr = dto.getDtbOrdCqr();
DtbOrdt ord = new DtbOrdt(cqr.getGestione(),UtilityLocalDate.localDateFromDate(cqr.getDataOrd()),cqr.getNumOrd());
DtbOrdt ord = new DtbOrdt(cqr.getGestione(), cqr.getDataOrd(), cqr.getNumOrd());
ord.setOperation(OperationType.SELECT_OBJECT);
entityProcessor.processEntity(ord,true, multiDBTransactionManager);
entityProcessor.processEntity(ord, true, multiDBTransactionManager);
if (UtilityString.isNullOrEmpty(ord.getCodProd()))
throw new Exception("L'ordine selezionato non è un ordine di lavorazione valido!");
@@ -2524,20 +2524,21 @@ public class MesProductionServiceV2 {
cqr.setOperation(OperationType.INSERT_OR_UPDATE);
ord.getDtbOrdCqr().add(cqr);
ord.setOperation(OperationType.UPDATE);
entityProcessor.processEntity(ord,true, multiDBTransactionManager);
entityProcessor.processEntity(ord, true, multiDBTransactionManager);
if (dto.getReloadCqr())
return getCqrByOrderAndRow(ord.getGestione(),ord.getDataOrd(),ord.getNumOrd(),cqr.getIdRiga());
return getCqrByOrderAndRow(ord.getGestione(), ord.getDataOrd(), ord.getNumOrd(), cqr.getIdRiga());
return Collections.singletonList(cqr);
}
public List<DtbOrdCqr> deleteCqrOrdine(MultiDBTransactionManager multiDBTransactionManager,UpdateCqrRequestDTO dto) throws Exception {
public List<DtbOrdCqr> deleteCqrOrdine(MultiDBTransactionManager multiDBTransactionManager, UpdateCqrRequestDTO dto) throws Exception {
if (dto.getDtbOrdCqr() == null)
throw new Exception("Nessun controllo disponibile per il salvataggio!");
DtbOrdCqr cqr = dto.getDtbOrdCqr();
DtbOrdt ord = new DtbOrdt(cqr.getGestione(),UtilityLocalDate.localDateFromDate(cqr.getDataOrd()),cqr.getNumOrd());
DtbOrdt ord = new DtbOrdt(cqr.getGestione(), cqr.getDataOrd(), cqr.getNumOrd());
ord.setOperation(OperationType.SELECT_OBJECT);
entityProcessor.processEntity(ord,true, multiDBTransactionManager);
entityProcessor.processEntity(ord, true, multiDBTransactionManager);
if (UtilityString.isNullOrEmpty(ord.getCodProd()))
throw new Exception("L'ordine selezionato non è un ordine di lavorazione valido!");
@@ -2545,18 +2546,19 @@ public class MesProductionServiceV2 {
cqr.setOperation(OperationType.DELETE);
ord.getDtbOrdCqr().add(cqr);
ord.setOperation(OperationType.UPDATE);
entityProcessor.processEntity(ord,true, multiDBTransactionManager);
entityProcessor.processEntity(ord, true, multiDBTransactionManager);
if (dto.getReloadCqr())
return UtilityList.isNull(getCqrByOrderAndRow(ord.getGestione(),ord.getDataOrd(),ord.getNumOrd(),cqr.getIdRiga()), new ArrayList<>());
return UtilityList.isNull(getCqrByOrderAndRow(ord.getGestione(), ord.getDataOrd(), ord.getNumOrd(), cqr.getIdRiga()), new ArrayList<>());
return Collections.singletonList(cqr);
}
private List<DtbOrdCqr> getCqrByOrderAndRow(String gestione, Date dataOrd, Integer numOrd, Integer idRiga) throws Exception {
private List<DtbOrdCqr> getCqrByOrderAndRow(String gestione, LocalDate dataOrd, Integer numOrd, Integer idRiga) throws Exception {
String sql = Query.format("SELECT * from dtb_ord_cqr where\n" +
" gestione = {}\n" +
" and data_ord = {}\n" +
" and num_ord = {}\n" +
" and id_riga = {}",gestione,dataOrd,numOrd,idRiga);
" and id_riga = {}", gestione, dataOrd, numOrd, idRiga);
return UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, DtbOrdCqr.class);
}

2
ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java
View File

@@ -446,7 +446,7 @@ public class WMSUtility {
.setSerDoc(insertUDCRowRequestDTO.getSerDoc())
.setDatetimeRow(UtilityLocalDate.isNull(insertUDCRowRequestDTO.getDatetimeRow(), UtilityLocalDate.getNowTime()))
.setNote(insertUDCRowRequestDTO.getNote())
.setNote(insertUDCRowRequestDTO.getAnnotazioni())
.setNumEtich(insertUDCRowRequestDTO.getNumEtich());
if (insertUDCRowRequestDTO.getCodDtip() != null){

2
ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java
View File

@@ -318,7 +318,7 @@ public class WMSAccettazioneService {
.setSerDoc(insertUDCRowRequestDTO.getSerDoc())
.setDatetimeRow(UtilityLocalDate.getNowTime())
.setNote(insertUDCRowRequestDTO.getNote())
.setNote(insertUDCRowRequestDTO.getAnnotazioni())
.setNumEtich(insertUDCRowRequestDTO.getNumEtich());

10
ems-engine/src/main/java/it/integry/ems/retail/wms/dto/InsertUDCRowRequestDTO.java
View File

@@ -33,7 +33,7 @@ public class InsertUDCRowRequestDTO {
private String codDtip;
private String fullName;
private String note;
private String annotazioni;
private Integer numEtich;
private String customBarcodeUlIn;
@@ -222,12 +222,12 @@ public class InsertUDCRowRequestDTO {
return this;
}
public String getNote() {
return note;
public String getAnnotazioni() {
return annotazioni;
}
public InsertUDCRowRequestDTO setNote(String note) {
this.note = note;
public InsertUDCRowRequestDTO setAnnotazioni(String annotazioni) {
this.annotazioni = annotazioni;
return this;
}