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-07-16 20:28:42 +02:00
parent 3cb2b9d8e9 9ba1078d5a
commit 68a76ca0c2
5 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ems-engine/src/main/java/it/integry/ems/production/dto/CreaOrdineProdDTO.java
View File

@@ -17,6 +17,7 @@ public class CreaOrdineProdDTO {
private BigDecimal colliPedana;
private String untOrd;
private List<ModificheDistintaDTO> modificheDistinta = new ArrayList<>();
private String descrizionePartita;
public LocalDate getDataOrd() {
return dataOrd;
@@ -116,4 +117,13 @@ public class CreaOrdineProdDTO {
this.modificheDistinta = modificheDistinta;
return this;
}
public String getDescrizionePartita() {
return descrizionePartita;
}
public CreaOrdineProdDTO setDescrizionePartita(String descrizionePartita) {
this.descrizionePartita = descrizionePartita;
return this;
}
}

12
ems-engine/src/main/java/it/integry/ems/production/service/ProductionService.java
View File

@@ -979,19 +979,9 @@ public class ProductionService {
Date dataOrd = Date.from(creaOrdineProdDTO.getDataOrd().atStartOfDay(ZoneId.systemDefault()).toInstant());
String partitaMag = PartitaMagRules.suggestCodePartitaMag(
multiDBTransactionManager.getPrimaryConnection(),
new DatiPartitaMagDTO()
.setCodMart(creaOrdineProdDTO.getCodMart())
.setPartitaMag(creaOrdineProdDTO.getPartitaMag())
.setCodAnag(creaOrdineProdDTO.getCodAnag())
.setDataOrd(dataOrd)
);
DtbOrdr rigaOrdProd = new DtbOrdr()
.setCodMart(creaOrdineProdDTO.getCodMart())
.setPartitaMag(partitaMag)
.setPartitaMag(creaOrdineProdDTO.getPartitaMag())
.setValUnt(creaOrdineProdDTO.getValUnt())
.setNumCnf(creaOrdineProdDTO.getNumCnf())
.setColliPedana(creaOrdineProdDTO.getColliPedana())

4
ems-engine/src/main/java/it/integry/ems/system/exchange/controller/ExchangeColliImportController.java
View File

@@ -39,8 +39,8 @@ public class ExchangeColliImportController {
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestParam() String codAnag,
@RequestParam() String dataCert,
@RequestParam() String codMart,
@RequestParam() String codVdes
@RequestParam(required = false) String codMart,
@RequestParam(required = false) String codVdes
) throws Exception {
LocalDate dataCertificato = LocalDate.parse(dataCert);
return ServiceRestResponse.createPositiveResponse(exchangeColliImportService.getCertificati(codAnag,

22
ems-engine/src/main/java/it/integry/ems/system/exchange/dto/CertificatiSinfoOneDTO.java
View File

@@ -51,6 +51,10 @@ public class CertificatiSinfoOneDTO {
private BigDecimal sconto8;
@SqlField("scartoCq")
private BigDecimal scartoCq;
@SqlField("cod_vvet")
private String codVvet;
@SqlField("vettore")
private String vettore;
public String getCodAnag() {
return codAnag;
@@ -249,4 +253,22 @@ public class CertificatiSinfoOneDTO {
this.scartoCq = scartoCq;
return this;
}
public String getCodVvet() {
return codVvet;
}
public CertificatiSinfoOneDTO setCodVvet(String codVvet) {
this.codVvet = codVvet;
return this;
}
public String getVettore() {
return vettore;
}
public CertificatiSinfoOneDTO setVettore(String vettore) {
this.vettore = vettore;
return this;
}
}

2
ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java
View File

@@ -220,6 +220,8 @@ public class ExchangeColliImportService {
" TRIM(tagliando_pesa) AS tagliandoPesa,\n" +
" data_ora_lordo AS dataOraLordo,\n" +
" CONVERT(NUMERIC(15, 3), sconto8) AS sconto8,\n" +
" cod_vettore AS cod_vvet,\n" +
" vettore AS vettore,\n" +
" CONVERT(NUMERIC(15, 3), PMB_SCARTO_CQ) AS scartoCq\n " +
"FROM s1_Certificati\n" +
"WHERE cod_anag = {}\n" +