fixed issue...

backend/services/database_service.py

@@ -5,7 +5,8 @@ from sqlalchemy import text, and_, or_
 from backend.models.schemas import NLPAnalysisResult, DatabaseResult, QueryType
 from backend.config import settings
 from backend.database.connection import get_database_session, close_database_session
-from backend.database.models import User, Product, Order, OrderItem, LineMessage, UserSession
+from backend.database.models import User, Product, PurchaseOrder, SalesOrder, LineMessage, Category
+from datetime import datetime
 import logging
 
 logger = logging.getLogger(__name__)
@@ -17,37 +18,32 @@ class DatabaseService:
         self.model_mapping = {
             "users": User,
             "products": Product,
-            "orders": Order,
-            "order_items": OrderItem,
-            "line_messages": LineMessage,
-            "user_sessions": UserSession
+            "purchase_orders": PurchaseOrder,
+            "sales_orders": SalesOrder,
+            "line_messages": LineMessage
         }
         
         # 定義資料表結構
         self.table_schemas = {
             "users": {
                 "model": User,
-                "searchable": ["name", "email", "display_name"]
+                "searchable": ["name", "email"]
             },
-            "orders": {
-                "model": Order,
-                "searchable": ["order_id", "status"]
+            "purchase_orders": {
+                "model": PurchaseOrder,
+                "searchable": ["po_number", "status"]
+            },
+            "sales_orders": {
+                "model": SalesOrder,
+                "searchable": ["so_number", "status"]
             },
             "products": {
                 "model": Product,
-                "searchable": ["name", "category", "description"]
+                "searchable": ["productName", "productCode", "barcode"]
             },
             "line_messages": {
                 "model": LineMessage,
                 "searchable": ["message", "user_id"]
-            },
-            "order_items": {
-                "model": OrderItem,
-                "searchable": []
-            },
-            "user_sessions": {
-                "model": UserSession,
-                "searchable": ["user_id"]
             }
         }
 
@@ -493,8 +489,8 @@ class DatabaseService:
             # 如果有查詢文字，進行模糊搜尋
             if query_text:
                 search_filter = or_(
-                    Product.name.ilike(f"%{query_text}%"),
-                    Product.description.ilike(f"%{query_text}%")
+                    Product.productName.ilike(f"%{query_text}%"),
+                    Product.productCode.ilike(f"%{query_text}%")
                 )
                 query = query.filter(search_filter)
             
@@ -510,12 +506,13 @@ class DatabaseService:
             for product in products:
                 product_data = {
                     "id": product.id,
-                    "name": product.name,
-                    "description": product.description,
-                    "price": float(product.price) if product.price else 0.0,
-                    "category": product.category,
-                    "stock": product.stock if hasattr(product, 'stock') else 0,
-                    "created_at": product.created_at.isoformat() if product.created_at else None
+                    "product_code": product.productCode,
+                    "product_name": product.productName,
+                    "unit": product.unit,
+                    "warehouse": product.warehouse,
+                    "stock": product.stock,
+                    "category_name": product.category.name if product.category else None,
+                    "created_at": product.createdAt.isoformat() if product.createdAt else None
                 }
                 data.append(product_data)
             
@@ -546,11 +543,11 @@ class DatabaseService:
             
             # 根據商品名稱查詢
             if product_name:
-                query = query.filter(Product.name.ilike(f"%{product_name}%"))
+                query = query.filter(Product.productName.ilike(f"%{product_name}%"))
             
-            # 類別篩選
+            # 類別篩選 (通過關聯查詢)
             if category:
-                query = query.filter(Product.category.ilike(f"%{category}%"))
+                query = query.join(Product.category).filter(Category.name.ilike(f"%{category}%"))
             
             products = query.all()
             
@@ -558,12 +555,13 @@ class DatabaseService:
             inventory_data = []
             for product in products:
                 stock_info = {
-                    "product_name": product.name,
-                    "category": product.category,
-                    "current_stock": product.stock if hasattr(product, 'stock') else 0,
-                    "price": float(product.price) if product.price else 0.0,
-                    "description": product.description,
-                    "last_updated": product.updated_at.isoformat() if product.updated_at else None
+                    "product_name": product.productName,
+                    "product_code": product.productCode,
+                    "category": product.category.name if product.category else None,
+                    "current_stock": product.stock,
+                    "unit": product.unit,
+                    "warehouse": product.warehouse,
+                    "last_updated": product.updatedAt.isoformat() if product.updatedAt else None
                 }
                 inventory_data.append(stock_info)
             
@@ -589,15 +587,16 @@ class DatabaseService:
         try:
             db = get_database_session()
             
-            query = db.query(Order)
+            # 使用 SalesOrder 作為主要的訂單查詢
+            query = db.query(SalesOrder)
             
-            # 用戶篩選
+            # 用戶篩選 (銷售人員)
             if user_id:
-                query = query.filter(Order.user_id == user_id)
+                query = query.filter(SalesOrder.salesperson_id == user_id)
             
             # 狀態篩選
             if status:
-                query = query.filter(Order.status.ilike(f"%{status}%"))
+                query = query.filter(SalesOrder.status.ilike(f"%{status}%"))
             
             orders = query.limit(limit).all()
             
@@ -605,9 +604,11 @@ class DatabaseService:
             order_data = []
             for order in orders:
                 order_info = {
-                    "order_id": order.order_id,
-                    "user_id": order.user_id,
-                    "status": order.status,
+                    "order_id": order.so_number,
+                    "sales_date": order.sales_date.isoformat() if order.sales_date else None,
+                    "customer_name": order.customer.customerName if order.customer else None,
+                    "salesperson_name": order.salesperson.name if order.salesperson else None,
+                    "status": order.status.value if order.status else None,
                     "total_amount": float(order.total_amount) if order.total_amount else 0.0,
                     "created_at": order.created_at.isoformat() if order.created_at else None,
                     "updated_at": order.updated_at.isoformat() if order.updated_at else None
@@ -647,10 +648,12 @@ class DatabaseService:
             data = []
             for product in low_stock_products:
                 product_data = {
-                    "product_name": product.name,
-                    "current_stock": product.stock if hasattr(product, 'stock') else 0,
-                    "category": product.category,
-                    "price": float(product.price) if product.price else 0.0,
+                    "product_name": product.productName,
+                    "product_code": product.productCode,
+                    "current_stock": product.stock,
+                    "unit": product.unit,
+                    "warehouse": product.warehouse,
+                    "category": product.category.name if product.category else None,
                     "status": "庫存不足"
                 }
                 data.append(product_data)
@@ -679,18 +682,18 @@ class DatabaseService:
             
             # 基本統計
             total_products = db.query(Product).count()
-            total_orders = db.query(Order).count()
+            total_sales_orders = db.query(SalesOrder).count()
+            total_purchase_orders = db.query(PurchaseOrder).count()
             total_users = db.query(User).count()
             
             # 計算低庫存商品數量
-            low_stock_count = 0
-            if hasattr(Product, 'stock'):
-                low_stock_count = db.query(Product).filter(Product.stock <= 10).count()
+            low_stock_count = db.query(Product).filter(Product.stock <= 10).count()
             
             # 準備摘要資料
             summary_data = [{
                 "total_products": total_products,
-                "total_orders": total_orders,
+                "total_sales_orders": total_sales_orders,
+                "total_purchase_orders": total_purchase_orders,
                 "total_users": total_users,
                 "low_stock_items": low_stock_count,
                 "report_date": datetime.now().isoformat()