Download as
Browse Code »

Commit 194617f3815d1024a785011045f32112621ac1be

Authored by erick.sato
1 parent b810adb2
Exists in master

Redmine #5043 Excluir um atendimento

Showing 9 changed files with 71 additions and 8 deletions   Show diff stats
cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/AtendimentoRequisicaoConsumoFIFODao.java 0 → 100644
  Diff comments   View file @194617f
... ... @@ -0,0 +1,5 @@
  1 +package br.com.centralit.api.dao;
  2 +
  3 +import br.com.centralit.framework.dao.arquitetura.CitGenericDAO;
  4 +
  5 +public interface AtendimentoRequisicaoConsumoFIFODao extends CitGenericDAO {}
... ...
cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/impl/AtendimentoRequisicaoConsumoFIFODaoHibernate.java 0 → 100644
  Diff comments   View file @194617f
... ... @@ -0,0 +1,14 @@
  1 +package br.com.centralit.api.dao.impl;
  2 +
  3 +import org.springframework.stereotype.Repository;
  4 +
  5 +import br.com.centralit.api.dao.AtendimentoRequisicaoConsumoFIFODao;
  6 +import br.com.centralit.api.model.AtendimentoRequisicaoConsumoItemFIFO;
  7 +import br.com.centralit.framework.dao.arquitetura.CitGenericDAOImpl;
  8 +
  9 +@Repository("atendimentoRequisicaoConsumoFIFODao")
  10 +public class AtendimentoRequisicaoConsumoFIFODaoHibernate extends CitGenericDAOImpl implements AtendimentoRequisicaoConsumoFIFODao {
  11 + public AtendimentoRequisicaoConsumoFIFODaoHibernate() {
  12 + super(AtendimentoRequisicaoConsumoItemFIFO.class);
  13 + }
  14 +}
... ...
cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/AtendimentoRequisicaoConsumoItem.java
  Diff comments   View file @194617f
... ... @@ -80,19 +80,24 @@ public class AtendimentoRequisicaoConsumoItem extends PersistentObjectAuditOrgan
80 80 private AtendimentoRequisicaoConsumo atendimentoRequisicaoConsumo;
81 81  
82 82 @ManyToOne(fetch = FetchType.LAZY, optional = false)
83   - @JsonView({ ViewsAlmoxarifado.AtendimentoRequisicaoConsumoItem.class, ViewsAlmoxarifado.AtendimentoRequisicaoConsumoEditView.class, Views.MaterialConsultaInfo.class, ViewsAdmMateriais.RequisicaoConsumoEditView.class })
  83 + @JsonView({ ViewsAlmoxarifado.AtendimentoRequisicaoConsumoItem.class,
  84 + ViewsAlmoxarifado.AtendimentoRequisicaoConsumoEditView.class, Views.MaterialConsultaInfo.class,
  85 + ViewsAdmMateriais.RequisicaoConsumoEditView.class })
84 86 private RequisicaoConsumoItem requisicaoConsumoItem;
85 87  
86 88 /** Atributo material. */
87 89 @ManyToOne(fetch = FetchType.LAZY, optional = false)
88   - @JsonView({ ViewsAlmoxarifado.AtendimentoRequisicaoConsumoItem.class, ViewsAlmoxarifado.AtendimentoRequisicaoConsumoEditView.class, ViewsAdmMateriais.RequisicaoConsumoEditView.class })
  90 + @JsonView({ ViewsAlmoxarifado.AtendimentoRequisicaoConsumoItem.class,
  91 + ViewsAlmoxarifado.AtendimentoRequisicaoConsumoEditView.class,
  92 + ViewsAdmMateriais.RequisicaoConsumoEditView.class })
89 93 private MaterialConsumo material;
90 94  
91 95 @OneToMany(fetch = FetchType.LAZY, mappedBy = "atendimentoRequisicaoConsumoItem", cascade = CascadeType.ALL, orphanRemoval = true)
92   - @JsonView({ ViewsAlmoxarifado.AtendimentoRequisicaoConsumoEditView.class, ViewsAdmMateriais.RequisicaoConsumoEditView.class })
  96 + @JsonView({ ViewsAlmoxarifado.AtendimentoRequisicaoConsumoEditView.class,
  97 + ViewsAdmMateriais.RequisicaoConsumoEditView.class })
