WebSVN - OpenConcerto - Diff - Rev 182 and 185 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/AbstractAchatArticleItemTable.java

 import org.openconcerto.erp.config.ComptaPropsConfiguration;
 import org.openconcerto.erp.core.finance.accounting.model.CurrencyConverter;
 import org.openconcerto.erp.core.finance.tax.model.TaxeCache;
 import org.openconcerto.erp.core.sales.pos.io.BarcodeReader;
+import org.openconcerto.erp.core.sales.pos.io.Barcode;
-import org.openconcerto.erp.core.sales.pos.ui.BarcodeListener;
+import org.openconcerto.erp.core.sales.pos.io.BarcodeListener;
+import org.openconcerto.erp.core.sales.product.element.LotSQLElement;
 import org.openconcerto.erp.core.sales.product.element.ReferenceArticleSQLElement;
 import org.openconcerto.erp.core.sales.product.element.UniteVenteArticleSQLElement;
+import org.openconcerto.erp.core.sales.product.element.LotSQLElement.TypeLot;
 import org.openconcerto.erp.core.sales.product.ui.CurrencyWithSymbolRenderer;
-import org.openconcerto.erp.core.sales.product.ui.DeliveredQtyRowValuesRenderer;
+import org.openconcerto.erp.core.sales.product.ui.QtyRowValuesRenderer;
+import org.openconcerto.erp.core.sales.product.ui.QteMultipleRowValuesRenderer;
 import org.openconcerto.erp.core.sales.product.ui.QteUnitRowValuesRenderer;
 import org.openconcerto.erp.core.supplychain.stock.element.DepotStockSQLElement;
 import org.openconcerto.erp.core.supplychain.stock.element.StockSQLElement;
 import org.openconcerto.erp.preferences.DefaultNXProps;
 import org.openconcerto.erp.preferences.GestionArticleGlobalPreferencePanel;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.element.SQLElement;
 import org.openconcerto.sql.model.FieldPath;
+import org.openconcerto.sql.model.SQLField;
 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.SQLRowValuesListFetcher;
 import org.openconcerto.sql.model.SQLSelect;
 import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.model.UndefinedRowValuesCache;
 import org.openconcerto.sql.model.Where;
 import org.openconcerto.sql.model.graph.Path;
 import org.openconcerto.sql.preferences.SQLPreferences;
+import org.openconcerto.sql.request.ComboSQLRequest;
 import org.openconcerto.sql.sqlobject.ITextArticleWithCompletionCellEditor;
 import org.openconcerto.sql.sqlobject.ITextWithCompletion;
 import org.openconcerto.sql.view.EditFrame;
 import org.openconcerto.sql.view.EditPanel.EditMode;
 import org.openconcerto.sql.view.list.AutoCompletionManager;
 import org.openconcerto.sql.view.list.RowValuesTable;
 import org.openconcerto.sql.view.list.RowValuesTableModel;
 import org.openconcerto.sql.view.list.SQLTableElement;
 import org.openconcerto.sql.view.list.ValidStateChecker;
 import org.openconcerto.ui.preferences.DefaultProps;
+import org.openconcerto.utils.CompareUtils;
 import org.openconcerto.utils.DecimalUtils;
 import org.openconcerto.utils.ExceptionHandler;
 import org.openconcerto.utils.Tuple3;
+import org.openconcerto.utils.checks.ValidState;
 import org.openconcerto.utils.i18n.TranslationManager;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
             @Override
             public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
                 boolean b = super.isCellEditable(vals, rowIndex, columnIndex);
