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

 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.InitializeStockPanel;
 import org.openconcerto.erp.core.sales.product.action.InventairePanel;
+import org.openconcerto.erp.core.sales.product.action.TransfertStockFromArticlePanel;
 import org.openconcerto.erp.core.sales.product.component.ReferenceArticleSQLComponent;
 import org.openconcerto.erp.core.sales.product.model.ProductComponent;
 import org.openconcerto.erp.core.supplychain.stock.action.ListeDesMouvementsStockAction;
 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.StockConsultPanel;
 import org.openconcerto.erp.core.supplychain.stock.element.StockItem;
 import org.openconcerto.erp.core.supplychain.stock.element.StockItem.TypeStockMouvement;
 import org.openconcerto.erp.generationDoc.gestcomm.FicheArticleXmlSheet;
 import org.openconcerto.erp.model.MouseSheetXmlListeListener;
 import org.openconcerto.erp.preferences.DefaultNXProps;
 import org.openconcerto.sql.model.SQLDataSource;
 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.Where;
 import org.openconcerto.sql.model.graph.Path;
 import org.openconcerto.sql.preferences.SQLPreferences;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import javax.swing.AbstractAction;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
     public static final int AU_METRE_LONGUEUR = 2;
     public static final int AU_METRE_CARRE = 3;
     public static final int AU_POID_METRECARRE = 4;
     public static final int A_LA_PIECE = 5;
     public static final int AU_METRE_LARGEUR = 6;
+    public static final int AU_KILO = 7;
     private static final int PRIX_HA = 1;
     private static final int PRIX_VT = 2;
     protected PredicateRowAction stock;
     public static final String[] CONDITIONS = new String[] { "CFR", "CIF", "CPT", "DAT", "DDP", "DDU", "EXW", "FCA", "FOB" };
                     FrameUtil.showPacked(frame);
+                }
             }, true, false).setPredicate(ListEvent.getNonEmptySelectionPredicate());
             getRowActions().add(actionConvVirtuel);
+            RowAction actionTransfert = new RowAction(new AbstractAction("Transfert de stock") {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    final SQLRowAccessor selectedRowAccessor = IListe.get(e).getSelectedRowAccessor().fetchNewRow(false);
+                    PanelFrame frame = new PanelFrame(new TransfertStockFromArticlePanel(ComptaPropsConfiguration.getInstance(), selectedRowAccessor, null), "Transfert de stock");
+                    FrameUtil.showPacked(frame);
+                    frame.setLocationRelativeTo(IListe.get(e));
+                }
+            }, true, false) {
+                @Override
+                public boolean enabledFor(ListEvent evt) {
+                    return evt.getSelectedRowAccessors().size() == 1 && evt.getSelectedRowAccessors().get(0).getBoolean("GESTION_STOCK");
+                }
+            };
+            getRowActions().add(actionTransfert);
+            RowAction actionStockShow = new RowAction(new AbstractAction("Consulter le stock") {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    final StockConsultPanel p = new StockConsultPanel(ReferenceArticleSQLElement.this, IListe.get(e).getSelectedRowAccessor());
+                    // p.load(IListe.get(e).getSelectedRowAccessor());
+                    PanelFrame frame = new PanelFrame(p, "Consultation du stock");
+                    FrameUtil.showPacked(frame);
+                    frame.setLocationRelativeTo(IListe.get(e));
+                }
+            }, true, false) {
+                @Override
+                public boolean enabledFor(ListEvent evt) {
+                    return evt.getSelectedRowAccessors().size() == 1 && evt.getSelectedRowAccessors().get(0).getBoolean("GESTION_STOCK");
+                }
+            };
+            getRowActions().add(actionStockShow);
+        }
         if (prefs.getBoolean(GestionArticleGlobalPreferencePanel.ACTIVER_DECLINAISON, false)) {
             RowAction actionConvVirtuel = new RowAction(new AbstractAction("Convertir en article virtuel") {
                         ExceptionHandler.handle("Erreur lors de la conversion de l'article en virtuel", e1);
+                    }
+                }
             }, true, false) {
                 @Override
                 public boolean enabledFor(ListEvent evt) {
                     final List<? extends SQLRowAccessor> selection = evt.getSelectedRowAccessors();
                     if (selection.size() == 1) {
                         return !selection.get(0).getBoolean("VIRTUEL") && selection.get(0).isForeignEmpty("ID_ARTICLE_VIRTUEL_PERE");
+                    }
                     return false;
+                }
             };
             getRowActions().add(actionConvVirtuel);
                     f.getSQLComponent().select(rowVals);
                     FrameUtil.show(f);
