WebSVN - OpenConcerto - Diff - Rev 180 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/shipment/component/BonDeLivraisonSQLComponent.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.
 import org.openconcerto.sql.preferences.SQLPreferences;
 import org.openconcerto.sql.sqlobject.ElementComboBox;
 import org.openconcerto.sql.sqlobject.JUniqueTextField;
 import org.openconcerto.sql.sqlobject.SQLRequestComboBox;
 import org.openconcerto.sql.sqlobject.SQLTextCombo;
+import org.openconcerto.sql.sqlobject.itemview.SimpleRowItemView;
 import org.openconcerto.sql.users.UserManager;
 import org.openconcerto.sql.view.EditFrame;
 import org.openconcerto.sql.view.list.RowValuesTable;
 import org.openconcerto.sql.view.list.RowValuesTableModel;
 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.valuewrapper.ValidatedValueWrapper;
 import org.openconcerto.utils.ExceptionHandler;
 import org.openconcerto.utils.NumberUtils;
+import org.openconcerto.utils.cc.ITransformer;
+import org.openconcerto.utils.checks.ValidState;
 import java.awt.Color;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
         c.gridx++;
         c.weightx = 0;
         c.weighty = 0;
         c.fill = GridBagConstraints.NONE;
+        final ValidatedValueWrapper<Integer> clientValidatedValueWrapper = ValidatedValueWrapper.add(new ElementComboBox(), new ITransformer<Integer, ValidState>() {
+            @Override
+            public ValidState transformChecked(Integer t) {
+                ElementComboBox boxClient = (ElementComboBox) getView("ID_CLIENT").getComp();
+                if (getMode() == Mode.INSERTION && boxClient != null && !boxClient.isEmpty()
+                        && (boxClient.getSelectedRow().getBoolean("BLOQUE_LIVRAISON") || boxClient.getSelectedRow().getBoolean("BLOQUE"))) {
+                    return ValidState.create(false, "Les intéractions avec ce client sont verrouillées.");
+                } else {
+                    return ValidState.getTrueInstance();
+                }
+            }
+        });
-        this.comboClient = new ElementComboBox();
+        this.comboClient = (ElementComboBox) clientValidatedValueWrapper.getComp();
+        addView(new SimpleRowItemView<Integer>(clientValidatedValueWrapper), "ID_CLIENT", REQ);
         this.add(this.comboClient, c);
