WebSVN - OpenConcerto - Diff - Rev 151 and 156 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/order/element/CommandeClientElementSQLElement.java

  package org.openconcerto.erp.core.sales.order.element;
 import org.openconcerto.erp.config.ComptaPropsConfiguration;
 import org.openconcerto.erp.core.common.element.ComptaSQLConfElement;
-import org.openconcerto.erp.core.common.ui.DeviseField;
 import org.openconcerto.erp.core.sales.product.element.ReferenceArticleSQLElement;
 import org.openconcerto.erp.core.supplychain.stock.element.MouvementStockSQLElement;
+import org.openconcerto.erp.core.supplychain.stock.element.StockItemsUpdater;
+import org.openconcerto.erp.core.supplychain.stock.element.StockItemsUpdater.TypeStockUpdate;
+import org.openconcerto.erp.core.supplychain.stock.element.StockLabel;
+import org.openconcerto.erp.core.supplychain.stock.element.StockSQLElement;
 import org.openconcerto.sql.element.SQLComponent;
 import org.openconcerto.sql.element.SQLElement;
 import org.openconcerto.sql.element.UISQLComponent;
 import org.openconcerto.sql.model.SQLInjector;
 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.SQLSelect;
 import org.openconcerto.sql.model.SQLTable;
+import org.openconcerto.sql.model.Where;
+import org.openconcerto.sql.request.ListSQLRequest;
+import org.openconcerto.sql.request.UpdateBuilder;
 import org.openconcerto.sql.sqlobject.ElementComboBox;
+import org.openconcerto.sql.users.UserManager;
+import org.openconcerto.sql.view.EditFrame;
+import org.openconcerto.sql.view.EditPanel.EditMode;
 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.ui.FrameUtil;
 import org.openconcerto.utils.DecimalUtils;
 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.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
         PredicateRowAction rowAction = new PredicateRowAction(new AbstractAction("Transfert vers commande fournisseur") {
             @Override
             public void actionPerformed(ActionEvent e) {
                 final List<SQLRowValues> selectedRows = IListe.get(e).getSelectedRows();
-                final List<SQLRowAccessor> arts = new ArrayList<SQLRowAccessor>();
-                final Set<Integer> s = new HashSet<Integer>();
-                for (SQLRowValues sqlRowValues : selectedRows) {
-                    if (sqlRowValues.getObject("ID_ARTICLE") != null && !sqlRowValues.isForeignEmpty("ID_ARTICLE")) {
-                        SQLRowAccessor rowArt = sqlRowValues.getForeign("ID_ARTICLE");
-                        if (!s.contains(rowArt.getID())) {
-                            s.add(rowArt.getID());
-                            arts.add(rowArt);
-                        }
-                    }
-                }
                 ComptaPropsConfiguration.getInstanceCompta().getNonInteractiveSQLExecutor().execute(new Runnable() {
                     @Override
                     public void run() {
-                        createCommandeF(arts);
+                        createCommandeF(selectedRows);
+                    }
                 });
+            }
         }, true);
         rowAction.setPredicate(IListeEvent.getNonEmptySelectionPredicate());
         getRowActions().add(rowAction);
