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

 import org.openconcerto.erp.core.sales.pos.model.RegisterFiles.DifferentDayException;
 import org.openconcerto.erp.core.sales.pos.model.Ticket;
 import org.openconcerto.sql.element.SQLElement;
 import org.openconcerto.sql.element.SQLElementDirectory;
 import org.openconcerto.sql.model.SQLRow;
+import org.openconcerto.sql.model.SQLRowAccessor;
 import org.openconcerto.sql.model.SQLRowListRSH;
+import org.openconcerto.sql.model.SQLRowValues;
+import org.openconcerto.sql.model.SQLRowValuesListFetcher;
 import org.openconcerto.sql.model.SQLSelect;
 import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.model.SQLTable.VirtualFields;
 import org.openconcerto.sql.model.Where;
 import org.openconcerto.utils.ExceptionHandler;
     private StatusBar st;
     private ArticleSelectorPanel articleSelectorPanel;
     private ArticleSearchPanel articleSearchPanel;
-    private JPanel articleSelector;
+    private JPanel selector;
     public CaissePanel(final CaisseFrame caisseFrame) throws Exception {
         final SQLElementDirectory dir = caisseFrame.getConf().getDirectory();
         this.setLayout(new GridBagLayout());
         this.setBackground(Color.WHITE);
         this.setOpaque(isOpaque());
         GridBagConstraints c = new GridBagConstraints();
+        // Column 1
         c.gridx = 0;
         c.gridy = 0;
         c.weightx = 0;
         c.weighty = 0;
         this.controler = new CaisseControler(caisseFrame);
         c.fill = GridBagConstraints.HORIZONTAL;
         this.st = createStatusBar(caisseFrame);
         this.add(this.st, c);
         TicketPanel t = new TicketPanel(this.controler);
-        // fillExampleArticle();
         loadArticles(dir);
-        c.gridx = 0;
         c.gridy++;
-        c.weightx = 0;
         c.weighty = 1;
         c.gridwidth = 1;
         c.anchor = GridBagConstraints.SOUTHWEST;
         c.fill = GridBagConstraints.NONE;
         this.add(t, c);
+        // Column 2
         c.fill = GridBagConstraints.BOTH;
         c.gridx++;
+        c.gridy = 0;
         c.weightx = 1;
-        c.gridy--;
         c.gridheight = 2;
-        articleSelectorPanel = new ArticleSelectorPanel(this.controler);
+        this.articleSelectorPanel = new ArticleSelectorPanel(this.controler);
-        articleSearchPanel = new ArticleSearchPanel(this.controler);
+        this.articleSearchPanel = new ArticleSearchPanel(this.controler);
-        articleSelector = articleSelectorPanel;
+        this.selector = this.articleSelectorPanel;
-        this.add(articleSelector, c);
+        this.add(this.selector, c);
+        // Column 3
         c.gridx++;
         c.weightx = 0;
         this.add(new PaiementPanel(this.controler), c);
         this.controler.addCaisseListener(this);
+    }
     private StatusBar createStatusBar(final CaisseFrame caisseFrame) {
         final StatusBar s = new StatusBar();
         s.setLayout(new GridBagLayout());
         final GridBagConstraints c = new GridBagConstraints();
+        if (this.controler.getPOSConf().getScreenWidth() < 1280) {
+            c.insets = new Insets(0, 2, 0, 2);
+        } else {
-        c.insets = new Insets(0, 10, 0, 10);
+            c.insets = new Insets(0, 10, 0, 10);
+        }
         c.gridx = 0;
         c.gridy = 0;
         c.fill = GridBagConstraints.NONE;
         c.anchor = GridBagConstraints.CENTER;
         c.weightx = 0;
         return s;
+    }
     private void loadArticles(final SQLElementDirectory dir) {
+        final SQLSelect selUniteVente = new SQLSelect();
+        selUniteVente.addSelectStar(dir.getElement("UNITE_VENTE").getTable());
+        final Map<Integer, String> mapUniteVenteName = new HashMap<>();
+        for (SQLRow row : SQLRowListRSH.execute(selUniteVente)) {
+            mapUniteVenteName.put(row.getID(), row.getString("CODE"));
+        }
-        final Set<Integer> favoriteProductsIds = controler.loadFavoriteProductsIds();
+        final Set<Integer> favoriteProductsIds = this.controler.loadFavoriteProductsIds();
         final List<Article> favoriteProducts = new ArrayList<>();
-        final Map<Integer, Categorie> categoriesMap = new HashMap<Integer, Categorie>();
+        final Map<Integer, Categorie> categoriesMap = new HashMap<>();
         SQLElement eltFam = dir.getElement("FAMILLE_ARTICLE");
         SQLElement eltArticle = dir.getElement("ARTICLE");
         final SQLSelect selFamille = new SQLSelect();
+        }
         final SQLSelect selArticle = new SQLSelect();
         final SQLTable tableArticle = eltArticle.getTable();
         selArticle.addAllSelect(tableArticle.getFields(VirtualFields.PRIMARY_KEY.union(VirtualFields.ARCHIVE)));
