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

creazione colli da documento di vendita
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Mina Ruggiero
2025-05-08 16:51:49 +02:00
parent 8c1caed359
commit 05bee71bd6
5 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250508164056.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.IntegryCustomer;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20250508164056 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
if (!isCustomer(IntegryCustomer.Agricoper)) return;
updateSetupValue("DATI_AZIENDA", "SETUP", "LOGIN_OVER_WEBSERVICES", "S");
}
@Override
public void down() throws Exception {
}
}

11
ems-core/src/main/java/it/integry/ems/rules/completing/DocumentRules.java
View File

@@ -601,15 +601,8 @@ public class DocumentRules extends QueryRules {
public static void completeDatiDocMtbColt(Connection connection, DtbDoct testata) throws SQLException {
List<MtbColt> colli = testata.getMtbColt().stream().filter(x -> x.getNativeSql() == null).collect(Collectors.toList());
for (MtbColt mtbColt: colli) {
boolean cancellaRifDoc;
if ( mtbColt.getCancellaRifDoc()==null) {
if ( mtbColt.getOperation() == OperationType.DELETE) {
cancellaRifDoc = true;
mtbColt.setOperation(OperationType.UPDATE);
} else {
cancellaRifDoc = false;
}
} else {
boolean cancellaRifDoc = false;
if ( mtbColt.getCancellaRifDoc() !=null) {
cancellaRifDoc = mtbColt.getCancellaRifDoc();
}
if (mtbColt.getOperation() != OperationType.DELETE) {

2
ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java
View File

@@ -781,7 +781,7 @@ public class DocumentiDirettiService {
.setCodMart(ulRowDTO.getCodMart())
.setPartitaMag(ulRowDTO.getPartitaMag())
.setQtaTot(ulRowDTO.getQtaCol())
.setDataOrd(UtilityLocalDate.localDateToDate(ulRowDTO.getDataOrd()))
.setDataOrd(ulRowDTO.getDataOrd()!=null?UtilityLocalDate.localDateToDate(ulRowDTO.getDataOrd()):null)
.setNumOrd(ulRowDTO.getNumOrd())
.setRigaOrd(ulRowDTO.getRigaOrd())
.setTargetMtbColt(uds)

2
ems-engine/src/main/java/it/integry/ems/logistic/service/ViaggiService.java
View File

@@ -99,11 +99,13 @@ public class ViaggiService {
}
if (!UtilityList.isNullOrEmpty(pedane)) {
String listino = setupGest.getSetup("DTB_DOCT", "FATTURA_PEDANE", "LISTINO");
dtbDoct
.setCodDtip(tipoDocResi)
.setCodMdep(creaViaggioDTO.getCodMdep())
.setCodAnag(datiClienteFornTrasp.getCodAnag())
.setIdViaggio(viaggio.getIdViaggio())
.setListino(listino)
.setDtbDocr(new ArrayList<>());
dtbDoct.setOperation(OperationType.DELETE_THEN_INSERT);

6
ems-engine/src/main/java/it/integry/ems/retail/wms/dto/CreateUDSRequestOrderDTO.java
View File

@@ -12,7 +12,7 @@ public class CreateUDSRequestOrderDTO {
private String gestione;
private LocalDate dataOrd;
private LocalDate dataCons;
private int numOrd;
private Integer numOrd;
public String getGestione() {
@@ -42,11 +42,11 @@ public class CreateUDSRequestOrderDTO {
return this;
}
public int getNumOrd() {
public Integer getNumOrd() {
return numOrd;
}
public CreateUDSRequestOrderDTO setNumOrd(int numOrd) {
public CreateUDSRequestOrderDTO setNumOrd(Integer numOrd) {
this.numOrd = numOrd;
return this;
}