WebSVN - OpenConcerto - Diff - Rev 156 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/ui/ConfigCaissePanel.java

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
- * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ * Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
+ *
  * The contents of this file are subject to the terms of the GNU General Public License Version 3
  * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
  * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
  * language governing permissions and limitations under the License.
     private int caisseId;
     private final ServerFinderPanel serverFinderPanel;
     private final JComboBox comboSociete;
     private final JComboBox comboCaisse;
     private final JComboBox comboUtilisateur;
+    private final JComboBox comboDepot;
     private final TicketLineTable headerTable;
     private final TicketLineTable footerTable;
     private JTextField textTerminalCB;
     // Ticket printers
     // LCD
     private JComboBox comboLCDType;
     private JTextField textLCDPort;
     private JTextField textLCDLine1;
     private JTextField textLCDLine2;
+    protected int depotStockId = 2;
     public ConfigCaissePanel(final ServerFinderPanel serverFinderPanel) {
         this.serverFinderPanel = serverFinderPanel;
         try {
             this.configuration = POSConfiguration.setInstance();
+                }
                 return super.getListCellRendererComponent(list, label, index, isSelected, cellHasFocus);
+            }
         });
         this.add(this.comboCaisse, c);
+        // Utilisateur
         c.gridx = 0;
         c.gridy++;
         c.weightx = 0;
         this.add(new JLabel("Utilisateur", SwingConstants.RIGHT), c);
         c.gridx++;
+                }
                 return super.getListCellRendererComponent(list, label, index, isSelected, cellHasFocus);
+            }
         });
         this.add(this.comboUtilisateur, c);
+        // Depots
+        c.gridx = 0;
+        c.gridy++;
+        c.weightx = 0;
+        this.add(new JLabel("Dépôt de stock", SwingConstants.RIGHT), c);
+        c.gridx++;
+        this.comboDepot = new JComboBox();
+        this.comboDepot.setRenderer(new DefaultListCellRenderer() {
+            @Override
+            public Component getListCellRendererComponent(final JList list, final Object value, final int index, final boolean isSelected, final boolean cellHasFocus) {
+                final SQLRow r = (SQLRow) value;
+                String label = "";
+                if (r != null) {
+                    label = r.getString("CODE") + "  " + r.getString("NOM") + " (" + r.getID() + ")".trim();
+                }
+                return super.getListCellRendererComponent(list, label, index, isSelected, cellHasFocus);
+            }
+        });
+        this.add(this.comboDepot, c);
         // Ticket
         final JLabelBold titleTicket = new JLabelBold("Ticket");
         c.gridwidth = 2;
         c.gridx = 0;
                 if (e.getStateChange() == ItemEvent.SELECTED) {
                     ConfigCaissePanel.this.userId = ((SQLRow) e.getItem()).getID();
+                }
+            }
         });
