Download as
Browse Code »

Commit c80f2ba4f84a45487946f714f64b20e7817088c4

Authored by geovane.filho
2 parents da9b4e3e 80c7f973
Exists in master

Merge branch 'adm-1.15.0' into tarefa-3943

Showing 5 changed files with 82 additions and 25 deletions   Show diff stats
cit-adm-materiais-api/src/main/resources/scripts-bd/Migracao_MPOG/04-Patrimonio.sql
  Diff comments   View file @c80f2ba
... ... @@ -2368,7 +2368,8 @@ BEGIN; -- #INI :: GERACAO DO HISTORICO DOS BENS PATRIMONIAIS >> HISTORICOBEMPAT
2368 2368 dominiotipohistorico_id,
2369 2369 dominiotipomotivoalteracao_id,
2370 2370 dominioclassereferencia_id,
2371   - idClasseReferencia
  2371 + idClasseReferencia,
  2372 + codigooperacao
2372 2373 )
2373 2374 SELECT
2374 2375 NEXTVAL('hibernate_sequence'),
... ... @@ -2385,7 +2386,8 @@ BEGIN; -- #INI :: GERACAO DO HISTORICO DOS BENS PATRIMONIAIS >> HISTORICOBEMPAT
2385 2386 hist_entrada,
2386 2387 mot_incorporacao,
2387 2388 classeId,
2388   - E.ID
  2389 + E.ID,
  2390 + E.CODIGO
2389 2391 FROM ENTRADA E
2390 2392 INNER JOIN ENTRADAPATRIMONIO EP ON (EP.ID = E.ID)
2391 2393 INNER JOIN ENTRADAPATRIMONIOITEM I ON (I.ENTRADA_ID = E.ID)
... ... @@ -2410,7 +2412,8 @@ BEGIN; -- #INI :: GERACAO DO HISTORICO DOS BENS PATRIMONIAIS >> HISTORICOBEMPAT
2410 2412 dominiotipohistorico_id,
2411 2413 dominiotipomotivoalteracao_id,
2412 2414 dominioclassereferencia_id,
2413   - idClasseReferencia
  2415 + idClasseReferencia,
  2416 + codigooperacao
2414 2417 )
2415 2418 SELECT
2416 2419 NEXTVAL('hibernate_sequence'),
... ... @@ -2427,7 +2430,8 @@ BEGIN; -- #INI :: GERACAO DO HISTORICO DOS BENS PATRIMONIAIS >> HISTORICOBEMPAT
2427 2430 hist_entrada,
2428 2431 mot_contabilizacao,
2429 2432 classeId,
2430   - E.ID
  2433 + E.ID,
  2434 + E.CODIGO
2431 2435 FROM ENTRADA E
2432 2436 INNER JOIN ENTRADAPATRIMONIOITEM I ON (I.ENTRADA_ID = E.ID)
2433 2437 INNER JOIN BEMPATRIMONIAL B ON (B.ENTRADAITEM_ID = I.ID)
... ... @@ -2451,7 +2455,8 @@ BEGIN; -- #INI :: GERACAO DO HISTORICO DOS BENS PATRIMONIAIS >> HISTORICOBEMPAT
2451 2455 dominiotipohistorico_id,
2452 2456 dominiotipomotivoalteracao_id,
2453 2457 dominioclassereferencia_id,
2454   - idClasseReferencia
  2458 + idClasseReferencia,
  2459 + codigooperacao
2455 2460 )
2456 2461 SELECT
2457 2462 NEXTVAL('hibernate_sequence'),
... ... @@ -2468,7 +2473,8 @@ BEGIN; -- #INI :: GERACAO DO HISTORICO DOS BENS PATRIMONIAIS >> HISTORICOBEMPAT
2468 2473 hist_baixa,
2469 2474 mot_baixa,
2470 2475 classeId,
2471   - B.ID
  2476 + B.ID,
  2477 + BP.CODIGO
2472 2478 FROM BAIXA B
2473 2479 INNER JOIN BAIXAPATRIMONIO BP ON (BP.ID = B.ID)
2474 2480 INNER JOIN BAIXAPATRIMONIOITEM I ON (I.BAIXA_ID = BP.ID)
... ... @@ -2492,7 +2498,8 @@ BEGIN; -- #INI :: GERACAO DO HISTORICO DOS BENS PATRIMONIAIS >> HISTORICOBEMPAT
2492 2498 dominiotipohistorico_id,
2493 2499 dominiotipomotivoalteracao_id,
2494 2500 dominioclassereferencia_id,
2495   - idClasseReferencia
  2501 + idClasseReferencia,
  2502 + codigooperacao
