WebSVN - OpenConcerto - Diff - Rev 177 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/ui/CaissePanel.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.
  */
  package org.openconcerto.erp.core.sales.pos.ui;
 import org.openconcerto.erp.core.sales.pos.model.Article;
+import org.openconcerto.erp.core.sales.pos.model.ArticleCache;
 import org.openconcerto.erp.core.sales.pos.model.Categorie;
 import org.openconcerto.erp.core.sales.pos.model.RegisterFiles.DifferentDayException;
+import org.openconcerto.erp.core.sales.pos.model.TarifQuantite;
 import org.openconcerto.erp.core.sales.pos.model.Ticket;
+import org.openconcerto.erp.core.sales.pos.model.TicketItem;
+import org.openconcerto.erp.core.supplychain.stock.element.StockSQLElement;
+import org.openconcerto.erp.preferences.TemplateNXProps;
 import org.openconcerto.sql.element.SQLElement;
 import org.openconcerto.sql.element.SQLElementDirectory;
+import org.openconcerto.sql.model.SQLField;
 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;
+import org.openconcerto.utils.FileUtils;
 import org.openconcerto.utils.StringUtils;
+import org.openconcerto.utils.cc.ITransformer;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Insets;
 import java.awt.RenderingHints;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.geom.Rectangle2D;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.swing.JOptionPane;
     private StatusBar st;
     private ArticleSelectorPanel articleSelectorPanel;
     private ArticleSearchPanel articleSearchPanel;
     private JPanel selector;
+    final SQLElementDirectory dir;
     public CaissePanel(final CaisseFrame caisseFrame) throws Exception {
-        final SQLElementDirectory dir = caisseFrame.getConf().getDirectory();
+        this.dir = caisseFrame.getConf().getDirectory();
+        loadArticles(this.dir);
         this.setLayout(new GridBagLayout());
         this.setBackground(Color.WHITE);
         this.setOpaque(isOpaque());
         GridBagConstraints c = new GridBagConstraints();
         c.fill = GridBagConstraints.HORIZONTAL;
         this.st = createStatusBar(caisseFrame);
         this.add(this.st, c);
         TicketPanel t = new TicketPanel(this.controler);
-        loadArticles(dir);
         c.gridy++;
         c.weighty = 1;
         c.gridwidth = 1;
         c.anchor = GridBagConstraints.SOUTHWEST;
         c.fill = GridBagConstraints.NONE;
         s.add(bMenu, c);
         bValidate.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                final Ticket savedReceipt;
-                try {
-                    savedReceipt = CaissePanel.this.controler.saveAndClearTicket(caisseFrame.getFiles(), caisseFrame.getConf().getDirectory());
-                } catch (DifferentDayException ex) {
+                checkStock(getControler().getPOSConf().getDepotID(), new Runnable() {
-                    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;
+                    @Override
-                } catch (Throwable ex) {
+                    public void run() {
-                    ExceptionHandler.handle(CaissePanel.this, "Erreur de sauvegarde des informations du ticket", ex);
-                    return;
-                }
-                if (savedReceipt != null) {
+                        if (caisseFrame.getPOSConf().askPostalCode()) {
-                    // Valider
-                    CaissePanel.this.controler.setLCD("Impression de", "votre ticket...", 0);
+                            caisseFrame.showPostalCodeFrame(CaissePanel.this);
-                    try {
+                        } else {
-                        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();
+                            validateTicket(caisseFrame);
-                        JOptionPane.showMessageDialog(CaissePanel.this, "Erreur d'impression du ticket");
+                        }
-                    CaissePanel.this.controler.setLCDDefaultDisplay(2);
+                    }
+                });
+            }
         });
         bClients.addActionListener(new ActionListener() {
         });
         return s;
