WebSVN - OpenConcerto - Diff - Rev 180 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/product/component/ReferenceArticleSQLComponent.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.component;
 import org.openconcerto.erp.config.ComptaPropsConfiguration;
 import org.openconcerto.erp.core.common.element.ComptaSQLConfElement;
+import org.openconcerto.erp.core.common.element.NumerotationAutoSQLElement;
 import org.openconcerto.erp.core.common.ui.CodeFournisseurItemTable;
 import org.openconcerto.erp.core.common.ui.TotalPanel;
 import org.openconcerto.erp.core.finance.accounting.model.CurrencyConverter;
 import org.openconcerto.erp.core.finance.tax.model.TaxeCache;
 import org.openconcerto.erp.core.sales.product.element.ArticleCodeClientTable;
 import org.openconcerto.erp.core.sales.product.element.SupplierPriceListTable;
 import org.openconcerto.erp.core.sales.product.element.UniteVenteArticleSQLElement;
 import org.openconcerto.erp.core.sales.product.model.ProductHelper;
 import org.openconcerto.erp.core.sales.product.ui.ArticleCategorieComptableTable;
 import org.openconcerto.erp.core.sales.product.ui.ArticleDesignationTable;
+import org.openconcerto.erp.core.sales.product.ui.ArticlePromotionTable;
 import org.openconcerto.erp.core.sales.product.ui.ArticleTarifTable;
 import org.openconcerto.erp.core.sales.product.ui.ProductItemListTable;
 import org.openconcerto.erp.core.sales.product.ui.ProductQtyPriceListTable;
 import org.openconcerto.erp.core.sales.product.ui.RowValuesTableEditionPanel;
 import org.openconcerto.erp.core.supplychain.stock.element.DepotStockSQLElement;
 import org.openconcerto.sql.model.SQLRowValues;
 import org.openconcerto.sql.model.SQLSelect;
 import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.model.Where;
 import org.openconcerto.sql.preferences.SQLPreferences;
+import org.openconcerto.sql.request.ComboSQLRequest;
 import org.openconcerto.sql.sqlobject.ElementComboBox;
 import org.openconcerto.sql.sqlobject.SQLTextCombo;
 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.ui.FormLayouter;
 import org.openconcerto.ui.JDate;
 import org.openconcerto.ui.TitledSeparator;
 import org.openconcerto.ui.component.ITextArea;