2496 2503 )
2497 2504 select
2498 2505 NEXTVAL('hibernate_sequence'),
... ... @@ -2510,7 +2517,8 @@ BEGIN; -- #INI :: GERACAO DO HISTORICO DOS BENS PATRIMONIAIS >> HISTORICOBEMPAT
2510 2517 hist_transf_interna,
2511 2518 mot_transf_interna,
2512 2519 classeId,
2513   - t.id
  2520 + t.id,
  2521 + t.codigo
2514 2522 from transferencia t
2515 2523 inner join transferenciaitem i on (i.transferencia_id = t.id)
2516 2524 inner join estruturaorganizacional ed on (ed.id = t.unidadedestino_id)
... ... @@ -2534,7 +2542,8 @@ BEGIN; -- #INI :: GERACAO DO HISTORICO DOS BENS PATRIMONIAIS >> HISTORICOBEMPAT
2534 2542 dominiotipohistorico_id,
2535 2543 dominiotipomotivoalteracao_id,
2536 2544 dominioclassereferencia_id,
2537   - idClasseReferencia
  2545 + idClasseReferencia,
  2546 + codigooperacao
2538 2547 )
2539 2548 select
2540 2549 NEXTVAL('hibernate_sequence'),
... ... @@ -2551,7 +2560,8 @@ BEGIN; -- #INI :: GERACAO DO HISTORICO DOS BENS PATRIMONIAIS >> HISTORICOBEMPAT
2551 2560 hist_atribuir_detentor,
2552 2561 mot_definicao_detentor,
2553 2562 classeId,
2554   - d.id
  2563 + d.id,
  2564 + d.codigo
2555 2565 from definicaodetentor d
2556 2566 inner join definicaodetentoritem di on (di.definicaodetentor_id = d.id)
2557 2567 inner join parceiro par on (par.id = d.colaborador_id)
... ... @@ -2574,7 +2584,8 @@ BEGIN; -- #INI :: GERACAO DO HISTORICO DOS BENS PATRIMONIAIS >> HISTORICOBEMPAT
2574 2584 dominiotipohistorico_id,
2575 2585 dominiotipomotivoalteracao_id,
2576 2586 dominioclassereferencia_id,
2577   - idClasseReferencia
  2587 + idClasseReferencia,
  2588 + codigooperacao
2578 2589 )
2579 2590 select
2580 2591 NEXTVAL('hibernate_sequence'),
... ... @@ -2591,7 +2602,8 @@ BEGIN; -- #INI :: GERACAO DO HISTORICO DOS BENS PATRIMONIAIS >> HISTORICOBEMPAT
2591 2602 hist_alteracao as tipo_historico,
2592 2603 mot_saida_temporaria as motivo_historico,
2593 2604 classeId,
2594   - s.id
  2605 + s.id,
  2606 + s.codigo
2595 2607 from saidatemporaria s
2596 2608 inner join saidatemporariaitem si on (si.saidatemporaria_id = s.id)
2597 2609 inner join bempatrimonial bem on (bem.id = si.bempatrimonial_id)
... ... @@ -2612,7 +2624,8 @@ BEGIN; -- #INI :: GERACAO DO HISTORICO DOS BENS PATRIMONIAIS >> HISTORICOBEMPAT
2612 2624 dominiotipohistorico_id,
2613 2625 dominiotipomotivoalteracao_id,
2614 2626 dominioclassereferencia_id,
2615   - idClasseReferencia
  2627 + idClasseReferencia,
  2628 + codigooperacao
2616 2629 )
2617 2630 select
2618 2631 NEXTVAL('hibernate_sequence'),
... ... @@ -2629,7 +2642,8 @@ BEGIN; -- #INI :: GERACAO DO HISTORICO DOS BENS PATRIMONIAIS >> HISTORICOBEMPAT
2629 2642 hist_alteracao as tipo_historico,
2630 2643 mot_retorno_saida as motivo_historico,
2631 2644 classeId,
2632   - s.id
  2645 + s.id,
  2646 + s.codigo