-        selArticle.addAllSelect(tableArticle, Arrays.asList("ID_FAMILLE_ARTICLE", "NOM", "CODE", "CODE_BARRE", "ID_TAXE", "PV_HT", "PV_TTC", "ADDITIONAL_TICKET_COPY"));
+        selArticle.addAllSelect(tableArticle, Arrays.asList("ID_FAMILLE_ARTICLE", "NOM", "CODE", "CODE_BARRE", "ID_TAXE", "PV_HT", "PV_TTC", "ADDITIONAL_TICKET_COPY", "ID_UNITE_VENTE"));
         selArticle.setWhere(new Where(tableArticle.getField("OBSOLETE"), "=", Boolean.FALSE).and(new Where(tableArticle.getField("MASQUE_CAISSE"), "=", Boolean.FALSE)));
         final Categorie cUnclassified = new Categorie("Non classés", true);
         cUnclassified.setUnknown();
         for (SQLRow row : SQLRowListRSH.execute(selArticle)) {
                 a.setCode(code);
                 a.setIdTaxe(row.getInt("ID_TAXE"));
                 a.setPriceWithoutTax(row.getBigDecimal("PV_HT"));
                 a.setPriceWithTax(row.getBigDecimal("PV_TTC"));
                 a.setAdditionalCopyRequested(row.getBoolean("ADDITIONAL_TICKET_COPY"));
+                if (row.getInt("ID_UNITE_VENTE") != 2) {
+                    a.setSalesUnit(mapUniteVenteName.get(row.getInt("ID_UNITE_VENTE")));
+                }
                 final Integer idProduct = a.getId();
                 if (favoriteProductsIds.contains(idProduct)) {
                     favoriteProducts.add(a);
+                }
+            }
+        }
         Categorie.setFavoriteProducts(favoriteProducts);
+        initCacheArticleMap(dir);
+    }
+    private static Map<Integer, SQLRowAccessor> cacheArticle = new HashMap<>();
+    public static SQLRowAccessor getArticleRowValuesFromCache(int id) {
+        return cacheArticle.get(id);
+    }
+    private void initCacheArticleMap(final SQLElementDirectory dir) {
+        final SQLTable tableArt = dir.getElement("ARTICLE").getTable();
+        SQLRowValues rowValsArt = new SQLRowValues(tableArt);
+        rowValsArt.putNulls(tableArt.getFieldsName());
+        final SQLTable tableArtCatComptable = dir.getElement("ARTICLE_CATEGORIE_COMPTABLE").getTable();
+        SQLRowValues rowValsArtCatComptable = new SQLRowValues(tableArtCatComptable);
+        rowValsArtCatComptable.putNulls(tableArtCatComptable.getFieldsName());
+        rowValsArtCatComptable.put("ID_ARTICLE", rowValsArt);
+        final SQLRowValues rowValsCaCompt = rowValsArtCatComptable.putRowValues("ID_CATEGORIE_COMPTABLE");
+        rowValsCaCompt.putNulls(rowValsCaCompt.getTable().getFieldsName());
+        final SQLRowValues rowValsFam = rowValsArt.putRowValues("ID_FAMILLE_ARTICLE");
+        rowValsFam.putNulls(rowValsFam.getTable().getFieldsName());
+        final SQLRowValues rowValuesFamP = rowValsFam.putRowValues("ID_FAMILLE_ARTICLE_PERE");
+        rowValuesFamP.putNulls(rowValuesFamP.getTable().getFieldsName());
+        SQLRowValuesListFetcher fetcher = SQLRowValuesListFetcher.create(rowValsArt);
+        List<SQLRowValues> res = fetcher.fetch();
+        for (SQLRowValues sqlRowValues : res) {
+            cacheArticle.put(sqlRowValues.getID(), sqlRowValues);
+        }
+    }
     @Override
     public void paint(Graphics g) {
         System.err.println("CaissePanel.paint()" + this.getWidth() + " x " + this.getHeight());
             g.setColor(Color.GRAY);
             g.setFont(g.getFont().deriveFont(18f));
             g.drawString("Solde : " + new DecimalFormat("#0.00").format(this.controler.getClient().getSolde()), 20, 120);
+        }
+        int xPos = 300;
+        if (this.controler.getPOSConf().getScreenWidth() < 1280) {
+            xPos = 270;
+        }
         // Prix
