WebSVN - OpenConcerto - Diff - Rev 180 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/product/action/TransfertStockPanel.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.product.action;
 import org.openconcerto.erp.core.common.ui.NumericTextField;
-import org.openconcerto.erp.core.sales.product.model.ProductComponent;
+import org.openconcerto.erp.core.sales.product.element.ReferenceArticleSQLElement;
-import org.openconcerto.erp.core.supplychain.stock.element.ComposedItemStockUpdater;
-import org.openconcerto.erp.core.supplychain.stock.element.StockItem;
-import org.openconcerto.erp.core.supplychain.stock.element.StockItem.TypeStockMouvement;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.element.SQLElement;
-import org.openconcerto.sql.model.ConnectionHandlerNoSetup;
-import org.openconcerto.sql.model.DBRoot;
-import org.openconcerto.sql.model.SQLDataSource;
-import org.openconcerto.sql.model.SQLRow;
-import org.openconcerto.sql.model.SQLRowAccessor;
-import org.openconcerto.sql.model.SQLRowValues;
-import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.sqlobject.SQLRequestComboBox;
-import org.openconcerto.sql.utils.SQLUtils;
 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.ui.JDate;
-import org.openconcerto.utils.ExceptionHandler;
 import org.openconcerto.utils.text.SimpleDocumentListener;
