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

     private final StockLabel label;
     private final List<? extends SQLRowAccessor> items;
     private final TypeStockUpdate type;
     private final boolean createMouvementStock;
     private final SQLRowAccessor rowSource;
+    private boolean resetStockTH = false;
     private boolean headless = false;
     public static enum TypeStockUpdate {
                 SQLRowValues rowVals = new SQLRowValues(stockTable);
                 rowVals.put("QTE_REEL", stockItem.getRealQty());
                 rowVals.put("QTE_TH", stockItem.getVirtualQty());
                 rowVals.put("QTE_LIV_ATTENTE", stockItem.getDeliverQty());
                 rowVals.put("QTE_RECEPT_ATTENTE", stockItem.getReceiptQty());
+                rowVals.put("ID_ARTICLE", stockItem.getArticle().getID());
+                rowVals.put("ID_DEPOT_STOCK", stockItem.stock.getForeignID("ID_DEPOT_STOCK"));
+                rowVals.commit();
+                if (stockItem.getArticle().getForeignID("ID_DEPOT_STOCK") == stockItem.stock.getForeignID("ID_DEPOT_STOCK")) {
-                SQLRowValues rowValsArt = stockItem.getArticle().createEmptyUpdateRow();
+                    SQLRowValues rowValsArt = stockItem.getArticle().createEmptyUpdateRow();
-                rowValsArt.put("ID_STOCK", rowVals);
+                    rowValsArt.put("ID_STOCK", rowVals);
-                rowValsArt.commit();
+                    rowValsArt.commit();
+                }
+            }
             if (!this.type.isEntry()) {
                 stockItem.fillCommandeFournisseur(cmd);
+            }
+        }
         rowValsStock.put("QTE_REEL", null);
         rowValsStock.put("QTE_TH", null);
         rowValsStock.put("QTE_RECEPT_ATTENTE", null);
         rowValsStock.put("QTE_LIV_ATTENTE", null);