-                return b && !isFromTranferred(vals);
+                return b && !isFromTranferred(vals) && !isLotLinked(vals);
+            }
         };
         list.add(tableElementArticle);
         final SQLTableElement tableElementCode = new SQLTableElement(e.getTable().getField("CODE"), String.class,
                 new ITextArticleWithCompletionCellEditor(e.getTable().getTable("ARTICLE"), e.getTable().getTable("ARTICLE_FOURNISSEUR"), withDeclinaison)) {
             @Override
             public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
                 boolean b = super.isCellEditable(vals, rowIndex, columnIndex);
-                return b && !isFromTranferred(vals);
+                return b && !isFromTranferred(vals) && !isLotLinked(vals);
+            }
         };
         list.add(tableElementCode);
         // Désignation de l'article
         final SQLTableElement tableElementNom = new SQLTableElement(e.getTable().getField("NOM")) {
             @Override
             public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
                 boolean b = super.isCellEditable(vals, rowIndex, columnIndex);
-                return b && !isFromTranferred(vals);
+                return b && !isFromTranferred(vals) && !isLotLinked(vals);
+            }
         };
         list.add(tableElementNom);
                 SQLRowAccessor row = vals.getForeign("ID_UNITE_VENTE");
                 if (row != null && !row.isUndefined() && row.getBoolean("A_LA_PIECE")) {
                     return false;
                 } else {
-                    return super.isCellEditable(vals, rowIndex, columnIndex);
+                    return super.isCellEditable(vals, rowIndex, columnIndex) && !isLotLinked(vals);
+                }
+            }
             @Override
             public TableCellRenderer getTableCellRenderer() {
             tableQteO.setEditable(false);
             list.add(tableQteO);
+        }
         // Quantité
-        final SQLTableElement qteElement = new SQLTableElement(e.getTable().getField("QTE"), Integer.class) {
+        final SQLTableElement qteElement = new SQLTableElement(e.getTable().getField("QTE"), Integer.class, new QteCellEditor()) {
             protected Object getDefaultNullValue() {
                 return Integer.valueOf(0);
+            }
+            @Override
+            public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
+                return super.isCellEditable(vals, rowIndex, columnIndex) && !isLotLinked(vals);
+            }
+            public TableCellRenderer getTableCellRenderer() {
+                if (getSQLElement().getTable().getFieldsName().contains("QTE_ACHAT")) {
+                    return new QteMultipleRowValuesRenderer();
+                } else {
+                    return super.getTableCellRenderer();
+                }
+            }
         };
         if (fieldsName.contains("QTE_ORIGINE")) {
-            qteElement.setRenderer(new DeliveredQtyRowValuesRenderer(false));
+            qteElement.setRenderer(new QtyRowValuesRenderer(false));
+        }
         list.add(qteElement);
         // TVA
         this.tableElementTVA = new SQLTableElement(e.getTable().getField("ID_TAXE"));
         list.add(this.tableElementTVA);
             this.defaultRowVals.put("ID_DEPOT_STOCK", depotDefault);