+import org.openconcerto.utils.Tuple2;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.event.DocumentEvent;
-import org.apache.commons.dbutils.ResultSetHandler;
 public class TransfertStockPanel extends JPanel {
-    private final String mvtStockTableQuoted;
     private static String defaultLabel = "Transfert de stock";
     public TransfertStockPanel(Configuration instance) {
         super(new GridBagLayout());
         final JButton buttonUpdate = new JButton("Mettre à jour");
-        final SQLTable mvtStockTable = instance.getRoot().findTable("MOUVEMENT_STOCK");
+        final ReferenceArticleSQLElement articleElt = instance.getDirectory().getElement(ReferenceArticleSQLElement.class);
-        this.mvtStockTableQuoted = mvtStockTable.getSQLName().quote();
-        final SQLElement articleElt = instance.getDirectory().getElement("ARTICLE");
         final SQLRequestComboBox comboArticle = new SQLRequestComboBox();
         comboArticle.uiInit(articleElt.createComboRequest());
         final SQLElement stockElt = instance.getDirectory().getElement("DEPOT_STOCK");
         final SQLRequestComboBox comboStockDepart = new SQLRequestComboBox();
             @Override
             public void actionPerformed(ActionEvent e) {
                 buttonUpdate.setEnabled(false);
                 BigDecimal qteReel = fieldReel.getValue();
-                List<String> multipleRequestsHundred = new ArrayList<String>(100);
-                boolean usePrice = mvtStockTable.contains("PRICE");
-                List<StockItem> stockItems = new ArrayList<StockItem>();
-                final Date dateValue = date.getValue();
-                final SQLRow selectedRowArticle = comboArticle.getSelectedRow();
-                final SQLRow selectedRowDepotDepart = comboStockDepart.getSelectedRow();
-                final SQLRow selectedRowDepotArrivee = comboStockArrive.getSelectedRow();
-                try {
-                    SQLUtils.executeAtomic(selectedRowDepotDepart.getTable().getDBSystemRoot().getDataSource(), new ConnectionHandlerNoSetup<Object, SQLException>() {
-                        @Override
-                        public Object handle(SQLDataSource ds) throws SQLException {
-                            {
-                                // DEPART
-                                final SQLRowAccessor rowStockDepart = ProductComponent.findOrCreateStock(selectedRowArticle, selectedRowDepotDepart);
-                                StockItem item = new StockItem(selectedRowArticle, rowStockDepart);
-                                if (!item.isStockInit()) {
-                                    SQLRowValues rowVals = new SQLRowValues(mvtStockTable.getTable("STOCK"));
-                                    rowVals.put("ID_ARTICLE", selectedRowArticle.getID());
-                                    rowVals.put("ID_DEPOT_STOCK", selectedRowDepotDepart.getID());
-                                    rowVals.commit();
-                                    selectedRowArticle.fetchValues();
-                                    item = new StockItem(selectedRowArticle, rowStockDepart);
-                                }
-                                stockItems.add(item);
-                                double diff = -qteReel.doubleValue();
-                                item.updateQty(diff, TypeStockMouvement.REEL);
-                                multipleRequestsHundred
-                                        .add(getMvtRequest(dateValue, BigDecimal.ZERO, diff, item, getLabel(label.getText(), selectedRowDepotDepart, selectedRowDepotArrivee), true, usePrice));
-                                item.updateQty(diff, TypeStockMouvement.THEORIQUE);
-                                multipleRequestsHundred
-                                        .add(getMvtRequest(dateValue, BigDecimal.ZERO, diff, item, getLabel(label.getText(), selectedRowDepotDepart, selectedRowDepotArrivee), false, usePrice));
-                                multipleRequestsHundred.add(item.getUpdateRequest());
-                            }
-                            // ARRIVEE
-                            {
-                                final SQLRowAccessor rowStockArrivee = ProductComponent.findOrCreateStock(selectedRowArticle, selectedRowDepotArrivee);
-                                StockItem item = new StockItem(selectedRowArticle, rowStockArrivee);
-                                if (!item.isStockInit()) {
-                                    SQLRowValues rowVals = new SQLRowValues(mvtStockTable.getTable("STOCK"));
-                                    rowVals.put("ID_ARTICLE", selectedRowArticle.getID());
-                                    rowVals.put("ID_DEPOT_STOCK", selectedRowDepotArrivee.getID());
-                                    rowVals.commit();
-                                    selectedRowArticle.fetchValues();
-                                    item = new StockItem(selectedRowArticle, rowStockArrivee);
-                                }
-                                stockItems.add(item);
-                                double diff = qteReel.doubleValue();
-                                item.updateQty(diff, TypeStockMouvement.REEL);
-                                multipleRequestsHundred
-                                        .add(getMvtRequest(dateValue, BigDecimal.ZERO, diff, item, getLabel(label.getText(), selectedRowDepotDepart, selectedRowDepotArrivee), true, usePrice));
-                                item.updateQty(diff, TypeStockMouvement.THEORIQUE);
-                                multipleRequestsHundred
-                                        .add(getMvtRequest(dateValue, BigDecimal.ZERO, diff, item, getLabel(label.getText(), selectedRowDepotDepart, selectedRowDepotArrivee), false, usePrice));
-                                multipleRequestsHundred.add(item.getUpdateRequest());
-                            }
-                            final int size = multipleRequestsHundred.size();
-                            List<? extends ResultSetHandler> handlers = new ArrayList<ResultSetHandler>(size);
+                articleElt.transfert(Arrays.asList(Tuple2.create(comboArticle.getSelectedRow(), qteReel)), comboStockDepart.getSelectedRow(), comboStockArrive.getSelectedRow(), label.getText(),
-                            for (int i = 0; i < size; i++) {
-                                handlers.add(null);
+                        date.getValue());
-                            }
-                            SQLUtils.executeMultiple(instance.getRoot().getDBSystemRoot(), multipleRequestsHundred, handlers);
-                            final DBRoot root = mvtStockTable.getDBRoot();
-                            if (root.contains("ARTICLE_ELEMENT")) {
-                                // Mise à jour des stocks des nomenclatures
-                                ComposedItemStockUpdater comp = new ComposedItemStockUpdater(root, stockItems);
-                                comp.update();
-                            }
-                            return null;
-                        }
-                    });
-                } catch (SQLException e1) {
-                    ExceptionHandler.handle("Stock update error", e1);
-                }
                 ((JFrame) SwingUtilities.getRoot(TransfertStockPanel.this)).dispose();
+            }
-        });
-    }
-    private String getLabel(String label, SQLRowAccessor fromDepot, SQLRowAccessor toDepot) {
-        return label + " de " + fromDepot.getString("NOM") + " vers " + toDepot.getString("NOM");
-    }
-    private String getMvtRequest(Date time, BigDecimal prc, double qteFinal, StockItem item, String label, boolean reel, boolean usePrice) {
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        String mvtStockQuery = "INSERT INTO " + this.mvtStockTableQuoted + " (\"QTE\",\"DATE\",\"ID_ARTICLE\",\"ID_STOCK\",\"NOM\",\"REEL\",\"ORDRE\"";
-        if (usePrice && prc != null) {
-            mvtStockQuery += ",\"PRICE\"";
-        }
+        });
-        mvtStockQuery += ") VALUES(" + qteFinal + ",'" + dateFormat.format(time) + "'," + item.getArticle().getID() + "," + item.stock.getID() + ",'" + label + "'," + reel
-                + ", (SELECT (MAX(\"ORDRE\")+1) FROM " + this.mvtStockTableQuoted + ")";
-        if (usePrice && prc != null) {
-            mvtStockQuery += "," + prc.setScale(6, RoundingMode.HALF_UP).toString();
-        }
-        mvtStockQuery += ")";
-        return mvtStockQuery;
+    }
     private void updateButtons(final JButton buttonUpdate, final SQLRequestComboBox comboArticle, final SQLRequestComboBox comboStockDepart, final SQLRequestComboBox comboStockArrive,
             final NumericTextField fieldReel) {
         buttonUpdate.setEnabled(fieldReel.getText().trim().length() > 0 && comboArticle.getSelectedRow() != null && comboStockArrive.getSelectedRow() != null
                 && comboStockDepart.getSelectedRow() != null && comboStockArrive.getSelectedRow().getID() != comboStockDepart.getSelectedRow().getID());
+    }
+}

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/action/TransfertStockPanel.java - Rev 180 → 182