Download as
Browse Code »

Commit 1f45e13488b7c9e5d9f77e88ee446ec2ee48e943

Authored by erick.sato
1 parent 48bdee43
Exists in master

[Redmine Atendimento #4827]Tela transferência endereço estoque

Showing 6 changed files with 91 additions and 9 deletions   Show diff stats
cit-adm-materiais-api/src/main/java/br/com/centralit/api/framework/json/ViewsAdmMateriais.java
  Diff comments   View file @1f45e13
... ... @@ -95,5 +95,7 @@ public class ViewsAdmMateriais extends Views {
95 95 public static class EnderecoEstoqueView extends GenericView{};
96 96  
97 97 public static class AutoCompleteEnderecoEstoqueView extends GenericView{};
  98 +
  99 + public static class TransferenciaEnderecoEstoqueView extends GenericView{};
98 100  
99 101 }
... ...
cit-adm-materiais-api/src/main/java/br/com/centralit/api/model/Material.java
  Diff comments   View file @1f45e13
... ... @@ -86,7 +86,7 @@ public class Material extends PersistentObjectAuditOrganizacao {
86 86 ViewsAdmMateriais.DevolucaoEditView.class, ViewsAdmMateriais.ConfiguracaoRessuprimentoListView.class, ViewsAdmMateriais.ConfiguracaoRessuprimentoEditView.class,
87 87 ViewsAdmMateriais.RequisicaoConsumoEditView.class, ViewsAdmMateriais.TransferenciaContaContabilEditView.class, ViewsAdmMateriais.CatalogoMaterialItemEditView.class, Views.InventarioMobileCompleto.class, Views.InventarioMobile.class,
88 88 Views.DefinicaoDetentorEditView.class, Views.InventarioMobileJEDI.class, Views.BemPatrimonialListView.class, Views.SelecaoBemPatrimonialEditView.class, Views.EntradaItemEditView.class, ViewsAdmMateriais.MaterialConsultaInfo.class,
89   - ViewsAdmMateriais.RequisicaoConsumo.class})
  89 + ViewsAdmMateriais.RequisicaoConsumo.class, ViewsAdmMateriais.TransferenciaEnderecoEstoqueView.class})
90 90 private String descricao;
91 91  
92 92 /** Atributo dominioTipoMaterial. */
... ...
cit-adm-materiais-api/src/main/java/br/com/centralit/api/model/UnidadeMedida.java
  Diff comments   View file @1f45e13
... ... @@ -70,7 +70,7 @@ public class UnidadeMedida extends PersistentObject {
70 70  
71 71 @Column(length = 30)
72 72 @JsonView({ ViewsAdmMateriais.UnidadeMedidaListView.class, ViewsAdmMateriais.MaterialConsumoAutoCompleteView.class,
73   - ViewsAdmMateriais.EntradaAlmoxarifadoEditView.class, Views.MaterialEditView.class, Views.MaterialConsultaInfo.class, ViewsAdmMateriais.RequisicaoConsumo.class })
  73 + ViewsAdmMateriais.EntradaAlmoxarifadoEditView.class, Views.MaterialEditView.class, Views.MaterialConsultaInfo.class, ViewsAdmMateriais.RequisicaoConsumo.class, ViewsAdmMateriais.TransferenciaEnderecoEstoqueView.class })