-        this.addRequiredSQLObject(this.comboClient, "ID_CLIENT");
         if (this.displayDpt) {
             c.gridx++;
             c.gridwidth = 1;
             final JLabel labelDpt = new JLabel(getLabelFor("ID_CLIENT_DEPARTEMENT"));
             final SQLElement contactElement = getElement().getForeignElement("ID_CONTACT");
             comboContact.init(contactElement, contactElement.getComboRequest(true));
             comboContact.getRequest().setWhere(Where.FALSE);
             DefaultGridBagConstraints.lockMinimumSize(comboContact);
             this.addView(comboContact, "ID_CONTACT");
+            // Commercial
+            JLabel labelCommercial = new JLabel(getLabelFor("ID_COMMERCIAL"));
+            labelCommercial.setHorizontalAlignment(SwingConstants.RIGHT);
+            c.gridx++;
+            c.weightx = 0;
+            this.add(labelCommercial, c);
+            this.comboCommercial = new ElementComboBox(false, 25);
+            this.comboCommercial.setListIconVisible(false);
+            c.gridx++;
+            c.fill = GridBagConstraints.NONE;
+            c.weightx = 1;
+            this.add(this.comboCommercial, c);
+            addRequiredSQLObject(this.comboCommercial, "ID_COMMERCIAL");
             comboClient.addModelListener("wantedID", new PropertyChangeListener() {
                 @Override
                 public void propertyChange(PropertyChangeEvent evt) {
                     int wantedID = comboClient.getWantedID();
                     System.err.println("SET WHERE ID_CLIENT = " + wantedID);
                     if (wantedID != SQLRow.NONEXISTANT_ID && wantedID >= SQLRow.MIN_VALID_ID) {
                         final SQLRow rowClient = getTable().getForeignTable("ID_CLIENT").getRow(wantedID);
+                        String alerte = rowClient.getString("ALERTE");
+                        if (!isFilling() && alerte != null && alerte.trim().length() > 0) {
+                            JOptionPane.showMessageDialog(comboClient, alerte);
+                        }
                         int idClient = rowClient.getID();
                         comboContact.getRequest().setWhere(new Where(contactElement.getTable().getField("ID_CLIENT"), "=", idClient));
                         if (rowClient.getObject("ID_CATEGORIE_COMPTABLE") != null && !rowClient.isForeignEmpty("ID_CATEGORIE_COMPTABLE")) {
                             tableBonItem.setRowCatComptable(rowClient.getForeign("ID_CATEGORIE_COMPTABLE"));
                         } else {
                             tableBonItem.setRowCatComptable(null);
+                        }
                         tableBonItem.setClient(rowClient, !isFilling());
+                        if (!isFilling() && !rowClient.isForeignEmpty("ID_COMMERCIAL")) {
+                            comboCommercial.setValue(rowClient.getForeignID("ID_COMMERCIAL"));
+                        }
                     } else {
                         comboContact.getRequest().setWhere(Where.FALSE);
                         tableBonItem.setRowCatComptable(null);
                         if (!isFilling()) {
                             tableBonItem.setClient(null, true);
+                        }
                         // DevisSQLComponent.this.table.setTarif(null, false);
+                    }
+                }
             });
-            // Commercial
-            JLabel labelCommercial = new JLabel(getLabelFor("ID_COMMERCIAL"));
-            labelCommercial.setHorizontalAlignment(SwingConstants.RIGHT);
-            c.fill = GridBagConstraints.HORIZONTAL;
-            c.gridx++;
-            c.weightx = 0;
-            this.add(labelCommercial, c);
-            this.comboCommercial = new ElementComboBox(false, 25);
-            this.comboCommercial.setListIconVisible(false);
-            c.gridx++;
-            c.fill = GridBagConstraints.NONE;
-            c.weightx = 1;
-            this.add(this.comboCommercial, c);
-            addRequiredSQLObject(this.comboCommercial, "ID_COMMERCIAL");
+        }
         final ElementComboBox boxTarif = new ElementComboBox();
         this.comboClient.addValueListener(new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
                 if (comboClient.getElement().getTable().contains("ID_TARIF")) {
                     if (BonDeLivraisonSQLComponent.this.isFilling())
         this.addSQLObject(textInfos, "INFOS");
         this.addSQLObject(this.textNom, "NOM");
         this.addSQLObject(this.selectCommande, "ID_COMMANDE_CLIENT");
         this.addRequiredSQLObject(this.textNumeroUnique, "NUMERO");
+        comboClient.addModelListener("wantedID", new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent arg0) {
+                Integer id = comboClient.getWantedID();
+                if (id > 1) {
+                    SQLRow rowClient = comboClient.getElement().getTable().getRow(id);
+                    if (rowClient.getObject("ID_CATEGORIE_COMPTABLE") != null && !rowClient.isForeignEmpty("ID_CATEGORIE_COMPTABLE")) {
+                        panelTotal.setCategorieComptable(rowClient.getForeign("ID_CATEGORIE_COMPTABLE"));
+                        tableBonItem.setRowCatComptable(rowClient.getForeign("ID_CATEGORIE_COMPTABLE"));
+                    } else {
+                        panelTotal.setCategorieComptable(null);
+                        tableBonItem.setRowCatComptable(null);
+                    }
+                }
+            }
+        });
         // Doit etre locké a la fin
         DefaultGridBagConstraints.lockMinimumSize(comboClient);
         textPortHT.getDocument().addDocumentListener(new DocumentListener() {
             public void changedUpdate(DocumentEvent e) {
             final List<Object> cmdDourceTrRowsFrom = ((BonDeLivraisonSQLElement) getElement()).getSourceTrRowsFrom(idBon, "COMMANDE_CLIENT_ELEMENT", "COMMANDE_CLIENT");
             ((BonDeLivraisonSQLElement) getElement()).updateQteLivree(cmdDourceTrRowsFrom, "COMMANDE_CLIENT_ELEMENT", "COMMANDE_CLIENT");
             final List<Object> devisSourceTrRowsFrom = ((BonDeLivraisonSQLElement) getElement()).getSourceTrRowsFrom(idBon, "DEVIS_ELEMENT", "DEVIS");
             ((BonDeLivraisonSQLElement) getElement()).updateQteLivree(devisSourceTrRowsFrom, "DEVIS_ELEMENT", "DEVIS");
             // generation du document
+            final SQLRow row = getTable().getRow(idBon);
-            BonLivraisonXmlSheet bSheet = new BonLivraisonXmlSheet(getTable().getRow(idBon));
+            BonLivraisonXmlSheet bSheet = new BonLivraisonXmlSheet(row);
             bSheet.createDocumentAsynchronous();
-            bSheet.showPrintAndExportAsynchronous(this.panelOO.isVisualisationSelected(), this.panelOO.isImpressionSelected(), true);
+            bSheet.showPrintAndExportAsynchronous(this.panelOO.isVisualisationSelected(), this.panelOO.isImpressionSelected(), true, getElement(), row);
             // incrémentation du numéro auto
             if (NumerotationAutoSQLElement.getNextNumero(getElement().getClass()).equalsIgnoreCase(this.textNumeroUnique.getText().trim())) {
                 SQLRowValues rowVals = new SQLRowValues(this.tableNum);
                 int val = this.tableNum.getRow(2).getInt("BON_L_START");
                 } catch (SQLException e) {
                     e.printStackTrace();
+                }
+            }
-            SQLPreferences prefs = new SQLPreferences(getTable().getDBRoot());
-            if (!prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_FACT, true)) {
-                try {
+            try {
-                    updateStock(idBon);
+                updateStock(idBon);
-                } catch (SQLException e) {
+            } catch (SQLException e) {
-                    throw new IllegalStateException(e);
+                throw new IllegalStateException(e);
+            }
-            }
             // updateQte(idBon);
             if (attempt > 0) {
                 SwingUtilities.invokeLater(new Runnable() {
                     public void run() {
                         JOptionPane.showMessageDialog(null, TM.tr("deliveryForm.numberRefreshed", num)); //$NON-NLS-1$
+                    }
                 });
+            }
+            ((BonDeLivraisonSQLElement) getElement()).fireInsertedCmdListener(row);
+        }
         return idBon;
+    }
         this.tableBonItem.createArticle(getSelectedID(), this.getElement());
         ((BonDeLivraisonSQLElement) getElement()).updateQteLivree(devisFrom, "DEVIS_ELEMENT", "DEVIS");
         ((BonDeLivraisonSQLElement) getElement()).updateQteLivree(cmdClientFrom, "COMMANDE_CLIENT_ELEMENT", "COMMANDE_CLIENT");
         // generation du document
