WebSVN - OpenConcerto - Diff - Rev 142 and 156 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/supplychain/stock/element/MouvementStockSQLElement.java

 import org.openconcerto.erp.config.ComptaPropsConfiguration;
 import org.openconcerto.erp.core.common.element.ComptaSQLConfElement;
 import org.openconcerto.erp.core.sales.product.element.ReferenceArticleSQLElement;
 import org.openconcerto.erp.core.supplychain.order.component.CommandeSQLComponent;
+import org.openconcerto.erp.core.supplychain.order.ui.CommandeItemTable;
 import org.openconcerto.erp.core.supplychain.supplier.component.MouvementStockSQLComponent;
 import org.openconcerto.erp.preferences.GestionArticleGlobalPreferencePanel;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.element.SQLComponent;
 import org.openconcerto.sql.element.SQLElement;
 import org.openconcerto.sql.view.EditFrame;
 import org.openconcerto.sql.view.EditPanel;
 import org.openconcerto.sql.view.EditPanel.EditMode;
 import org.openconcerto.sql.view.list.RowValuesTableModel;
 import org.openconcerto.ui.FrameUtil;
-import org.openconcerto.utils.ExceptionHandler;
 import org.openconcerto.utils.ListMap;
 import java.math.BigDecimal;
 import java.sql.SQLException;
 import java.util.ArrayList;
     public MouvementStockSQLElement() {
         super("MOUVEMENT_STOCK", "un mouvement de stock", "mouvements de stock");
+    }
+    @Override
+    public ListMap<String, String> getShowAs() {
+        ListMap<String, String> map = new ListMap<String, String>();
+        map.putCollection("ID_STOCK", "ID_DEPOT_STOCK");
+        return map;
+    }
     protected List<String> getListFields() {
         final List<String> l = new ArrayList<String>();
+        l.add("ID_STOCK");
         l.add("DATE");
         l.add("NOM");
         l.add("ID_ARTICLE");
         l.add("QTE");
         l.add("REEL");
         super.archive(trees, cutLinks);
         updateStock(trees.getRows(), true);
+    }
-    // public CollectionMap<SQLRow, List<SQLRowValues>> updateStock(List<Integer> ids) {
-    // return updateStock(ids, false);
-    // }
-    private final SQLTable sqlTableArticle = ((ComptaPropsConfiguration) Configuration.getInstance()).getRootSociete().getTable("ARTICLE");
     /**
      * Mise à jour des stocks ajoute la quantité si archive est à false
+     *
      * @param id mouvement stock
      * @param archive
+     * @throws SQLException
      */