2633 2647 from saidatemporaria s
2634 2648 inner join saidatemporariaitem si on (si.saidatemporaria_id = s.id)
2635 2649 inner join bempatrimonial bem on (bem.id = si.bempatrimonial_id)
... ...
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 @c80f2ba
... ... @@ -1619,7 +1619,6 @@ END$$;
1619 1619  
1620 1620 */
1621 1621 -- ERICK FIM 10/05/2016
1622   -
1623 1622 -- GEOVANE 10/05/2016
1624 1623 ALTER TABLE alm_me_fifoitem DROP CONSTRAINT IF EXISTS uk_3pa241s7brr43ml1kgvlrb9e8;
1625 1624  
... ... @@ -1636,3 +1635,36 @@ ALTER TABLE alm_me_movimentoestoque ADD COLUMN materialestoqueinativo_id bigint,
1636 1635 ALTER TABLE alm_me_movimentoestoque_aud ADD COLUMN materialestoqueinativo_id bigint;
1637 1636  
1638 1637 -- GEOVANE FIM 10/05/2016
  1638 +
  1639 +
  1640 +-- RONAN INICIO 12/05/2016
  1641 +update historicobempatrimonial hbp set codigooperacao = e.codigo
  1642 + from entrada e
  1643 + where e.id = hbp.idclassereferencia and hbp.codigooperacao is null
  1644 + and hbp.dominioclassereferencia_id = (
  1645 + select id from dominio where chave = 'classeReferencia' and codigo = 1);
  1646 +
  1647 +update historicobempatrimonial hbp set codigooperacao = b.codigo
  1648 + from baixapatrimonio b
  1649 + where b.id = hbp.idclassereferencia and hbp.codigooperacao is null
  1650 + and hbp.dominioclassereferencia_id = (
  1651 + select id from dominio where chave = 'classeReferencia' and codigo = 2);
  1652 +
  1653 +update historicobempatrimonial hbp set codigooperacao = t.codigo
  1654 + from transferencia t
  1655 + where t.id = hbp.idclassereferencia and hbp.codigooperacao is null
  1656 + and hbp.dominioclassereferencia_id in (
  1657 + select id from dominio where chave = 'classeReferencia' and (codigo = 3 or codigo = 4));
  1658 +
  1659 +update historicobempatrimonial hbp set codigooperacao = s.codigo
  1660 + from saidatemporaria s
  1661 + where s.id = hbp.idclassereferencia and hbp.codigooperacao is null
  1662 + and hbp.dominioclassereferencia_id = (
  1663 + select id from dominio where chave = 'classeReferencia' and codigo = 9);
  1664 +
  1665 +update historicobempatrimonial hbp set codigooperacao = d.codigo
  1666 + from definicaodetentor d
  1667 + where d.id = hbp.idclassereferencia and hbp.codigooperacao is null
  1668 + and hbp.dominioclassereferencia_id = (
  1669 + select id from dominio where chave = 'classeReferencia' and codigo = 10);
  1670 +-- RONAN FIM 12/05/2016
1639 1671 \ No newline at end of file
... ...
cit-adm-materiais-web/src/main/resources/reports/templatePaisagem.jrxml
  Diff comments   View file @c80f2ba
1 1 <?xml version="1.0" encoding="UTF-8"?>
  2 +<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
  3 +<!-- 2016-05-12T10:58:45 -->
2 4 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="templatePaisagem" language="groovy" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f">
3 5 <property name="ireport.zoom" value="1.5"/>
4 6 <property name="ireport.x" value="61"/>
... ... @@ -26,12 +28,15 @@ from anexoimagem aImagem right join configuracao conf on aImagem.configuracao_id
26 28 <field name="logo" class="java.lang.Object"/>
27 29 <title>
28 30 <band height="130" splitType="Stretch">
29   - <image>
30   - <reportElement positionType="Float" x="23" y="20" width="85" height="60" uuid="21d967cf-a639-41a7-a0af-62fc1f113936"/>
  31 + <image hAlign="Center">
  32 + <reportElement positionType="Float" x="23" y="20" width="140" height="75" uuid="21d967cf-a639-41a7-a0af-62fc1f113936">
  33 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  34 + <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
  35 + </reportElement>
31 36 <imageExpression><![CDATA[new ByteArrayInputStream((byte[])$F{logo})]]></imageExpression>
32 37 </image>
33 38 <textField isBlankWhenNull="true">
34   - <reportElement x="108" y="20" width="677" height="20" uuid="4e1c4a55-25b5-42c3-a656-feaaab3ee44c"/>
  39 + <reportElement x="163" y="20" width="617" height="20" uuid="4e1c4a55-25b5-42c3-a656-feaaab3ee44c"/>
35 40 <box leftPadding="5"/>
36 41 <textElement verticalAlignment="Middle">
37 42 <font size="12" isBold="true"/>
... ... @@ -39,7 +44,7 @@ from anexoimagem aImagem right join configuracao conf on aImagem.configuracao_id
39 44 <textFieldExpression><![CDATA[$F{titulo1}]]></textFieldExpression>
40 45 </textField>
41 46 <textField isBlankWhenNull="true">
42   - <reportElement x="108" y="40" width="677" height="20" uuid="7ce4c085-aea3-4ae6-83ae-0134ef022bd7"/>
  47 + <reportElement x="163" y="40" width="617" height="20" uuid="7ce4c085-aea3-4ae6-83ae-0134ef022bd7"/>