+        PredicateRowAction rowActionCmd = new PredicateRowAction(new AbstractAction("Modifier la commande associée") {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                SQLRowValues selectedRow = IListe.get(e).getSelectedRow();
+                EditFrame f = new EditFrame(getForeignElement("ID_COMMANDE_CLIENT"), EditMode.MODIFICATION);
+                f.getSQLComponent().select(selectedRow.getForeignID("ID_COMMANDE_CLIENT"));
+                FrameUtil.showPacked(f);
+            }
+        }, true);
+        rowActionCmd.setPredicate(IListeEvent.getSingleSelectionPredicate());
+        getRowActions().add(rowActionCmd);
+        if (getTable().getForeignTable("ID_USER_COMMON_CREATE").getRow(UserManager.getUserID()).getBoolean("ADMIN")) {
+            PredicateRowAction rowActionForceLivr = new PredicateRowAction(new AbstractAction("Forcer la livraison") {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    updateForceLivrer(e, Boolean.TRUE);
+                }
+            }, true);
+            rowActionForceLivr.setPredicate(IListeEvent.getNonEmptySelectionPredicate());
+            getRowActions().add(rowActionForceLivr);
+            PredicateRowAction rowActionAnnuler = new PredicateRowAction(new AbstractAction("Annuler Forcer la livraison") {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    updateForceLivrer(e, Boolean.FALSE);
+                }
+            }, true);
+            rowActionAnnuler.setPredicate(IListeEvent.getNonEmptySelectionPredicate());
+            getRowActions().add(rowActionAnnuler);
+            PredicateRowAction rowActionUpdateStockTh = new PredicateRowAction(new AbstractAction("Recalculer le stock théorique") {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    recalculStockTh();
+                }
+            }, true);
+            rowActionUpdateStockTh.setPredicate(IListeEvent.createTotalRowCountPredicate(0, Integer.MAX_VALUE));
+            getRowActions().add(rowActionUpdateStockTh);
+        }
+    }
+    private void updateForceLivrer(ActionEvent e, Boolean state) {
+        final List<SQLRowValues> selectedRows = IListe.get(e).getSelectedRows();
+        final Set<Integer> ids = new HashSet<Integer>();
+        for (SQLRowValues sqlRowValues : selectedRows) {
+            ids.add(sqlRowValues.getID());
+        }
+        UpdateBuilder build = new UpdateBuilder(getTable());
+        build.setObject("LIVRE_FORCED", state);
+        build.setWhere(new Where(getTable().getKey(), ids));
+        getTable().getDBSystemRoot().getDataSource().execute(build.asString());
+        IListe.get(e).getModel().updateAll();
+    }
+    public void recalculStockTh() {
+        // RAZ des stocks TH --> TH = REEL
+        final SQLTable tableStock = getTable().getDBRoot().findTable("STOCK");
+        String req = "UPDATE " + tableStock.getSQLName().quote() + " SET " + tableStock.getField("QTE_TH").getQuotedName() + " = " + tableStock.getField("QTE_REEL").getQuotedName() + ","
+                + tableStock.getField("QTE_RECEPT_ATTENTE").getQuotedName() + " = 0," + tableStock.getField("QTE_LIV_ATTENTE").getQuotedName() + "=0";
+        tableStock.getDBSystemRoot().getDataSource().execute(req);
+        {
+            SQLSelect selCmdElt = new SQLSelect();
+            final SQLTable tableCmdElt = tableStock.getTable("COMMANDE_ELEMENT");
+            selCmdElt.addSelectStar(tableCmdElt);
+            Where w = new Where(tableCmdElt.getField("RECU_FORCED"), "=", Boolean.FALSE).and(new Where(tableCmdElt.getField("RECU"), "=", Boolean.FALSE));
+            selCmdElt.setWhere(w);
+            List<SQLRow> res = SQLRowListRSH.execute(selCmdElt);
+            if (res != null && res.size() > 0) {
+                StockItemsUpdater updater = new StockItemsUpdater(new StockLabel() {
+                    @Override
+                    public String getLabel(SQLRowAccessor rowOrigin, SQLRowAccessor rowElt) {
+                        return "Commande fournisseur N°" + rowElt.getForeign("ID_COMMANDE").getString("NUMERO");
+                    }
+                }, res.get(0), res, TypeStockUpdate.VIRTUAL_RECEPT, false);
+                try {
+                    updater.update();
+                } catch (SQLException e1) {
+                    e1.printStackTrace();
+                }
+            }
+        }
+        {
+            SQLSelect selCmdElt = new SQLSelect();
+            final SQLTable tableCmdElt = tableStock.getTable("COMMANDE_CLIENT_ELEMENT");
+            selCmdElt.addSelectStar(tableCmdElt);
+            Where w = new Where(tableCmdElt.getField("LIVRE_FORCED"), "=", Boolean.FALSE).and(new Where(tableCmdElt.getField("LIVRE"), "=", Boolean.FALSE));
+            selCmdElt.setWhere(w);
+            List<SQLRow> res = SQLRowListRSH.execute(selCmdElt);
+            if (res != null && res.size() > 0) {
+                StockItemsUpdater updater = new StockItemsUpdater(new StockLabel() {
+                    @Override
+                    public String getLabel(SQLRowAccessor rowOrigin, SQLRowAccessor rowElt) {
+                        return "Commande N°" + rowElt.getForeign("ID_COMMANDE_CLIENT").getString("NUMERO");
+                    }
+                }, res.get(0), res, TypeStockUpdate.VIRTUAL_DELIVER, false);
+                try {
+                    updater.update();
+                } catch (SQLException e1) {
+                    e1.printStackTrace();
+                }
+            }
+        }
+    }
     @Override
     protected String getParentFFName() {
         return "ID_COMMANDE_CLIENT";
         l.add("T_PV_HT");
         l.add("T_PV_TTC");
         l.add("QTE");
         l.add("QTE_UNITAIRE");
         l.add("QTE_LIVREE");
+        l.add("LIVRE");
+        l.add("LIVRE_FORCED");
         return l;
+    }
     /**
      * Transfert d'une commande en commande fournisseur
         SQLElement eltArticle = getDirectory().getElement("ARTICLE");
         final ListMap<SQLRow, SQLRowValues> map = new ListMap<SQLRow, SQLRowValues>();
         List<String> fields2copy = Arrays.asList("CODE", "NOM", "VALEUR_METRIQUE_1", "VALEUR_METRIQUE_2", "VALEUR_METRIQUE_3");
-        Set<Integer> art = new HashSet<Integer>();
+        // Set<Integer> art = new HashSet<Integer>();
         for (SQLRowValues sqlRow : commandeClientEltsRows) {
             // on récupére l'article qui lui correspond
             SQLRowValues rowArticle = new SQLRowValues(eltArticle.getTable());
             for (String field : fields2copy) {
                 // if (sqlRow.getTable().getFieldsName().contains(field.getName())) {
+        }
         // TODO
         MouvementStockSQLElement.createCommandeF(map, null, "", false);
+    }
-    public void createCommandeF(final List<? extends SQLRowAccessor> rowsArt) {
+    public void createCommandeF(final List<? extends SQLRowAccessor> rowsItems) {
         ComptaPropsConfiguration.getInstanceCompta().getNonInteractiveSQLExecutor().execute(new Runnable() {
             @Override
             public void run() {
                 final ListMap<SQLRow, SQLRowValues> map = new ListMap<SQLRow, SQLRowValues>();
+                final Set<Integer> stockChecked = new HashSet<Integer>();
-                for (SQLRowAccessor rowArticleFind : rowsArt) {
+                for (SQLRowAccessor rowItem : rowsItems) {
+                    if (rowItem.getObject("ID_ARTICLE") != null && !rowItem.isForeignEmpty("ID_ARTICLE")) {
+                        SQLRowAccessor rowArticleFind = rowItem.getForeign("ID_ARTICLE");
-                    SQLRow row = rowArticleFind.asRow();
+                        SQLRow row = rowArticleFind.asRow();
+                        SQLRowAccessor rowStock = StockSQLElement.getStock(rowItem);
+                        if (!stockChecked.contains(rowStock.getID())) {
+                            stockChecked.add(rowStock.getID());
-                    final int value = -Math.round(row.getForeign("ID_STOCK").getFloat("QTE_TH") - row.getFloat("QTE_MIN"));
+                            int value = -Math.round(rowStock.getFloat("QTE_TH") - rowStock.getFloat("QTE_MIN"));
-                    if (value > 0) {
+                            if (value > 0) {
-                        SQLInjector inj = SQLInjector.getInjector(row.getTable(), row.getTable().getTable("COMMANDE_ELEMENT"));
+                                SQLInjector inj = SQLInjector.getInjector(row.getTable(), row.getTable().getTable("COMMANDE_ELEMENT"));
-                        SQLRowValues rowValsElt = new SQLRowValues(inj.createRowValuesFrom(row));
+                                SQLRowValues rowValsElt = new SQLRowValues(inj.createRowValuesFrom(row));
-                        // rowValsElt.put("ID_DEVISE",
+                                // rowValsElt.put("ID_DEVISE",
-                        // rowCmd.getForeignRow("ID_TARIF").getForeignID("ID_DEVISE"));
+                                // rowCmd.getForeignRow("ID_TARIF").getForeignID("ID_DEVISE"));
-                        map.add(rowArticleFind.getForeign("ID_FOURNISSEUR").asRow(), rowValsElt);
+                                map.add(rowArticleFind.getForeign("ID_FOURNISSEUR").asRow(), rowValsElt);
+                            }
+                        }
+                    }
+                }
                 MouvementStockSQLElement.createCommandeF(map, null, "", false);
+            }
         });
+    }
         l.add("PV_HT");
         return l;
+    }
     @Override
+    protected void _initListRequest(ListSQLRequest req) {
+        super._initListRequest(req);
+        req.addToGraphToFetch("ID_DEPOT_STOCK");
+    }
+    @Override
     public ListMap<String, String> getShowAs() {
         final ListMap<String, String> res = new ListMap<String, String>();
-        res.putCollection("ID_COMMANDE_CLIENT", "NUMERO", "ID_CLIENT", "DATE", "DATE_LIVRAISON_PREV");
+        res.putCollection("ID_COMMANDE_CLIENT", "NUMERO", "DATE", "DATE_LIVRAISON_PREV", "ID_CLIENT");
         if (getTable().contains("ID_ARTICLE")) {
             res.putCollection("ID_ARTICLE", "ID_FAMILLE_ARTICLE", "ID_FOURNISSEUR");
+        }
         res.putCollection(null, "NOM");
         return res;
                 this.addRequiredSQLObject(new JTextField(), "NOM", "left");
                 this.addRequiredSQLObject(new JTextField(), "CODE", "right");
                 this.addSQLObject(new ElementComboBox(), "ID_STYLE", "left");
-                this.addRequiredSQLObject(new DeviseField(), "PA_HT", "left");
+                this.addRequiredSQLObject(new JTextField(), "PA_HT", "left");
-                this.addSQLObject(new DeviseField(), "PV_HT", "right");
+                this.addSQLObject(new JTextField(), "PV_HT", "right");
                 this.addSQLObject(new JTextField(), "POIDS", "left");
                 this.addSQLObject(new ElementComboBox(), "ID_TAXE", "right");
+            }
         };
+    }
     @Override
     protected String createCode() {
-        return createCodeFromPackage() + ".item";
+        return createCodeOfPackage() + ".item";
+    }
+}

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/order/element/CommandeClientElementSQLElement.java - Rev 151 → 156