-        int x = 300;
+        int x = xPos;
         int y = 110;
         String euros;
         String cents;
         Rectangle2D r;
         g.setColor(Color.BLACK);
         g.drawString(euros, x, y);
         g.setFont(g.getFont().deriveFont(40f));
         g.drawString(cents, x + (int) r.getWidth(), y);
         // Paiement
         y += 40;
-        x = 300;
+        x = xPos;
         final int paye = this.controler.getPaidTotal();
         euros = CaisseControler.getEuros(paye) + ".";
         cents = CaisseControler.getCents(paye);
         g.setFont(g.getFont().deriveFont(18f));
         g.drawString("Payé", x - (int) r2.getWidth() - (int) r.getWidth() - 10, y);
         // A rendre
         final boolean minimalHeight = this.getHeight() < 750;
         if (!minimalHeight) {
             y += 40;
-            x = 300;
+            x = xPos;
         } else {
             x = 140;
+        }
         int aRendre = paye - total;
         if (aRendre != 0) {
         repaint();
+    }
     public void switchListMode() {
-        GridBagConstraints c = ((GridBagLayout) this.getLayout()).getConstraints(articleSelector);
+        GridBagConstraints c = ((GridBagLayout) this.getLayout()).getConstraints(this.selector);
-        this.remove(articleSelector);
+        this.remove(this.selector);
-        if (articleSelector == this.articleSearchPanel) {
+        if (this.selector == this.articleSearchPanel) {
-            articleSelector = this.articleSelectorPanel;
+            this.selector = this.articleSelectorPanel;
         } else {
-            articleSelector = this.articleSearchPanel;
+            this.selector = this.articleSearchPanel;
+        }
+        System.err.println("CaissePanel.switchListMode()" + this.selector.getMinimumSize() + " " + this.selector.getPreferredSize() + " " + this.selector.getMaximumSize());
-        this.add(articleSelector, c);
+        this.add(this.selector, c);
         this.validate();
         this.repaint();
+    }
     public CaisseControler getControler() {
-        return controler;
+        return this.controler;
+    }
+    public void validateTicket(final CaisseFrame caisseFrame) {
+        final Ticket savedReceipt;
+        try {
+            savedReceipt = CaissePanel.this.controler.saveAndClearTicket(caisseFrame.getFiles(), caisseFrame.getConf().getDirectory());
+        } catch (DifferentDayException ex) {
+            JOptionPane.showMessageDialog(CaissePanel.this, "Impossible de laisser la caisse ouverte plusieurs jours. Veuillez la clÃ´turer pour pouvoir faire de nouveaux tickets.", "Erreur",
+                    JOptionPane.ERROR_MESSAGE);
+            return;
+        } catch (Throwable ex) {
+            ExceptionHandler.handle(CaissePanel.this, "Erreur de sauvegarde des informations du ticket", ex);
+            return;
+        }
+        if (savedReceipt != null) {
+            // Valider
+            CaissePanel.this.controler.setLCD("Impression de", "votre ticket...", 0);
+            try {
+                caisseFrame.getPOSConf().print(savedReceipt, (savedReceipt.isAdditionnalCopyRequested() ? 1 : 0));
+            } catch (UnsatisfiedLinkError ex) {
+                JOptionPane.showMessageDialog(CaissePanel.this, "Erreur de configuration de la liaison Ã  l'imprimante");
+            } catch (Throwable ex) {
+                ex.printStackTrace();
+                JOptionPane.showMessageDialog(CaissePanel.this, "Erreur d'impression du ticket");
+            }
+            CaissePanel.this.controler.setLCDDefaultDisplay(2);
+        } else {
+            System.err.println("CaissePanel.validateTicket() ticket non sauvÃ©");
+        }
+    }
+}

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/CaissePanel.java - Rev 156 → 174