+    }
+    protected void checkStock(int idDepot, Runnable runnable) {
+        final List<TicketItem> items = this.controler.getItems();
+        final List<Integer> articleIds = new ArrayList<>();
+        final Map<Integer, TicketItem> mapTicketItem = new HashMap<>();
+        for (TicketItem item : items) {
+            articleIds.add(item.getArticle().getId());
+            mapTicketItem.put(item.getArticle().getId(), item);
+        }
+        final SQLTable stockTable = this.dir.getElement(StockSQLElement.class).getTable();
+        final SQLSelect selStock = new SQLSelect();
+        selStock.addSelect(stockTable.getField("ID"));
+        selStock.addSelect(stockTable.getField("ID_DEPOT_STOCK"));
+        selStock.addSelect(stockTable.getField("QTE_REEL"));
+        selStock.addSelect(stockTable.getField("ID_ARTICLE"));
+        selStock.setWhere(Where.inValues(stockTable.getField("ID_ARTICLE"), articleIds).and(new Where(stockTable.getField("ID_DEPOT_STOCK"), "=", idDepot)));
+        Map<TicketItem, Integer> missingQty = new HashMap<>();
+        for (SQLRow row : SQLRowListRSH.execute(selStock)) {
+            int idArticle = row.getInt("ID_ARTICLE");
+            int qte = (int) Math.round(row.getFloat("QTE_REEL"));
+            TicketItem item = mapTicketItem.get(idArticle);
+            if (item == null) {
+                System.err.println("Pas d'entrée dans STOCK pour l'article " + idArticle);
+            } else {
+                if (qte < item.getQty().intValue()) {
+                    int delta = item.getQty().intValue() - qte;
+                    missingQty.put(item, delta);
+                }
+            }
+        }
+        if (missingQty.isEmpty()) {
+            runnable.run();
+        } else {
+            // Transfert de stock, Annulation ou bypass
+            getControler().openStockErrorPanel(missingQty, runnable);
+        }
+    }
+    public Set<Integer> loadFavoriteProductsIds() {
+        final TemplateNXProps nxprops = (TemplateNXProps) TemplateNXProps.getInstance();
+        final File f = new File(nxprops.getDefaultStringValue(), "favorites.txt");
+        System.out.println("CaisseControler.saveFavoriteProductsIds() loading favorites from " + f.getAbsolutePath());
+        final Set<Integer> result = new HashSet<>();
+        if (f.exists()) {
+            try {
+                String s = FileUtils.read(f);
+                List<String> sIds = StringUtils.fastSplit(s, ',');
+                for (String string : sIds) {
+                    if (!string.isEmpty()) {
+                        result.add(Integer.parseInt(string));
+                    }
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+    }
+    public void saveFavoriteProductsIds(List<Article> products) {
+        final TemplateNXProps nxprops = (TemplateNXProps) TemplateNXProps.getInstance();
+        final File f = new File(nxprops.getDefaultStringValue(), "favorites.txt");
+        System.out.println("CaisseControler.saveFavoriteProductsIds() saving favorites to " + f.getAbsolutePath());
+        try (FileOutputStream fOut = new FileOutputStream(f);) {
+            for (Article product : products) {
+                fOut.write(String.valueOf(product.getId()).getBytes());
+                fOut.write(',');
+            }
+            fOut.flush();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
-    private void loadArticles(final SQLElementDirectory dir) {
+    private List<Article> loadArticles(final SQLElementDirectory dir) {
+        long t1 = System.currentTimeMillis();
         final SQLSelect selUniteVente = new SQLSelect();
-        selUniteVente.addSelectStar(dir.getElement("UNITE_VENTE").getTable());
+        final SQLTable tableUniteVente = dir.getElement("UNITE_VENTE").getTable();
+        selUniteVente.addSelect(tableUniteVente.getKey());
+        selUniteVente.addSelect(tableUniteVente.getField("CODE"));
         final Map<Integer, String> mapUniteVenteName = new HashMap<>();
         for (SQLRow row : SQLRowListRSH.execute(selUniteVente)) {
             mapUniteVenteName.put(row.getID(), row.getString("CODE"));
+        }
-        final Set<Integer> favoriteProductsIds = this.controler.loadFavoriteProductsIds();
+        final Set<Integer> favoriteProductsIds = loadFavoriteProductsIds();
         final List<Article> favoriteProducts = new ArrayList<>();
         final Map<Integer, Categorie> categoriesMap = new HashMap<>();
         SQLElement eltFam = dir.getElement("FAMILLE_ARTICLE");
+        }
         final SQLSelect selArticle = new SQLSelect();
         final SQLTable tableArticle = eltArticle.getTable();
         selArticle.addAllSelect(tableArticle.getFields(VirtualFields.PRIMARY_KEY.union(VirtualFields.ARCHIVE)));
+        selArticle.addAllSelect(tableArticle,
-        selArticle.addAllSelect(tableArticle, Arrays.asList("ID_FAMILLE_ARTICLE", "NOM", "CODE", "CODE_BARRE", "ID_TAXE", "PV_HT", "PV_TTC", "ADDITIONAL_TICKET_COPY", "ID_UNITE_VENTE"));
+                Arrays.asList("ID_FAMILLE_ARTICLE", "NOM", "CODE", "CODE_BARRE", "ID_TAXE", "PV_HT", "PV_TTC", "ADDITIONAL_TICKET_COPY", "ID_UNITE_VENTE", "ID_ECO_CONTRIBUTION"));
         selArticle.setWhere(new Where(tableArticle.getField("OBSOLETE"), "=", Boolean.FALSE).and(new Where(tableArticle.getField("MASQUE_CAISSE"), "=", Boolean.FALSE)));
+        selArticle.andWhere(new Where(tableArticle.getField("VIRTUEL"), "=", Boolean.FALSE));
+        List<String> tablesDeclinaisons = new ArrayList<>();
+        List<String> declinaisonsFieldNames = new ArrayList<>();
+        for (SQLField f : tableArticle.getFields()) {
+            if (f.getName().startsWith("ID_ARTICLE_DECLINAISON_")) {
+                selArticle.addSelect(f);
+                declinaisonsFieldNames.add(f.getName());
+                tablesDeclinaisons.add(f.getName().substring("ID_".length()));
+            }
+        }
         final Categorie cUnclassified = new Categorie("Non classés", true);
         cUnclassified.setUnknown();
+        // Fetch des declinaisons :
+        // "ID_ARTICLE_DECLINAISON_COULEUR" : { {3 , "noir"] } ,
+        // "ID_ARTICLE_DECLINAISON_TAILLE" : { {2 ,"XL"},{3,"XXL"}};
+        Map<String, Map<Integer, String>> mapDeclinaisons = new HashMap<>();
+        for (String table : tablesDeclinaisons) {
+            SQLTable t = eltArticle.getTable().getTable(table);
+            final SQLSelect selDecl = new SQLSelect();
+            selDecl.addSelect(t.getKey());
+            selDecl.addSelect(t.getField("NOM"));
+            Map<Integer, String> m = new HashMap<>();
+            mapDeclinaisons.put("ID_" + table, m);
-        for (SQLRow row : SQLRowListRSH.execute(selArticle)) {
+            for (SQLRow row : SQLRowListRSH.execute(selDecl)) {
+                m.put(row.getID(), row.getString("NOM"));
+            }
+        }
+        // Fetch des articles
+        final List<SQLRow> rArticles = SQLRowListRSH.execute(selArticle);
+        List<Integer> idsArticles = new ArrayList<>(rArticles.size());
+        for (SQLRow r : rArticles) {
+            idsArticles.add(r.getID());
+        }
+        // Recuperation des promos
+        final SQLTable tableArticleTairdPromotion = tableArticle.getTable("ARTICLE_TARIF_PROMOTION");
+        final SQLTable tableTarifPromotion = tableArticle.getTable("TARIF_PROMOTION");
+        SQLRowValues rTarifPromotion = new SQLRowValues(tableArticleTairdPromotion);
+        rTarifPromotion.putNulls(tableArticleTairdPromotion.getFieldsName());
+        rTarifPromotion.putRowValues("ID_TARIF_PROMOTION").putNulls("START", "END");
+        rTarifPromotion.putRowValues("ID_ARTICLE").putNulls("ID_TAXE");
+        Where where = new Where(tableArticleTairdPromotion.getField("ID_ARTICLE"), idsArticles);
+        Calendar today = Calendar.getInstance();
+        final SQLRowValuesListFetcher fetcher = SQLRowValuesListFetcher.create(rTarifPromotion);
+        fetcher.appendSelTransf(new ITransformer<SQLSelect, SQLSelect>() {
+            @Override
+            public SQLSelect transformChecked(SQLSelect input) {
+                input.andWhere(new Where(input.getAlias(tableTarifPromotion.getField("START")), "<", today));
+                input.andWhere(new Where(input.getAlias(tableTarifPromotion.getField("END")), ">", today));
+                return input;
+            }
+        });
+        List<SQLRowValues> rPromotions = fetcher.fetch(where);
+        long t1p = System.currentTimeMillis();
+        // Tarifs : id article <-> liste des tarifs par quantité
+        Map<Integer, List<TarifQuantite>> mapTarif = new HashMap<>();
+        System.err.println("CaissePanel.loadArticles()" + rPromotions.size() + " promotions");
+        for (SQLRowValues r : rPromotions) {
+            final Integer foreignID = ((Integer) r.getObjectNoCheck("ID_ARTICLE"));
+            List<TarifQuantite> list = mapTarif.get(foreignID);
+            if (list == null) {
+                list = new ArrayList<>();
+                mapTarif.put(foreignID, list);
+            }
+            TarifQuantite t = new TarifQuantite(foreignID, r.getInt("QTE"), r.getBigDecimal("PV_HT"), r.getBigDecimal("PV_TTC"), r.getForeign("ID_ARTICLE").getInt("ID_TAXE"));
+            list.add(t);
+        }
+        final List<Article> res = new ArrayList<>(rArticles.size());
+        for (SQLRow row : rArticles) {
-            final int idFamilleArticle = row.getInt("ID_FAMILLE_ARTICLE");
+            final Integer idFamilleArticle = ((Integer) row.getObjectNoCheck("ID_FAMILLE_ARTICLE"));
             Categorie s1 = categoriesMap.get(idFamilleArticle);
             if (s1 == null) {
                 s1 = cUnclassified;
                 categoriesMap.put(idFamilleArticle, cUnclassified);
+            }
-            final String name = row.getString("NOM").trim();
+            final String name = ((String) row.getObjectNoCheck("NOM")).trim();
             if (name.length() > 0) {
                 final Article a = new Article(s1, name, row.getID());
-                final String barcode = row.getString("CODE_BARRE");
+                final String barcode = (String) row.getObjectNoCheck("CODE_BARRE");
-                final String code = row.getString("CODE");
+                final String code = (String) row.getObjectNoCheck("CODE");
                 a.setBarCode(StringUtils.isEmpty(barcode, true) ? code : barcode);
                 a.setCode(code);
-                a.setIdTaxe(row.getInt("ID_TAXE"));
+                a.setIdTaxe(((Integer) row.getObjectNoCheck("ID_TAXE")));
-                a.setPriceWithoutTax(row.getBigDecimal("PV_HT"));
+                a.setPriceWithoutTax((BigDecimal) row.getObjectNoCheck("PV_HT"));
-                a.setPriceWithTax(row.getBigDecimal("PV_TTC"));
+                a.setPriceWithTax((BigDecimal) row.getObjectNoCheck("PV_TTC"));
-                a.setAdditionalCopyRequested(row.getBoolean("ADDITIONAL_TICKET_COPY"));
+                a.setAdditionalCopyRequested((Boolean) row.getObjectNoCheck("ADDITIONAL_TICKET_COPY"));
+                final Integer idEcoContribution = ((Integer) row.getObjectNoCheck("ID_ECO_CONTRIBUTION"));
+                if (idEcoContribution > 1)
+                    a.setEcoTaxe((BigDecimal) row.getForeign("ID_ECO_CONTRIBUTION").getObjectNoCheck("TAUX"));
+                final Integer idUniteVente = ((Integer) row.getObjectNoCheck("ID_UNITE_VENTE"));
-                if (row.getInt("ID_UNITE_VENTE") != 2) {
+                if (idUniteVente != 2) {
-                    a.setSalesUnit(mapUniteVenteName.get(row.getInt("ID_UNITE_VENTE")));
+                    a.setSalesUnit(mapUniteVenteName.get(idUniteVente));
+                }
                 final Integer idProduct = a.getId();
                 if (favoriteProductsIds.contains(idProduct)) {
                     favoriteProducts.add(a);
+                }
+                final List<TarifQuantite> promotions = mapTarif.get(row.getID());
+                if (promotions != null) {
+                    a.setTarifsPromotion(promotions);
+                    for (TarifQuantite t : promotions) {
+                        if (t.getQuantite() == 1) {
+                            a.setIdTaxe(t.getIdTaxe());
+                            a.setPriceWithoutTax(t.getPrixHT());
+                            a.setPriceWithTax(t.getPrixTTC());
+                            break;
+                        }
+                    }
-        Categorie.setFavoriteProducts(favoriteProducts);
-        initCacheArticleMap(dir);
-    }
-    private static Map<Integer, SQLRowAccessor> cacheArticle = new HashMap<>();
+                }
-    public static SQLRowAccessor getArticleRowValuesFromCache(int id) {
+                for (String f : declinaisonsFieldNames) {
+                    Integer idArtDeclinaison = (Integer) row.getObjectNoCheck(f);
+                    if (idArtDeclinaison != null && idArtDeclinaison > 1) {
+                        Map<Integer, String> mm = mapDeclinaisons.get(f);
-        return cacheArticle.get(id);
+                        if (mm != null) {
+                            String v = mm.get(idArtDeclinaison);
+                            a.addDeclinaison(f.substring("ID_ARTICLE_DECLINAISON_".length()), v);
+                        }
+                    }
+                }
-    private void initCacheArticleMap(final SQLElementDirectory dir) {
-        final SQLTable tableArt = dir.getElement("ARTICLE").getTable();
-        SQLRowValues rowValsArt = new SQLRowValues(tableArt);
-        rowValsArt.putNulls(tableArt.getFieldsName());
+                res.add(a);
-        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);
+        }
+        long t2p = System.currentTimeMillis();
+        Categorie.setFavoriteProducts(favoriteProducts);
+        ArticleCache.initCache(dir);
+        ArticleCache.getInstance().preloadCacheArticleMap(new ArrayList<>(favoriteProductsIds));
+        long t2 = System.currentTimeMillis();
+        System.err.println("CaissePanel.loadArticles() " + res.size() + " in " + (t2 - t1) + " ms : process: " + (t2p - t1p) + " ms");
+        return res;
+    }
     @Override
     public void paint(Graphics g) {
         System.err.println("CaissePanel.paint()" + this.getWidth() + " x " + this.getHeight());
             // 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");
+                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Ã©");
+            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 177 → 182