Modifider csv de comande-Le csv contient Barcode, Nom, Quantités Reçues (de colis), Quantités Promises (de colis), Nombre d'éléments par colis, Commentaire, Anomalie

Author: Andros78

app/__init__.py

@@ -28,6 +28,11 @@ def create_app():
     # Initialisation des extensions
     from .extensions import db, migrate, oauth
     db.init_app(app)
+    from app.models.received_order import ReceivedOrder
+
+    with app.app_context():
+        db.create_all()
+
     migrate.init_app(app, db)
     oauth.init_app(app)
 

app/main/routes.py

@@ -9,6 +9,8 @@
 from app.services.email_service import EmailPreparer, EmailSender
 import urllib.parse
 from app.auth.pkce_auth import requires_auth
+from app.models.received_order import ReceivedOrder
+from app.extensions import db
 # Configuration du logger
 logger = logging.getLogger(__name__)
 
@@ -105,7 +107,7 @@ def process_inbound_order(po_reference):
         has_errors = False
 
         for item in data['products']:
-            if 'barcode' not in item or 'ok' not in item or (not item['ok'] and 'received' not in item):
+            if 'barcode' not in item or 'ok' not in item or (not item['ok'] and 'received_quantity' not in item):
                 has_errors = True
                 continue
 
@@ -119,13 +121,13 @@ def process_inbound_order(po_reference):
             processed_products.append({
                 "barcode": item['barcode'],
                 "name": item.get("name", ""),          # optionnel : ajouter nom produit si disponible
-                "parcels": item.get("parcels", 1),
-                "packSize": item.get("packSize", 1),
+                "received_quantity": item.get("received_quantity", ""),
+                "ordered_quantity": item.get("ordered_quantity", ""),
+                "packsize": item.get("packsize", ""),
                 "ok": item['ok'],
                 "comment": item.get("comment", ""),
                 "status": status,
                 "message": message,
-                "received_quantity": item.get('received')
             })
 
         if has_errors:
@@ -150,6 +152,17 @@ def process_inbound_order(po_reference):
             }
         }
 
+        
+        # --- Marquer la commande comme réceptionnée ---
+        already_received = ReceivedOrder.query.filter_by(po=po_reference).first()
+
+        if not already_received:
+            db.session.add(ReceivedOrder(po=po_reference))
+            db.session.commit()
+            logging.info(f"Commande {po_reference} marquée comme réceptionnée")
+        else:
+            logging.info(f"Commande {po_reference} déjà réceptionnée")
+            
         logging.info(f"Traitement de la commande {po_reference} terminé avec succès")
         return jsonify(response), 200
 
@@ -218,6 +231,7 @@ def get_product_info():
     except Exception as e:
         return jsonify({"error": str(e)}), 500
 
+
 @main_bp.route("/orders/inbound", methods=["GET", "OPTIONS"])
 @requires_auth()
 def get_inbound_orders():
@@ -253,6 +267,15 @@ def get_inbound_orders():
         odoo = current_app.extensions['odoo']
         purchase_orders = asyncio.run(odoo.fetch_waiting_purchase_orders())
 
+
+        # Récupération des PO déjà réceptionnées (1 requête DB)
+        received_pos = {
+            po for (po,) in db.session.query(ReceivedOrder.po).all()
+        }
+
+        print("Received POS", received_pos)
+
+
         # Formatage de la réponse selon le format attendu
         response = []
 
@@ -263,7 +286,8 @@ def get_inbound_orders():
                     "po": po.name,
                     "provider": po.partner_name if po.partner_name else "Inconnu",
                     "date": po.date_order.strftime("%Y-%m-%dT%H:%M:%S") if po.date_order else None,
-                    "n_products": po.lines_count
+                    "n_products": po.lines_count,
+                    "received": True if po.name in received_pos else False
                 }
                 response.append(po_data)
 

app/models/received_order.py

@@ -0,0 +1,9 @@
+from datetime import datetime
+from app.extensions import db  # adapte l'import si besoin
+
+class ReceivedOrder(db.Model):
+    __tablename__ = "received_orders"
+
+    id = db.Column(db.Integer, primary_key=True)
+    po = db.Column(db.String(50), unique=True, nullable=False, index=True)
+    received_at = db.Column(db.DateTime, default=datetime.utcnow)

app/services/email_service.py

@@ -84,14 +84,15 @@ def prepare_purchase_order_email(purchase_order, lines, sender, recipient):
         writer = csv.writer(output)
         # En-têtes
         writer.writerow([
-            "Code Barre", "Nom Produit", "Quantité", "Pack Size", "Statut", "Commentaire"
+            "Code Barre", "Nom Produit", "Quantité reçue","Quantité commandée",  "Pack Size", "Statut", "Commentaire"
         ])
         # Lignes
         for line in lines:
             writer.writerow([
                 line.get("barcode"),
                 line.get("name"),
-                line.get("parcels", 0) * line.get("packSize", 1),
+                line.get("received_quantity", 0),
+                line.get("ordered_quantity", 0),
                 line.get("packSize", 1),
                 "OK" if line.get("ok") else "Anomalie",
                 line.get("comment", "")