WebSVN - OpenConcerto - Diff - Rev 142 and 156 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/product/element/ReferenceArticleSQLElement.java

  package org.openconcerto.erp.core.sales.product.element;
 import org.openconcerto.erp.config.ComptaPropsConfiguration;
 import org.openconcerto.erp.core.common.element.ComptaSQLConfElement;
-import org.openconcerto.erp.core.common.ui.PanelFrame;
 import org.openconcerto.erp.core.edm.AttachmentAction;
 import org.openconcerto.erp.core.finance.tax.model.TaxeCache;
+import org.openconcerto.erp.core.reports.history.ui.HistoriqueArticleFrame;
 import org.openconcerto.erp.core.sales.product.action.InventairePanel;
 import org.openconcerto.erp.core.sales.product.component.ReferenceArticleSQLComponent;
+import org.openconcerto.erp.core.supplychain.stock.element.ComposedItemStockUpdater;
+import org.openconcerto.erp.core.supplychain.stock.element.DepotStockSQLElement;
+import org.openconcerto.erp.core.supplychain.stock.element.StockItem;
 import org.openconcerto.erp.generationDoc.gestcomm.FicheArticleXmlSheet;
 import org.openconcerto.erp.model.MouseSheetXmlListeListener;
 import org.openconcerto.erp.preferences.DefaultNXProps;
 import org.openconcerto.erp.preferences.GestionArticleGlobalPreferencePanel;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.model.SQLSelect;
 import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.model.Where;
 import org.openconcerto.sql.model.graph.Path;
 import org.openconcerto.sql.preferences.SQLPreferences;
+import org.openconcerto.sql.request.ComboSQLRequest;
 import org.openconcerto.sql.view.EditFrame;
 import org.openconcerto.sql.view.EditPanel.EditMode;
 import org.openconcerto.sql.view.list.BaseSQLTableModelColumn;
 import org.openconcerto.sql.view.list.IListe;
 import org.openconcerto.sql.view.list.IListeAction.IListeEvent;
 import org.openconcerto.sql.view.list.RowAction.PredicateRowAction;
 import org.openconcerto.sql.view.list.SQLTableModelColumn;
 import org.openconcerto.sql.view.list.SQLTableModelSource;
 import org.openconcerto.ui.FrameUtil;
+import org.openconcerto.ui.PanelFrame;
 import org.openconcerto.utils.CollectionUtils;
 import org.openconcerto.utils.DecimalUtils;
+import org.openconcerto.utils.ExceptionHandler;
 import org.openconcerto.utils.ListMap;
 import java.awt.event.ActionEvent;
 import java.math.BigDecimal;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import javax.swing.AbstractAction;
 import org.apache.commons.dbutils.handlers.ArrayListHandler;
     public static final int AU_POID_METRECARRE = 4;
     public static final int A_LA_PIECE = 5;
     public static final int AU_METRE_LARGEUR = 6;
     private static final int PRIX_HA = 1;
     private static final int PRIX_VT = 2;