74 74 private String codigo;
75 75  
76 76 @JsonView({ ViewsAdmMateriais.UnidadeMedidaListView.class, ViewsAdmMateriais.MaterialConsumoAutoCompleteView.class,
... ...
cit-adm-materiais-api/src/main/resources/scripts-bd/postgres/v1.15.0/01-cit-adm-materiais-v1.15.0-postgres.sql
  Diff comments   View file @1f45e13
... ... @@ -1487,4 +1487,84 @@ ALTER TABLE alm_me_localestoque DROP CONSTRAINT uk_qnx0r3sv9yxte5bholpq15k4p;
1487 1487  
1488 1488 -- JOYFAS INICIO 06/05/16
1489 1489 alter table MatConsumoTipoUnidadeEntrada add isPadrao boolean
1490   --- JOYFAS FIM 06/05/16
1491 1490 \ No newline at end of file
  1491 +-- JOYFAS FIM 06/05/16
  1492 +
  1493 +-- Erick INICIO 09/05/2016
  1494 +
  1495 +INSERT INTO menufile (id, datacriacao, dataedicao, version, ativo, caminho, dominiomenufile_id, menu_id)
  1496 +VALUES (NEXTVAL('hibernate_sequence'), LOCALTIMESTAMP, LOCALTIMESTAMP, 0, true, '/cit-almoxarifado-web/assets/js/angular/custom/repository/TransferenciaEnderecoEstoqueRepository.js',
  1497 + (SELECT id FROM dominio WHERE chave = 'tipoFile' AND codigo = 2), (SELECT id FROM menu WHERE chave = 'USUARIO'));
  1498 +
  1499 +INSERT INTO menufile (id, datacriacao, dataedicao, version, ativo, caminho, dominiomenufile_id, menu_id)
  1500 +VALUES (NEXTVAL('hibernate_sequence'), LOCALTIMESTAMP, LOCALTIMESTAMP, 0, true, '/cit-almoxarifado-web/assets/js/angular/custom/repository/TransferenciaEnderecoEstoqueRepository.min.js',
  1501 + (SELECT id FROM dominio WHERE chave = 'tipoFile' AND codigo = 2), (SELECT id FROM menu WHERE chave = 'USUARIO'));
  1502 +
  1503 +ALTER TABLE alm_me_localestoque ADD COLUMN capacidade NUMERIC(19,2);
  1504 +
  1505 +CREATE TABLE alm_ee_transferencia
  1506 +(
  1507 + id bigint NOT NULL,
  1508 + databloqueio date,
  1509 + datainativo date,
  1510 + datacriacao timestamp without time zone NOT NULL,
  1511 + dataedicao timestamp without time zone NOT NULL,
  1512 + version bigint,
  1513 + datatransferencia timestamp without time zone NOT NULL,
  1514 + quantidade numeric(19,2),
  1515 + inativador_id bigint,
  1516 + autor_id bigint,
  1517 + editor_id bigint,
  1518 + organizacao_id bigint,
  1519 + almoxarifado_id bigint NOT NULL,
  1520 + enderecoestoquedestino_id bigint NOT NULL,
  1521 + enderecoestoqueorigem_id bigint NOT NULL,
  1522 + material_id bigint NOT NULL,
  1523 + CONSTRAINT alm_ee_transferencia_pkey PRIMARY KEY (id),
  1524 + CONSTRAINT fk_21a1us9qpemu3lgu5jbqdisgu FOREIGN KEY (organizacao_id)
  1525 + REFERENCES organizacao (id) MATCH SIMPLE
  1526 + ON UPDATE NO ACTION ON DELETE NO ACTION,
  1527 + CONSTRAINT fk_2b2rfe5o4p8j8sic2kmxay32m FOREIGN KEY (editor_id)
  1528 + REFERENCES seguranca_usuario (id) MATCH SIMPLE
  1529 + ON UPDATE NO ACTION ON DELETE NO ACTION,
  1530 + CONSTRAINT fk_9a6wpagfkhydwsdbsxq8gqd3q FOREIGN KEY (inativador_id)
  1531 + REFERENCES seguranca_usuario (id) MATCH SIMPLE
  1532 + ON UPDATE NO ACTION ON DELETE NO ACTION,
  1533 + CONSTRAINT fk_d6dff7rdhktoxacwlveu0w6to FOREIGN KEY (enderecoestoquedestino_id)
  1534 + REFERENCES alm_me_localestoque (id) MATCH SIMPLE
  1535 + ON UPDATE NO ACTION ON DELETE NO ACTION,
  1536 + CONSTRAINT fk_fdpifqxokpxfbeqjsh21as37d FOREIGN KEY (almoxarifado_id)
  1537 + REFERENCES estruturaorganizacional (id) MATCH SIMPLE
  1538 + ON UPDATE NO ACTION ON DELETE NO ACTION,
  1539 + CONSTRAINT fk_fl7mat880ri95y9qg6q0rdc7y FOREIGN KEY (autor_id)
  1540 + REFERENCES seguranca_usuario (id) MATCH SIMPLE
  1541 + ON UPDATE NO ACTION ON DELETE NO ACTION,
  1542 + CONSTRAINT fk_kfotr1rwotdhx4xjj38yj8l72 FOREIGN KEY (enderecoestoqueorigem_id)
  1543 + REFERENCES alm_me_localestoque (id) MATCH SIMPLE
  1544 + ON UPDATE NO ACTION ON DELETE NO ACTION,
  1545 + CONSTRAINT fk_tou1v0a8mfd68auhh7imc6vw6 FOREIGN KEY (material_id)
  1546 + REFERENCES alm_materialconsumo (id) MATCH SIMPLE
  1547 + ON UPDATE NO ACTION ON DELETE NO ACTION,
  1548 + CONSTRAINT uk_tou1v0a8mfd68auhh7imc6vw6 UNIQUE (material_id)
  1549 +);
  1550 +
  1551 +CREATE TABLE alm_ee_transferencia_aud
  1552 +(
  1553 + id bigint NOT NULL,
  1554 + rev integer NOT NULL,
  1555 + revtype smallint,
  1556 + databloqueio date,
  1557 + datainativo date,
  1558 + datacriacao timestamp without time zone,
  1559 + dataedicao timestamp without time zone,
  1560 + datatransferencia timestamp without time zone,
  1561 + quantidade numeric(19,2),
  1562 + autor_id bigint,
  1563 + editor_id bigint,
  1564 + almoxarifado_id bigint,
  1565 + enderecoestoquedestino_id bigint,
  1566 + enderecoestoqueorigem_id bigint,
  1567 + material_id bigint,
  1568 + CONSTRAINT alm_ee_transferencia_aud_pkey PRIMARY KEY (id, rev)
  1569 +);
  1570 +
  1571 +-- ERICK FIM 09/05/2016
1492 1572 \ No newline at end of file
... ...
cit-adm-materiais-web/src/main/webapp/assets/js/angular/custom/controller/MaterialController.js
  Diff comments   View file @1f45e13
... ... @@ -838,10 +838,10 @@ citApp.controller('MaterialController', ['$scope', 'MaterialRepository', 'Classi
838 838 };
839 839  
840 840 $scope.aplicarValidacaoDecimal = function(){
841   - if($scope.materialLocalEstoque.quantidade){
842   - $scope.materialLocalEstoque.quantidade= parseFloat($scope.materialLocalEstoque.quantidade).toFixed(2);
  841 + if($scope.materialLocalEstoque.capacidade){
  842 + $scope.materialLocalEstoque.capacidade= parseFloat($scope.materialLocalEstoque.capacidade).toFixed(2);
843 843 }else{
844   - $scope.materialLocalEstoque.quantidade= '';
  844 + $scope.materialLocalEstoque.capacidade= '';
845 845 }
846 846 };
847 847  
... ...
cit-adm-materiais-web/src/main/webapp/html/material/materialEnderecoEstoque.html
  Diff comments   View file @1f45e13
... ... @@ -82,7 +82,7 @@
82 82 {{matEndEstoque.endereco.estoque.almoxarifado.codigoENome}}
83 83 </td>
84 84 <td>
85   - {{matEndEstoque.quantidade}}
  85 + {{matEndEstoque.capacidade}}
86 86 </td>
87 87 <td>
88 88 {{matEndEstoque.localPrincipal | booleanSimNao}}
... ... @@ -128,10 +128,10 @@
128 128 </div>
129 129  
130 130 <div class="col-md-5" ng-show="showInteiro">
131   - <label-input-number ng-id="materialLocalEstoque.quantidade" ng-model="materialLocalEstoque.quantidade" ng-custom-maxlength="4" ng-type="text" ng-label="LABEL.CAPACIDADE" ng-obrigatorio="showInteiro" form="formDialogMaterialEnderecoEstoque"/>
  131 + <label-input-number ng-id="materialLocalEstoque.capacidade" ng-model="materialLocalEstoque.capacidade" ng-custom-maxlength="4" ng-type="text" ng-label="LABEL.CAPACIDADE" ng-obrigatorio="showInteiro" form="formDialogMaterialEnderecoEstoque"/>
132 132 </div>
133 133 <div class="col-md-5" ng-show="showDecimal">
134   - <label-input-decimal ng-precisao="decimal" ng-custom-maxlength="11" ng-evento-blur="aplicarValidacaoDecimal" ng-id="materialLocalEstoque.quantidade" ng-model="materialLocalEstoque.quantidade" ng-label="LABEL.CAPACIDADE" ng-obrigatorio="showDecimal" form="formDialogMaterialEnderecoEstoque"/>
  134 + <label-input-decimal ng-precisao="decimal" ng-custom-maxlength="11" ng-evento-blur="aplicarValidacaoDecimal" ng-id="materialLocalEstoque.capacidade" ng-model="materialLocalEstoque.capacidade" ng-label="LABEL.CAPACIDADE" ng-obrigatorio="showDecimal" form="formDialogMaterialEnderecoEstoque"/>
135 135 </div>
136 136 </div>
137 137 <div class="row">
... ...