+import org.openconcerto.ui.component.InteractionMode;
 import org.openconcerto.ui.preferences.DefaultProps;
 import org.openconcerto.utils.DecimalUtils;
 import org.openconcerto.utils.ExceptionHandler;
 import org.openconcerto.utils.StringUtils;
 import org.openconcerto.utils.Tuple2;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 public class ReferenceArticleSQLComponent extends BaseSQLComponent {
     protected JTextField textPVHT, textPVTTC, textPAHT;
     protected JTextField textMetrique1VT, textMetrique1HA;
-    protected final JCheckBox boxService = new JCheckBox(getLabelFor("SERVICE"));
+    private final JCheckBox boxService = new JCheckBox(getLabelFor("SERVICE"));
-    protected final JCheckBox checkObs = new JCheckBox(getLabelFor("OBSOLETE"));
+    private final JCheckBox checkObs = new JCheckBox(getLabelFor("OBSOLETE"));
+    private JTextField textNom;
-    protected JTextField textNom, textCode;
+    private JTextField textCode;
-    protected JTextField textPoids;
+    private JTextField textPoids;
-    protected JTextField textValMetrique1, textValMetrique2, textValMetrique3;
+    private JTextField textValMetrique1, textValMetrique2, textValMetrique3;
-    protected DocumentListener htDocListener, ttcDocListener, detailsListener;
+    private DocumentListener htDocListener, ttcDocListener, detailsListener;
-    protected PropertyChangeListener propertyChangeListener;
+    private PropertyChangeListener propertyChangeListener;
-    protected PropertyChangeListener taxeListener;
+    private PropertyChangeListener taxeListener;
-    protected final ElementComboBox comboSelTaxe = new ElementComboBox(false, 10);
+    private final ElementComboBox comboSelTaxe = new ElementComboBox(false, 10);
-    protected final ElementComboBox comboSelModeVente = new ElementComboBox(false, 25);
+    private final ElementComboBox comboSelModeVente = new ElementComboBox(false, 25);
-    protected JLabel labelMetriqueHA1 = new JLabel(getLabelFor("PRIX_METRIQUE_HA_1"), SwingConstants.RIGHT);
+    private JLabel labelMetriqueHA1 = new JLabel(getLabelFor("PRIX_METRIQUE_HA_1"), SwingConstants.RIGHT);
-    protected JLabel labelMetriqueVT1 = new JLabel(getLabelFor("PRIX_METRIQUE_VT_1"), SwingConstants.RIGHT);
+    private JLabel labelMetriqueVT1 = new JLabel(getLabelFor("PRIX_METRIQUE_VT_1"), SwingConstants.RIGHT);
     protected ArticleDesignationTable tableDes = new ArticleDesignationTable();
     protected ArticleCodeClientTable tableCodeClient = new ArticleCodeClientTable();
     protected ArticleTarifTable tableTarifVente = new ArticleTarifTable(this);
+    protected ArticlePromotionTable tableTarifPromotionVente = new ArticlePromotionTable(this);
-    protected ArticleCategorieComptableTable tableCatComptable = new ArticleCategorieComptableTable();
+    protected final ArticleCategorieComptableTable tableCatComptable = new ArticleCategorieComptableTable();;
     protected SupplierPriceListTable tableFourSec = new SupplierPriceListTable();
     protected ProductQtyPriceListTable tableTarifQteVente = new ProductQtyPriceListTable(this);
     protected ProductItemListTable tableBom;
     protected final JTextField textMarge = new JTextField(10);
     protected final JLabel labelMarge = new JLabel("%           ");
     protected ElementComboBox boxCR;
     protected JCheckBox boxMargeWithCR;
+    protected List<ElementComboBox> boxesDeclinaison = new ArrayList<>();
     protected DocumentListener pieceHAArticle = new SimpleDocumentListener() {
         @Override
         public void update(DocumentEvent e) {
     public void select(SQLRowAccessor r) {
         super.select(r);
         if (r != null && r.getID() > getTable().getUndefinedID()) {
             this.checkObs.setVisible(true);
             this.tableTarifVente.setArticleValues(r);
+            selectModeVente(r.getForeignID("ID_MODE_VENTE_ARTICLE"));
+        } else {
+            if (r == null || !r.contains("CODE") || r.getString("CODE") == null || r.getString("CODE").trim().length() == 0) {
+                this.textCode.setText(getElement().getDirectory().getElement(NumerotationAutoSQLElement.class).getNextNumero(getElement().getClass()));
+            }
+        }
-            this.tableTarifVente.insertFrom("ID_ARTICLE", r.getID());
+        this.tableTarifVente.getRowValuesTable().insertFrom(r);
+        this.tableTarifPromotionVente.getRowValuesTable().insertFrom(r);
-            this.tableCatComptable.insertFrom("ID_ARTICLE", r.getID());
+        this.tableCatComptable.getRowValuesTable().insertFrom(r);
-            this.tableFourSec.insertFrom("ID_ARTICLE", r.getID());
+        this.tableFourSec.getRowValuesTable().insertFrom(r);
-            this.tableTarifQteVente.insertFrom("ID_ARTICLE", r.getID());
+        this.tableTarifQteVente.getRowValuesTable().insertFrom(r);
-            if (this.tableBom != null) {
+        if (this.tableBom != null) {
-                this.tableBom.insertFrom("ID_ARTICLE_PARENT", r.getID());
+            this.tableBom.getRowValuesTable().getRowValuesTableModel().insertFrom(r, getTable().getTable("ARTICLE_ELEMENT").getField("ID_ARTICLE_PARENT"));
+        }
-            this.tableDes.insertFrom("ID_ARTICLE", r.getID());
+        this.tableDes.getRowValuesTable().insertFrom(r);
-            this.tableCodeClient.insertFrom("ID_ARTICLE", r.getID());
+        this.tableCodeClient.getRowValuesTable().insertFrom(r);
-            if (this.codeFournisseurTable != null) {
+        if (this.codeFournisseurTable != null) {
-                this.codeFournisseurTable.insertFrom("ID_ARTICLE", r.getID());
+            this.codeFournisseurTable.getModel().insertFrom(r);
+        }
-            selectModeVente(r.getForeignID("ID_MODE_VENTE_ARTICLE"));
+        for (ElementComboBox elementComboBox : boxesDeclinaison) {
+            elementComboBox.setEnabled(r != null && r.getNonEmptyForeign("ID_ARTICLE_VIRTUEL_PERE") != null ? InteractionMode.READ_WRITE : InteractionMode.DISABLED);
+        }
+    }
     public void addViews() {
         this.setLayout(new GridBagLayout());
         c.weightx = 1;
         c.weighty = 1;
         pane.add("Tarifs de vente spéciaux", createTarifPanel());
         pane.add("Tarifs de vente par quantité", createTarifQtePanel());
+        pane.add("Tarifs promotionnels", createTarifPromotionPanel());
         if (this.tableBom != null) {
             pane.add("Nomenclature", createBOMpanel());
+        }
         pane.add("Exportation", createExportationPanel());
         pane.add("Achat", createAchatPanel());
         pane.add("Stock", createStockPanel());
         pane.add("Descriptif", createDescriptifPanel());
         pane.add("Désignations multilingues", createDesignationPanel());
         pane.add("Désignations clients", createCodeClientPanel());
+        if (prefs.getBoolean(GestionArticleGlobalPreferencePanel.ACTIVER_DECLINAISON, false)) {
+            pane.add("Déclinaison", createDeclinaisonPanel());
+        }
         pane.add("Comptabilité", createComptaPanel());
         pane.add(getLabelFor("INFOS"), createInfosPanel());
         c.fill = GridBagConstraints.BOTH;
         this.add(pane, c);
         c.gridx++;
         JTextField textTare = new JTextField(40);
         panel.add(textTare, c);
         addView(textTare, "TARE");
+        // c.gridy++;
+        // c.gridx = 0;
+        // c.weightx = 0;
+        // JLabel labelDLC = new JLabel(getLabelFor("DLC"));
+        // panel.add(labelDLC, c);
+        // c.weightx = 1;
+        // c.gridx++;
+        // JDate dateDLC = new JDate();
+        // panel.add(dateDLC, c);
+        // addView(dateDLC, "DLC");
+        c.weightx = 0;
         c.gridy++;
         c.gridx = 0;
-        c.weightx = 0;
-        JLabel labelDLC = new JLabel(getLabelFor("DLC"));
+        JLabel labelOption = new JLabel(getLabelFor("OPTION"));
+        c.fill = GridBagConstraints.BOTH;
-        panel.add(labelDLC, c);
+        panel.add(labelOption, c);
         c.weightx = 1;
         c.gridx++;
-        JDate dateDLC = new JDate();
+        JCheckBox boxOption = new JCheckBox();
-        panel.add(dateDLC, c);
+        panel.add(boxOption, c);
-        addView(dateDLC, "DLC");
+        this.addSQLObject(boxOption, "OPTION");
         c.weightx = 0;
         c.gridy++;
         c.gridx = 0;
         if (getTable().contains("POIDS_COLIS_NET")) {
         panel.add(this.tableCodeClient, c);
         return panel;
+    }
+    protected Component createDeclinaisonPanel() {
+        JPanel panel = new JPanel(new GridBagLayout());
+        panel.setOpaque(false);
+        GridBagConstraints c = new DefaultGridBagConstraints();
+        c.weighty = 0;
+        c.weightx = 0;
+        panel.add(new JLabel(getLabelFor("ID_ARTICLE_VIRTUEL_PERE")), c);
+        c.gridx++;
+        c.weightx = 1;
+        final ElementComboBox boxPere = new ElementComboBox();
+        panel.add(boxPere, c);
+        final ComboSQLRequest reqVir = getElement().createComboRequest();
+        reqVir.setWhere(new Where(getElement().getTable().getField("VIRTUEL"), "=", Boolean.TRUE));
+        boxPere.init(getElement(), reqVir);
+        this.addView(boxPere, "ID_ARTICLE_VIRTUEL_PERE");
+        c.gridx = 0;
+        c.gridy++;
+        List<String> declFiels = new ArrayList<String>();
+        for (String string : getTable().getFieldsName()) {
+            if (string.startsWith("ID_ARTICLE_DECLINAISON_")) {
+                declFiels.add(string);
+            }
+        }
+        this.boxesDeclinaison.clear();
+        for (String field : declFiels) {
+            c.weightx = 0;
+            if (c.gridx == 4) {
+                c.gridx = 0;
+                c.gridy++;
+            }
+            panel.add(new JLabel(getLabelFor(field)), c);
+            c.gridx++;
+            c.weightx = 1;
+            ElementComboBox box1 = new ElementComboBox();
+            final SQLElement declElement = getElement().getForeignElement(field);
+            box1.init(declElement, declElement.createComboRequest());
+            box1.setEnabled(InteractionMode.DISABLED);
+            panel.add(box1, c);
+            this.addView(box1, field);
+            this.boxesDeclinaison.add(box1);
+            c.gridx++;
+        }
+        boxPere.addModelListener("wantedID", new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                for (ElementComboBox elementComboBox : boxesDeclinaison) {
+                    elementComboBox.setEnabled(boxPere.getWantedID() != SQLRow.NONEXISTANT_ID ? InteractionMode.READ_WRITE : InteractionMode.DISABLED);
+                }
+            }
+        });
+        return panel;
+    }
     protected Component createStockPanel() {
         JPanel panel = new JPanel(new GridBagLayout());
         panel.setOpaque(false);
         GridBagConstraints c = new DefaultGridBagConstraints();
         SQLPreferences prefs = new SQLPreferences(getTable().getDBRoot());
             c.weightx = 1;
             panel.add(fieldQteAchat, c);
             this.addView(fieldQteAchat, "QTE_ACHAT");
+        }
+        //
+        c.gridy++;
+        c.gridx = 1;
+        c.weightx = 1;
+        JCheckBox DLCrequis = new JCheckBox("DLC requis");
+        panel.add(DLCrequis, c);
+        addView(DLCrequis, "DLC_REQUIS");
+        c.gridy++;
+        JCheckBox DLUOrequis = new JCheckBox("DLUO requis");
+        panel.add(DLUOrequis, c);
+        addView(DLUOrequis, "DLUO_REQUIS");
+        c.gridy++;
+        JCheckBox numeroLotRequis = new JCheckBox("n° de lot requis");
+        panel.add(numeroLotRequis, c);
+        addView(numeroLotRequis, "NUMERO_LOT_REQUIS");
+        c.gridy++;
+        JCheckBox numeroSerieRequis = new JCheckBox("n° de série requis");
+        panel.add(numeroSerieRequis, c);
+        addView(numeroSerieRequis, "NUMERO_SERIE_REQUIS");
         c.gridy++;
         c.weighty = 1;
         c.weightx = 1;
         c.fill = GridBagConstraints.BOTH;
         final JPanel spacer = new JPanel();
+            }
         });
         return panel;
+    }
+    protected JPanel createTarifPromotionPanel() {
+        JPanel panel = new JPanel(new GridBagLayout());
+        panel.setOpaque(false);
+        GridBagConstraints c = new DefaultGridBagConstraints();
+        // Ajout tarif
+        c.gridwidth = 1;
+        c.weightx = 0;
+        c.gridy++;
+        c.gridx = 0;
+        panel.add(new JLabel("Ajouter la promotion"), c);
+        final ElementComboBox boxTarif = new ElementComboBox();
+        boxTarif.init(Configuration.getInstance().getDirectory().getElement("TARIF_PROMOTION"));
+        c.gridx++;
+        panel.add(boxTarif, c);
+        c.fill = GridBagConstraints.NONE;
+        c.gridx++;
+        JButton buttonAjouter = new JButton("Ajouter");
+        buttonAjouter.setOpaque(false);
+        panel.add(buttonAjouter, c);
+        c.gridx++;
+        JButton buttonSupprimer = new JButton("Supprimer");
+        buttonSupprimer.setOpaque(false);
+        panel.add(buttonSupprimer, c);
+        c.gridwidth = GridBagConstraints.REMAINDER;
+        c.fill = GridBagConstraints.BOTH;
+        c.weightx = 1;
+        c.weighty = 1;
+        c.gridy++;
+        c.gridx = 0;
+        c.fill = GridBagConstraints.BOTH;
+        this.tableTarifPromotionVente.setOpaque(false);
+        panel.add(this.tableTarifPromotionVente, c);
+        // Listeners
+        buttonAjouter.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                SQLRow rowTarif = boxTarif.getSelectedRow();
+                if (rowTarif == null || rowTarif.isUndefined()) {
+                    return;
+                }
+                SQLRowValues rowVals = new SQLRowValues(Configuration.getInstance().getBase().getTable("ARTICLE_TARIF_PROMOTION"));
+                if (getSelectedID() > 1) {
+                    rowVals.put("ID_ARTICLE", getSelectedID());
+                }
+                rowVals.put("ID_TARIF_PROMOTION", rowTarif.getID());
+                rowVals.put("PRIX_METRIQUE_VT_1", BigDecimal.ZERO);
+                rowVals.put("PV_HT", BigDecimal.ZERO);
+                rowVals.put("PV_TTC", BigDecimal.ZERO);
+                tableTarifPromotionVente.getModel().addRow(rowVals);
+            }
+        });
+        buttonSupprimer.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                tableTarifPromotionVente.removeSelectedRow();
+            }
+        });
+        return panel;
+    }
     protected JPanel createCategorieComptablePanel() {
         JPanel panel = new JPanel(new GridBagLayout());
         panel.setOpaque(false);
         GridBagConstraints c = new DefaultGridBagConstraints();
             super.update();
         this.tableTarifVente.updateField("ID_ARTICLE", selectedID);
         this.tableCatComptable.updateField("ID_ARTICLE", selectedID);
         this.tableFourSec.updateField("ID_ARTICLE", selectedID);
         this.tableTarifQteVente.updateField("ID_ARTICLE", selectedID);
+        this.tableTarifPromotionVente.updateField("ID_ARTICLE", selectedID);
         if (this.tableBom != null) {
             this.tableBom.updateField("ID_ARTICLE_PARENT", selectedID);
+        }
         this.tableDes.updateField("ID_ARTICLE", selectedID);
         int id = super.insert(order);
         this.tableTarifVente.updateField("ID_ARTICLE", id);
         this.tableCatComptable.updateField("ID_ARTICLE", id);
         this.tableFourSec.updateField("ID_ARTICLE", id);
         this.tableTarifQteVente.updateField("ID_ARTICLE", id);
+        this.tableTarifPromotionVente.updateField("ID_ARTICLE", id);
         if (this.tableBom != null) {
             this.tableBom.updateField("ID_ARTICLE_PARENT", id);
+        }
         this.tableDes.updateField("ID_ARTICLE", id);
         this.tableCodeClient.updateField("ID_ARTICLE", id);
         if (this.codeFournisseurTable != null) {
             this.codeFournisseurTable.updateField("ID_ARTICLE", id);
+        }
         ((ReferenceArticleSQLElement) getElement()).initStock(id);
         ReferenceArticleSQLElement.updateDateAchat(getTable(), getTable().getRow(id));
+        // incrémentation du numéro auto
+        if (NumerotationAutoSQLElement.getNextNumero(getElement().getClass(), new Date()).equalsIgnoreCase(this.textCode.getText().trim())) {
+            final SQLTable tableNum = getElement().getDirectory().getElement(NumerotationAutoSQLElement.class).getTable();
+            SQLRowValues rowVals = new SQLRowValues(tableNum);
+            final SQLRow rowNumAuto = tableNum.getRow(2);
+            if (rowNumAuto.getObject("ARTICLE_START") != null) {
+                int val = rowNumAuto.getInt("ARTICLE_START");
+                val++;
+                rowVals.put("ARTICLE_START", new Integer(val));
+                try {
+                    rowVals.update(2);
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
         return id;
+    }
     @Override
     protected SQLRowValues createDefaults() {

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/component/ReferenceArticleSQLComponent.java - Rev 180 → 182