-    public ListMap<SQLRow, SQLRowValues> updateStock(Collection<SQLRow> rowsMvt, boolean archive) {
+    public ListMap<SQLRow, SQLRowValues> updateStock(Collection<SQLRow> rowsMvt, boolean archive) throws SQLException {
         // FIXME: if (SwingUtilities.isEventDispatchThread()) {
         // throw new IllegalStateException("This method must be called outside of EDT");
         // }
         // Stock Reel : inc/dec QTE_REEL, inc/dec QTE_LIV_ATTENTE/inc/dec
         // QTE_RECEPT_ATTENTE
         // Stock Th : inc/dec QTE_TH, inc/dec QTE_LIV_ATTENTE/inc/dec
         // QTE_RECEPT_ATTENTE
-        final ListMap<SQLRow, SQLRowValues> map = new ListMap<SQLRow, SQLRowValues>();
+        final ListMap<SQLRow, SQLRowValues> map = new ListMap<>();
-        SQLTable tableCmdElt = Configuration.getInstance().getBase().getTable("COMMANDE_ELEMENT");
+        final SQLTable tableCommandeElement = Configuration.getInstance().getBase().getTable("COMMANDE_ELEMENT");
+        final SQLElement elementStock = Configuration.getInstance().getDirectory().getElement("STOCK");
         for (SQLRow rowMvtStock : rowsMvt) {
             boolean retour = rowMvtStock.getString("SOURCE") == null || rowMvtStock.getString("SOURCE").startsWith("AVOIR_CLIENT");
             // Mise à jour des stocks
-            SQLTable sqlTableArticle = ((ComptaPropsConfiguration) Configuration.getInstance()).getRootSociete().getTable("ARTICLE");
-            SQLElement eltArticle = Configuration.getInstance().getDirectory().getElement(sqlTableArticle);
-            SQLElement eltStock = Configuration.getInstance().getDirectory().getElement("STOCK");
             final SQLRow rowArticle = rowMvtStock.getForeignRow("ID_ARTICLE");
-            SQLRow rowStock = rowArticle.getForeignRow(("ID_STOCK"));
+            SQLRow rowStock = rowMvtStock.getForeignRow(("ID_STOCK"));
+            if (rowStock == null || rowStock.isUndefined()) {
+                rowStock = rowArticle.getForeign("ID_STOCK");
+            }
             if (rowMvtStock.getBoolean("REEL")) {
                 float qte = rowStock.getFloat("QTE_REEL");
                 float qteMvt = rowMvtStock.getFloat("QTE");
-                SQLRowValues rowVals = new SQLRowValues(eltStock.getTable());
+                SQLRowValues rowVals = new SQLRowValues(elementStock.getTable());
                 float qteNvlle;
                 float qteNvlleEnAttenteRecept = rowStock.getFloat("QTE_RECEPT_ATTENTE");
                 float qteNvlleEnAttenteExp = rowStock.getFloat("QTE_LIV_ATTENTE");
                 if (archive) {
                 rowVals.put("QTE_REEL", qteNvlle);
                 rowVals.put("QTE_RECEPT_ATTENTE", qteNvlleEnAttenteRecept);
                 rowVals.put("QTE_LIV_ATTENTE", qteNvlleEnAttenteExp);
                 try {
-                    if (rowStock.getID() <= 1) {
-                        SQLRow row = rowVals.insert();
-                        SQLRowValues rowValsArt = new SQLRowValues(eltArticle.getTable());
-                        rowValsArt.put("ID_STOCK", row.getID());
-                        final int idArticle = rowArticle.getID();
-                        if (idArticle > 1) {
-                            rowValsArt.update(idArticle);
-                        }
-                    } else {
-                        rowVals.update(rowStock.getID());
+                    rowVals.update(rowStock.getID());
-                    }
-                } catch (SQLException e) {
-                    ExceptionHandler.handle("Erreur lors de la mise à jour du stock pour l'article " + rowArticle.getString("CODE"));
-                }
-                SQLPreferences prefs = new SQLPreferences(getTable().getDBRoot());
+                    SQLPreferences prefs = new SQLPreferences(getTable().getDBRoot());
-                boolean gestionStockMin = prefs.getBoolean(GestionArticleGlobalPreferencePanel.WARNING_STOCK_MIN, true);
+                    boolean gestionStockMin = prefs.getBoolean(GestionArticleGlobalPreferencePanel.WARNING_STOCK_MIN, true);
-                if (!archive && rowArticle.getTable().getFieldsName().contains("QTE_MIN") && gestionStockMin && rowArticle.getObject("QTE_MIN") != null && qteNvlle < rowArticle.getInt("QTE_MIN")) {
+                    if (!archive && gestionStockMin && rowStock.getObject("QTE_MIN") != null && qteNvlle < rowStock.getFloat("QTE_MIN")) {
-                    // final float qteShow = qteNvlle;
+                        // final float qteShow = qteNvlle;
-                    SQLInjector inj = SQLInjector.getInjector(rowArticle.getTable(), tableCmdElt);
+                        SQLInjector inj = SQLInjector.getInjector(rowArticle.getTable(), tableCommandeElement);
-                    SQLRowValues rowValsElt = new SQLRowValues(inj.createRowValuesFrom(rowArticle));
+                        SQLRowValues rowValsElt = new SQLRowValues(inj.createRowValuesFrom(rowArticle));
-                    rowValsElt.put("ID_STYLE", 2);
+                        rowValsElt.put("ID_STYLE", 2);
-                    final SQLRow unite = rowArticle.getForeign("ID_UNITE_VENTE");
+                        final SQLRow unite = rowArticle.getForeign("ID_UNITE_VENTE");
-                    final float qteElt = rowArticle.getInt("QTE_MIN") - qteNvlle;
+                        final float qteElt = rowStock.getFloat("QTE_MIN") - qteNvlle;
-                    if (unite.isUndefined() || unite.getBoolean("A_LA_PIECE")) {
+                        if (unite.isUndefined() || unite.getBoolean("A_LA_PIECE")) {
-                        rowValsElt.put("QTE", Math.round(qteElt));
+                            rowValsElt.put("QTE", Math.round(qteElt));
-                        rowValsElt.put("QTE_UNITAIRE", BigDecimal.ONE);
+                            rowValsElt.put("QTE_UNITAIRE", BigDecimal.ONE);
-                    } else {
+                        } else {
-                        rowValsElt.put("QTE", 1);
+                            rowValsElt.put("QTE", 1);
+                        }
-                    rowValsElt.put("ID_TAXE", rowValsElt.getObject("ID_TAXE"));
+                        rowValsElt.put("ID_TAXE", rowValsElt.getObject("ID_TAXE"));
-                    rowValsElt.put("T_POIDS", rowValsElt.getLong("POIDS") * qteElt);
+                        rowValsElt.put("T_POIDS", rowValsElt.getLong("POIDS") * qteElt);
-                    rowValsElt.put("T_PA_HT", rowValsElt.getLong("PA_HT") * qteElt);
+                        rowValsElt.put("T_PA_HT", rowValsElt.getLong("PA_HT") * qteElt);
-                    rowValsElt.put("T_PA_TTC", rowValsElt.getLong("T_PA_HT") * (rowValsElt.getForeign("ID_TAXE").getFloat("TAUX") / 100.0 + 1.0));
+                        rowValsElt.put("T_PA_TTC", rowValsElt.getLong("T_PA_HT") * (rowValsElt.getForeign("ID_TAXE").getFloat("TAUX") / 100.0 + 1.0));
-                    map.add(rowArticle.getForeignRow("ID_FOURNISSEUR"), rowValsElt);
+                        map.add(rowArticle.getForeignRow("ID_FOURNISSEUR"), rowValsElt);
+                    }
+                } catch (SQLException e) {
+                    throw new SQLException("Erreur lors de la mise à jour du stock pour l'article " + rowArticle.getString("CODE"), e);
+                }
             } else {
                 float qte = rowStock.getFloat("QTE_TH");
                 float qteMvt = rowMvtStock.getFloat("QTE");
-                SQLRowValues rowVals = new SQLRowValues(eltStock.getTable());
+                SQLRowValues rowVals = new SQLRowValues(elementStock.getTable());
                 float qteNvlle;
                 float qteNvlleEnAttenteRecept = rowStock.getFloat("QTE_RECEPT_ATTENTE");
                 float qteNvlleEnAttenteExp = rowStock.getFloat("QTE_LIV_ATTENTE");
+                    }
+                }
                 rowVals.put("QTE_TH", qteNvlle);
                 rowVals.put("QTE_RECEPT_ATTENTE", qteNvlleEnAttenteRecept);
                 rowVals.put("QTE_LIV_ATTENTE", qteNvlleEnAttenteExp);
                 try {
-                    if (rowStock.getID() <= 1) {
-                        SQLRow row = rowVals.insert();
-                        SQLRowValues rowValsArt = new SQLRowValues(eltArticle.getTable());
-                        rowValsArt.put("ID_STOCK", row.getID());
-                        final int idArticle = rowArticle.getID();
-                        if (idArticle > 1) {
-                            rowValsArt.update(idArticle);
-                        }
-                    } else {
-                        rowVals.update(rowStock.getID());
+                    rowVals.update(rowStock.getID());
-                    }
                 } catch (SQLException e) {
-                    ExceptionHandler.handle("Erreur lors de la mise à jour du stock pour l'article " + rowArticle.getString("CODE"));
+                    throw new SQLException("Erreur lors de la mise à jour du stock pour l'article " + rowArticle.getString("CODE"), e);
+                }
+            }
+        }
         return map;
                             rowVals.put("NOM", ref);
                             cmp.select(rowVals);
                             cmp.getRowValuesTable().getRowValuesTableModel().clearRows();
+                        }
+                        CommandeItemTable itemTable = cmp.getRowValuesTablePanel();
                         final RowValuesTableModel model = cmp.getRowValuesTable().getRowValuesTableModel();
                         for (SQLRowValues rowValsElt : e.getValue()) {
                             SQLRowValues rowValsMatch = null;
                             int index = 0;
                             if (rowValsMatch != null) {
                                 final int qte = rowValsMatch.getInt("QTE");
                                 model.putValue(qte + rowValsElt.getInt("QTE"), index, "QTE");
                             } else {
                                 model.addRow(rowValsElt);
+                                if (rowValsElt.getObject("ID_ARTICLE") != null && !rowValsElt.isForeignEmpty("ID_ARTICLE")) {
+                                    Object o = itemTable.tarifCompletion(rowValsElt.getForeign("ID_ARTICLE").asRow(), "PRIX_METRIQUE_HA_1");
+                                    if (o != null) {
+                                        model.putValue(o, model.getRowCount() - 1, "PRIX_METRIQUE_HA_1");
+                                    }
+                                }
+                            }
+                        }
                         frame.pack();
                         FrameUtil.show(frame);
+        }
+    }
     @Override
     protected String createCode() {
-        return createCodeFromPackage() + ".transaction";
+        return createCodeOfPackage() + ".transaction";
+    }
+}

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/supplychain/stock/element/MouvementStockSQLElement.java @ 174 - Rev 142 → 156