-        rowValsArt.put("ID_STOCK", rowValsStock);
+        rowVals.put("ID_STOCK", rowValsStock);
         rowVals.put("ID_ARTICLE", rowValsArt);
         SQLRowValuesListFetcher fetcher = SQLRowValuesListFetcher.create(rowVals);
         fetcher.setSelTransf(new ITransformer<SQLSelect, SQLSelect>() {
         // on archive un mvt reel et theorique)
         Map<Number, StockItem> items = new HashMap<Number, StockItem>();
         List<SQLRowValues> result = fetcher.fetch();
         for (SQLRowValues sqlRowValues : result) {
             final StockItem item;
-            if (!items.containsKey(sqlRowValues.getForeignIDNumber("ID_ARTICLE"))) {
+            if (!items.containsKey(sqlRowValues.getForeignIDNumber("ID_STOCK"))) {
-                item = new StockItem(sqlRowValues.getForeign("ID_ARTICLE"));
+                item = new StockItem(sqlRowValues.getForeign("ID_ARTICLE"), sqlRowValues.getForeign("ID_STOCK"));
-                items.put(sqlRowValues.getForeignIDNumber("ID_ARTICLE"), item);
+                items.put(sqlRowValues.getForeignIDNumber("ID_STOCK"), item);
             } else {
-                item = items.get(sqlRowValues.getForeignIDNumber("ID_ARTICLE"));
+                item = items.get(sqlRowValues.getForeignIDNumber("ID_STOCK"));
+            }
             final TypeStockMouvement t;
             if (sqlRowValues.getBoolean("REEL")) {
                 t = TypeStockMouvement.REEL;
             } else {
                                 continue;
+                            }
+                        }
+                    }
                     if ((!r.getTable().contains("NIVEAU") || r.getInt("NIVEAU") == level) && !r.isForeignEmpty("ID_ARTICLE") && r.getForeign("ID_ARTICLE") != null) {
-                        productComponents.add(ProductComponent.createFrom(r, qte));
+                        productComponents.add(ProductComponent.createFrom(r, qte, r));
+                    }
                 } else if (r.getInt("NIVEAU") < level) {
                     // BREAK si on sort de l'article composé
                     break;
+                }
+     *
      * @return la liste des stocks à jour
      */
     private List<StockItem> fetch() {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        List<StockItem> stockItems = new ArrayList<StockItem>(items.size());
+        Map<Number, StockItem> stockItems = new HashMap<Number, StockItem>();
         String mvtStockTableQuoted = rowSource.getTable().getTable("MOUVEMENT_STOCK").getSQLName().quote();
         // Liste des éléments à mettre à jour
         List<ProductComponent> productComponents = new ArrayList<ProductComponent>();
         fillProductComponent(productComponents, 1, 0, 1);
         List<ProductComponent> boms = helper.getChildWithQtyFrom(productComponents);
         for (ProductComponent productComp : boms) {
             if (productComp.getProduct().getBoolean("GESTION_STOCK") && productComp.getQty().signum() != 0) {
+                final StockItem stockItem;
+                if (!stockItems.containsKey(productComp.getStock().getID())) {
-                StockItem stockItem = new StockItem(productComp.getProduct());
+                    stockItem = new StockItem(productComp.getProduct(), productComp.getStock());
+                    stockItems.put(productComp.getStock().getID(), stockItem);
+                } else {
+                    stockItem = stockItems.get(productComp.getStock().getID());
+                }
                 double qteFinal = productComp.getQty().doubleValue();
                 // reliquat
                 for (Tuple3<SQLRowAccessor, Integer, BigDecimal> t : reliquat) {
                     if (stockItem.getArticle() != null && stockItem.getArticle().equalsAsRow(t.get0())) {
                 if (!this.type.isEntry()) {
                     qteFinal = -qteFinal;
+                }
                 stockItem.updateQty(qteFinal, this.type.getType());
-                stockItems.add(stockItem);
                 if (this.createMouvementStock) {
                     final Date time = this.rowSource.getDate("DATE").getTime();
                     BigDecimal prc = productComp.getPRC(time);
                     if (this.type.getType() == TypeStockMouvement.REEL || this.type.getType() == TypeStockMouvement.REEL_THEORIQUE || this.type.getType() == TypeStockMouvement.RETOUR) {
-                        String mvtStockQuery = "INSERT INTO " + mvtStockTableQuoted + " (\"QTE\",\"DATE\",\"ID_ARTICLE\",\"SOURCE\",\"IDSOURCE\",\"NOM\",\"REEL\",\"ORDRE\"";
+                        String mvtStockQuery = "INSERT INTO " + mvtStockTableQuoted + " (\"QTE\",\"DATE\",\"ID_ARTICLE\",\"ID_STOCK\",\"SOURCE\",\"IDSOURCE\",\"NOM\",\"REEL\",\"ORDRE\"";
                         if (prc != null) {
                             mvtStockQuery += ",\"PRICE\"";
+                        }
-                        mvtStockQuery += ") VALUES(" + qteFinal + ",'" + dateFormat.format(time) + "'," + productComp.getProduct().getID() + ",'" + this.rowSource.getTable().getName() + "',"
+                        mvtStockQuery += ") VALUES(" + qteFinal + ",'" + dateFormat.format(time) + "'," + productComp.getProduct().getID() + "," + productComp.getStock().getID() + ",'"
-                                + this.rowSource.getID() + ",'" + this.label.getLabel(this.rowSource, productComp.getProduct()) + "',true, (SELECT (MAX(\"ORDRE\")+1) FROM " + mvtStockTableQuoted
+                                + this.rowSource.getTable().getName() + "'," + this.rowSource.getID() + ",'" + this.label.getLabel(this.rowSource, productComp.getProduct())
-                                + ")";
+                                + "',true, (SELECT (MAX(\"ORDRE\")+1) FROM " + mvtStockTableQuoted + ")";
                         if (prc != null) {
                             mvtStockQuery += "," + prc.setScale(6, RoundingMode.HALF_UP).toString();
+                        }
                         mvtStockQuery += ")";
                         this.requests.add(mvtStockQuery);
+                    }
                     if (this.type.getType() == TypeStockMouvement.THEORIQUE || this.type.getType() == TypeStockMouvement.REEL_THEORIQUE || this.type.getType() == TypeStockMouvement.RETOUR) {
-                        String mvtStockQuery = "INSERT INTO " + mvtStockTableQuoted + " (\"QTE\",\"DATE\",\"ID_ARTICLE\",\"SOURCE\",\"IDSOURCE\",\"NOM\",\"REEL\",\"ORDRE\"";
+                        String mvtStockQuery = "INSERT INTO " + mvtStockTableQuoted + " (\"QTE\",\"DATE\",\"ID_ARTICLE\",\"ID_STOCK\",\"SOURCE\",\"IDSOURCE\",\"NOM\",\"REEL\",\"ORDRE\"";
                         if (prc != null) {
                             mvtStockQuery += ",\"PRICE\"";
+                        }
-                        mvtStockQuery += ") VALUES(" + qteFinal + ",'" + dateFormat.format(time) + "'," + productComp.getProduct().getID() + ",'" + this.rowSource.getTable().getName() + "',"
+                        mvtStockQuery += ") VALUES(" + qteFinal + ",'" + dateFormat.format(time) + "'," + productComp.getProduct().getID() + "," + productComp.getStock().getID() + ",'"
-                                + this.rowSource.getID() + ",'" + this.label.getLabel(this.rowSource, productComp.getProduct()) + "',false, (SELECT (MAX(\"ORDRE\")+1) FROM " + mvtStockTableQuoted
+                                + this.rowSource.getTable().getName() + "'," + this.rowSource.getID() + ",'" + this.label.getLabel(this.rowSource, productComp.getProduct())
-                                + ")";
+                                + "',false, (SELECT (MAX(\"ORDRE\")+1) FROM " + mvtStockTableQuoted + ")";
                         if (prc != null) {
                             mvtStockQuery += "," + prc.setScale(6, RoundingMode.HALF_UP).toString();
+                        }
                         mvtStockQuery += ")";
                         this.requests.add(mvtStockQuery);
+                    }
+                }
+            }
+        }
+        return new ArrayList<StockItem>(stockItems.values());
+    }
+    public void setResetStockTH(boolean resetStockTH) {
-        return stockItems;
+        this.resetStockTH = resetStockTH;
+    }
+}

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/StockItemsUpdater.java - Rev 142 → 156