-    protected final PredicateRowAction stock;
+    protected PredicateRowAction stock;
     public static final String[] CONDITIONS = new String[] { "CFR", "CIF", "CPT", "DAT", "DDP", "DDU", "EXW", "FCA", "FOB" };
     public ReferenceArticleSQLElement() {
         super("ARTICLE", "un article", "articles");
         this.stock = new PredicateRowAction(new AbstractAction("Mettre à jour les stocks") {
             @Override
             public void actionPerformed(ActionEvent e) {
+                final List<SQLRowValues> selectedRows = IListe.get(e).getSelectedRows();
+                List<SQLRowAccessor> l = new ArrayList<SQLRowAccessor>();
+                for (SQLRowValues sqlRowValues : selectedRows) {
+                    l.add(sqlRowValues.asRow().getForeign("ID_STOCK"));
+                }
-                PanelFrame p = new PanelFrame(new InventairePanel(IListe.get(e), IListe.get(e).getSelectedRows()), "Mise à jour des stocks");
+                PanelFrame p = new PanelFrame(new InventairePanel(IListe.get(e), l), "Mise à jour des stocks");
                 FrameUtil.show(p);
+            }
         }, true, false);
         stock.setPredicate(IListeEvent.getNonEmptySelectionPredicate());
         getRowActions().add(stock);
+        PredicateRowAction history = new PredicateRowAction(new AbstractAction("Historique") {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                HistoriqueArticleFrame frame = new HistoriqueArticleFrame(ReferenceArticleSQLElement.this);
+                frame.selectId(IListe.get(e).getSelectedId());
+                frame.setVisible(true);
+            }
+        }, false, true);
+        history.setPredicate(IListeEvent.getSingleSelectionPredicate());
+        getRowActions().add(history);
         PredicateRowAction clone = new PredicateRowAction(new AbstractAction("Dupliquer") {
             @Override
             public void actionPerformed(ActionEvent e) {
         clone.setPredicate(IListeEvent.getSingleSelectionPredicate());
         getRowActions().add(clone);
         PredicateRowAction actionAttachment = new PredicateRowAction(new AttachmentAction().getAction(), true);
         actionAttachment.setPredicate(IListeEvent.getSingleSelectionPredicate());
         getRowActions().add(actionAttachment);
+    }
     @Override
     protected synchronized void _initTableSource(final SQLTableModelSource source) {
             l.add("ID_TAXE");
         l.add("PV_TTC");
         l.add("ID_FAMILLE_ARTICLE");
         l.add("ID_FOURNISSEUR");
         l.add("SKU");
+        // if (!prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_MULTI_DEPOT, false)) {
         l.add("ID_STOCK");
+        // }
         String val = DefaultNXProps.getInstance().getStringProperty("ArticleService");
         Boolean b = Boolean.valueOf(val);
         if (b != null && b.booleanValue()) {
             l.add("SERVICE");
+        }
         final ListMap<String, String> res = new ListMap<String, String>();
         SQLPreferences prefs = new SQLPreferences(getTable().getDBRoot());
         if (prefs.getBoolean(GestionArticleGlobalPreferencePanel.SHOW_PRODUCT_BAR_CODE, false)) {
             res.add(null, "CODE_BARRE");
+        }
-        res.addAll(null, "NOM", "ID_FAMILLE_ARTICLE");
+        res.addAll(null, "CODE", "NOM", "ID_FAMILLE_ARTICLE");
         return res;
+    }
     protected List<String> getComboFields() {
         final List<String> l = new ArrayList<String>();
         if (createIfNotExist && row.getString("CODE") != null && row.getString("CODE").trim().length() > 0 && row.getString("NOM") != null && row.getString("NOM").trim().length() > 0) {
             SQLRowValues vals = new SQLRowValues(row);
             BigDecimal taux = BigDecimal.ONE.add(new BigDecimal(TaxeCache.getCache().getTauxFromId(row.getForeignID("ID_TAXE")) / 100f));
             vals.put("PV_TTC", vals.getBigDecimal("PV_HT").multiply(taux));
+            vals.put("ID_DEPOT_STOCK", DepotStockSQLElement.DEFAULT_ID);
             int idArticle;
             try {
                 // Liaison avec l'article fournisseur si il existe
                 SQLSelect selMatchingCodeF = new SQLSelect();
     public static boolean isReferenceEquals(SQLRowValues rowVals1, SQLRowValues rowVals2) {
         return (rowVals1.getObject("CODE").equals(rowVals2.getObject("CODE")) && rowVals1.getString("VALEUR_METRIQUE_1").equals(rowVals2.getString("VALEUR_METRIQUE_1"))
                 && rowVals1.getString("VALEUR_METRIQUE_2").equals(rowVals2.getString("VALEUR_METRIQUE_2")) && rowVals1.getString("VALEUR_METRIQUE_3").equals(rowVals2.getString("VALEUR_METRIQUE_3")));
+    }
+    public void initStock(int id) {
+        SQLRow row = getTable().getRow(id);
+        SQLSelect sel = new SQLSelect();
+        sel.addSelectStar(getTable().getTable("DEPOT_STOCK"));
+        List<SQLRow> rowsDepot = SQLRowListRSH.execute(sel);
+        SQLSelect selStock = new SQLSelect();
+        selStock.addSelectStar(getTable().getTable("STOCK"));
+        selStock.setWhere(new Where(getTable().getTable("STOCK").getField("ID_ARTICLE"), "=", id));
+        List<SQLRow> rowsStock = SQLRowListRSH.execute(selStock);
+        Map<Integer, SQLRow> initedDepot = new HashMap<>();
+        for (SQLRow sqlRow : rowsStock) {
+            initedDepot.put(sqlRow.getForeignID("ID_DEPOT_STOCK"), sqlRow);
+        }
+        List<StockItem> stockItems = new ArrayList<StockItem>();
+        for (SQLRow sqlRow : rowsDepot) {
+            try {
+                if (!initedDepot.keySet().contains(sqlRow.getID())) {
+                    SQLRowValues rowVals = new SQLRowValues(getTable().getTable("STOCK"));
+                    rowVals.put("ID_ARTICLE", row.getID());
+                    rowVals.put("ID_DEPOT_STOCK", sqlRow.getID());
+                    SQLRow rowStock = rowVals.commit();
+                    if ((row.getObject("ID_DEPOT_STOCK") == null || row.isForeignEmpty("ID_DEPOT_STOCK")) && sqlRow.getID() == DepotStockSQLElement.DEFAULT_ID) {
+                        row.createEmptyUpdateRow().put("ID_STOCK", rowStock.getID()).put("ID_DEPOT_STOCK", DepotStockSQLElement.DEFAULT_ID).commit();
+                    } else if (sqlRow.getID() == row.getForeignID("ID_DEPOT_STOCK")) {
+                        row.createEmptyUpdateRow().put("ID_STOCK", rowStock.getID()).commit();
+                    }
+                    stockItems.add(new StockItem(row, rowStock));
+                } else {
+                    SQLRow rowExisting = initedDepot.get(sqlRow.getID());
+                    if ((row.getObject("ID_DEPOT_STOCK") == null || row.isForeignEmpty("ID_DEPOT_STOCK")) && sqlRow.getID() == DepotStockSQLElement.DEFAULT_ID) {
+                        row.createEmptyUpdateRow().put("ID_STOCK", rowExisting.getID()).put("ID_DEPOT_STOCK", DepotStockSQLElement.DEFAULT_ID).commit();
+                    } else if (sqlRow.getID() == row.getForeignID("ID_DEPOT_STOCK")) {
+                        row.createEmptyUpdateRow().put("ID_STOCK", rowExisting.getID()).commit();
+                    }
+                    stockItems.add(new StockItem(row, rowExisting));
+                }
+            } catch (SQLException e) {
+                ExceptionHandler.handle("Erreur lors de l'initialisation du stock de l'article", e);
+            }
+        }
+        if (row.getReferentRows(getTable().getTable("ARTICLE_ELEMENT").getField("ID_ARTICLE_PARENT")).size() > 0) {
+            ComposedItemStockUpdater up = new ComposedItemStockUpdater(getTable().getDBRoot(), stockItems);
+            try {
+                up.updateNomenclature(stockItems);
+            } catch (SQLException e) {
+                ExceptionHandler.handle("Erreur lors de l'actualisation du stock!", e);
+            }
+        }
+    }
     @Override
     protected String createCode() {
-        return createCodeFromPackage() + ".ref";
+        return createCodeOfPackage() + ".ref";
+    }
+    @Override
+    protected void _initComboRequest(ComboSQLRequest req) {
+        super._initComboRequest(req);
+        req.addToGraphToFetch("ID_DEPOT_STOCK");
+        // req.addForeignToGraphToFetch("ID_DEPOT_STOCK", Arrays.asList("ID"));
+    }
+}

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/product/element/ReferenceArticleSQLElement.java - Rev 142 → 156