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

Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Carla Delfine
2025-06-26 12:07:39 +02:00
parent 1cf01c2c0a 4b96dbd100
commit 7f8e5f18e8
4 changed files with 66 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.idea/runConfigurations/Tomcat__1__Smetar___VPN_.xml generated Normal file
View File

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat #1 (Smetar) [VPN]" type="Remote" folderName="Smetar">
<module name="ems-engine" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="10.0.0.2" />
<option name="PORT" value="5005" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="5005" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>

63
ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookFieldService.java
View File

@@ -36,43 +36,50 @@ public class AgribookFieldService {
}
public List<EntityBase> createField(MultiDBTransactionManager connection, AgribookNewFieldRequestDTO dto, String username, RequestDataDTO requestDataDTO) throws Exception {
List<EntityBase> entityList = new ArrayList<>();
String codVdes = dto.isNewDes() ? this.suggestCodVdes(connection, dto.getCodAnag()) : dto.getCodVdes();
VtbDest vtbDest = new VtbDest();
vtbDest
.setCodAnag(dto.getCodAnag())
.setCodVdes(codVdes)
.setDestinatario(dto.getDestinatario())
.setIndirizzo(dto.getIndirizzo())
.setCap(dto.getCap())
.setCitta(dto.getCitta())
.setProv(dto.getProv())
.setNazione("IT")
.setLat(dto.getLat())
.setLng(dto.getLng())
.setCodVzon(dto.getCodVzon())
.setPartIva(dto.getPartIva())
.setRagSocLegale(dto.getRagSocLegale())
.setCodFiscLegale(dto.getCodFiscLegale())
.setPartIvaLegale(dto.getPartIvaLegale());
if (dto.isNewDes()) {
if (UtilityString.isNullOrEmpty(codVdes)) {
throw new Exception("Impossibile calcolare il codice destinatario!");
}
VtbDest vtbDest = new VtbDest();
vtbDest
.setCodAnag(dto.getCodAnag())
.setCodVdes(codVdes)
.setDestinatario(dto.getDestinatario())
.setIndirizzo(dto.getIndirizzo())
.setCap(dto.getCap())
.setCitta(dto.getCitta())
.setProv(dto.getProv())
.setNazione("IT")
.setLat(dto.getLat())
.setLng(dto.getLng())
.setCodVzon(dto.getCodVzon())
.setPartIva(dto.getPartIva())
.setRagSocLegale(dto.getRagSocLegale())
.setCodFiscLegale(dto.getCodFiscLegale())
.setPartIvaLegale(dto.getPartIvaLegale())
.setOperation(OperationType.INSERT_OR_UPDATE);
GtbAnag gtbanag = new GtbAnag();
List<VtbDest> destList = new ArrayList<>();
destList.add(vtbDest);
gtbanag.setCodAnag(dto.getCodAnag())
.setVtbDest(destList)
.setOperation(OperationType.UPDATE);
entityList.add(gtbanag);
vtbDest.setOperation(OperationType.INSERT);
} else {
vtbDest.setOperation(OperationType.UPDATE);
}
GtbAnag gtbAnag = new GtbAnag();
gtbAnag.setCodAnag(dto.getCodAnag())
.setVtbDest(new ArrayList<>())
.getVtbDest()
.add(vtbDest);
gtbAnag.setOperation(OperationType.NO_OP);
entityList.add(gtbAnag);
String codMdepDest = this.getCodMdepDest(connection, dto.getCodAnag(), codVdes);
if (UtilityString.isNullOrEmpty(codMdepDest)) {

5
ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookOrderService.java
View File

@@ -422,6 +422,7 @@ public class AgribookOrderService {
" dtb_ordr.cod_mart,\n" +
" dtb_ordr.descrizione AS varieta,\n" +
" dtb_ordr.partita_mag,\n" +
" dtb_ordr.val_unt,\n" +
" dtb_ordr.unt_ord,\n" +
" MIN(dtb_ordr.data_cons) AS data_cons_min,\n" +
" MAX(dtb_ordr.data_cons) AS data_cons_max,\n" +
@@ -446,7 +447,7 @@ public class AgribookOrderService {
" GROUP BY dtb_ordt.cod_anag, dtb_ordt.cod_vdes, dtb_ordt.cod_mdep,\n" +
" dtb_ordr.unt_ord, dtb_ordt.gestione, dtb_ordt.data_ord, dtb_ordt.num_ord,\n" +
" dtb_ordr.cod_mart,\n" +
" dtb_ordr.descrizione, dtb_ordr.partita_mag,\n" +
" dtb_ordr.descrizione, dtb_ordr.partita_mag, dtb_ordr.val_unt,\n" +
" dtb_ordt.netto_merce),\n" +
" result AS (SELECT CONCAT(gestione, '-', data_ord, '-', num_ord) AS id,\n" +
" gestione,\n" +
@@ -460,6 +461,7 @@ public class AgribookOrderService {
" opened_orders.cod_mart,\n" +
" varieta,\n" +
" opened_orders.partita_mag,\n" +
" opened_orders.val_unt,\n" +
" CONCAT(mtb_partita_mag.partita_mag, ' ', mtb_partita_mag.descrizione, ' ', mtb_partita_mag.note) AS lotto,\n" +
" unt_ord,\n" +
" data_cons_min,\n" +
@@ -797,6 +799,7 @@ public class AgribookOrderService {
for (AgribookOrderDTO order : agribookOrderDTOList) {
DtbOrdr dtbOrdr = new DtbOrdr()
.setRigaOrd(1)
.setValUnt(order.getValUnt())
.setQtaOrd(order.getQtaPrevista());
dtbOrdr.setOperation(OperationType.UPDATE);

11
ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookOrderDTO.java
View File

@@ -46,6 +46,8 @@ public class AgribookOrderDTO extends ComposedEntityBase {
private String varieta;
@SqlField("partita_mag")
private String partitaMag;
@SqlField("val_unt")
private BigDecimal valUnt;
@SqlField("lotto")
private String lotto;
@SqlField("unt_ord")
@@ -214,6 +216,15 @@ public class AgribookOrderDTO extends ComposedEntityBase {
return this;
}
public BigDecimal getValUnt() {
return valUnt;
}
public AgribookOrderDTO setValUnt(BigDecimal valUnt) {
this.valUnt = valUnt;
return this;
}
public String getLotto() {
return lotto;
}