WebSVN - OpenConcerto - Diff - Rev 94 and 156 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/product/action/InventairePanel.java

  */
  package org.openconcerto.erp.core.sales.product.action;
 import org.openconcerto.erp.core.common.ui.NumericTextField;
+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.model.DBRoot;
 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.utils.SQLUtils;
 import org.openconcerto.sql.view.list.IListe;
 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.ui.JDate;
 public class InventairePanel extends JPanel {
     private final String mvtStockTableQuoted;
     private static String defaultLabel = "Mise à jour des stocks";
-    public InventairePanel(final IListe liste, final List<? extends SQLRowAccessor> articles) {
+    public InventairePanel(final IListe liste, final List<? extends SQLRowAccessor> stocks) {
         super(new GridBagLayout());
         final SQLTable mvtStockTable = Configuration.getInstance().getRoot().findTable("MOUVEMENT_STOCK");
         this.mvtStockTableQuoted = mvtStockTable.getSQLName().quote();
         JLabel qteReel = new JLabel("Quantité réel", SwingConstants.RIGHT);
         };
         fieldLivAtt.getDocument().addDocumentListener(l);
         fieldReel.getDocument().addDocumentListener(l);
         fieldRecpAtt.getDocument().addDocumentListener(l);
-        if (articles.size() == 1) {
+        if (stocks.size() == 1) {
-            SQLRowAccessor r = articles.get(0);
+            SQLRowAccessor r = stocks.get(0);
-            if (!r.isForeignEmpty("ID_STOCK")) {
-                SQLRowAccessor stock = r.getForeign("ID_STOCK");
+            SQLRowAccessor stock = r;
-                fieldReel.setText(String.valueOf(stock.getFloat("QTE_REEL")));
+            fieldReel.setText(String.valueOf(stock.getFloat("QTE_REEL")));
-                fieldLivAtt.setText(String.valueOf(stock.getFloat("QTE_LIV_ATTENTE")));
+            fieldLivAtt.setText(String.valueOf(stock.getFloat("QTE_LIV_ATTENTE")));
-                fieldRecpAtt.setText(String.valueOf(stock.getFloat("QTE_RECEPT_ATTENTE")));
+            fieldRecpAtt.setText(String.valueOf(stock.getFloat("QTE_RECEPT_ATTENTE")));
-                fieldTh.setText(String.valueOf(stock.getFloat("QTE_TH")));
+            fieldTh.setText(String.valueOf(stock.getFloat("QTE_TH")));
+        }
-        }
         c.gridy++;
         c.gridx = 0;
         final JButton buttonUpdate = new JButton("Mettre à jour");
         JButton buttonCancel = new JButton("Annuler");
                 BigDecimal qteRecptAttente = fieldRecpAtt.getValue();
                 List<List<String>> multipleRequests = new ArrayList<List<String>>();
                 List<String> multipleRequestsHundred = new ArrayList<String>(100);
                 boolean usePrice = mvtStockTable.contains("PRICE");
+                List<StockItem> stockItems = new ArrayList<StockItem>();
                 final Date dateValue = date.getValue();
-                for (SQLRowAccessor sqlRowAccessor : articles) {
+                for (SQLRowAccessor sqlRowAccessor : stocks) {
                     if (multipleRequestsHundred.size() > 100) {
                         multipleRequests.add(multipleRequestsHundred);
                         multipleRequestsHundred = new ArrayList<String>(100);
+                    }
-                    StockItem item = new StockItem(sqlRowAccessor);
+                    StockItem item = new StockItem(sqlRowAccessor.getForeign("ID_ARTICLE"), sqlRowAccessor);
+                    if (!item.isStockInit()) {
+                        ((ReferenceArticleSQLElement) liste.getSource().getElem().getDirectory().getElement("ARTICLE")).initStock(sqlRowAccessor.getForeignID("ID_ARTICLE"));
+                        SQLRow rowArticle = sqlRowAccessor.getForeign("ID_ARTICLE").asRow();
+                        rowArticle.fetchValues();
+                        item = new StockItem(rowArticle, rowArticle.getForeign("ID_STOCK"));
+                    }
+                    stockItems.add(item);
                     boolean modified = false;
                     if (qteReel != null && !NumberUtils.areNumericallyEqual(qteReel, item.getRealQty())) {
                         double diff = qteReel.doubleValue() - item.getRealQty();
                         item.updateQty(diff, TypeStockMouvement.REEL);
                         multipleRequestsHundred.add(getMvtRequest(dateValue, BigDecimal.ZERO, diff, item, label.getText(), true, usePrice));
+                    }
                     if (modified) {
                         if (item.isStockInit()) {
                             multipleRequestsHundred.add(item.getUpdateRequest());
                         } else {
-                            SQLRowValues rowVals = new SQLRowValues(sqlRowAccessor.getTable().getForeignTable("ID_STOCK"));
-                            rowVals.put("QTE_REEL", item.getRealQty());
-                            rowVals.put("QTE_TH", item.getVirtualQty());
-                            rowVals.put("QTE_LIV_ATTENTE", item.getDeliverQty());
-                            rowVals.put("QTE_RECEPT_ATTENTE", item.getReceiptQty());
-                            SQLRowValues rowValsArt = item.getArticle().createEmptyUpdateRow();
-                            rowValsArt.put("ID_STOCK", rowVals);
-                            try {
-                                rowValsArt.commit();
+                            throw new IllegalStateException();
-                            } catch (SQLException e1) {
-                                e1.printStackTrace();
-                            }
+                        }
+                    }
+                }
                 multipleRequests.add(multipleRequestsHundred);
                     ExceptionHandler.handle("Stock update error", e1);
+                }
                 final DBRoot root = mvtStockTable.getDBRoot();
                 if (root.contains("ARTICLE_ELEMENT")) {
-                    List<StockItem> stockItems = new ArrayList<StockItem>();
+                    // List<StockItem> stockItems = new ArrayList<StockItem>();
-                    for (SQLRowAccessor sqlRowAccessor2 : articles) {
+                    // for (SQLRowAccessor sqlRowAccessor2 : stocks) {
-                        final SQLRow asRow = sqlRowAccessor2.asRow();
+                    // final SQLRow asRow = sqlRowAccessor2.asRow();
-                        asRow.fetchValues();
+                    // asRow.fetchValues();
-                        stockItems.add(new StockItem(asRow));
+                    // stockItems.add(new StockItem(asRow));
-                    }
+                    // }
                     // Mise à jour des stocks des nomenclatures
                     ComposedItemStockUpdater comp = new ComposedItemStockUpdater(root, stockItems);
                     try {
                         comp.update();
                     } catch (SQLException e1) {
         });
+    }
     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 " + mvtStockTableQuoted + " (\"QTE\",\"DATE\",\"ID_ARTICLE\",\"NOM\",\"REEL\",\"ORDRE\"";
+        String mvtStockQuery = "INSERT INTO " + 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() + ",'" + label + "'," + reel + ", (SELECT (MAX(\"ORDRE\")+1) FROM "
+        mvtStockQuery += ") VALUES(" + qteFinal + ",'" + dateFormat.format(time) + "'," + item.getArticle().getID() + "," + item.stock.getID() + ",'" + label + "'," + reel
-                + mvtStockTableQuoted + ")";
+                + ", (SELECT (MAX(\"ORDRE\")+1) FROM " + mvtStockTableQuoted + ")";
         if (usePrice && prc != null) {
             mvtStockQuery += "," + prc.setScale(6, RoundingMode.HALF_UP).toString();
+        }
         mvtStockQuery += ")";
         return mvtStockQuery;

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/InventairePanel.java - Rev 94 → 156