+        }
         final RowValuesTableModel model = new RowValuesTableModel(e, list, e.getTable().getField("QTE"), false, this.defaultRowVals) {
             @Override
-            public void commitData() {
+            public void commitData() throws SQLException {
-                super.commitData(true);
+                commitData(true);
+            }
-        };
+            @Override
+            public void commitData(boolean useMultipleInsertUpdate) throws SQLException {
+                if (getSQLElement().getTable().getName().equalsIgnoreCase("BON_RECEPTION_ELEMENT")) {
+                    // Mise à jour de l'ID_ARTICLE et l'ID_DEPOT_STOCK
+                    final SQLTable tableLotR = getSQLElement().getTable().getTable("LOT_RECEPTION");
+                    for (int i = 0; i < getRowCount(); i++) {
+                        final SQLRowValues rowValuesAt = getRowValuesAt(i);
+                        final Set<SQLRowValues> referentRows = rowValuesAt.getReferentRows(tableLotR.getField("ID_BON_RECEPTION_ELEMENT"));
+                        for (SQLRowValues ref : referentRows) {
+                            ref.put("ID_ARTICLE", rowValuesAt.getForeignIDNumber("ID_ARTICLE"));
+                            ref.put("ID_DEPOT_STOCK", rowValuesAt.getForeignIDNumber("ID_DEPOT_STOCK"));
+                        }
+                    }
+                }
+                super.commitData(useMultipleInsertUpdate);
+                if (getSQLElement().getTable().getName().equalsIgnoreCase("BON_RECEPTION_ELEMENT")) {
+                    getSQLElement().getDirectory().getElement(LotSQLElement.class).updateLotQuantiteFromBRItems(getCopyOfValues());
+                }
+            }
+            @Override
+            public List<SQLRowValues> fetchDataFromDB(SQLRowAccessor rowVals, SQLField referentField, SQLField fieldWhere, Object value) {
+                final SQLTable table = getSQLElement().getTable();
+                List<SQLRowValues> newRows = new ArrayList<>();
+                SQLRowValues rowValsBrItem = new SQLRowValues(table);
+                rowValsBrItem.putNulls(table.getFieldsName());
+                rowValsBrItem.putRowValues("ID_UNITE_VENTE").putNulls("A_LA_PIECE");
+                rowValsBrItem.putRowValues("ID_ARTICLE").putNulls("CODE", "NOM", "DLC_REQUIS", "DLUO_REQUIS", "NUMERO_LOT_REQUIS", "NUMERO_SERIE_REQUIS");
+                if (table.getName().equals("BON_RECEPTION_ELEMENT")) {
+                    final SQLTable tableLotR = table.getTable("LOT_RECEPTION");
+                    SQLRowValues rowValsLotRecp = new SQLRowValues(tableLotR);
+                    rowValsLotRecp.putNulls(rowValsLotRecp.getTable().getFieldsName());
+                    rowValsLotRecp.put("ID_BON_RECEPTION_ELEMENT", rowValsBrItem);
+                }
+                if (referentField == null) {
+                    referentField = table.getField("ID_" + rowVals.getTable().getName());
+                }
+                final List<SQLRowValues> fetch = SQLRowValuesListFetcher.create(rowValsBrItem).fetch(new Where(referentField, "=", rowVals.getID()));
+                for (SQLRowValues row2 : fetch) {
+                    if (fieldWhere == null || CompareUtils.equals(row2.getObject(fieldWhere.getName()), value)) {
+                        newRows.add(row2);
+                    }
+                }
+                return newRows;
+            }
+        };
+        if (getSQLElement().getTable().getName().equalsIgnoreCase("BON_RECEPTION_ELEMENT")) {
+            model.setGestionReferentActive(true);
+        }
         setModel(model);
