diff --git a/ems-core/src/main/java/it/integry/ems/service/dto/production/OrdineLavorazioneDTO.java b/ems-core/src/main/java/it/integry/ems/service/dto/production/OrdineLavorazioneDTO.java index 489944b37f..177a5b488e 100644 --- a/ems-core/src/main/java/it/integry/ems/service/dto/production/OrdineLavorazioneDTO.java +++ b/ems-core/src/main/java/it/integry/ems/service/dto/production/OrdineLavorazioneDTO.java @@ -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; } diff --git a/ems-core/src/main/java/it/integry/ems/service/production/ProductionOrderDataHandlerService.java b/ems-core/src/main/java/it/integry/ems/service/production/ProductionOrderDataHandlerService.java index f4cfb7dc04..8557569794 100644 --- a/ems-core/src/main/java/it/integry/ems/service/production/ProductionOrderDataHandlerService.java +++ b/ems-core/src/main/java/it/integry/ems/service/production/ProductionOrderDataHandlerService.java @@ -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" + diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/controller/WMSAccettazioneController.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/controller/WMSAccettazioneController.java index 67e292a8f7..a80f4741b6 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/controller/WMSAccettazioneController.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/controller/WMSAccettazioneController.java @@ -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)); + } } diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java index 85a147c71e..62e22fc44f 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java @@ -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); + } } diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/dto/CreateUDCWithRowsRequestDTO.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/dto/CreateUDCWithRowsRequestDTO.java new file mode 100644 index 0000000000..de22f8c850 --- /dev/null +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/dto/CreateUDCWithRowsRequestDTO.java @@ -0,0 +1,17 @@ +package it.integry.ems.retail.wms.dto; + +import java.util.List; + +public class CreateUDCWithRowsRequestDTO extends CreateUDCRequestDTO { + + List udcRows; + + public List getUdcRows() { + return udcRows; + } + + public CreateUDCWithRowsRequestDTO setUdcRows(List udcRows) { + this.udcRows = udcRows; + return this; + } +}