cambios

jeanramalalvarez · Dec 19, 2015 · 518b7c8 · 518b7c8
1 parent 98e49b0
commit 518b7c8
Show file tree

Hide file tree

Showing 8 changed files with 1,980 additions and 8 deletions.
diff --git a/veterinaria/GestionMatrizSeconReload/bd/INSERTS_20151208.sql b/veterinaria/GestionMatrizSeconReload/bd/INSERTS_20151208.sql
@@ -0,0 +1,3 @@
+INSERT INTO `bdmatriz_desa`.`tb_familia` (`int_idFamilia`, `str_codigoFamilia`, `str_nombre`, `str_descripcion`, `str_estado`, `str_usuarioCreador`, `dte_fechaCreacion`) VALUES ('99999', 'F99999', 'SERVICIOS', 'SERVICIOS', 'ACTIVO', 'SISTEMAS', '2015-12-08 08:48:53');
+
+INSERT INTO `bdmatriz_desa`.`tb_producto` (`int_idProducto`, `str_codigoInterno`, `str_nombreProducto`, `str_estado`, `str_usuarioCreador`, `dte_fechaCreacion`, `str_tipoProducto`, `int_idTipoServicio`) VALUES ('9990', '99999990', 'ESTETICA', 'ACTIVO', 'SISTEMAS', '2015-12-08 08:48:53', 'S', '1');
diff --git a/veterinaria/GestionMatrizSeconReload/bd/alter_table_producto_20151208.sql b/veterinaria/GestionMatrizSeconReload/bd/alter_table_producto_20151208.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `bdmatriz_desa`.`tb_producto` 
+ADD COLUMN `str_tipoProducto` CHAR(1) NOT NULL DEFAULT 'P' COMMENT '' AFTER `dte_fechaModificacion`,
+ADD COLUMN `int_idTipoServicio` INT(11) NULL COMMENT '' AFTER `str_tipoProducto`;
diff --git a/...estionMatrizSeconReload/src/main/java/com/gestionmatriz/puntoventa/gui/BuscarCliente.java b/...estionMatrizSeconReload/src/main/java/com/gestionmatriz/puntoventa/gui/BuscarCliente.java
@@ -4,9 +4,6 @@
  */
 package com.gestionmatriz.puntoventa.gui;
 
-import com.gestionmatriz.dao.PaqueteBusinessDelegate;
-import com.gestionmatriz.puntoventa.bean.Cliente;
-
 import java.awt.Frame;
 import java.awt.event.KeyEvent;
 import java.util.List;
@@ -15,6 +12,9 @@
 
 import org.apache.log4j.Logger;
 