93 98 private Collection<AtendimentoRequisicaoConsumoItemEndereco> atendimentoRequisicaoConsumoItemEnderecos;
94 99  
95   - @OneToMany(fetch = FetchType.LAZY, mappedBy = "atendimentoRequisicaoConsumoItem", cascade = CascadeType.ALL, orphanRemoval = true)
  100 + @OneToMany(fetch = FetchType.LAZY, mappedBy = "atendimentoRequisicaoConsumoItem", cascade = CascadeType.ALL)
96 101 @JsonView({ ViewsAlmoxarifado.AtendimentoRequisicaoConsumoEditView.class })
97 102 private Collection<AtendimentoRequisicaoConsumoItemFIFO> atendimentoRequisicaoConsumoItemFIFOs;
98 103  
... ... @@ -204,8 +209,7 @@ public class AtendimentoRequisicaoConsumoItem extends PersistentObjectAuditOrgan
204 209  
205 210 public void setAtendimentoRequisicaoConsumoItemFIFOs(
206 211 Collection<AtendimentoRequisicaoConsumoItemFIFO> atendimentoRequisicaoConsumoItemFIFOs) {
207   - this.atendimentoRequisicaoConsumoItemFIFOs.clear();
208   - this.atendimentoRequisicaoConsumoItemFIFOs.addAll(atendimentoRequisicaoConsumoItemFIFOs);
  212 + this.atendimentoRequisicaoConsumoItemFIFOs = atendimentoRequisicaoConsumoItemFIFOs;
209 213 }
210 214  
211 215 }
... ...
cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/AtendimentoRequisicaoConsumoFIFOService.java 0 → 100644
  Diff comments   View file @194617f
... ... @@ -0,0 +1,7 @@
  1 +package br.com.centralit.api.service;
  2 +
  3 +import br.com.centralit.api.model.AtendimentoRequisicaoConsumoItemFIFO;
  4 +import br.com.centralit.framework.service.arquitetura.GenericService;
  5 +
  6 +public interface AtendimentoRequisicaoConsumoFIFOService extends GenericService<AtendimentoRequisicaoConsumoItemFIFO, Long> {
  7 +}
... ...
cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/AtendimentoRequisicaoConsumoFIFOServiceImpl.java 0 → 100644
  Diff comments   View file @194617f
... ... @@ -0,0 +1,22 @@
  1 +package br.com.centralit.api.service.impl;
  2 +
  3 +import org.springframework.beans.factory.annotation.Autowired;
  4 +import org.springframework.stereotype.Service;
  5 +
  6 +import br.com.centralit.api.dao.AtendimentoRequisicaoConsumoFIFODao;
  7 +import br.com.centralit.api.model.AtendimentoRequisicaoConsumoItemFIFO;
  8 +import br.com.centralit.api.service.AtendimentoRequisicaoConsumoFIFOService;
  9 +import br.com.centralit.framework.service.arquitetura.GenericServiceImpl;
  10 +
  11 +@Service("atendimentoRequisicaoConsumoFIFOService")
  12 +public class AtendimentoRequisicaoConsumoFIFOServiceImpl extends GenericServiceImpl<AtendimentoRequisicaoConsumoItemFIFO, Long> implements AtendimentoRequisicaoConsumoFIFOService {
  13 +
  14 + private AtendimentoRequisicaoConsumoFIFODao atendimentoRequisicaoConsumoFIFODao;
  15 +
  16 + @Autowired
  17 + public AtendimentoRequisicaoConsumoFIFOServiceImpl(AtendimentoRequisicaoConsumoFIFODao atendimentoRequisicaoConsumoFIFODao) {
  18 + this.dao = atendimentoRequisicaoConsumoFIFODao;
  19 + this.atendimentoRequisicaoConsumoFIFODao = atendimentoRequisicaoConsumoFIFODao;
  20 + }
  21 +
  22 +}
... ...
cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/AtendimentoRequisicaoConsumoServiceImpl.java
  Diff comments   View file @194617f
... ... @@ -25,6 +25,7 @@ import br.com.centralit.api.model.MaterialEstoqueFIFOItem;
25 25 import br.com.centralit.api.model.MaterialLocalEstoque;
26 26 import br.com.centralit.api.model.MovimentoEstoque;
27 27 import br.com.centralit.api.model.RequisicaoConsumoItem;
  28 +import br.com.centralit.api.service.AtendimentoRequisicaoConsumoFIFOService;
