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:
Mina Ruggiero
2025-12-04 13:02:34 +01:00
parent 89c69bc0d2 240f18d19d
commit 149bdc36b3
5 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ems-core/src/main/java/it/integry/ems/service/dto/production/OrdineLavorazioneDTO.java
View File

@@ -191,6 +191,12 @@ public class OrdineLavorazioneDTO {
@JsonProperty("qtaProd")
@JsonSerialize
private BigDecimal qtaProd;
@SqlField(value = "qta_ord")
@JsonProperty("qtaOrd")
@JsonSerialize
private BigDecimal qtaOrd;
@SqlField(value = "qta_lav")
@JsonProperty("qtaLav")
@JsonSerialize
@@ -726,6 +732,15 @@ public class OrdineLavorazioneDTO {
return this;
}
public BigDecimal getQtaOrd() {
return qtaOrd;
}
public OrdineLavorazioneDTO setQtaOrd(BigDecimal qtaOrd) {
this.qtaOrd = qtaOrd;
return this;
}
public BigDecimal getQtaLav() {
return qtaLav;
}

3
ems-core/src/main/java/it/integry/ems/service/production/ProductionOrderDataHandlerService.java
View File

@@ -223,7 +223,8 @@ public class ProductionOrderDataHandlerService {
" jtb_comt.cod_jcom,\n" +
" jtb_comt.descrizione as descrizione_commessa,\n" +
" jl.id_lotto,\n" +
" dtb_ordt.qta_prod as qta_ord \n" +
" mtb_aart.qta_cnf,\n" +
" ordl.qta_prod AS qta_ord\n" +
"FROM dtb_ordt\n" +
" INNER JOIN dtb_ordt ordl ON dtb_ordt.gestione = ordl.gestione_rif\n" +
" AND dtb_ordt.data_ord = ordl.data_ord_rif\n" +

12
ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/controller/WMSAccettazioneController.java
View File

@@ -85,8 +85,8 @@ public class WMSAccettazioneController {
@RequestMapping(value = EmsRestConstants.PATH_ACCETTAZIONE_MERCE_SILOS, method = RequestMethod.POST)
public @ResponseBody ServiceRestResponse accettazioneMerceSilos(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestBody MtbColt colloCarico
) throws Exception {
@RequestBody MtbColt colloCarico) throws Exception {
return ServiceRestResponse.createPositiveResponse(wmsAccettazioneService.accettazioneMerceSilos(colloCarico));
}
@@ -98,4 +98,12 @@ public class WMSAccettazioneController {
return ServiceRestResponse.createPositiveResponse(wmsAccettazioneService.checkIfBarcodeUlAlreadyRegistered(barcodeUl));
}
@PostMapping(value = "createUDCWithRows")
public @ResponseBody
ServiceRestResponse createUDCWithRows(@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestBody CreateUDCWithRowsRequestDTO createUDCWithRows) throws Exception {
return ServiceRestResponse.createPositiveResponse(wmsAccettazioneService.createUDCWithRows(createUDCWithRows));
}
}

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

@@ -757,4 +757,19 @@ public class WMSAccettazioneService {
return UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
}
public CreateUDCResponseDTO createUDCWithRows(CreateUDCWithRowsRequestDTO dto) throws Exception {
if (!userSession.isAttivo()) {
throw new UsernameNotFoundException("Utente " + userSession.getUsername() + " non riconosciuto!");
}
MtbColt udc = this.createUDC(dto);
for (InsertUDCRowRequestDTO row : dto.getUdcRows()){
row.setTargetMtbColt(udc);
WMSUtility.insertUDCRow(row, entityProcessor, multiDBTransactionManager);
}
return new CreateUDCResponseDTO().setMtbColt(udc);
}
}

17
ems-engine/src/main/java/it/integry/ems/retail/wms/dto/CreateUDCWithRowsRequestDTO.java Normal file
View File

@@ -0,0 +1,17 @@
package it.integry.ems.retail.wms.dto;
import java.util.List;
public class CreateUDCWithRowsRequestDTO extends CreateUDCRequestDTO {
List<InsertUDCRowRequestDTO> udcRows;
public List<InsertUDCRowRequestDTO> getUdcRows() {
return udcRows;
}
public CreateUDCWithRowsRequestDTO setUdcRows(List<InsertUDCRowRequestDTO> udcRows) {
this.udcRows = udcRows;
return this;
}
}