Skip to content

Commit

Permalink
Versao 1.03_3
Browse files Browse the repository at this point in the history
  • Loading branch information
@pedrohlira
pedrohlira committed Dec 11, 2013
1 parent ecd2802 commit 6970e08
Show file tree
Hide file tree
Showing 78 changed files with 5,849 additions and 1,715 deletions.
Binary file modified .DS_Store
View file
Binary file not shown.
Binary file modified ACBrMonitor/.DS_Store
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@

<target name="-post-jar">
<mkdir dir="${dist.jar.dir}/arquivos"/>
<mkdir dir="${dist.jar.dir}/arquivos/exportar"/>
<mkdir dir="${dist.jar.dir}/arquivos/importar"/>
<mkdir dir="${dist.jar.dir}/arquivos/cat52"/>
<mkdir dir="${dist.jar.dir}/db"/>
<mkdir dir="${dist.jar.dir}/dlls"/>
<mkdir dir="${dist.jar.dir}/logs"/>
Expand Down
34 changes: 30 additions & 4 deletions conf/config.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,26 @@

## GERAL ##
# define se a aplicacao nao tem bordas (padrao = true)
openpdv.semborda=true
openpdv.semborda=false
# url de validacao da permissao de uso do sistema OpenPDV.
openpdv.url=http://phd.opensig.com.br/openpdv/server/validar
# define o path completo sem o nome do arquivo ex: [D:\\] onde deve ser salvo o backup do banco,
# devendo ser um local na rede ou outro HD de preferencia, deixar vazio para salvar no mesmo local do bd
openpdv.backup=
# define o periodo que deve salvar o backup use um destes valores [dia, semana, mes], deixar vazio para salvar todo mes
openpdv.backup.periodo=mes
# site da empresa
openpdv.site=http://phdss.com.br
# email do sistema
openpdv.email=openpdv@phdss.com.br
# telefone da empresa
openpdv.telefone=+55 (82) 3313-6532
# skype da empresa
openpdv.skype=pedroh.lira

## SINC ##
# define se o sincronismo e realizado via rest ou arquivo (rest ou arquivo)
sinc.tipo=rest
# url do servidor do sistema, o qual e usado para sincronizar os dados (use http://localhost esta maquina)
sinc.servidor=http://localhost
# porta em que o servico de sincronizacao vai responder, verifique se o firewall permite o uso (por padrao usar a porta 80)
Expand All @@ -28,11 +38,25 @@ sinc.server=/openpdv/server
# limite maximo de dados a serem recebidos de uma vez
sinc.limite=1000

## PAGAMENTOS ##
# define quais as formas de pagamentos que estao ativas
pag.dinheiro=true
pag.cartao=true
pag.cheque=true
pag.troca=true
pag.pos=true

## ECF ##
# ip ou url da maquina que esta com o ACBr rodando (padrao = localhost)
ecf.servidor=localhost
# porta onde o ACBr responde (padrao = 3434)
ecf.porta=3434
# tempo em segundos de espera para recuperar a Z
ecf.tempo=30
# quantidade de tentativas de recuperar os dados da Z
ecf.tentativas=3
# gerar arquivo cat52 para NFA ou NFP
ecf.cat52=true
# nome de suprimento
ecf.suprimento=Suprimento
# nome de sangria
Expand Down Expand Up @@ -63,8 +87,8 @@ ecf.relpresente=06
ecf.msgpresente=VALIDO POR 30 DIAS APARTIR DA DATA DE VENDA

## TEF ##
# O nome da janela do GP para auto foco [Pay&Go Cliente ou TEF DISCADO - Vers\u00e3o 4.0]
tef.titulo=Pay&Go Cliente
# O nome da janela do GP para auto foco [Pay&Go Cliente ou ClientGlobal ou TEF DISCADO - Vers\u00e3o 4.0]
tef.titulo=ClientGlobal
# path da pasta de requisicoes do GP
tef.req=C:\\tef_dial\\Req\\
# path da pasta de respostas do GP
Expand All @@ -74,7 +98,9 @@ tef.tmp=C:\\tef_dial\\Tmp\\
# quantidade de cartoes aceito no sistema [modo experimental nao homologado no TEF]
tef.cartoes=2
# informa se ira imprimir o tef linha-a-linha ou tudo de uma vez. (padrao = false)
tef.linha=true
tef.linha=false
# informa se usara o arquivo Ativo.001 para verificar se o GP esta ativo. (padrao = true)
tef.ativo.001=true

