WebSVN - OpenConcerto - Diff - Rev 149 and 174 - /trunk/OpenConcerto/src/org/openconcerto/erp/generationDoc/gestcomm/EtatVentesXmlSheet.java

 import org.openconcerto.sql.element.SQLElementDirectory;
 import org.openconcerto.sql.model.AliasedField;
 import org.openconcerto.sql.model.AliasedTable;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowAccessor;
+import org.openconcerto.sql.model.SQLRowValues;
+import org.openconcerto.sql.model.SQLRowValuesListFetcher;
 import org.openconcerto.sql.model.SQLSelect;
 import org.openconcerto.sql.model.SQLSelectJoin;
 import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.model.Where;
 import org.openconcerto.utils.Tuple2;
     public static final String TEMPLATE_PROPERTY_NAME = DEFAULT_PROPERTY_NAME;
     private Timestamp du, au;
     public boolean ticketCaisse = false;
+    public boolean facture = false;
-    public EtatVentesXmlSheet(Date du, Date au, boolean ticketCaisse) {
+    public EtatVentesXmlSheet(Date du, Date au, boolean ticketCaisse, boolean facture) {
         super();
         this.printer = PrinterNXProps.getInstance().getStringProperty("BonPrinter");
         this.ticketCaisse = ticketCaisse;
+        this.facture = facture;
         if (du != null) {
             final Calendar c1 = Calendar.getInstance();
             c1.setTime(du);
             c1.set(Calendar.HOUR_OF_DAY, 0);
             c1.set(Calendar.MINUTE, 0);
         if (style == null) {
             style = new HashMap<Integer, String>();
             styleAllSheetValues.put(0, style);
+        }
+        final ArrayList<Map<String, Object>> listValuesStock = new ArrayList<>();
+        final Map<Integer, String> styleStock = new HashMap<>();
         // Ventes
+        final SQLTable foreignTableArticle = tableFactureElement.getForeignTable("ID_ARTICLE");
+        {
             final AliasedTable tableModeReglement1 = new AliasedTable(tableModeReglement, MODE1);
             final AliasedTable tableModeReglement2 = new AliasedTable(tableModeReglement, MODE2);
             final AliasedTable tableTicket = new AliasedTable(eltTicketCaisse.getTable(), "ticket");
+            // Stock
+            SQLRowValues rowValsArtStock = new SQLRowValues(foreignTableArticle);
+            rowValsArtStock.putNulls("ID", "CODE", "NOM");
+            rowValsArtStock.putRowValues("ID_STOCK").putNulls("QTE_REEL", "QTE_TH", "QTE_MIN", "QTE_RECEPT_ATTENTE", "QTE_LIV_ATTENTE");
+            SQLRowValuesListFetcher fetcherStock = SQLRowValuesListFetcher.create(rowValsArtStock);
+            List<SQLRowValues> resultStock = fetcherStock.fetch();
+            Map<Integer, SQLRowValues> mapStock = new HashMap<>();
+            for (SQLRowValues sqlRowValues : resultStock) {
+                mapStock.put(sqlRowValues.getID(), sqlRowValues);
+            }
             // Requete Pour obtenir les quantités pour chaque type de réglement
             SQLSelect sel = new SQLSelect();
             sel.addSelect(tableFactureElement.getField("CODE"));
             sel.addSelect(tableFactureElement.getField("NOM"));
             selQte.addSelect(tableFactureElement.getField("T_PA_HT"), "SUM");
             selQte.addSelect(tableFactureElement.getField("T_PV_HT"), "SUM");
             selQte.addSelect(tableFactureElement.getField("T_PV_TTC"), "SUM");
             selQte.addSelect(tableFactureElement.getField("ID_TAXE"));
             selQte.addSelect(tableFactureElement.getField("ID_ARTICLE"));
-            if (!this.ticketCaisse) {
+            if (this.ticketCaisse) {
+                selQte.addJoin("LEFT", tableFactureElement.getField("ID_SAISIE_VENTE_FACTURE")).setWhere(Where.FALSE);
+                selQte.addJoin("LEFT", tableFactureElement.getField("ID_TICKET_CAISSE"), "ticket").setWhere(w2);
+            } else if (this.facture) {
                 selQte.addJoin("LEFT", tableFactureElement.getField("ID_SAISIE_VENTE_FACTURE")).setWhere(w);
+                selQte.addJoin("LEFT", tableFactureElement.getField("ID_TICKET_CAISSE"), "ticket").setWhere(Where.FALSE);
             } else {
-                selQte.addJoin("LEFT", tableFactureElement.getField("ID_SAISIE_VENTE_FACTURE")).setWhere(Where.FALSE);
+                selQte.addJoin("LEFT", tableFactureElement.getField("ID_SAISIE_VENTE_FACTURE")).setWhere(w);
-            }
-            selQte.addJoin("LEFT", tableFactureElement.getField("ID_TICKET_CAISSE"), "ticket").setWhere(w2);
+                selQte.addJoin("LEFT", tableFactureElement.getField("ID_TICKET_CAISSE"), "ticket").setWhere(w2);
+            }
             SQLSelectJoin joinArt2 = selQte.addJoin("LEFT", tableFactureElement.getField("ID_ARTICLE"));
             SQLSelectJoin joinFamArt2 = selQte.addJoin("LEFT", joinArt2.getJoinedTable().getField("ID_FAMILLE_ARTICLE"));
             selQte.addSelect(joinFamArt2.getJoinedTable().getField("NOM"));
             // FIXME traiter le cas du!=null et au==null et vice
             // versa
                 } else {
                     Tuple2<BigDecimal, BigDecimal> t = mapTVAVT.get(tvaID.intValue());
                     mapTVAVT.put(tvaID.intValue(), Tuple2.create(t.get0().add((BigDecimal) ht), t.get1().add(ttc)));
+                }
                 Number articleID = (Number) sqlRow[7];
-                ArticleVendu a = new ArticleVendu(code, nom, qteVendu.intValue(), (BigDecimal) ht, (BigDecimal) ha, ttc, tvaID.intValue(),
+                ArticleVendu a = new ArticleVendu(code, nom, qteVendu.intValue(), (BigDecimal) ht, (BigDecimal) ha, ttc, tvaID.intValue(), foreignTableArticle.getRow(articleID.intValue()));
-                        tableFactureElement.getForeignTable("ID_ARTICLE").getRow(articleID.intValue()));
                 map.put(articleID + "##" + code + "##" + nom + "##" + tvaID, a);
+            }
             List<Object[]> listeIds = (List<Object[]>) Configuration.getInstance().getBase().getDataSource().execute(sel.asString(), new ArrayListHandler());
                     famille = "Non classés";
                     Map<String, Object> mValues = new HashMap<String, Object>();
                     mValues.put("NOM", famille);
                     style.put(listValues.size(), "Titre 1");
                     listValues.add(mValues);
+                    styleStock.put(listValuesStock.size(), "Titre 1");
+                    listValuesStock.add(mValues);
                 } else if (valueFam != null && !valueFam.toString().equalsIgnoreCase(famille)) {
                     famille = valueFam.toString();
                     Map<String, Object> mValues = new HashMap<String, Object>();
                     mValues.put("NOM", famille);
                     style.put(listValues.size(), "Titre 1");
                     listValues.add(mValues);
+                    styleStock.put(listValuesStock.size(), "Titre 1");
+                    listValuesStock.add(mValues);
+                }
                 Map<String, Object> mValues = new HashMap<String, Object>();
                 String code = (String) obj[0];
                     mValues.put("FAMILLE", valueFam);
                     totalTPA = totalTPA.add(a.ha);
                     totalTPVTTC = totalTPVTTC.add(a.ttc);
                     style.put(listValues.size(), "Normal");
                     listValues.add(mValues);
+                    Map<String, Object> mValuesStock = new HashMap<String, Object>();
+                    mValuesStock.put("CODE", code);
+                    mValuesStock.put("NOM", nom);
+                    mValuesStock.put("QTE", a.qte);
+                    if (mapStock.containsKey(articleID)) {
+                        SQLRowValues rowValsArt = mapStock.get(articleID);
+                        if (rowValsArt.getObject("ID_STOCK") != null && !rowValsArt.isForeignEmpty("ID_STOCK")) {
+                            SQLRowAccessor rowValsStock = rowValsArt.getForeign("ID_STOCK");
+                            mValuesStock.put("QTE_TH", rowValsStock.getObject("QTE_TH"));
+                            mValuesStock.put("QTE_REEL", rowValsStock.getObject("QTE_REEL"));
+                            mValuesStock.put("QTE_MIN", rowValsStock.getObject("QTE_MIN"));
+                            mValuesStock.put("QTE_RECEPT_ATTENTE", rowValsStock.getObject("QTE_RECEPT_ATTENTE"));
+                            mValuesStock.put("QTE_LIV_ATTENTE", rowValsStock.getObject("QTE_LIV_ATTENTE"));
+                        }
+                        styleStock.put(listValuesStock.size(), "Normal");
+                        listValuesStock.add(mValuesStock);
+                    }
+                }
                 // System.out.println("EtatVentesXmlSheet.createListeValues():" + listValues);