-        this.table = new RowValuesTable(model, getConfigurationFile());
+        this.table = new RowValuesTable(model, getConfigurationFile()) {
+            @Override
+            public synchronized ValidState getValidState() {
+                if (getSQLElement().getTable().getName().equalsIgnoreCase("BON_RECEPTION_ELEMENT")) {
+                    final LotSQLElement element = getSQLElement().getDirectory().getElement(LotSQLElement.class);
+                    ValidState lotState = element.getValidStateOfRowValuesTable(getRowValuesTable().getRowValuesTableModel(), TypeLot.RECEPTION);
+                    if (lotState != ValidState.getTrueInstance()) {
+                        return lotState;
+                    }
+                }
+                return super.getValidState();
+            }
+        };
         ToolTipManager.sharedInstance().unregisterComponent(this.table);
         ToolTipManager.sharedInstance().unregisterComponent(this.table.getTableHeader());
         if (getSQLElement().getTable().getName().equals("COMMANDE_ELEMENT")) {
             this.table.getClearCloneTableElement().add("QTE_RECUE");
             this.table.getClearCloneTableElement().add("RECU");
         completionFields.add("QTE_UNITAIRE");
         completionFields.add("PA_HT");
         completionFields.add("PV_HT");
         completionFields.add("POIDS");
         completionFields.add("ID_TAXE");
+        completionFields.add("ID_MODE_VENTE_ARTICLE");
         completionFields.add("PRIX_METRIQUE_HA_1");
         completionFields.add("PRIX_METRIQUE_HA_2");
         completionFields.add("PRIX_METRIQUE_HA_3");
         completionFields.add("VALEUR_METRIQUE_1");
         completionFields.add("VALEUR_METRIQUE_2");
         completionFields.add("VALEUR_METRIQUE_3");
-        completionFields.add("ID_MODE_VENTE_ARTICLE");
         completionFields.add("PRIX_METRIQUE_VT_1");
         completionFields.add("PRIX_METRIQUE_VT_2");
         completionFields.add("PRIX_METRIQUE_VT_3");
         completionFields.add("SERVICE");
         completionFields.add("ID_DEVISE");
             completionFields.add("POIDS_COLIS_NET");
+        }
         if (getSQLElement().getTable().getFieldsName().contains("TARE") && sqlTableArticle.getTable().getFieldsName().contains("TARE")) {
             completionFields.add("TARE");
+        }
+        if (getSQLElement().getTable().getFieldsName().contains("QTE_ACHAT") && sqlTableArticle.getTable().getFieldsName().contains("QTE_ACHAT")) {
+            completionFields.add("QTE_ACHAT");
+        }
         this.m = new AutoCompletionManager(tableElementCode, sqlTableArticle.getField("CODE"), this.table, this.table.getRowValuesTableModel()) {
             @Override
             protected Object getValueFrom(SQLRow row, String field, SQLRowAccessor rowDest) {
                 Object res = tarifCompletion(row, field);
                 if (res == null) {
             m.fill(string, string);
+        }
         final Where w = new Where(sqlTableArticle.getField("OBSOLETE"), "=", Boolean.FALSE);
         m.setWhere(w);
+        ComboSQLRequest req = new ComboSQLRequest(sqlTableArticle, Arrays.asList("NOM", "CODE"));
+        req.setWhere(w);
         this.m2 = new AutoCompletionManager(tableElementNom, ((ComptaPropsConfiguration) Configuration.getInstance()).getSQLBaseSociete().getField("ARTICLE.NOM"), this.table,
-                this.table.getRowValuesTableModel()) {
+                this.table.getRowValuesTableModel(), req) {
             @Override
             protected Object getValueFrom(SQLRow row, String field, SQLRowAccessor rowDest) {
                 Object res = tarifCompletion(row, field);
                 if (res == null) {
                     return super.getValueFrom(row, field, rowDest);
                 } else {
                     return res;
+                }
+            }
         };
+        m2.setFillWithField("NOM");
         m2.fill("CODE", "CODE");
         m2.fill("ID", "ID_ARTICLE");
         for (String string : completionFields) {
             m2.fill(string, string);
+        }
             @Override
             public Object computeValueFrom(SQLRowValues row, SQLTableElement source) {
                 try {
                     SQLRowAccessor foreign = row.getForeign("ID_ARTICLE");
                     if (foreign != null && !foreign.isUndefined() && foreign.getObject("CODE") != null && foreign.getString("CODE").equals(row.getString("CODE"))) {
-                        return foreign.getID();
+                        return foreign/* .getID() */;
                     } else {
                         return tableArticle.getUndefinedID();
+                    }
                 } catch (Exception e) {
                     return tableArticle.getUndefinedID();
                 public void keyReceived(KeyEvent ee) {
                     // TODO Auto-generated method stub
+                }
                 @Override
-                public void barcodeRead(String code) {
+                public void barcodeRead(Barcode barcode) {
                     if (((JFrame) SwingUtilities.getRoot(getRowValuesTable())).isActive()) {
                         final SQLSelect selArticle = new SQLSelect();
                         final SQLTable tableArticle = getSQLElement().getForeignElement("ID_ARTICLE").getTable();
                         selArticle.addSelectStar(tableArticle);
                         Where w = new Where(tableArticle.getField("OBSOLETE"), "=", Boolean.FALSE);
-                        w = w.and(new Where(tableArticle.getField("CODE_BARRE"), "=", code));
+                        w = w.and(new Where(tableArticle.getField("CODE_BARRE"), "=", barcode.getData()));
                         selArticle.setWhere(w);
                         List<SQLRow> l2 = SQLRowListRSH.execute(selArticle);
                         if (l2.size() > 0) {
                             System.err.println("ARTICLE " + l2.get(0).getString("NOM"));
                             Tuple3<Double, String, String> art = Tuple3.create(1.0D, l2.get(0).getString("CODE"), l2.get(0).getString("NOM"));
             } else if (this.incoterm != null && this.incoterm.equalsIgnoreCase("DDP")) {
                 incoTerms = Arrays.asList("PRIX_ACHAT", "COEF_TRANSPORT_PORT", "COEF_TAXE_D");
             } else {
                 incoTerms = Arrays.asList("PRIX_ACHAT");
+            }
+            List<SQLRowValues> rows;
+            if (this.rowFournisseur != null && !this.rowFournisseur.isUndefined()) {
-            List<SQLRow> rows = row.getReferentRows(tTarifFournisseur);
+                SQLRowValues rowValsTarif = new SQLRowValues(tTarifFournisseur);
+                rowValsTarif.putNulls(tTarifFournisseur.getFieldsName());
+                Where where = new Where(tTarifFournisseur.getField("ID_FOURNISSEUR"), "=", this.rowFournisseur.getID()).and(new Where(tTarifFournisseur.getField("ID_ARTICLE"), "=", row.getID()));
+                rows = SQLRowValuesListFetcher.create(rowValsTarif).fetch(where);
+                if (rows.isEmpty() && row.getObject("ID_ARTICLE_VIRTUEL_PERE") != null && !row.isForeignEmpty("ID_ARTICLE_VIRTUEL_PERE")) {
+                    Where where2 = new Where(tTarifFournisseur.getField("ID_FOURNISSEUR"), "=", this.rowFournisseur.getID())
+                            .and(new Where(tTarifFournisseur.getField("ID_ARTICLE"), "=", row.getForeignID("ID_ARTICLE_VIRTUEL_PERE")));
+                    rows = SQLRowValuesListFetcher.create(rowValsTarif).fetch(where2);
+                }
+            } else {
+                rows = Collections.emptyList();
+            }
             if (row.getBoolean("AUTO_PRIX_ACHAT_NOMENCLATURE") && row.getTable().getDBRoot().contains("ARTICLE_PRIX_REVIENT")) {
                 List<SQLRow> rowsElt = row.getReferentRows(row.getTable().getTable("ARTICLE_ELEMENT").getField("ID_ARTICLE_PARENT"));
                 BigDecimal price = BigDecimal.ZERO;
                 final Set<String> tarifNotFound = new HashSet<String>();
             } else if (!rows.isEmpty()) {
                 BigDecimal min = row.getBigDecimal("PRIX_METRIQUE_HA_1");
                 Calendar c = null;
-                for (SQLRow sqlRow : rows) {
+                for (SQLRowValues sqlRow : rows) {
                     if (this.rowFournisseur != null && this.rowFournisseur.getID() == sqlRow.getForeignID("ID_FOURNISSEUR")) {
                         BigDecimal price = getPrice(sqlRow, incoTerms);
                         final Calendar datePrice = sqlRow.getDate("DATE_PRIX");
                         if (datePrice == null || (this.getDateDevise() != null && !this.getDateDevise().before(datePrice.getTime()))) {
                             if (c == null || c.before(datePrice)) {
+            }
+        }
         return false;
+    }
+    private boolean isLotLinked(SQLRowValues vals) {
+        if (vals.getTable().getName().equals("BON_RECEPTION_ELEMENT")) {
+            return !vals.getReferentRows(vals.getTable().getTable("LOT_RECEPTION").getField("ID_BON_RECEPTION_ELEMENT")).isEmpty();
+        }
+        return false;
+    }
+}

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/AbstractAchatArticleItemTable.java @ 180 - Rev 182 → 185