+                }
             }, true, false) {
                 @Override
                 public boolean enabledFor(ListEvent evt) {
                     final List<? extends SQLRowAccessor> selection = evt.getSelectedRowAccessors();
                     if (selection.size() == 1) {
                         return selection.get(0).getBoolean("VIRTUEL");
                     f.setLocationRelativeTo(null);
                     FrameUtil.show(f);
+                }
             }, false, true) {
                 @Override
                 public boolean enabledFor(ListEvent evt) {
                     final List<? extends SQLRowAccessor> selection = evt.getSelectedRowAccessors();
                     if (selection.size() == 1) {
                         return selection.get(0).getBoolean("VIRTUEL");
+                }
             };
             getRowActions().add(actionCreateDecls);
+        }
         PredicateRowAction history = new PredicateRowAction(new AbstractAction("Historique") {
             @Override
             public void actionPerformed(ActionEvent e) {
                 HistoriqueArticleFrame frame = new HistoriqueArticleFrame(ReferenceArticleSQLElement.this);
+            }
         }, false, true);
         mvtStock.setPredicate(IListeEvent.getSingleSelectionPredicate());
         getRowActions().add(mvtStock);
-        if (ComptaPropsConfiguration.getInstanceCompta().isExperimental()) {
-            PredicateRowAction batches = new PredicateRowAction(new AbstractAction("Lots et numéros de série") {
+        PredicateRowAction batches = new PredicateRowAction(new AbstractAction("Lots et numéros de série") {
-                @Override
+            @Override
-                public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(ActionEvent e) {
-                    ListeDesLotsAction action = new ListeDesLotsAction(ReferenceArticleSQLElement.this.getDirectory(), IListe.get(e).getSelectedRowAccessor());
+                ListeDesLotsAction action = new ListeDesLotsAction(ReferenceArticleSQLElement.this.getDirectory(), IListe.get(e).getSelectedRowAccessor());
-                    action.actionPerformed(e);
+                action.actionPerformed(e);
+            }
-            }, false, true);
+        }, false, true);
-            batches.setPredicate(IListeEvent.getSingleSelectionPredicate());
+        batches.setPredicate(IListeEvent.getSingleSelectionPredicate());
-            getRowActions().add(batches);
+        getRowActions().add(batches);
-        }
         PredicateRowAction clone = new PredicateRowAction(new AbstractAction("Dupliquer") {
             @Override
             public void actionPerformed(ActionEvent e) {
             final BaseSQLTableModelColumn colStockGlobal = new BaseSQLTableModelColumn("Stock Global", BigDecimal.class) {
                 @Override
                 protected Object show_(SQLRowAccessor r) {
+                    if (!r.getBoolean("GESTION_STOCK")) {
+                        return null;
+                    }
                     BigDecimal totalQte = BigDecimal.ZERO;
                     Collection<? extends SQLRowAccessor> stockElt = r.getReferentRows(getTable().getTable("STOCK").getField("ID_ARTICLE"));
                     for (SQLRowAccessor rowElt : stockElt) {
                         BigDecimal qteCmd = new BigDecimal(rowElt.getFloat("QTE_REEL"));
                     return totalQte;
+                }
                 @Override
                 public Set<FieldPath> getPaths() {
+                    final Path p = new Path(getTable());
-                    Path p2 = new Path(getTable()).add(getTable().getTable("STOCK").getField("ID_ARTICLE"));
+                    Path p2 = p.add(getTable().getTable("STOCK").getField("ID_ARTICLE"));
-                    return CollectionUtils.createSet(new FieldPath(p2, "QTE_REEL"));
+                    return CollectionUtils.createSet(new FieldPath(p, "GESTION_STOCK"), new FieldPath(p2, "QTE_REEL"));
+                }
             };
             colStockGlobal.setRenderer(new NumberCellRenderer());
             source.getColumns().add(colStockGlobal);
+        }
                 public Set<FieldPath> getPaths() {
                     Path p = new Path(getTable());
                     p = p.add(getTable().getTable("ARTICLE_ELEMENT").getField("ID_ARTICLE_PARENT"));
                     return CollectionUtils.createSet(new FieldPath(p, "QTE"));
+                }
             });
+        }
+    }
     @Override
             l.add("ID_FOURNISSEUR");
+        }
         l.add("POIDS");
         l.add("SKU");
-        // if (!prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_MULTI_DEPOT, false)) {
+        if (!prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_MULTI_DEPOT, false)) {
-        l.add("GESTION_STOCK");
+            l.add("GESTION_STOCK");
-        l.add("ID_STOCK");
+            l.add("ID_STOCK");
-        // }
+        }
         String val = DefaultNXProps.getInstance().getStringProperty("ArticleService");
         Boolean b = Boolean.valueOf(val);
         if (b != null && b.booleanValue()) {
             l.add("SERVICE");
+        }
+        }
         mvtStockQuery += ")";
         return mvtStockQuery;
+    }
+    /**
+     * Article qui ont comme code les codes fournis en paramètre,
+     */
+    public Map<String, SQLRowAccessor> findArticleFromCode(List<String> codes) {
+        final SQLRowValues rv = new SQLRowValues(getTable());
+        rv.setAllToNull();
+        final SQLRowValuesListFetcher fetcher = SQLRowValuesListFetcher.create(rv);
+        final List<SQLRowValues> list = fetcher.fetch(Where.inValues(getTable().getField("CODE"), codes));
+        final Map<String, SQLRowAccessor> result = new HashMap<>(list.size());
+        for (SQLRowValues r : list) {
+            result.put(r.getString("CODE"), r);
+        }
+        return result;
+    }
+}

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 @ 180 - Rev 182 → 185