## NFE ##
# Versao do XML da NFe
Expand Down
26 changes: 26 additions & 0 deletions db/atu_104.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/* Atualizacao para a versao 1.04 */

/* Adicionando o campo de venda na troca, para que a venda possa ter mais de uma troca */
ALTER TABLE ecf_troca ADD COLUMN ecf_venda_id int(11) DEFAULT NULL BEFORE ecf_troca_cliente;
ALTER TABLE ecf_troca ADD CONSTRAINT FK_ecf_troca_1 FOREIGN KEY (ecf_venda_id) REFERENCES ecf_venda (ecf_venda_id) ON DELETE NO ACTION ON UPDATE NO ACTION;

/* Setando as vendas nas trocas */
UPDATE ecf_troca AS t SET t.ecf_venda_id = (SELECT v.ecf_venda_id FROM ecf_venda AS v WHERE NOT v.ecf_troca_id IS NULL AND v.ecf_troca_id = t.ecf_troca_id);

/* Deletando o campo de troca da venda */
ALTER TABLE ecf_venda DROP CONSTRAINT FK_ecf_venda_6;
ALTER TABLE ecf_venda DROP COLUMN ecf_troca_id;

/* Adicionando o campo para identificar a venda ao ECF usado */
ALTER TABLE ecf_venda ADD COLUMN ecf_impressora_id int(11) NOT NULL BEFORE ecf_z_id;
UPDATE ecf_venda SET ecf_impressora_id = (SELECT ecf_impressora_id FROM ecf_impressora);
ALTER TABLE ecf_venda ADD CONSTRAINT FK_ecf_venda_6 FOREIGN KEY (ecf_impressora_id) REFERENCES ecf_impressora (ecf_impressora_id) ON DELETE NO ACTION ON UPDATE NO ACTION;

/* Adicionando o campo de sinc na venda, pra que possa fazr o sincronismo isolado de cada venda */
ALTER TABLE ecf_venda ADD COLUMN ecf_venda_sinc bit(1) NOT NULL BEFORE ecf_venda_observacao;
UPDATE ecf_venda SET ecf_venda_sinc = 1;