28 29 import br.com.centralit.api.service.AtendimentoRequisicaoConsumoItemService;
29 30 import br.com.centralit.api.service.AtendimentoRequisicaoConsumoService;
30 31 import br.com.centralit.api.service.ConfiguracaoParametroSistemaService;
... ... @@ -122,6 +123,9 @@ public class AtendimentoRequisicaoConsumoServiceImpl extends GenericServiceImpl&lt;
122 123  
123 124 @Autowired
124 125 private MaterialEstoqueFIFOItemService materialEstoqueFIFOItemService;
  126 +
  127 + @Autowired
  128 + private AtendimentoRequisicaoConsumoFIFOService atendimentoRequisicaoConsumoFIFOService;
125 129  
126 130 private Dominio idioma;
127 131  
... ... @@ -298,6 +302,8 @@ public class AtendimentoRequisicaoConsumoServiceImpl extends GenericServiceImpl&lt;
298 302 this.movimentoEstoqueService.remove(movimentoEstoque);
299 303 }
300 304  
  305 + atendimentoRequisicaoConsumoFIFOService.removeList(new ArrayList(item.getAtendimentoRequisicaoConsumoItemFIFOs()));
  306 +
301 307 }
302 308 }
303 309  
... ...
cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/MovimentoEstoqueServiceImpl.java
  Diff comments   View file @194617f
... ... @@ -36,6 +36,7 @@ import br.com.centralit.api.model.MaterialEstoque;
36 36 import br.com.centralit.api.model.MaterialEstoqueFIFOItem;
37 37 import br.com.centralit.api.model.MaterialLocalEstoque;
38 38 import br.com.centralit.api.model.MovimentoEstoque;
  39 +import br.com.centralit.api.service.AtendimentoRequisicaoConsumoFIFOService;
39 40 import br.com.centralit.api.service.AtendimentoRequisicaoConsumoItemService;
40 41 import br.com.centralit.api.service.BaixaAlmoxarifadoItemService;
41 42 import br.com.centralit.api.service.ConfiguracaoParametroSistemaService;
... ... @@ -144,6 +145,9 @@ public class MovimentoEstoqueServiceImpl extends GenericServiceImpl&lt;MovimentoEst
144 145 @Autowired
145 146 private MaterialEstoqueFIFOItemService materialEstoqueFIFOItemService;
146 147  
  148 + @Autowired
  149 + private AtendimentoRequisicaoConsumoFIFOService atendimentoRequisicaoConsumoFIFOService;
  150 +
147 151  
148 152 /**
149 153 * Responsável pela criação de novas instâncias desta classe.
... ... @@ -494,6 +498,7 @@ public class MovimentoEstoqueServiceImpl extends GenericServiceImpl&lt;MovimentoEst
494 498 }
495 499 }
496 500  
  501 + itemFIFOs = this.atendimentoRequisicaoConsumoFIFOService.saveList(itemFIFOs);
497 502 atendimentoRequisicaoConsumoItem.setAtendimentoRequisicaoConsumoItemFIFOs(itemFIFOs);
498 503  
499 504 return retorno;
... ...
cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/RequisicaoConsumoController.js
  Diff comments   View file @194617f
... ... @@ -5,7 +5,7 @@ citApp.controller(&#39;RequisicaoConsumoController&#39;, [&#39;$scope&#39;, &#39;$filter&#39;, &#39;Requisic
5 5  
6 6 // CONSTANTES DOMINIO
7 7 var TIPO_STATUS_REQUISICAO = 'tipoStatusRequisicao';
8   - var NAO_CONCLUIDA = 1;
  8 + var NAO_CONCLUIDA = 3;
9 9 var PRONTA_PARA_ATENDIMENTO = 2;
10 10  
11 11 $scope.requisicaoConsumo = {};
... ...
cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/RequisicaoConsumoListController.js
  Diff comments   View file @194617f
... ... @@ -58,7 +58,7 @@ citApp.controller(&#39;RequisicaoConsumoListController&#39;, [&#39;$scope&#39;, &#39;RequisicaoConsu
58 58  
59 59 } else {
60 60  
61   - if(requisicaoConsumo !== null && requisicaoConsumo['tipoStatusRequisicao.codigo'] !== 1 && requisicaoConsumo !== null && requisicaoConsumo['tipoStatusRequisicao.codigo'] !== 2){
  61 + if(requisicaoConsumo !== null && requisicaoConsumo['tipoStatusRequisicao.codigo'] !== 3 && requisicaoConsumo !== null && requisicaoConsumo['tipoStatusRequisicao.codigo'] !== 2){
62 62  
63 63 $scope.showAlert('warning', $translate.instant('ALMOXARIFADO.MSG.REQUISICAO_DIFERENTE_NAO_CONCLUIDA_PRONTA_ATENDIMENTO'));
64 64 return;
... ...