+        final SQLRow row = getTable().getRow(getSelectedID());
-        BonLivraisonXmlSheet bSheet = new BonLivraisonXmlSheet(getTable().getRow(getSelectedID()));
+        BonLivraisonXmlSheet bSheet = new BonLivraisonXmlSheet(row);
         bSheet.createDocumentAsynchronous();
-        bSheet.showPrintAndExportAsynchronous(this.panelOO.isVisualisationSelected(), this.panelOO.isImpressionSelected(), true);
+        bSheet.showPrintAndExportAsynchronous(this.panelOO.isVisualisationSelected(), this.panelOO.isImpressionSelected(), true, getElement(), row);
-        SQLPreferences prefs = new SQLPreferences(getTable().getDBRoot());
-        if (!prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_FACT, true)) {
-            try {
+        try {
-                updateStock(getSelectedID());
+            updateStock(getSelectedID());
-            } catch (SQLException e) {
+        } catch (SQLException e) {
-                throw new IllegalStateException(e);
+            throw new IllegalStateException(e);
+        }
-        }
+    }
     /**
      * Chargement des qtés restantes à livrer
                 this.tableBonItem.getModel().putValue(r.getObject("QTE"), i, "QTE_LIVREE");
+            }
+        }
+    }
+    public void removeZeroQtyLines() {
+        int count = this.tableBonItem.getModel().getRowCount() - 1;
+        for (int i = count; i >= 0; i--) {
+            final SQLRowValues rowValuesAt = this.tableBonItem.getModel().getRowValuesAt(i);
+            if (rowValuesAt.getInt("QTE_LIVREE") == 0) {
+                this.tableBonItem.getModel().removeRowAt(i);
+            }
+        }
+    }
     /***********************************************************************************************
      * Mise à jour des quantités livrées dans les élements de facture
+     *
      * @param idBon id du bon de livraison
      * @throws SQLException
         SQLPreferences prefs = new SQLPreferences(getTable().getDBRoot());
         // Check if tr from bl or cmd pour DS
         boolean stockWithBL = !prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_FACT, true);
         if (getTable().getForeignTable("ID_CLIENT").contains("NOTE_2018")) {
             SQLRow row = getTable().getRow(id);
-            List<SQLRow> trCmd = row.getReferentRows(getTable().getTable("TR_COMMANDE_CLIENT"));
+            List<SQLRow> items = row.getReferentRows(getTable().getTable("BON_DE_LIVRAISON_ELEMENT"));
-            if (!trCmd.isEmpty()) {
+            for (SQLRow sqlRow : items) {
+                if (sqlRow.contains("ID_COMMANDE_CLIENT_ELEMENT") && !sqlRow.isForeignEmpty("ID_COMMANDE_CLIENT_ELEMENT")) {
-                stockWithBL = true;
+                    stockWithBL = true;
+                    break;
+                }
+            }
+        }
         if (stockWithBL) {
             SQLRow row = getTable().getRow(id);
             StockItemsUpdater stockUpdater = new StockItemsUpdater(new StockLabel() {
                 @Override
                 public String getLabel(SQLRowAccessor rowOrigin, SQLRowAccessor rowElt) {
                     return getLibelleStock(rowOrigin, rowElt);
             for (final SQLRow rowElt : myListItem) {
                 final SQLRowValues rowVals = rowElt.createUpdateRow();
                 rowVals.clearPrimaryKeys();
                 rowVals.putEmptyLink("ID_COMMANDE_CLIENT_ELEMENT");
-                getRowValuesTable().getRowValuesTableModel().addRow(rowVals);
+                getRowValuesTable().getRowValuesTableModel().addRow(rowVals, false);
                 final int rowIndex = getRowValuesTable().getRowValuesTableModel().getRowCount() - 1;
                 getRowValuesTable().getRowValuesTableModel().fireTableModelModified(rowIndex);
+            }
         } else {
             getRowValuesTable().getRowValuesTableModel().clearRows();

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