43 48 <box leftPadding="5"/>
44 49 <textElement verticalAlignment="Middle">
45 50 <font size="12" isBold="true"/>
... ... @@ -47,7 +52,7 @@ from anexoimagem aImagem right join configuracao conf on aImagem.configuracao_id
47 52 <textFieldExpression><![CDATA[$F{titulo2}]]></textFieldExpression>
48 53 </textField>
49 54 <textField isBlankWhenNull="true">
50   - <reportElement x="108" y="60" width="677" height="20" uuid="edd46a21-e588-4e52-8438-c70f2ede5324"/>
  55 + <reportElement x="163" y="60" width="617" height="20" uuid="edd46a21-e588-4e52-8438-c70f2ede5324"/>
51 56 <box leftPadding="5"/>
52 57 <textElement verticalAlignment="Middle">
53 58 <font size="12" isBold="true"/>
... ...
cit-adm-materiais-web/src/main/resources/reports/templateRetrato.jrxml
  Diff comments   View file @c80f2ba
1 1 <?xml version="1.0" encoding="UTF-8"?>
  2 +<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
  3 +<!-- 2016-05-12T10:58:26 -->
2 4 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="templateRetrato" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f">
3 5 <property name="ireport.zoom" value="2.0"/>
4 6 <property name="ireport.x" value="25"/>
... ... @@ -27,7 +29,7 @@ from anexoimagem aImagem right join configuracao conf on aImagem.configuracao_id
27 29 <title>
28 30 <band height="134" splitType="Stretch">
29 31 <textField isBlankWhenNull="true">
30   - <reportElement x="102" y="37" width="453" height="20" uuid="8b7353fa-6d6b-4b7d-bd04-2564491beff4"/>
  32 + <reportElement x="157" y="37" width="398" height="20" uuid="8b7353fa-6d6b-4b7d-bd04-2564491beff4"/>
31 33 <box leftPadding="5"/>
32 34 <textElement verticalAlignment="Middle">
33 35 <font size="12" isBold="true"/>
... ... @@ -35,19 +37,22 @@ from anexoimagem aImagem right join configuracao conf on aImagem.configuracao_id
35 37 <textFieldExpression><![CDATA[$F{titulo2}]]></textFieldExpression>
36 38 </textField>
37 39 <textField isBlankWhenNull="true">
38   - <reportElement x="102" y="17" width="453" height="20" uuid="0c63ef23-5e35-4c22-81ed-dbd9a2fac964"/>
  40 + <reportElement x="157" y="17" width="398" height="20" uuid="0c63ef23-5e35-4c22-81ed-dbd9a2fac964"/>
39 41 <box leftPadding="5"/>
40 42 <textElement verticalAlignment="Middle">
41 43 <font size="12" isBold="true"/>
42 44 </textElement>
43 45 <textFieldExpression><![CDATA[$F{titulo1}]]></textFieldExpression>
44 46 </textField>
45   - <image isUsingCache="true" onErrorType="Icon">
46   - <reportElement positionType="Float" x="17" y="17" width="85" height="60" uuid="d161cd66-d9ef-43e9-b70a-3fb2c8b4eba4"/>
  47 + <image hAlign="Center" isUsingCache="true" onErrorType="Icon">
  48 + <reportElement positionType="Float" x="17" y="17" width="140" height="75" uuid="d161cd66-d9ef-43e9-b70a-3fb2c8b4eba4">
  49 + <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
  50 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  51 + </reportElement>
47 52 <imageExpression><![CDATA[new ByteArrayInputStream((byte[])$F{logo})]]></imageExpression>
48 53 </image>
49 54 <textField isBlankWhenNull="true">
50   - <reportElement x="102" y="57" width="453" height="20" uuid="7fc824c8-633f-40d4-8310-4d81780f2834"/>
  55 + <reportElement x="157" y="57" width="398" height="20" uuid="7fc824c8-633f-40d4-8310-4d81780f2834"/>
51 56 <box leftPadding="5"/>
52 57 <textElement verticalAlignment="Middle">
53 58 <font size="12" isBold="true"/>
... ...
cit-adm-materiais-web/src/main/webapp/assets/js/angular/custom/controller/MaterialController.js
  Diff comments   View file @c80f2ba
... ... @@ -721,6 +721,7 @@ citApp.controller(&#39;MaterialController&#39;, [&#39;$scope&#39;, &#39;MaterialRepository&#39;, &#39;Classi
721 721 $scope.editEnderecoEstoque = true;
722 722 $scope.materialLocalEstoque = $scope.matEndEstoqueCheck;
723 723 $scope.$openModal('modal-material-endereco-estoque.html', 'lg');
  724 + $scope.alternaTipoNumericoUnidadeMedida();
724 725 }
725 726 };
726 727  
... ...