+            }
+        }
         // Liste des ventes comptoirs
                     Tuple2<BigDecimal, BigDecimal> t = mapTVAVT.get(tvaID.intValue());
                     mapTVAVT.put(tvaID.intValue(), Tuple2.create(t.get0().subtract((BigDecimal) ht), t.get1().subtract(ttc)));
+                }
                 Number articleID = (Number) sqlRow[7];
                 ArticleVendu a = new ArticleVendu(code, nom, -qteVendu.intValue(), ((BigDecimal) ht).negate(), ((BigDecimal) ha).negate(), ttc.negate(), tvaID.intValue(),
-                        tableFactureElement.getForeignTable("ID_ARTICLE").getRow(articleID.intValue()));
+                        foreignTableArticle.getRow(articleID.intValue()));
                 map.put(articleID + "##" + code + "##" + nom + "##" + tvaID, a);
+            }
             List<Object[]> listeIds = (List<Object[]>) Configuration.getInstance().getBase().getDataSource().execute(sel.asString(), new ArrayListHandler());
         Map<String, Object> valuesTVA = new HashMap<String, Object>();
         valuesTVA.put("TOTAL_TVA", totalTTC.subtract(totalHT).subtract(totalTTCHA.subtract(totalHTHA)));
         this.listAllSheetValues.put(3, listValuesTVA);
         valuesTVA.put("DATE", periode);
         this.mapAllSheetValues.put(3, valuesTVA);
+        this.listAllSheetValues.put(4, listValuesStock);
+        this.styleAllSheetValues.put(4, styleStock);
+        this.mapAllSheetValues.put(4, values);
+    }
     public static SQLRow rowDefaultCptService, rowDefaultCptProduit;
     static {
         final SQLTable tablePrefCompte = Configuration.getInstance().getRoot().findTable("PREFS_COMPTE");

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/generationDoc/gestcomm/EtatVentesXmlSheet.java - Rev 149 → 174