+        this.comboDepot.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(final ItemEvent e) {
+                if (e.getStateChange() == ItemEvent.SELECTED) {
+                    ConfigCaissePanel.this.depotStockId = ((SQLRow) e.getItem()).getID();
+                }
+            }
+        });
+    }
     private Component createLCDPanel() {
         final JPanel p = new JPanel();
         p.setOpaque(false);
                 final String name = societe.getString("DATABASE_NAME");
                 // Caisses
                 final SQLSelect sel = new SQLSelect();
                 sel.addSelectStar(conf.getRootSociete().getTable("CAISSE"));
                 final List<SQLRow> caisses = SQLRowListRSH.execute(sel);
+                // Depots
+                final SQLSelect sel2 = new SQLSelect();
+                sel2.addSelectStar(conf.getRootSociete().getTable("DEPOT_STOCK"));
+                final List<SQLRow> depots = SQLRowListRSH.execute(sel2);
                 // Stock l'id de la caisse pour que la reslectionne soit correcte
                 final int idCaisseToSelect = this.caisseId;
+                final int idDepotToSelect = this.depotStockId;
                 SwingUtilities.invokeLater(new Runnable() {
                     @Override
                     public void run() {
                         ConfigCaissePanel.this.caisseId = idCaisseToSelect;
+                        ConfigCaissePanel.this.depotStockId = idDepotToSelect;
                         if (caisses.isEmpty()) {
                             JOptionPane.showMessageDialog(ConfigCaissePanel.this, "Pas de caisses définies dans la société " + name);
+                        }
                         ConfigCaissePanel.this.comboCaisse.setModel(new DefaultComboBoxModel(new Vector<SQLRow>(caisses)));
+                        ConfigCaissePanel.this.comboDepot.setModel(new DefaultComboBoxModel(new Vector<SQLRow>(depots)));
                         ConfigCaissePanel.this.comboUtilisateur.setEnabled(true);
                         ConfigCaissePanel.this.comboCaisse.setEnabled(true);
+                        ConfigCaissePanel.this.comboDepot.setEnabled(true);
+                        {
+                            // Selection caisse
-                        final ComboBoxModel model = ConfigCaissePanel.this.comboCaisse.getModel();
+                            final ComboBoxModel model = ConfigCaissePanel.this.comboCaisse.getModel();
-                        final int stop = model.getSize();
+                            final int stop = model.getSize();
-                        if (stop > 0) {
+                            if (stop > 0) {
-                            // Force la reselection si la valeur n'existe plus,
+                                // Force la reselection si la valeur n'existe plus,
-                            // nécessité de recuperer l'id
+                                // nécessité de recuperer l'id
-                                ConfigCaissePanel.this.comboCaisse.setSelectedItem(r);
+                                    ConfigCaissePanel.this.comboCaisse.setSelectedItem(r);
-                                break;
+                                    break;
+                                }
+                            }
+                        }
+                        {
+                            // Selection depot
+                            final ComboBoxModel model2 = ConfigCaissePanel.this.comboDepot.getModel();
+                            final int stop2 = model2.getSize();
+                            if (stop2 > 0) {
+                                // Force la reselection si la valeur n'existe plus,
+                                // nécessité de recuperer l'id
+                                ConfigCaissePanel.this.depotStockId = ((SQLRow) model2.getElementAt(0)).getID();
+                            }
+                            for (int i = 0; i < stop2; i++) {
+                                final SQLRow r = (SQLRow) model2.getElementAt(i);
+                                if (r.getID() == idDepotToSelect) {
+                                    ConfigCaissePanel.this.comboDepot.setSelectedItem(r);
+                                    break;
+                                }
+                            }
+                        }
+                    }
                 });
             } else {
                 JOptionPane.showMessageDialog(this, "Impossible de trouver la société d'ID " + id);
+            }
         this.textLCDLine2.setText(configuration.getLCDLine2());
         this.userId = configuration.getUserID();
         this.societeId = configuration.getCompanyID();
         this.caisseId = configuration.getPosID();
+        this.depotStockId = configuration.getDepotID();
         this.headerTable.fillFrom(configuration.getHeaderLines());
         this.footerTable.fillFrom(configuration.getFooterLines());
         this.ticketPanel1.setConfiguration(configuration.getTicketPrinterConfiguration1());
         this.ticketPanel2.setConfiguration(configuration.getTicketPrinterConfiguration2());
                     @Override
                     public void run() {
                         ConfigCaissePanel.this.comboSociete.setEnabled(false);
                         ConfigCaissePanel.this.comboUtilisateur.setEnabled(false);
                         ConfigCaissePanel.this.comboCaisse.setEnabled(false);
+                        ConfigCaissePanel.this.comboDepot.setEnabled(false);
                         final ServerFinderConfig config = ConfigCaissePanel.this.serverFinderPanel.createServerFinderConfig();
                         if (!config.isOnline()) {
                             JOptionPane.showMessageDialog(ConfigCaissePanel.this, "Impossible de se connecter au serveur");
                             return;
+                        }
     public void dumpConfiguration() {
         System.out.println("Societe: id:" + this.societeId);
         System.out.println("Caisse: id:" + this.caisseId);
         System.out.println("Utilisateur:  id:" + this.userId);
+        System.out.println("Depot:  id:" + this.depotStockId);
+    }
     public void saveConfiguration() {
         final POSConfiguration configuration = this.configuration;
         this.ticketPanel1.commitValues();
         this.ticketPanel2.commitValues();
         configuration.setUserID(this.userId);
         configuration.setCompanyID(this.societeId);
         configuration.setPosID(this.caisseId);
+        configuration.setDepotID(this.depotStockId);
         configuration.setHeaderLines(this.headerTable.getLines());
         configuration.setFooterLines(this.footerTable.getLines());
         // Terminal CB
         configuration.setCreditCardPort(this.textTerminalCB.getText());
         // LCD

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/ui/ConfigCaissePanel.java @ 156 - Rev 156 → 182