+import com.gestionmatriz.dao.PaqueteBusinessDelegate;
+import com.gestionmatriz.puntoventa.bean.Cliente;
+
 /**
  *
  * @author cesareo
@@ -29,6 +29,7 @@ public class BuscarCliente extends javax.swing.JDialog {
     private Frame gui;
     private GestionCliente frmGestionCliente;
     private PreVenta frmPreVenta;
+    private PrecargaCliente frmPrecargaCliente;
     private List<Cliente> listaCliente;
 
     public BuscarCliente(Frame gui, List<Cliente> listaCliente, GestionCliente frmGestionCliente) {
@@ -48,6 +49,15 @@ public BuscarCliente(Frame gui, List<Cliente> listaCliente, PreVenta frmPreVenta
         initComponents();
         cargarDatos();
     }
+
+    public BuscarCliente(Frame gui, List<Cliente> listaCliente, PrecargaCliente frmPrecargaCliente) {
+        super(gui, true);
+        this.gui = gui;
+        this.listaCliente = listaCliente;
+        this.frmPrecargaCliente = frmPrecargaCliente;
+        initComponents();
+        cargarDatos();
+    }
 
     @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
@@ -258,13 +268,15 @@ private void cargarDatos() {
 
     private void evento() {
 
-        if (frmGestionCliente == null) {
-            frmPreVenta.cargarDatosBusquedaCliente(clienteSeleccionado());
-            this.setVisible(false);
-            return;
+        if (frmGestionCliente != null) {
+        	frmGestionCliente.cargarDatosBusquedaCliente(clienteSeleccionado());
+        }if(frmPreVenta != null){
+        	frmPreVenta.cargarDatosBusquedaCliente(clienteSeleccionado());        		
+        }else if(frmPrecargaCliente != null){
+        	frmPrecargaCliente.cargarDatosBusquedaCliente(clienteSeleccionado());        		
         }
-        frmGestionCliente.cargarDatosBusquedaCliente(clienteSeleccionado());
         this.setVisible(false);
+        //return;
     }
 
     private void cargarTabla(List<Cliente> listaCliente) {

diff --git a/...estionMatrizSeconReload/src/main/java/com/gestionmatriz/puntoventa/gui/BusquedaStock.java b/...estionMatrizSeconReload/src/main/java/com/gestionmatriz/puntoventa/gui/BusquedaStock.java
@@ -35,6 +35,9 @@ public class BusquedaStock extends javax.swing.JDialog {
     private PrecargaProducto jdPrecarga;
     private GuiaRemision frmGuiaRemision;
 
+    /**
+     * @wbp.parser.constructor
+     */
     public BusquedaStock(Principal gui, Venta guiVenta) {
         super(gui);
         this.gui = gui;

diff --git a/...ria/GestionMatrizSeconReload/src/main/java/com/gestionmatriz/puntoventa/gui/Estetica.form b/...ria/GestionMatrizSeconReload/src/main/java/com/gestionmatriz/puntoventa/gui/Estetica.form
diff --git a/...ria/GestionMatrizSeconReload/src/main/java/com/gestionmatriz/puntoventa/gui/Estetica.java b/...ria/GestionMatrizSeconReload/src/main/java/com/gestionmatriz/puntoventa/gui/Estetica.java
diff --git a/...tionMatrizSeconReload/src/main/java/com/gestionmatriz/puntoventa/gui/PrecargaCliente.form b/...tionMatrizSeconReload/src/main/java/com/gestionmatriz/puntoventa/gui/PrecargaCliente.form
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+  <NonVisualComponents>
+    <Component class="javax.swing.ButtonGroup" name="buttonGroup1">
+    </Component>
+  </NonVisualComponents>
+  <Properties>
+    <Property name="type" type="java.awt.Window$Type" editor="org.netbeans.modules.form.editors.EnumEditor">
+      <Value id="UTILITY"/>
+    </Property>
+  </Properties>
+  <SyntheticProperties>
+    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
+  </SyntheticProperties>
+  <Events>
+    <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="formKeyPressed"/>
+    <EventHandler event="keyReleased" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="formKeyReleased"/>
+  </Events>
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+  </AuxValues>
+
+  <Layout>
+    <DimensionLayout dim="0">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" alignment="0" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jXPanel1" max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+    <DimensionLayout dim="1">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" alignment="1" attributes="0">
+              <EmptySpace max="32767" attributes="0"/>
+              <Component id="jXPanel1" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+  </Layout>
+  <SubComponents>
+    <Container class="org.jdesktop.swingx.JXPanel" name="jXPanel1">
+      <Properties>
+        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+            <TitledBorder title="Datos Cliente"/>
+          </Border>
+        </Property>
+      </Properties>
+      <AccessibilityProperties>
+        <Property name="AccessibleContext.accessibleName" type="java.lang.String" value="Datos Clientes"/>
+      </AccessibilityProperties>
+
+      <Layout>
+        <DimensionLayout dim="0">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <Group type="102" attributes="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Group type="102" attributes="0">
+                          <Group type="103" groupAlignment="1" max="-2" attributes="0">
+                              <Component id="jXLabel2" alignment="0" pref="105" max="32767" attributes="1"/>
+                              <Component id="jXLabel1" alignment="0" max="32767" attributes="1"/>
+                              <Component id="jXLabel3" max="32767" attributes="1"/>
+                          </Group>
+                          <EmptySpace type="separate" max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="1" max="-2" attributes="0">
+                              <Component id="txtClienteResponsable" alignment="0" max="32767" attributes="0"/>
+                              <Component id="txtRucDNI" alignment="0" max="32767" attributes="0"/>
+                              <Component id="txtCliente" alignment="0" min="-2" pref="262" max="-2" attributes="0"/>
+                          </Group>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="btnBuscar" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <Group type="102" alignment="0" attributes="0">
+                          <EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
+                          <Component id="jXLabel11" min="-2" pref="154" max="-2" attributes="0"/>
+                          <EmptySpace type="separate" max="-2" attributes="0"/>
+                          <Component id="jXLabel12" min="-2" pref="154" max="-2" attributes="0"/>
+                      </Group>
+                  </Group>
+                  <EmptySpace max="32767" attributes="0"/>
+              </Group>
+          </Group>
+        </DimensionLayout>
+        <DimensionLayout dim="1">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <Group type="102" alignment="0" attributes="0">
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="jXLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="txtCliente" alignment="3" min="-2" pref="32" max="-2" attributes="0"/>
+                      <Component id="btnBuscar" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="jXLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="txtRucDNI" alignment="3" min="-2" pref="30" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="jXLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="txtClienteResponsable" alignment="3" min="-2" pref="34" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace pref="26" max="32767" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="jXLabel11" alignment="3" min="-2" pref="28" max="-2" attributes="0"/>
+                      <Component id="jXLabel12" alignment="3" min="-2" pref="28" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace min="-2" pref="28" max="-2" attributes="0"/>
+              </Group>
+          </Group>
+        </DimensionLayout>
+      </Layout>
+      <SubComponents>
+        <Component class="org.jdesktop.swingx.JXLabel" name="jXLabel1">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Cliente: "/>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+              <Font name="SansSerif" size="14" style="1"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="org.jdesktop.swingx.JXTextField" name="txtCliente">
+          <Properties>
+            <Property name="editable" type="boolean" value="false"/>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="0" green="99" red="ff" type="rgb"/>
+            </Property>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+              <Font name="SansSerif" size="14" style="1"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="org.jdesktop.swingx.JXLabel" name="jXLabel2">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="RUC / DNI: "/>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+              <Font name="SansSerif" size="14" style="1"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="org.jdesktop.swingx.JXTextField" name="txtRucDNI">
+          <Properties>
+            <Property name="editable" type="boolean" value="false"/>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="0" green="99" red="ff" type="rgb"/>
+            </Property>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+              <Font name="SansSerif" size="14" style="1"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="org.jdesktop.swingx.JXLabel" name="jXLabel3">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Cliente: "/>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+              <Font name="SansSerif" size="14" style="1"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="org.jdesktop.swingx.JXTextField" name="txtClienteResponsable">
+          <Properties>
+            <Property name="editable" type="boolean" value="false"/>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="0" green="99" red="ff" type="rgb"/>
+            </Property>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+              <Font name="SansSerif" size="14" style="1"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="org.jdesktop.swingx.JXLabel" name="jXLabel11">
+          <Properties>
+            <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+              <Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
+                <LineBorder/>
+              </Border>
+            </Property>
+            <Property name="horizontalAlignment" type="int" value="0"/>
+            <Property name="text" type="java.lang.String" value="[F9]=CARGAR CLIENTE"/>
+            <Property name="toolTipText" type="java.lang.String" value=""/>
+          </Properties>
+        </Component>
+        <Component class="org.jdesktop.swingx.JXLabel" name="jXLabel12">
+          <Properties>
+            <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+              <Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
+                <LineBorder/>
+              </Border>
+            </Property>
+            <Property name="horizontalAlignment" type="int" value="0"/>
+            <Property name="text" type="java.lang.String" value="[ESC]=REGRESAR"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JButton" name="btnBuscar">
+          <Properties>
+            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="3" name="/com/gestionmatriz/icon/minibuscar.png"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="Buscar (F4)"/>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnBuscarActionPerformed"/>
+            <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="btnBuscarrbnBoletaKeyPressed"/>
+          </Events>
+        </Component>
+      </SubComponents>
+    </Container>
+  </SubComponents>
+</Form>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		INSERT INTO `bdmatriz_desa`.`tb_familia` (`int_idFamilia`, `str_codigoFamilia`, `str_nombre`, `str_descripcion`, `str_estado`, `str_usuarioCreador`, `dte_fechaCreacion`) VALUES ('99999', 'F99999', 'SERVICIOS', 'SERVICIOS', 'ACTIVO', 'SISTEMAS', '2015-12-08 08:48:53');

		INSERT INTO `bdmatriz_desa`.`tb_producto` (`int_idProducto`, `str_codigoInterno`, `str_nombreProducto`, `str_estado`, `str_usuarioCreador`, `dte_fechaCreacion`, `str_tipoProducto`, `int_idTipoServicio`) VALUES ('9990', '99999990', 'ESTETICA', 'ACTIVO', 'SISTEMAS', '2015-12-08 08:48:53', 'S', '1');