/* Adicionando o campo da leituraZ no documento, para que possa ficar vinculado */
ALTER TABLE ecf_documento ADD COLUMN ecf_z_id int(11) DEFAULT NULL BEFORE ecf_documento_usuario;
ALTER TABLE ecf_documento ADD CONSTRAINT FK_ecf_documento_2 FOREIGN KEY (ecf_z_id) REFERENCES ecf_z (ecf_z_id) ON DELETE NO ACTION ON UPDATE NO ACTION;
UPDATE ecf_documento AS d SET d.ecf_z_id = (SELECT z.ecf_z_id FROM ecf_z AS z WHERE d.ecf_documento_data >= z.ecf_z_movimento AND d.ecf_documento_data <= z.ecf_z_emissao);
2 changes: 1 addition & 1 deletion db/banco.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1oFIhFDWJwT9WDoGq9bpR38FP3Elk8N5dxBSUjxf+WRbECMHSlnrhZwtIkBlgzNtxKuJdDENKyLNMIOZ1WSzMjCu5V2GuWSj1FJabcneb9Tjzgg2zucjgDF23noB1JMGMS8rWNrYDa55QHCTL2jn4MCGrEkNulS3JD0WHghKF0DVhuTmX7IhiDxZjh5+tTjs7kK9CAjtVbtxt/WAZ4YlKSz4oLaXzLMSUFCMEHjFn3X367CK0y9RJwJ2zFReRqsFVT9bNVajnPtdivtCCPWjD6OsOcwvFNfRruVABXzRSjpc9iKNyTWUjDhkLCe7Bjomc6GexKC9ufASaPUPfBX2KoN0gGrmsH0kOvIZsbBHVk629WqeBkmLPE0r28PPhvsKdpN1gxev4DzgZJz5G8gP0epyIS5v/OjI1LncdS7doNUaMafUHRujLMeIfFCzQXWrdyxc5Ms/SRpgtpMBFVN7ARhb9/eEctOnjvnh+jLMaNEGu7FaCt+xFYuMLbyongwjckLKwYTRTDWTNBuH6UKJF+nGAY3tQb0co3pPJs9lWbBer/CI0SYXMt+5dTzZMrFYrQbFh+g7D+/GPGsBK0jPkFi+EBdhrsIiMXRtPCCgJITnaEE9Eh7x7ft+Ojhbjyh5JZOQQYELKqgrFWEQPHgFlEzfhjUKsS7lC82JS8utxKd4b7EnyDdbctzR1eOHlYhI9JjFMdAaidoD41GDJR6k3O5mTAT+u9g/j/NjcZRjW/X825VVJ5zsBX7a8KXDb+WR9AkbLtuDXWY=
qgbJ6rB/1hwfHfKggusmAPESaQx2B5fpKwYFiG1sKRGevlaUpe9v8UtfB/wt83UKCH/m/t9Px8OFVoy6+qB8IAeGK7x6Vl/0/PvRrcR3wB1WeiggwnHXOxlKDoP9Ai7Tiyu6QRRa+JPqrqJJ9rQZV7nAjfMK3wC4UhCCTvtuwFgsgQc4pWBYG7ndBIJQmwocbYywN/6YNPadU4Ch0499B7wiYE3Cp3x5YoZM8WydcEEZ0qx4hkYdrS1E4JGzrylrhGb83zK57zG6PYGA9kMX4aN2OiGH5kaeLojKjYbUwcf39Rs04JvyjFUVtK3mTdfzrV+uagbfFUZgpOewSHE0NTZZRljd3a5SNQpvJerDqRWi6IXRpDTrnKglGgDCMGemNEZE2X8F+e9V0eh4FBY755/HEyEvLUPzpRW0HlqjfLT4vV+6/LLrwXMJA0rNFtdd79jVwAPG5KmlZpnJXrfXuDj3IAng5KA83Cf3aIXAfWDUAZeEwFCQDoSPBCt3+ubtIQroKNRa0K17QAjWxDZwXCaTFtV5kHXEFCSuODvDutyCnuIE6qOjh7KDHJYAZlxwp14Rbnhxqafc9B5G3rNRF6xCcATQgx8bjEDu5EFk4fSb/nnkNru8ZjqFcQ6AH0blLym8zfMh6kGl6QIlfD2iGr3C3GYyMqyvsyQG7jlDMIxkRYdnLb4Fni30PTnhp3MFiw47grnuvXJl8fbtzrGtcY/+UjdSTE+uQA2eCJHHfgn7/qD1Q4xD6QGEYovUnM+sleKLKpZDNYg788TE7LIIn9L8pIgJEhcWcJGzN3k4Q4U5K8OopqJBDjwl3S3QEQ2lOgeI5ihlqyiEiRxQuReRnQHF9ZxsIbqizf7rrNauREFpDg4O8BGksrJCYwq+MuR94wtZN0nMbbN8BP995R/cTA==
Binary file modified db/openpdv.h2.db
View file
Binary file not shown.
62 changes: 62 additions & 0 deletions db/openpdv.trace.db
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
10-23 10:55:44 jdbc[2]: exception
org.h2.jdbc.JdbcSQLException: Syntax error in SQL statement "UPDATE ECF_TROCA,[*] ECF_VENDA SET ECF_TROCA.ECF_VENDA_ID = ECF_VENDA.ECF_VENDA_ID WHERE NOT ECF_VENDA.ECF_TROCA_ID IS NULL AND ECF_TROCA.ECF_TROCA_ID = ECF_VENDA.ECF_TROCA_ID "; expected "., AS, SET"; SQL statement:
UPDATE ecf_troca, ecf_venda SET ecf_troca.ecf_venda_id = ecf_venda.ecf_venda_id WHERE NOT ecf_venda.ecf_troca_id IS NULL AND ecf_troca.ecf_troca_id = ecf_venda.ecf_troca_id [42001-170]
10-23 10:55:44 jdbc[2]: exception
org.h2.jdbc.JdbcSQLException: Constraint "FK_ECF_VENDA_6" not found; SQL statement:
ALTER TABLE ecf_venda DROP CONSTRAINT FK_ecf_venda_6 [90057-170]
at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
at org.h2.message.DbException.get(DbException.java:169)
at org.h2.message.DbException.get(DbException.java:146)
at org.h2.command.ddl.AlterTableDropConstraint.update(AlterTableDropConstraint.java:40)
at org.h2.command.CommandContainer.update(CommandContainer.java:75)
at org.h2.command.Command.executeUpdate(Command.java:230)
at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:177)
at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:152)
at org.h2.server.web.WebApp.getResult(WebApp.java:1311)
at org.h2.server.web.WebApp.query(WebApp.java:1001)
at org.h2.server.web.WebApp$1.next(WebApp.java:964)
at org.h2.server.web.WebApp$1.next(WebApp.java:953)
at org.h2.server.web.WebThread.process(WebThread.java:166)
at org.h2.server.web.WebThread.run(WebThread.java:93)
at java.lang.Thread.run(Thread.java:724)
10-23 11:03:02 jdbc[2]: exception
org.h2.jdbc.JdbcSQLException: Column "V.ECF_VENDA_ID" not found; SQL statement:
UPDATE ecf_troca t SET t.ecf_venda_id = (SELECT v.ecf_venda_id WHERE NOT v.ecf_troca_id IS NULL AND v.ecf_troca_id = t.ecf_troca_id) [42122-170]
at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
at org.h2.message.DbException.get(DbException.java:169)
at org.h2.message.DbException.get(DbException.java:146)
at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:141)
at org.h2.command.dml.Select.prepare(Select.java:799)
at org.h2.expression.Subquery.optimize(Subquery.java:69)
at org.h2.command.dml.Update.prepare(Update.java:184)
at org.h2.command.Parser.prepareCommand(Parser.java:218)
at org.h2.engine.Session.prepareLocal(Session.java:414)
at org.h2.engine.Session.prepareCommand(Session.java:363)
at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1116)
at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:164)
at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:152)
at org.h2.server.web.WebApp.getResult(WebApp.java:1311)
at org.h2.server.web.WebApp.query(WebApp.java:1001)
at org.h2.server.web.WebApp$1.next(WebApp.java:964)
at org.h2.server.web.WebApp$1.next(WebApp.java:953)
at org.h2.server.web.WebThread.process(WebThread.java:166)
at org.h2.server.web.WebThread.run(WebThread.java:93)
at java.lang.Thread.run(Thread.java:724)
10-23 11:04:41 jdbc[2]: exception
org.h2.jdbc.JdbcSQLException: Constraint "FK_ECF_VENDA_6" not found; SQL statement:
ALTER TABLE ecf_venda DROP CONSTRAINT FK_ecf_venda_6 [90057-170]
at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
at org.h2.message.DbException.get(DbException.java:169)
at org.h2.message.DbException.get(DbException.java:146)
at org.h2.command.ddl.AlterTableDropConstraint.update(AlterTableDropConstraint.java:40)
at org.h2.command.CommandContainer.update(CommandContainer.java:75)
at org.h2.command.Command.executeUpdate(Command.java:230)
at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:177)
at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:152)
at org.h2.server.web.WebApp.getResult(WebApp.java:1311)
at org.h2.server.web.WebApp.query(WebApp.java:1001)
at org.h2.server.web.WebApp$1.next(WebApp.java:964)
at org.h2.server.web.WebApp$1.next(WebApp.java:953)
at org.h2.server.web.WebThread.process(WebThread.java:166)
at org.h2.server.web.WebThread.run(WebThread.java:93)
at java.lang.Thread.run(Thread.java:724)
Loading

0 comments on commit 6970e08

Please sign in to comment.