diff --git a/app/modules/warehouse/routes.py b/app/modules/warehouse/routes.py
index 529149c..7d05385 100644
--- a/app/modules/warehouse/routes.py
+++ b/app/modules/warehouse/routes.py
@@ -9,6 +9,11 @@ from app.modules.warehouse.warehouse import (
     assign_box_to_location, move_box_to_new_location,
     get_cp_inventory_list, search_cp_code, search_by_box_number, get_cp_details
 )
+from app.modules.warehouse.warehouse_orders import (
+    get_unassigned_orders, get_orders_by_box, search_orders_by_cp_code,
+    assign_order_to_box, move_order_to_box, unassign_order_from_box,
+    get_all_boxes_summary
+)
 import logging
 
 logger = logging.getLogger(__name__)
@@ -119,6 +124,15 @@ def reports():
     return render_template('modules/warehouse/reports.html')
 
 
+@warehouse_bp.route('/set-orders-on-boxes', methods=['GET', 'POST'])
+def set_orders_on_boxes():
+    """Set orders on boxes - assign or move orders between boxes"""
+    if 'user_id' not in session:
+        return redirect(url_for('main.login'))
+    
+    return render_template('modules/warehouse/set_orders_on_boxes.html')
+
+
 @warehouse_bp.route('/test-barcode', methods=['GET'])
 def test_barcode():
     """Test barcode printing functionality"""
@@ -218,6 +232,119 @@ def api_get_locations():
     return jsonify({'success': True, 'locations': locations}), 200
 
 
+# ============================================================================
+# API Routes for Orders Management
+# ============================================================================
+
+@warehouse_bp.route('/api/unassigned-orders', methods=['GET'], endpoint='api_unassigned_orders')
+def api_unassigned_orders():
+    """Get all unassigned orders"""
+    if 'user_id' not in session:
+        return jsonify({'success': False, 'error': 'Unauthorized'}), 401
+    
+    try:
+        limit = request.args.get('limit', 100, type=int)
+        offset = request.args.get('offset', 0, type=int)
+        
+        orders = get_unassigned_orders(limit, offset)
+        return jsonify({'success': True, 'orders': orders, 'count': len(orders)}), 200
+    except Exception as e:
+        logger.error(f"Error getting unassigned orders: {e}")
+        return jsonify({'success': False, 'error': str(e)}), 500
+
+
+@warehouse_bp.route('/api/orders-by-box', methods=['POST'], endpoint='api_orders_by_box')
+def api_orders_by_box():
+    """Get all orders assigned to a specific box"""
+    if 'user_id' not in session:
+        return jsonify({'success': False, 'error': 'Unauthorized'}), 401
+    
+    data = request.get_json()
+    box_id = data.get('box_id')
+    
+    if not box_id:
+        return jsonify({'success': False, 'error': 'Box ID is required'}), 400
+    
+    success, data_resp, status_code = get_orders_by_box(box_id)
+    return jsonify({'success': success, **data_resp}), status_code
+
+
+@warehouse_bp.route('/api/search-orders', methods=['POST'], endpoint='api_search_orders')
+def api_search_orders():
+    """Search for orders by CP code"""
+    if 'user_id' not in session:
+        return jsonify({'success': False, 'error': 'Unauthorized'}), 401
+    
+    data = request.get_json()
+    cp_code = data.get('cp_code', '').strip()
+    
+    if not cp_code:
+        return jsonify({'success': False, 'error': 'CP code is required'}), 400
+    
+    orders = search_orders_by_cp_code(cp_code)
+    return jsonify({'success': True, 'orders': orders, 'count': len(orders)}), 200
+
+
+@warehouse_bp.route('/api/assign-order-to-box', methods=['POST'], endpoint='api_assign_order_to_box')
+def api_assign_order_to_box():
+    """Assign an order to a box"""
+    if 'user_id' not in session:
+        return jsonify({'success': False, 'error': 'Unauthorized'}), 401
+    
+    data = request.get_json()
+    order_id = data.get('order_id')
+    box_id = data.get('box_id')
+    
+    if not order_id or not box_id:
+        return jsonify({'success': False, 'error': 'Order ID and box ID are required'}), 400
+    
+    success, message, status_code = assign_order_to_box(order_id, box_id)
+    return jsonify({'success': success, 'message': message}), status_code
+
+
+@warehouse_bp.route('/api/move-order-to-box', methods=['POST'], endpoint='api_move_order_to_box')
+def api_move_order_to_box():
+    """Move an order to a different box"""
+    if 'user_id' not in session:
+        return jsonify({'success': False, 'error': 'Unauthorized'}), 401
+    
+    data = request.get_json()
+    order_id = data.get('order_id')
+    new_box_id = data.get('new_box_id')
+    
+    if not order_id or not new_box_id:
+        return jsonify({'success': False, 'error': 'Order ID and destination box ID are required'}), 400
+    
+    success, message, status_code = move_order_to_box(order_id, new_box_id)
+    return jsonify({'success': success, 'message': message}), status_code
+
+
+@warehouse_bp.route('/api/unassign-order', methods=['POST'], endpoint='api_unassign_order')
+def api_unassign_order():
+    """Remove an order from its box"""
+    if 'user_id' not in session:
+        return jsonify({'success': False, 'error': 'Unauthorized'}), 401
+    
+    data = request.get_json()
+    order_id = data.get('order_id')
+    
+    if not order_id:
+        return jsonify({'success': False, 'error': 'Order ID is required'}), 400
+    
+    success, message, status_code = unassign_order_from_box(order_id)
+    return jsonify({'success': success, 'message': message}), status_code
+
+
+@warehouse_bp.route('/api/boxes-summary', methods=['GET'], endpoint='api_boxes_summary')
+def api_boxes_summary():
+    """Get summary of all boxes with order counts"""
+    if 'user_id' not in session:
+        return jsonify({'success': False, 'error': 'Unauthorized'}), 401
+    
+    boxes = get_all_boxes_summary()
+    return jsonify({'success': True, 'boxes': boxes}), 200
+
+
 # ============================================================================
 # API Routes for CP Inventory View
 # ============================================================================
diff --git a/app/modules/warehouse/warehouse.py b/app/modules/warehouse/warehouse.py
index 8d59f87..6afde00 100644
--- a/app/modules/warehouse/warehouse.py
+++ b/app/modules/warehouse/warehouse.py
@@ -452,6 +452,7 @@ def get_cp_inventory_list(limit=100, offset=0):
         cursor = conn.cursor()
         
         # Get all CP codes with their box and location info (latest entries first)
+        # NOTE: Use box's CURRENT location (from boxes_crates), not the historical scan location
         cursor.execute("""
             SELECT 
                 s.id,
@@ -468,7 +469,7 @@ def get_cp_inventory_list(limit=100, offset=0):
                 SUM(s.rejected_quantity) as total_rejected
             FROM scanfg_orders s
             LEFT JOIN boxes_crates bc ON s.box_id = bc.id
-            LEFT JOIN warehouse_locations wl ON s.location_id = wl.id
+            LEFT JOIN warehouse_locations wl ON bc.location_id = wl.id
             GROUP BY SUBSTRING(s.CP_full_code, 1, 10), s.box_id
             ORDER BY MAX(s.created_at) DESC
             LIMIT %s OFFSET %s
@@ -476,7 +477,15 @@ def get_cp_inventory_list(limit=100, offset=0):
         
         # Convert tuples to dicts using cursor description
         columns = [col[0] for col in cursor.description]
-        results = [{columns[i]: row[i] for i in range(len(columns))} for row in cursor.fetchall()]
+        results = []
+        for row in cursor.fetchall():
+            row_dict = {columns[i]: row[i] for i in range(len(columns))}
+            # Convert time and date fields to strings to avoid JSON serialization issues
+            if row_dict.get('latest_date'):
+                row_dict['latest_date'] = str(row_dict['latest_date'])
+            if row_dict.get('latest_time'):
+                row_dict['latest_time'] = str(row_dict['latest_time'])
+            results.append(row_dict)
         cursor.close()
         
         return results if results else []
@@ -503,6 +512,7 @@ def search_cp_code(cp_code_search):
         search_term = cp_code_search.replace('-', '').strip().upper()
         
         # Search for matching CP codes
+        # NOTE: Use box's CURRENT location (from boxes_crates), not the historical scan location
         cursor.execute("""
             SELECT 
                 s.id,
@@ -519,7 +529,7 @@ def search_cp_code(cp_code_search):
                 SUM(s.rejected_quantity) as total_rejected
             FROM scanfg_orders s
             LEFT JOIN boxes_crates bc ON s.box_id = bc.id
-            LEFT JOIN warehouse_locations wl ON s.location_id = wl.id
+            LEFT JOIN warehouse_locations wl ON bc.location_id = wl.id
             WHERE REPLACE(s.CP_full_code, '-', '') LIKE %s
             GROUP BY SUBSTRING(s.CP_full_code, 1, 10), s.box_id
             ORDER BY MAX(s.created_at) DESC
@@ -527,7 +537,15 @@ def search_cp_code(cp_code_search):
         
         # Convert tuples to dicts using cursor description
         columns = [col[0] for col in cursor.description]
-        results = [{columns[i]: row[i] for i in range(len(columns))} for row in cursor.fetchall()]
+        results = []
+        for row in cursor.fetchall():
+            row_dict = {columns[i]: row[i] for i in range(len(columns))}
+            # Convert time and date fields to strings to avoid JSON serialization issues
+            if row_dict.get('latest_date'):
+                row_dict['latest_date'] = str(row_dict['latest_date'])
+            if row_dict.get('latest_time'):
+                row_dict['latest_time'] = str(row_dict['latest_time'])
+            results.append(row_dict)
         cursor.close()
         
         return results if results else []
@@ -569,7 +587,7 @@ def search_by_box_number(box_number_search):
                 s.created_at
             FROM scanfg_orders s
             LEFT JOIN boxes_crates bc ON s.box_id = bc.id
-            LEFT JOIN warehouse_locations wl ON s.location_id = wl.id
+            LEFT JOIN warehouse_locations wl ON bc.location_id = wl.id
             WHERE bc.box_number LIKE %s
             ORDER BY s.created_at DESC
             LIMIT 500
@@ -577,7 +595,17 @@ def search_by_box_number(box_number_search):
         
         # Convert tuples to dicts using cursor description
         columns = [col[0] for col in cursor.description]
-        results = [{columns[i]: row[i] for i in range(len(columns))} for row in cursor.fetchall()]
+        results = []
+        for row in cursor.fetchall():
+            row_dict = {columns[i]: row[i] for i in range(len(columns))}
+            # Convert time and date fields to strings to avoid JSON serialization issues
+            if row_dict.get('date'):
+                row_dict['date'] = str(row_dict['date'])
+            if row_dict.get('time'):
+                row_dict['time'] = str(row_dict['time'])
+            if row_dict.get('created_at'):
+                row_dict['created_at'] = str(row_dict['created_at'])
+            results.append(row_dict)
         cursor.close()
         
         return results if results else []
@@ -602,6 +630,7 @@ def get_cp_details(cp_code):
         cursor = conn.cursor()
         
         # Search for all entries with this CP base
+        # NOTE: Use box's CURRENT location (from boxes_crates), not the historical scan location
         cursor.execute("""
             SELECT 
                 s.id,
@@ -622,7 +651,7 @@ def get_cp_details(cp_code):
                 s.created_at
             FROM scanfg_orders s
             LEFT JOIN boxes_crates bc ON s.box_id = bc.id
-            LEFT JOIN warehouse_locations wl ON s.location_id = wl.id
+            LEFT JOIN warehouse_locations wl ON bc.location_id = wl.id
             WHERE SUBSTRING(s.CP_full_code, 1, 10) = %s
             ORDER BY s.created_at DESC
             LIMIT 1000
@@ -630,7 +659,17 @@ def get_cp_details(cp_code):
         
         # Convert tuples to dicts using cursor description
         columns = [col[0] for col in cursor.description]
-        results = [{columns[i]: row[i] for i in range(len(columns))} for row in cursor.fetchall()]
+        results = []
+        for row in cursor.fetchall():
+            row_dict = {columns[i]: row[i] for i in range(len(columns))}
+            # Convert time and date fields to strings to avoid JSON serialization issues
+            if row_dict.get('date'):
+                row_dict['date'] = str(row_dict['date'])
+            if row_dict.get('time'):
+                row_dict['time'] = str(row_dict['time'])
+            if row_dict.get('created_at'):
+                row_dict['created_at'] = str(row_dict['created_at'])
+            results.append(row_dict)
         cursor.close()
         
         return results if results else []
diff --git a/app/modules/warehouse/warehouse_orders.py b/app/modules/warehouse/warehouse_orders.py
new file mode 100644
index 0000000..d5bfced
--- /dev/null
+++ b/app/modules/warehouse/warehouse_orders.py
@@ -0,0 +1,392 @@
+"""
+Warehouse Orders Management - Helper Functions
+Provides functions for managing orders on boxes
+"""
+import logging
+import pymysql
+from app.database import get_db
+
+logger = logging.getLogger(__name__)
+
+
+def get_unassigned_orders(limit=100, offset=0):
+    """Get all orders not yet assigned to any box
+    
+    Returns:
+        List of unassigned orders
+    """
+    try:
+        conn = get_db()
+        cursor = conn.cursor()
+        
+        cursor.execute("""
+            SELECT 
+                id,
+                CP_full_code,
+                operator_code,
+                quality_code,
+                date,
+                time,
+                approved_quantity,
+                rejected_quantity,
+                created_at
+            FROM scanfg_orders
+            WHERE box_id IS NULL
+            ORDER BY created_at DESC
+            LIMIT %s OFFSET %s
+        """, (limit, offset))
+        
+        columns = [col[0] for col in cursor.description]
+        results = []
+        for row in cursor.fetchall():
+            row_dict = {columns[i]: row[i] for i in range(len(columns))}
+            if row_dict.get('date'):
+                row_dict['date'] = str(row_dict['date'])
+            if row_dict.get('time'):
+                row_dict['time'] = str(row_dict['time'])
+            if row_dict.get('created_at'):
+                row_dict['created_at'] = str(row_dict['created_at'])
+            results.append(row_dict)
+        cursor.close()
+        
+        return results if results else []
+    except Exception as e:
+        logger.error(f"Error getting unassigned orders: {e}")
+        return []
+
+
+def get_orders_by_box(box_id):
+    """Get all orders assigned to a specific box
+    
+    Args:
+        box_id: ID of the box
+    
+    Returns:
+        Tuple: (success: bool, data: dict, status_code: int)
+    """
+    try:
+        conn = get_db()
+        cursor = conn.cursor()
+        
+        # Get box info
+        cursor.execute("""
+            SELECT id, box_number, status, location_id
+            FROM boxes_crates
+            WHERE id = %s
+        """, (box_id,))
+        
+        box = cursor.fetchone()
+        
+        if not box:
+            cursor.close()
+            return False, {'error': 'Box not found'}, 404
+        
+        # Get all orders in this box
+        cursor.execute("""
+            SELECT 
+                id,
+                CP_full_code,
+                operator_code,
+                quality_code,
+                date,
+                time,
+                approved_quantity,
+                rejected_quantity,
+                created_at
+            FROM scanfg_orders
+            WHERE box_id = %s
+            ORDER BY created_at DESC
+        """, (box_id,))
+        
+        orders = cursor.fetchall()
+        columns = [col[0] for col in cursor.description]
+        
+        orders_list = []
+        for order in orders:
+            order_dict = {columns[i]: order[i] for i in range(len(columns))}
+            if order_dict.get('date'):
+                order_dict['date'] = str(order_dict['date'])
+            if order_dict.get('time'):
+                order_dict['time'] = str(order_dict['time'])
+            if order_dict.get('created_at'):
+                order_dict['created_at'] = str(order_dict['created_at'])
+            orders_list.append(order_dict)
+        
+        # Get location info if box has a location
+        location_info = None
+        if box[3]:  # location_id
+            cursor.execute("""
+                SELECT id, location_code, size, description
+                FROM warehouse_locations
+                WHERE id = %s
+            """, (box[3],))
+            loc = cursor.fetchone()
+            if loc:
+                location_info = {
+                    'id': loc[0],
+                    'location_code': loc[1],
+                    'size': loc[2],
+                    'description': loc[3]
+                }
+        
+        box_data = {
+            'id': box[0],
+            'box_number': box[1],
+            'status': box[2],
+            'location_id': box[3],
+            'location': location_info,
+            'orders_count': len(orders_list)
+        }
+        
+        cursor.close()
+        
+        return True, {'box': box_data, 'orders': orders_list}, 200
+    except Exception as e:
+        logger.error(f"Error getting orders by box: {e}")
+        return False, {'error': str(e)}, 500
+
+
+def search_orders_by_cp_code(cp_code):
+    """Search for orders by CP code
+    
+    Args:
+        cp_code: CP code to search for (can be partial)
+    
+    Returns:
+        List of matching orders
+    """
+    try:
+        conn = get_db()
+        cursor = conn.cursor()
+        
+        search_term = cp_code.replace('-', '').strip().upper()
+        
+        cursor.execute("""
+            SELECT 
+                id,
+                CP_full_code,
+                operator_code,
+                quality_code,
+                date,
+                time,
+                approved_quantity,
+                rejected_quantity,
+                box_id,
+                created_at
+            FROM scanfg_orders
+            WHERE REPLACE(CP_full_code, '-', '') LIKE %s
+            ORDER BY created_at DESC
+            LIMIT 100
+        """, (f"{search_term}%",))
+        
+        columns = [col[0] for col in cursor.description]
+        results = []
+        for row in cursor.fetchall():
+            row_dict = {columns[i]: row[i] for i in range(len(columns))}
+            if row_dict.get('date'):
+                row_dict['date'] = str(row_dict['date'])
+            if row_dict.get('time'):
+                row_dict['time'] = str(row_dict['time'])
+            if row_dict.get('created_at'):
+                row_dict['created_at'] = str(row_dict['created_at'])
+            results.append(row_dict)
+        cursor.close()
+        
+        return results if results else []
+    except Exception as e:
+        logger.error(f"Error searching orders: {e}")
+        return []
+
+
+def assign_order_to_box(order_id, box_id):
+    """Assign an order to a box
+    
+    Args:
+        order_id: ID of the order (scanfg_orders.id)
+        box_id: ID of the box to assign to
+    
+    Returns:
+        Tuple: (success: bool, message: str, status_code: int)
+    """
+    try:
+        if not order_id or not box_id:
+            return False, 'Order ID and box ID are required', 400
+        
+        conn = get_db()
+        cursor = conn.cursor()
+        
+        # Verify order exists
+        cursor.execute("SELECT CP_full_code FROM scanfg_orders WHERE id = %s", (order_id,))
+        order = cursor.fetchone()
+        
+        if not order:
+            cursor.close()
+            return False, 'Order not found', 404
+        
+        # Verify box exists
+        cursor.execute("SELECT box_number FROM boxes_crates WHERE id = %s", (box_id,))
+        box = cursor.fetchone()
+        
+        if not box:
+            cursor.close()
+            return False, 'Box not found', 404
+        
+        # Assign order to box
+        cursor.execute("""
+            UPDATE scanfg_orders
+            SET box_id = %s
+            WHERE id = %s
+        """, (box_id, order_id))
+        
+        conn.commit()
+        cursor.close()
+        
+        return True, f'Order "{order[0]}" assigned to box "{box[0]}"', 200
+    except Exception as e:
+        logger.error(f"Error assigning order to box: {e}")
+        return False, f'Error: {str(e)}', 500
+
+
+def move_order_to_box(order_id, new_box_id):
+    """Move an order from one box to another
+    
+    Args:
+        order_id: ID of the order
+        new_box_id: ID of the destination box
+    
+    Returns:
+        Tuple: (success: bool, message: str, status_code: int)
+    """
+    try:
+        if not order_id or not new_box_id:
+            return False, 'Order ID and destination box ID are required', 400
+        
+        conn = get_db()
+        cursor = conn.cursor()
+        
+        # Get order info
+        cursor.execute("""
+            SELECT CP_full_code, box_id FROM scanfg_orders WHERE id = %s
+        """, (order_id,))
+        
+        order = cursor.fetchone()
+        
+        if not order:
+            cursor.close()
+            return False, 'Order not found', 404
+        
+        old_box_id = order[1]
+        
+        # Verify new box exists
+        cursor.execute("SELECT box_number FROM boxes_crates WHERE id = %s", (new_box_id,))
+        new_box = cursor.fetchone()
+        
+        if not new_box:
+            cursor.close()
+            return False, 'Destination box not found', 404
+        
+        # Get old box info if it exists
+        old_box_number = None
+        if old_box_id:
+            cursor.execute("SELECT box_number FROM boxes_crates WHERE id = %s", (old_box_id,))
+            old_box = cursor.fetchone()
+            if old_box:
+                old_box_number = old_box[0]
+        
+        # Move order to new box
+        cursor.execute("""
+            UPDATE scanfg_orders
+            SET box_id = %s
+            WHERE id = %s
+        """, (new_box_id, order_id))
+        
+        conn.commit()
+        cursor.close()
+        
+        if old_box_number:
+            message = f'Order "{order[0]}" moved from "{old_box_number}" to "{new_box[0]}"'
+        else:
+            message = f'Order "{order[0]}" moved to "{new_box[0]}"'
+        
+        return True, message, 200
+    except Exception as e:
+        logger.error(f"Error moving order to box: {e}")
+        return False, f'Error: {str(e)}', 500
+
+
+def unassign_order_from_box(order_id):
+    """Remove order from its assigned box
+    
+    Args:
+        order_id: ID of the order
+    
+    Returns:
+        Tuple: (success: bool, message: str, status_code: int)
+    """
+    try:
+        conn = get_db()
+        cursor = conn.cursor()
+        
+        # Get order info
+        cursor.execute("""
+            SELECT CP_full_code, box_id FROM scanfg_orders WHERE id = %s
+        """, (order_id,))
+        
+        order = cursor.fetchone()
+        
+        if not order:
+            cursor.close()
+            return False, 'Order not found', 404
+        
+        # Remove from box
+        cursor.execute("""
+            UPDATE scanfg_orders
+            SET box_id = NULL
+            WHERE id = %s
+        """, (order_id,))
+        
+        conn.commit()
+        cursor.close()
+        
+        return True, f'Order "{order[0]}" removed from box', 200
+    except Exception as e:
+        logger.error(f"Error unassigning order: {e}")
+        return False, f'Error: {str(e)}', 500
+
+
+def get_all_boxes_summary():
+    """Get summary of all boxes with order counts
+    
+    Returns:
+        List of boxes with order counts
+    """
+    try:
+        conn = get_db()
+        cursor = conn.cursor()
+        
+        cursor.execute("""
+            SELECT 
+                bc.id,
+                bc.box_number,
+                bc.status,
+                wl.location_code,
+                wl.id as location_id,
+                COUNT(so.id) as order_count
+            FROM boxes_crates bc
+            LEFT JOIN warehouse_locations wl ON bc.location_id = wl.id
+            LEFT JOIN scanfg_orders so ON bc.id = so.box_id
+            GROUP BY bc.id, bc.box_number, bc.status, wl.location_code, wl.id
+            ORDER BY bc.box_number ASC
+        """)
+        
+        columns = [col[0] for col in cursor.description]
+        results = []
+        for row in cursor.fetchall():
+            row_dict = {columns[i]: row[i] for i in range(len(columns))}
+            results.append(row_dict)
+        cursor.close()
+        
+        return results if results else []
+    except Exception as e:
+        logger.error(f"Error getting boxes summary: {e}")
+        return []
diff --git a/app/templates/modules/warehouse/index.html b/app/templates/modules/warehouse/index.html
index f50047e..37acc5b 100644
--- a/app/templates/modules/warehouse/index.html
+++ b/app/templates/modules/warehouse/index.html
@@ -30,6 +30,22 @@
             </div>
         </div>
 
+        <!-- Set Orders on Boxes Card -->
+        <div class="col-md-6 col-lg-4 mb-4">
+            <div class="card shadow-sm h-100 module-launcher">
+                <div class="card-body text-center">
+                    <div class="launcher-icon mb-3">
+                        <i class="fas fa-archive text-secondary"></i>
+                    </div>
+                    <h5 class="card-title">Set Orders on Boxes</h5>
+                    <p class="card-text text-muted">Assign, move, or view orders on boxes and manage order-to-box relationships.</p>
+                    <a href="{{ url_for('warehouse.set_orders_on_boxes') }}" class="btn btn-secondary btn-sm">
+                        <i class="fas fa-arrow-right"></i> Manage Orders
+                    </a>
+                </div>
+            </div>
+        </div>
+
         <!-- Create Warehouse Locations Card -->
         <div class="col-md-6 col-lg-4 mb-4">
             <div class="card shadow-sm h-100 module-launcher">
diff --git a/app/templates/modules/warehouse/inventory.html b/app/templates/modules/warehouse/inventory.html
index 810292d..f208de4 100644
--- a/app/templates/modules/warehouse/inventory.html
+++ b/app/templates/modules/warehouse/inventory.html
@@ -40,8 +40,11 @@
                         </button>
                     </div>
                     <small class="text-muted d-block mt-2">
-                        Searches for any CP code starting with the entered text. Shows all related entries.
+                        <i class="fas fa-info-circle"></i> Must start with "CP" (e.g., CP00000001). Searches for any CP code starting with the entered text.
                     </small>
+                    <div id="cpCodeValidation" class="alert alert-warning d-none mt-2 mb-0 py-2" role="alert">
+                        <small><i class="fas fa-exclamation-triangle"></i> <span id="cpCodeValidationText"></span></small>
+                    </div>
                 </div>
             </div>
         </div>
@@ -133,14 +136,14 @@
     </div>
 
     <!-- CP Details Modal -->
-    <div class="modal fade" id="cpDetailsModal" tabindex="-1">
+    <div class="modal fade" id="cpDetailsModal" tabindex="-1" aria-labelledby="cpDetailsModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-lg">
             <div class="modal-content">
                 <div class="modal-header bg-primary text-white">
-                    <h5 class="modal-title">
+                    <h5 class="modal-title" id="cpDetailsModalLabel">
                         <i class="fas fa-details"></i> CP Code Details
                     </h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
                     <div id="cpDetailsContent">
@@ -189,6 +192,75 @@
         font-family: 'Courier New', monospace;
         font-weight: 600;
     }
+
+    /* Modal Theme Styling */
+    .modal-content {
+        background-color: var(--bg-primary);
+        color: var(--text-primary);
+        border-color: var(--border-color);
+        transition: background-color 0.3s ease, color 0.3s ease, border-color 0.3s ease;
+    }
+
+    .modal-header {
+        background-color: var(--bg-secondary);
+        border-bottom-color: var(--border-color);
+        color: var(--text-primary);
+        transition: background-color 0.3s ease, border-color 0.3s ease, color 0.3s ease;
+    }
+
+    .modal-header .modal-title {
+        color: var(--text-primary);
+        font-weight: 600;
+    }
+
+    .modal-body {
+        background-color: var(--bg-primary);
+        color: var(--text-primary);
+        transition: background-color 0.3s ease, color 0.3s ease;
+    }
+
+    .modal-footer {
+        background-color: var(--bg-secondary);
+        border-top-color: var(--border-color);
+        transition: background-color 0.3s ease, border-color 0.3s ease;
+    }
+
+    /* Modal Button Close - Theme aware */
+    .btn-close {
+        filter: invert(0);
+    }
+
+    [data-theme="dark"] .btn-close {
+        filter: invert(1);
+    }
+
+    /* Modal Table Styling */
+    .modal-body table {
+        border-color: var(--border-color);
+    }
+
+    .modal-body th {
+        background-color: var(--bg-secondary);
+        color: var(--text-primary);
+        border-color: var(--border-color);
+        transition: background-color 0.3s ease, color 0.3s ease, border-color 0.3s ease;
+    }
+
+    .modal-body td {
+        color: var(--text-primary);
+        border-color: var(--border-color);
+        transition: color 0.3s ease, border-color 0.3s ease;
+    }
+
+    /* Override hardcoded Bootstrap classes in modal */
+    .modal-header.bg-primary {
+        background-color: var(--bg-secondary) !important;
+        color: var(--text-primary) !important;
+    }
+
+    .modal-header.text-white {
+        color: var(--text-primary) !important;
+    }
 </style>
 
 <script>
@@ -197,44 +269,169 @@ let inventoryData = [];
 
 // Initialize on page load
 document.addEventListener('DOMContentLoaded', function() {
+    // Ensure input fields are enabled and ready for input
+    const cpCodeSearchEl = document.getElementById('cpCodeSearch');
+    const boxNumberSearchEl = document.getElementById('boxNumberSearch');
+    
+    if (cpCodeSearchEl) {
+        cpCodeSearchEl.disabled = false;
+        cpCodeSearchEl.readOnly = false;
+        cpCodeSearchEl.addEventListener('keypress', function(e) {
+            if (e.key === 'Enter') searchByCpCode();
+        });
+        // Add real-time validation for CP code
+        cpCodeSearchEl.addEventListener('input', function(e) {
+            validateCpCodeInput(this.value);
+        });
+        cpCodeSearchEl.addEventListener('blur', function(e) {
+            validateCpCodeInput(this.value);
+        });
+    }
+    
+    if (boxNumberSearchEl) {
+        boxNumberSearchEl.disabled = false;
+        boxNumberSearchEl.readOnly = false;
+        boxNumberSearchEl.addEventListener('keypress', function(e) {
+            if (e.key === 'Enter') searchByBoxNumber();
+        });
+    }
+    
+    // Load inventory after setting up input fields
     loadInventory();
-    
-    // Auto-search on Enter key
-    document.getElementById('cpCodeSearch').addEventListener('keypress', function(e) {
-        if (e.key === 'Enter') searchByCpCode();
-    });
-    
-    document.getElementById('boxNumberSearch').addEventListener('keypress', function(e) {
-        if (e.key === 'Enter') searchByBoxNumber();
-    });
 });
 
-function showStatus(message, type = 'info') {
-    const alert = document.getElementById('statusAlert');
-    const messageEl = document.getElementById('statusMessage');
-    messageEl.textContent = message;
-    alert.className = `alert alert-${type}`;
-    alert.classList.remove('d-none');
+// Validate CP Code input - must start with "CP"
+function validateCpCodeInput(value) {
+    const validationDiv = document.getElementById('cpCodeValidation');
+    const validationText = document.getElementById('cpCodeValidationText');
     
-    // Auto-hide after 5 seconds
-    setTimeout(() => {
-        alert.classList.add('d-none');
-    }, 5000);
+    if (!validationDiv || !validationText) return;
+    
+    // If field is empty, hide validation message
+    if (!value || value.trim() === '') {
+        validationDiv.classList.add('d-none');
+        return;
+    }
+    
+    // Check if starts with "CP"
+    if (!value.toUpperCase().startsWith('CP')) {
+        validationText.textContent = 'CP code must start with "CP" (e.g., CP00000001)';
+        validationDiv.classList.remove('d-none');
+    } else {
+        validationDiv.classList.add('d-none');
+    }
+}
+
+
+function showStatus(message, type = 'info') {
+    // Try to find the alert elements
+    let alert = document.getElementById('statusAlert');
+    let messageEl = document.getElementById('statusMessage');
+    
+    // If elements don't exist, create them
+    if (!alert) {
+        const container = document.querySelector('.container-fluid') || document.body;
+        alert = document.createElement('div');
+        alert.id = 'statusAlert';
+        alert.className = `alert alert-${type} d-none`;
+        alert.setAttribute('role', 'alert');
+        
+        messageEl = document.createElement('span');
+        messageEl.id = 'statusMessage';
+        
+        const icon = document.createElement('i');
+        icon.className = 'fas fa-info-circle';
+        
+        alert.appendChild(icon);
+        alert.appendChild(document.createTextNode(' '));
+        alert.appendChild(messageEl);
+        
+        // Insert after first container-fluid div
+        if (container && container.firstChild) {
+            container.insertBefore(alert, container.firstChild.nextSibling);
+        } else {
+            document.body.insertBefore(alert, document.body.firstChild);
+        }
+    }
+    
+    // Update message element if it was just created or found
+    if (messageEl) {
+        messageEl.textContent = message;
+    }
+    
+    if (alert) {
+        alert.className = `alert alert-${type}`;
+        alert.classList.remove('d-none');
+        
+        // Auto-hide after 5 seconds
+        setTimeout(() => {
+            alert.classList.add('d-none');
+        }, 5000);
+    }
 }
 
 function showLoading() {
-    document.getElementById('loadingSpinner').classList.remove('d-none');
+    let spinner = document.getElementById('loadingSpinner');
+    if (!spinner) {
+        spinner = document.createElement('div');
+        spinner.id = 'loadingSpinner';
+        spinner.className = 'spinner-border d-none';
+        spinner.setAttribute('role', 'status');
+        spinner.style.display = 'none';
+        spinner.innerHTML = '<span class="sr-only">Loading...</span>';
+        document.body.appendChild(spinner);
+    }
+    spinner.classList.remove('d-none');
+    spinner.style.display = 'block';
 }
 
 function hideLoading() {
-    document.getElementById('loadingSpinner').classList.add('d-none');
+    const spinner = document.getElementById('loadingSpinner');
+    if (spinner) {
+        spinner.classList.add('d-none');
+        spinner.style.display = 'none';
+    }
+}
+
+// Helper function to safely get and update element text content
+function safeSetElementText(elementId, text) {
+    const el = document.getElementById(elementId);
+    if (el) {
+        el.textContent = text;
+    }
+    return el;
+}
+
+// Helper function to safely get element value
+function safeGetElementValue(elementId) {
+    const el = document.getElementById(elementId);
+    return el ? (el.value || '') : '';
+}
+
+// Helper function to safely set element value
+function safeSetElementValue(elementId, value) {
+    const el = document.getElementById(elementId);
+    if (el) {
+        el.value = value;
+    }
+    return el;
 }
 
 function loadInventory() {
     showLoading();
     currentSearchType = 'all';
-    document.getElementById('cpCodeSearch').value = '';
-    document.getElementById('boxNumberSearch').value = '';
+    
+    // Clear search fields but ensure they're enabled
+    const cpField = safeSetElementValue('cpCodeSearch', '');
+    const boxField = safeSetElementValue('boxNumberSearch', '');
+    
+    // Ensure fields are not disabled
+    if (cpField) {
+        cpField.disabled = false;
+    }
+    if (boxField) {
+        boxField.disabled = false;
+    }
     
     fetch('/warehouse/api/cp-inventory?limit=500&offset=0')
         .then(response => {
@@ -245,9 +442,9 @@ function loadInventory() {
             if (data.success) {
                 inventoryData = data.inventory;
                 renderTable(data.inventory);
-                document.getElementById('totalRecords').textContent = data.count;
-                document.getElementById('showingRecords').textContent = data.count;
-                document.getElementById('lastUpdated').textContent = new Date().toLocaleTimeString();
+                safeSetElementText('totalRecords', data.count);
+                safeSetElementText('showingRecords', data.count);
+                safeSetElementText('lastUpdated', new Date().toLocaleTimeString());
                 showStatus(`Loaded ${data.count} inventory items`, 'success');
             } else {
                 showStatus(`Error: ${data.error}`, 'danger');
@@ -265,13 +462,19 @@ function reloadInventory() {
 }
 
 function searchByCpCode() {
-    const cpCode = document.getElementById('cpCodeSearch').value.trim();
+    const cpCode = safeGetElementValue('cpCodeSearch').trim();
     
     if (!cpCode) {
         showStatus('Please enter a CP code', 'warning');
         return;
     }
     
+    // Validate that CP code starts with "CP"
+    if (!cpCode.toUpperCase().startsWith('CP')) {
+        showStatus('CP code must start with "CP" (e.g., CP00000001)', 'danger');
+        return;
+    }
+    
     showLoading();
     currentSearchType = 'cp';
     
@@ -287,8 +490,8 @@ function searchByCpCode() {
         if (data.success) {
             inventoryData = data.results;
             renderTable(data.results);
-            document.getElementById('totalRecords').textContent = data.count;
-            document.getElementById('showingRecords').textContent = data.count;
+            safeSetElementText('totalRecords', data.count);
+            safeSetElementText('showingRecords', data.count);
             showStatus(`Found ${data.count} entries for CP code: ${cpCode}`, 'success');
         } else {
             showStatus(`Error: ${data.error}`, 'danger');
@@ -302,12 +505,12 @@ function searchByCpCode() {
 }
 
 function clearCpSearch() {
-    document.getElementById('cpCodeSearch').value = '';
+    safeSetElementValue('cpCodeSearch', '');
     loadInventory();
 }
 
 function searchByBoxNumber() {
-    const boxNumber = document.getElementById('boxNumberSearch').value.trim();
+    const boxNumber = safeGetElementValue('boxNumberSearch').trim();
     
     if (!boxNumber) {
         showStatus('Please enter a box number', 'warning');
@@ -329,8 +532,8 @@ function searchByBoxNumber() {
         if (data.success) {
             inventoryData = data.results;
             renderBoxSearchTable(data.results);
-            document.getElementById('totalRecords').textContent = data.count;
-            document.getElementById('showingRecords').textContent = data.count;
+            safeSetElementText('totalRecords', data.count);
+            safeSetElementText('showingRecords', data.count);
             showStatus(`Found ${data.count} CP entries in box: ${boxNumber}`, 'success');
         } else {
             showStatus(`Error: ${data.error}`, 'danger');
@@ -344,13 +547,18 @@ function searchByBoxNumber() {
 }
 
 function clearBoxSearch() {
-    document.getElementById('boxNumberSearch').value = '';
+    safeSetElementValue('boxNumberSearch', '');
     loadInventory();
 }
 
 function renderTable(data) {
     const tbody = document.getElementById('tableBody');
     
+    if (!tbody) {
+        console.warn('tableBody element not found');
+        return;
+    }
+    
     if (!data || data.length === 0) {
         tbody.innerHTML = '<tr><td colspan="10" class="text-center text-muted py-5">No inventory records found</td></tr>';
         return;
@@ -413,6 +621,11 @@ function renderTable(data) {
 function renderBoxSearchTable(data) {
     const tbody = document.getElementById('tableBody');
     
+    if (!tbody) {
+        console.warn('tableBody element not found');
+        return;
+    }
+    
     if (!data || data.length === 0) {
         tbody.innerHTML = '<tr><td colspan="10" class="text-center text-muted py-5">No CP entries found in this box</td></tr>';
         return;
@@ -492,6 +705,12 @@ function viewCpDetails(cpCode) {
                 const modal = document.getElementById('cpDetailsModal');
                 const content = document.getElementById('cpDetailsContent');
                 
+                if (!modal || !content) {
+                    console.error('Modal or content element not found');
+                    showStatus('Error displaying details modal', 'danger');
+                    return;
+                }
+                
                 let html = `
                     <h6 class="mb-3">CP Code: <span class="cp-code-mono badge bg-primary">${data.cp_code}</span></h6>
                     <p class="text-muted">Total Variations: <strong>${data.count}</strong></p>
@@ -536,8 +755,18 @@ function viewCpDetails(cpCode) {
                 `;
                 
                 content.innerHTML = html;
-                const modalObj = new bootstrap.Modal(modal);
-                modalObj.show();
+                
+                // Get or create Bootstrap Modal instance
+                let modalInstance = bootstrap.Modal.getInstance(modal);
+                if (!modalInstance) {
+                    modalInstance = new bootstrap.Modal(modal);
+                }
+                
+                // Remove aria-hidden before showing
+                modal.removeAttribute('aria-hidden');
+                
+                // Show the modal
+                modalInstance.show();
             } else {
                 showStatus(`Error: ${data.error}`, 'danger');
             }
diff --git a/app/templates/modules/warehouse/set_boxes_locations.html b/app/templates/modules/warehouse/set_boxes_locations.html
index 5c2943f..9cd5a76 100644
--- a/app/templates/modules/warehouse/set_boxes_locations.html
+++ b/app/templates/modules/warehouse/set_boxes_locations.html
@@ -722,6 +722,7 @@
 
     async function assignBoxToLocationTab0() {
         const locationCode = document.getElementById('location-code-input-tab0').value.trim();
+        const boxNumber = document.getElementById('box-number-input-tab0').value.trim();
         
         if (!currentBoxId_Tab0) {
             showAlert('alert-tab0', 'Please search for a box first', 'error');
@@ -751,8 +752,36 @@
             const data = await response.json();
 
             if (data.success) {
-                showAlert('alert-tab0', data.message, 'success');
-                setTimeout(() => clearTab0(), 1500);
+                showAlert('alert-tab0', data.message + ' - Refreshing box info...', 'success');
+                // Clear location input but keep box number to refresh details
+                document.getElementById('location-code-input-tab0').value = '';
+                document.getElementById('assign-section-tab0').style.display = 'none';
+                
+                // Automatically refresh box details after a brief delay
+                setTimeout(async () => {
+                    try {
+                        const searchResponse = await fetch('{{ url_for("warehouse.api_search_box") }}', {
+                            method: 'POST',
+                            headers: {
+                                'Content-Type': 'application/json'
+                            },
+                            body: JSON.stringify({ box_number: boxNumber })
+                        });
+
+                        const searchData = await searchResponse.json();
+
+                        if (searchData.success) {
+                            document.getElementById('display-box-number-tab0').textContent = searchData.box.box_number;
+                            document.getElementById('display-box-status-tab0').textContent = searchData.box.status;
+                            document.getElementById('display-box-location-tab0').textContent = searchData.box.location_code || 'Unassigned';
+                            
+                            document.getElementById('box-info-tab0').classList.add('show');
+                            showAlert('alert-tab0', 'Box updated successfully', 'success');
+                        }
+                    } catch (error) {
+                        console.error('Error refreshing box:', error);
+                    }
+                }, 800);
             } else {
                 showAlert('alert-tab0', data.message || 'Error assigning box', 'error');
             }
@@ -932,6 +961,7 @@
     }
 
     async function moveBoxTab2() {
+        const locationCode = document.getElementById('location-code-input-tab2').value.trim();
         const newLocationCode = document.getElementById('new-location-input-tab2').value.trim();
         
         if (!currentBoxId_Tab2) {
@@ -962,8 +992,45 @@
             const data = await response.json();
 
             if (data.success) {
-                showAlert('alert-tab2', data.message, 'success');
-                setTimeout(() => clearTab2(), 1500);
+                showAlert('alert-tab2', data.message + ' - Refreshing location...', 'success');
+                // Clear the selection but keep the location code to show updated list
+                document.getElementById('new-location-input-tab2').value = '';
+                document.getElementById('move-section-tab2').style.display = 'none';
+                document.getElementById('selected-box-display-tab2').textContent = '-';
+                currentBoxId_Tab2 = null;
+                
+                // Automatically refresh and show the updated location list after a brief delay
+                setTimeout(async () => {
+                    try {
+                        const searchResponse = await fetch('{{ url_for("warehouse.api_search_location") }}', {
+                            method: 'POST',
+                            headers: {
+                                'Content-Type': 'application/json'
+                            },
+                            body: JSON.stringify({ location_code: locationCode })
+                        });
+
+                        const searchData = await searchResponse.json();
+
+                        if (searchData.success) {
+                            document.getElementById('display-location-code-tab2').textContent = searchData.location.location_code;
+                            document.getElementById('display-boxes-count-tab2').textContent = searchData.boxes.length;
+                            
+                            document.getElementById('location-info-tab2').classList.add('show');
+                            
+                            if (searchData.boxes.length > 0) {
+                                displayBoxesTab2(searchData.boxes);
+                                document.getElementById('boxes-list-tab2').classList.add('show');
+                                showAlert('alert-tab2', `Location updated - ${searchData.boxes.length} box(es) found`, 'success');
+                            } else {
+                                document.getElementById('boxes-list-tab2').classList.remove('show');
+                                showAlert('alert-tab2', `Location "${locationCode}" is now empty`, 'warning');
+                            }
+                        }
+                    } catch (error) {
+                        console.error('Error refreshing location:', error);
+                    }
+                }, 800);
             } else {
                 showAlert('alert-tab2', data.message || 'Error moving box', 'error');
             }
diff --git a/app/templates/modules/warehouse/set_orders_on_boxes.html b/app/templates/modules/warehouse/set_orders_on_boxes.html
new file mode 100644
index 0000000..7f2b271
--- /dev/null
+++ b/app/templates/modules/warehouse/set_orders_on_boxes.html
@@ -0,0 +1,1064 @@
+{% extends "base.html" %}
+
+{% block title %}Set Orders on Boxes - Quality App v2{% endblock %}
+
+{% block content %}
+<style>
+    .location-manager-container {
+        max-width: 1400px;
+        margin: 0 auto;
+        padding: 15px;
+    }
+
+    .main-card {
+        background: var(--bg-primary);
+        border-radius: 8px;
+        box-shadow: 0 2px 4px var(--card-shadow);
+        overflow: hidden;
+        color: var(--text-primary);
+        transition: background-color 0.3s ease, color 0.3s ease, box-shadow 0.3s ease;
+    }
+
+    /* Tab Navigation */
+    .tab-navigation {
+        display: flex;
+        background: var(--bg-tertiary);
+        border-bottom: 2px solid var(--border-color);
+        transition: background-color 0.3s ease, border-color 0.3s ease;
+        flex-wrap: wrap;
+    }
+
+    .tab-button {
+        flex: 1;
+        padding: 15px 10px;
+        background: none;
+        border: none;
+        font-size: 14px;
+        font-weight: 600;
+        color: var(--text-secondary);
+        cursor: pointer;
+        transition: all 0.3s;
+        border-bottom: 3px solid transparent;
+        min-width: 150px;
+    }
+
+    .tab-button.active {
+        color: #0d6efd;
+        border-bottom-color: #0d6efd;
+        background: rgba(13, 110, 253, 0.08);
+    }
+
+    .tab-button:hover {
+        background: var(--bg-tertiary);
+        color: #0d6efd;
+    }
+
+    .tab-content {
+        display: none;
+        padding: 25px;
+        background: var(--bg-primary);
+        color: var(--text-primary);
+    }
+
+    .tab-content.active {
+        display: block;
+    }
+
+    /* Form Sections */
+    .form-section {
+        margin-bottom: 25px;
+    }
+
+    .form-section h3 {
+        font-size: 18px;
+        font-weight: 600;
+        margin-bottom: 15px;
+        color: var(--text-primary);
+        padding-bottom: 10px;
+        border-bottom: 2px solid var(--border-color);
+        transition: color 0.3s ease, border-color 0.3s ease;
+    }
+
+    .section-icon {
+        margin-right: 8px;
+    }
+
+    .input-group {
+        margin-bottom: 15px;
+    }
+
+    .input-group label {
+        display: block;
+        font-weight: 500;
+        margin-bottom: 8px;
+        color: var(--text-primary);
+        font-size: 14px;
+        transition: color 0.3s ease;
+    }
+
+    .input-group input,
+    .input-group select {
+        width: 100%;
+        padding: 10px 12px;
+        border: 1px solid var(--input-border);
+        border-radius: 4px;
+        background-color: var(--input-bg);
+        color: var(--text-primary);
+        font-size: 14px;
+        transition: all 0.3s ease;
+    }
+
+    .input-group input:focus,
+    .input-group select:focus {
+        outline: none;
+        border-color: var(--input-focus-border);
+        box-shadow: 0 0 0 3px var(--input-focus-shadow);
+    }
+
+    /* Buttons */
+    .btn-group {
+        display: flex;
+        gap: 10px;
+        margin-top: 20px;
+    }
+
+    .btn-primary {
+        flex: 1;
+        padding: 12px 20px;
+        background: #0d6efd;
+        color: white;
+        border: none;
+        border-radius: 4px;
+        font-weight: 600;
+        cursor: pointer;
+        transition: all 0.3s;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 8px;
+    }
+
+    .btn-primary:hover {
+        background: #0b5ed7;
+        transform: translateY(-2px);
+        box-shadow: 0 4px 12px rgba(13, 110, 253, 0.3);
+    }
+
+    .btn-secondary {
+        flex: 1;
+        padding: 12px 20px;
+        background: var(--bg-tertiary);
+        color: var(--text-primary);
+        border: 1px solid var(--border-color);
+        border-radius: 4px;
+        font-weight: 600;
+        cursor: pointer;
+        transition: all 0.3s;
+    }
+
+    .btn-secondary:hover {
+        background: var(--bg-secondary);
+    }
+
+    .btn-success {
+        background: #28a745;
+    }
+
+    .btn-success:hover {
+        background: #218838;
+    }
+
+    .btn-danger {
+        background: #dc3545;
+    }
+
+    .btn-danger:hover {
+        background: #c82333;
+    }
+
+    .btn-small {
+        padding: 6px 12px;
+        font-size: 12px;
+        flex: none;
+    }
+
+    /* Alert Messages */
+    .alert {
+        padding: 12px 16px;
+        border-radius: 4px;
+        margin-bottom: 15px;
+        display: none;
+        animation: slideIn 0.3s ease;
+    }
+
+    .alert.show {
+        display: block;
+    }
+
+    .alert-success {
+        background-color: #d4edda;
+        color: #155724;
+        border: 1px solid #c3e6cb;
+    }
+
+    .alert-error {
+        background-color: #f8d7da;
+        color: #721c24;
+        border: 1px solid #f5c6cb;
+    }
+
+    .alert-warning {
+        background-color: #fff3cd;
+        color: #856404;
+        border: 1px solid #ffeeba;
+    }
+
+    .alert-info {
+        background-color: #d1ecf1;
+        color: #0c5460;
+        border: 1px solid #bee5eb;
+    }
+
+    [data-theme="dark"] .alert-success {
+        background-color: #1e4620;
+        color: #a6e3a1;
+        border-color: #2d5a2d;
+    }
+
+    [data-theme="dark"] .alert-error {
+        background-color: #4a2c2c;
+        color: #f8b4b8;
+        border-color: #6d3c3c;
+    }
+
+    /* Info Box */
+    .info-box {
+        background: var(--bg-tertiary);
+        border: 1px solid var(--border-color);
+        border-radius: 4px;
+        padding: 15px;
+        margin-bottom: 15px;
+        display: none;
+        transition: all 0.3s ease;
+    }
+
+    .info-box.show {
+        display: block;
+    }
+
+    .info-box h4 {
+        margin: 0 0 10px 0;
+        color: var(--text-primary);
+        font-size: 14px;
+        font-weight: 600;
+    }
+
+    .info-box p {
+        margin: 5px 0;
+        color: var(--text-secondary);
+        font-size: 13px;
+    }
+
+    /* Lists and Tables */
+    .orders-list {
+        max-height: 400px;
+        overflow-y: auto;
+        border: 1px solid var(--border-color);
+        border-radius: 4px;
+        margin-top: 10px;
+        display: none;
+    }
+
+    .orders-list.show {
+        display: block;
+    }
+
+    .order-item {
+        padding: 12px;
+        border-bottom: 1px solid var(--border-color);
+        cursor: pointer;
+        transition: all 0.2s;
+        background: var(--bg-primary);
+    }
+
+    .order-item:hover {
+        background: var(--bg-secondary);
+    }
+
+    .order-item.selected {
+        background: rgba(13, 110, 253, 0.1);
+        border-left: 3px solid #0d6efd;
+    }
+
+    .order-item-header {
+        font-weight: 600;
+        color: var(--text-primary);
+        font-size: 14px;
+        margin-bottom: 5px;
+    }
+
+    .order-item-details {
+        font-size: 12px;
+        color: var(--text-secondary);
+        margin-top: 5px;
+    }
+
+    .order-status {
+        display: inline-block;
+        padding: 3px 8px;
+        border-radius: 3px;
+        font-size: 11px;
+        font-weight: 600;
+        margin-top: 5px;
+    }
+
+    .order-status.unassigned {
+        background: #fff3cd;
+        color: #856404;
+    }
+
+    .order-status.assigned {
+        background: #d4edda;
+        color: #155724;
+    }
+
+    /* Spinner */
+    .spinner {
+        display: inline-block;
+        width: 16px;
+        height: 16px;
+        border: 2px solid rgba(255, 255, 255, 0.3);
+        border-radius: 50%;
+        border-top-color: white;
+        animation: spin 0.8s linear infinite;
+        margin-right: 8px;
+    }
+
+    @keyframes spin {
+        to { transform: rotate(360deg); }
+    }
+
+    @keyframes slideIn {
+        from { transform: translateY(-20px); opacity: 0; }
+        to { transform: translateY(0); opacity: 1; }
+    }
+
+    /* Loading overlay */
+    .loading-overlay {
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background-color: rgba(0, 0, 0, 0.5);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        z-index: 9999;
+    }
+
+    /* Responsive */
+    @media (max-width: 768px) {
+        .tab-button {
+            min-width: 120px;
+            font-size: 12px;
+            padding: 12px 8px;
+        }
+
+        .orders-list {
+            max-height: 250px;
+        }
+    }
+
+    /* Back link */
+    .back-link {
+        display: inline-flex;
+        align-items: center;
+        gap: 8px;
+        color: #0d6efd;
+        text-decoration: none;
+        margin-bottom: 20px;
+        transition: all 0.3s;
+    }
+
+    .back-link:hover {
+        color: #0b5ed7;
+        transform: translateX(-4px);
+    }
+</style>
+
+<!-- Main Container -->
+<div class="location-manager-container">
+    <a href="{{ url_for('warehouse.warehouse_index') }}" class="back-link">
+        <i class="fas fa-arrow-left"></i> Back to Warehouse
+    </a>
+
+    <div class="main-card">
+        <!-- Tab Navigation -->
+        <div class="tab-navigation">
+            <button class="tab-button active" onclick="switchTab('tab-0')">
+                <span class="section-icon">📦</span> Assign Order to Box
+            </button>
+            <button class="tab-button" onclick="switchTab('tab-1')">
+                <span class="section-icon">🔍</span> Find Orders by Box
+            </button>
+            <button class="tab-button" onclick="switchTab('tab-2')">
+                <span class="section-icon">🚚</span> Move Order to Box
+            </button>
+            <button class="tab-button" onclick="switchTab('tab-3')">
+                <span class="section-icon">📋</span> View Unassigned Orders
+            </button>
+        </div>
+
+        <!-- TAB 0: ASSIGN ORDER TO BOX -->
+        <div class="tab-content active" id="tab-0">
+            <div class="alert" id="alert-tab0"></div>
+
+            <div class="form-section">
+                <h3><span class="section-icon">🔍</span> Search Order</h3>
+                
+                <div class="input-group">
+                    <label for="cp-code-input-tab0">CP Code or CP Full Code</label>
+                    <input type="text" id="cp-code-input-tab0" placeholder="e.g., CP00000001 or CP00000001-0001" 
+                           onkeypress="handleEnter(event, 'searchOrderTab0')">
+                </div>
+
+                <div class="btn-group">
+                    <button type="button" class="btn-primary" onclick="searchOrderTab0()">
+                        <span class="spinner" id="spinner-search-tab0" style="display: none;"></span>
+                        <span id="btn-search-tab0-text">🔍 Search Order</span>
+                    </button>
+                </div>
+            </div>
+
+            <!-- Order Info Section -->
+            <div class="info-box" id="order-info-tab0">
+                <h4>Order Details</h4>
+                <p><strong>CP Code:</strong> <span id="display-cp-code-tab0" class="cp-code-mono">-</span></p>
+                <p><strong>Current Box:</strong> <span id="display-current-box-tab0">Unassigned</span></p>
+                <p><strong>Quantity Approved:</strong> <span id="display-qty-tab0">-</span></p>
+                <p><strong>Quality Code:</strong> <span id="display-quality-tab0">-</span></p>
+            </div>
+
+            <!-- Assign Box Section -->
+            <div class="form-section" id="assign-section-tab0" style="display: none;">
+                <h3><span class="section-icon">📦</span> Assign to Box</h3>
+
+                <div class="input-group">
+                    <label for="box-number-input-tab0">Scan or Enter Box Number</label>
+                    <input type="text" id="box-number-input-tab0" placeholder="e.g., BOX00000001" 
+                           onkeypress="handleEnter(event, 'assignOrderToBoxTab0')"
+                           oninput="validateBoxNumberInput(this)">
+                    <small style="color: var(--text-secondary); margin-top: 5px; display: block;">
+                        Format: BOX followed by 8 digits (e.g., BOX00000001)
+                    </small>
+                </div>
+
+                <div class="btn-group">
+                    <button type="button" class="btn-primary btn-success" onclick="assignOrderToBoxTab0()">
+                        <span class="spinner" id="spinner-assign-tab0" style="display: none;"></span>
+                        <span id="btn-assign-tab0-text">✅ Assign Order to Box</span>
+                    </button>
+                    <button type="button" class="btn-secondary" onclick="clearTab0()">Clear</button>
+                </div>
+            </div>
+        </div>
+
+        <!-- TAB 1: FIND ORDERS BY BOX -->
+        <div class="tab-content" id="tab-1">
+            <div class="alert" id="alert-tab1"></div>
+
+            <div class="form-section">
+                <h3><span class="section-icon">🔍</span> Search Box</h3>
+
+                <div class="input-group">
+                    <label for="box-number-input-tab1">Box Number</label>
+                    <input type="text" id="box-number-input-tab1" placeholder="e.g., BOX00000001" 
+                           onkeypress="handleEnter(event, 'searchBoxTab1')">
+                </div>
+
+                <div class="btn-group">
+                    <button type="button" class="btn-primary" onclick="searchBoxTab1()">
+                        <span class="spinner" id="spinner-search-tab1" style="display: none;"></span>
+                        <span id="btn-search-tab1-text">🔍 Search Box</span>
+                    </button>
+                </div>
+            </div>
+
+            <!-- Box Info Section -->
+            <div class="info-box" id="box-info-tab1">
+                <h4>Box Details</h4>
+                <p><strong>Box Number:</strong> <span id="display-box-number-tab1">-</span></p>
+                <p><strong>Status:</strong> <span id="display-box-status-tab1">-</span></p>
+                <p><strong>Location:</strong> <span id="display-box-location-tab1">-</span></p>
+                <p><strong>Orders Count:</strong> <span id="display-orders-count-tab1">0</span></p>
+            </div>
+
+            <!-- Orders List -->
+            <div class="orders-list" id="orders-list-tab1">
+                <div id="orders-container-tab1"></div>
+            </div>
+        </div>
+
+        <!-- TAB 2: MOVE ORDER TO BOX -->
+        <div class="tab-content" id="tab-2">
+            <div class="alert" id="alert-tab2"></div>
+
+            <div class="form-section">
+                <h3><span class="section-icon">🔍</span> Search Order</h3>
+
+                <div class="input-group">
+                    <label for="cp-code-input-tab2">CP Code</label>
+                    <input type="text" id="cp-code-input-tab2" placeholder="e.g., CP00000001" 
+                           onkeypress="handleEnter(event, 'searchOrderTab2')">
+                </div>
+
+                <div class="btn-group">
+                    <button type="button" class="btn-primary" onclick="searchOrderTab2()">
+                        <span class="spinner" id="spinner-search-tab2" style="display: none;"></span>
+                        <span id="btn-search-tab2-text">🔍 Search Order</span>
+                    </button>
+                </div>
+            </div>
+
+            <!-- Order Info -->
+            <div class="info-box" id="order-info-tab2">
+                <h4>Order Details</h4>
+                <p><strong>CP Code:</strong> <span id="display-cp-code-tab2" class="cp-code-mono">-</span></p>
+                <p><strong>Current Box:</strong> <span id="display-current-box-tab2">-</span></p>
+                <p><strong>Status:</strong> <span id="display-order-status-tab2">-</span></p>
+            </div>
+
+            <!-- Move Section -->
+            <div class="form-section" id="move-section-tab2" style="display: none;">
+                <h3><span class="section-icon">🚚</span> Move to New Box</h3>
+
+                <div class="input-group">
+                    <label for="new-box-select-tab2">Select Destination Box</label>
+                    <select id="new-box-select-tab2">
+                        <option value="">-- Select a box --</option>
+                    </select>
+                </div>
+
+                <div class="btn-group">
+                    <button type="button" class="btn-primary btn-success" onclick="moveOrderToBoxTab2()">
+                        <span class="spinner" id="spinner-move-tab2" style="display: none;"></span>
+                        <span id="btn-move-tab2-text">🚚 Move Order</span>
+                    </button>
+                    <button type="button" class="btn-secondary" onclick="clearTab2()">Clear</button>
+                </div>
+            </div>
+        </div>
+
+        <!-- TAB 3: VIEW UNASSIGNED ORDERS -->
+        <div class="tab-content" id="tab-3">
+            <div class="alert" id="alert-tab3"></div>
+
+            <div class="form-section">
+                <h3><span class="section-icon">📋</span> Unassigned Orders</h3>
+                <p style="color: var(--text-secondary); font-size: 13px; margin-bottom: 15px;">
+                    Orders that haven't been assigned to any box yet. Click to select and assign to a box using Tab 0.
+                </p>
+
+                <div class="btn-group">
+                    <button type="button" class="btn-primary" onclick="loadUnassignedOrders()">
+                        <span class="spinner" id="spinner-unassigned" style="display: none;"></span>
+                        <span id="btn-unassigned-text">📋 Load Unassigned Orders</span>
+                    </button>
+                </div>
+            </div>
+
+            <!-- Unassigned Orders List -->
+            <div class="orders-list" id="unassigned-orders-list">
+                <div id="unassigned-orders-container"></div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+// ============================================================================
+// SHARED UTILITIES
+// ============================================================================
+
+let currentOrderId_Tab0 = null;
+let currentOrderId_Tab2 = null;
+let currentBoxId_Tab1 = null;
+let allBoxes = [];
+
+function switchTab(tabId) {
+    // Remove active from all tabs
+    document.querySelectorAll('.tab-button').forEach(btn => btn.classList.remove('active'));
+    document.querySelectorAll('.tab-content').forEach(content => content.classList.remove('active'));
+    
+    // Add active to selected tab
+    event.target.closest('.tab-button').classList.add('active');
+    document.getElementById(tabId).classList.add('active');
+}
+
+function showAlert(alertId, message, type = 'info') {
+    const alert = document.getElementById(alertId);
+    if (alert) {
+        alert.textContent = message;
+        alert.className = `alert alert-${type} show`;
+        alert.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+    }
+}
+
+function hideAlert(alertId) {
+    const alert = document.getElementById(alertId);
+    if (alert) {
+        alert.classList.remove('show');
+    }
+}
+
+function showSpinner(spinnerId, textId, loadingText) {
+    document.getElementById(spinnerId).style.display = 'inline-block';
+    document.getElementById(textId).textContent = loadingText;
+}
+
+function hideSpinner(spinnerId, textId, originalText) {
+    document.getElementById(spinnerId).style.display = 'none';
+    document.getElementById(textId).textContent = originalText;
+}
+
+function handleEnter(event, functionName) {
+    if (event.key === 'Enter') {
+        event.preventDefault();
+        window[functionName]();
+    }
+}
+
+// Load all boxes for dropdowns
+async function loadAllBoxes() {
+    try {
+        const response = await fetch('{{ url_for("warehouse.api_boxes_summary") }}');
+        const data = await response.json();
+        
+        if (data.success && data.boxes) {
+            allBoxes = data.boxes;
+            
+            // Update box dropdowns (only Tab 2 uses dropdown now)
+            updateBoxDropdown('new-box-select-tab2');
+        }
+    } catch (error) {
+        console.error('Error loading boxes:', error);
+    }
+}
+
+function updateBoxDropdown(dropdownId) {
+    const dropdown = document.getElementById(dropdownId);
+    if (!dropdown) return;
+    
+    const currentValue = dropdown.value;
+    
+    // Clear and rebuild dropdown
+    dropdown.innerHTML = '<option value="">-- Select a box --</option>';
+    
+    allBoxes.forEach(box => {
+        const option = document.createElement('option');
+        option.value = box.id;
+        const locationInfo = box.location_code ? ` (${box.location_code})` : '';
+        const orderInfo = box.order_count > 0 ? ` [${box.order_count} orders]` : '';
+        option.textContent = `${box.box_number}${locationInfo}${orderInfo}`;
+        dropdown.appendChild(option);
+    });
+    
+    dropdown.value = currentValue;
+}
+
+// ============================================================================
+// TAB 0: ASSIGN ORDER TO BOX
+// ============================================================================
+
+async function searchOrderTab0() {
+    const cpCode = document.getElementById('cp-code-input-tab0').value.trim();
+    
+    if (!cpCode) {
+        showAlert('alert-tab0', 'Please enter a CP code', 'error');
+        return;
+    }
+    
+    hideAlert('alert-tab0');
+    showSpinner('spinner-search-tab0', 'btn-search-tab0-text', 'Searching...');
+    
+    try {
+        const response = await fetch('{{ url_for("warehouse.api_search_orders") }}', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ cp_code: cpCode })
+        });
+        
+        const data = await response.json();
+        
+        if (data.success && data.orders && data.orders.length > 0) {
+            const order = data.orders[0];
+            currentOrderId_Tab0 = order.id;
+            
+            document.getElementById('display-cp-code-tab0').textContent = order.CP_full_code;
+            document.getElementById('display-current-box-tab0').textContent = order.box_id ? 'Assigned' : 'Unassigned';
+            document.getElementById('display-qty-tab0').textContent = order.approved_quantity || 0;
+            document.getElementById('display-quality-tab0').textContent = order.quality_code || '-';
+            
+            document.getElementById('order-info-tab0').classList.add('show');
+            document.getElementById('assign-section-tab0').style.display = 'block';
+            showAlert('alert-tab0', 'Order found. Select a box and click Assign.', 'info');
+        } else {
+            document.getElementById('order-info-tab0').classList.remove('show');
+            document.getElementById('assign-section-tab0').style.display = 'none';
+            showAlert('alert-tab0', 'Order not found', 'error');
+        }
+    } catch (error) {
+        console.error('Error:', error);
+        showAlert('alert-tab0', 'An error occurred', 'error');
+    } finally {
+        hideSpinner('spinner-search-tab0', 'btn-search-tab0-text', '🔍 Search Order');
+    }
+}
+
+let isAssigning_Tab0 = false;
+
+async function assignOrderToBoxTab0() {
+    console.log('assignOrderToBoxTab0 called');
+    
+    // Prevent multiple rapid submissions
+    if (isAssigning_Tab0) {
+        console.log('Assignment already in progress, ignoring duplicate call');
+        return;
+    }
+    
+    const boxNumber = document.getElementById('box-number-input-tab0').value.trim().toUpperCase();
+    console.log('Box number:', boxNumber);
+    console.log('Current order ID:', currentOrderId_Tab0);
+    
+    if (!currentOrderId_Tab0) {
+        showAlert('alert-tab0', 'Please search for an order first', 'error');
+        return;
+    }
+    
+    if (!boxNumber) {
+        showAlert('alert-tab0', 'Please scan or enter a box number', 'error');
+        return;
+    }
+    
+    // Validate format
+    const boxPattern = /^BOX\d{8}$/;
+    if (!boxPattern.test(boxNumber)) {
+        showAlert('alert-tab0', 'Invalid box number format. Must be BOX followed by 8 digits (e.g., BOX00000001)', 'error');
+        return;
+    }
+    
+    // Find the box in our list
+    console.log('Available boxes:', allBoxes);
+    const box = allBoxes.find(b => b.box_number.toUpperCase() === boxNumber);
+    console.log('Found box:', box);
+    
+    if (!box) {
+        showAlert('alert-tab0', `Box "${boxNumber}" not found in the system`, 'error');
+        return;
+    }
+    
+    isAssigning_Tab0 = true;
+    const assignButton = document.querySelector('button[onclick="assignOrderToBoxTab0()"]');
+    if (assignButton) assignButton.disabled = true;
+    
+    hideAlert('alert-tab0');
+    showSpinner('spinner-assign-tab0', 'btn-assign-tab0-text', 'Assigning...');
+    
+    try {
+        const response = await fetch('{{ url_for("warehouse.api_assign_order_to_box") }}', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ order_id: currentOrderId_Tab0, box_id: box.id })
+        });
+        
+        const data = await response.json();
+        console.log('Response:', data);
+        
+        if (data.success) {
+            showAlert('alert-tab0', data.message + ' - Page will refresh in 2 seconds...', 'success');
+            clearTab0();
+            loadAllBoxes();
+            // Refresh page after 2 seconds to show updated data
+            setTimeout(() => {
+                location.reload();
+            }, 2000);
+        } else {
+            showAlert('alert-tab0', data.message || 'Error assigning order', 'error');
+            isAssigning_Tab0 = false;
+            if (assignButton) assignButton.disabled = false;
+        }
+    } catch (error) {
+        console.error('Error:', error);
+        showAlert('alert-tab0', 'An error occurred: ' + error.message, 'error');
+        isAssigning_Tab0 = false;
+        if (assignButton) assignButton.disabled = false;
+    } finally {
+        hideSpinner('spinner-assign-tab0', 'btn-assign-tab0-text', '✅ Assign Order to Box');
+    }
+}
+
+function clearTab0() {
+    document.getElementById('cp-code-input-tab0').value = '';
+    document.getElementById('box-number-input-tab0').value = '';
+    document.getElementById('order-info-tab0').classList.remove('show');
+    document.getElementById('assign-section-tab0').style.display = 'none';
+    hideAlert('alert-tab0');
+    currentOrderId_Tab0 = null;
+}
+
+function validateBoxNumberInput(input) {
+    const value = input.value.toUpperCase();
+    input.value = value;
+    
+    const boxPattern = /^BOX\d{0,8}$/;
+    
+    if (value.length > 0 && !boxPattern.test(value)) {
+        input.style.borderColor = '#dc3545';
+        input.style.boxShadow = '0 0 0 3px rgba(220, 53, 69, 0.1)';
+    } else if (value.length === 11 && /^BOX\d{8}$/.test(value)) {
+        input.style.borderColor = '#28a745';
+        input.style.boxShadow = '0 0 0 3px rgba(40, 167, 69, 0.1)';
+    } else {
+        input.style.borderColor = 'var(--input-border)';
+        input.style.boxShadow = 'none';
+    }
+}
+
+// ============================================================================
+// TAB 1: FIND ORDERS BY BOX
+// ============================================================================
+
+async function searchBoxTab1() {
+    const boxNumber = document.getElementById('box-number-input-tab1').value.trim();
+    
+    if (!boxNumber) {
+        showAlert('alert-tab1', 'Please enter a box number', 'error');
+        return;
+    }
+    
+    // Find box from loaded boxes
+    const box = allBoxes.find(b => b.box_number.toUpperCase() === boxNumber.toUpperCase());
+    
+    if (!box) {
+        showAlert('alert-tab1', 'Box not found', 'error');
+        return;
+    }
+    
+    hideAlert('alert-tab1');
+    showSpinner('spinner-search-tab1', 'btn-search-tab1-text', 'Loading...');
+    
+    try {
+        const response = await fetch('{{ url_for("warehouse.api_orders_by_box") }}', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ box_id: box.id })
+        });
+        
+        const data = await response.json();
+        
+        if (data.success) {
+            currentBoxId_Tab1 = box.id;
+            
+            document.getElementById('display-box-number-tab1').textContent = data.box.box_number;
+            document.getElementById('display-box-status-tab1').textContent = data.box.status || '-';
+            document.getElementById('display-box-location-tab1').textContent = data.box.location?.location_code || 'No Location';
+            document.getElementById('display-orders-count-tab1').textContent = data.orders.length;
+            
+            document.getElementById('box-info-tab1').classList.add('show');
+            
+            if (data.orders.length > 0) {
+                displayOrdersTab1(data.orders);
+                document.getElementById('orders-list-tab1').classList.add('show');
+                showAlert('alert-tab1', `Found ${data.orders.length} order(s) in this box`, 'info');
+            } else {
+                document.getElementById('orders-list-tab1').classList.remove('show');
+                showAlert('alert-tab1', 'This box has no orders', 'warning');
+            }
+        } else {
+            showAlert('alert-tab1', data.error || 'Error loading orders', 'error');
+        }
+    } catch (error) {
+        console.error('Error:', error);
+        showAlert('alert-tab1', 'An error occurred', 'error');
+    } finally {
+        hideSpinner('spinner-search-tab1', 'btn-search-tab1-text', '🔍 Search Box');
+    }
+}
+
+function displayOrdersTab1(orders) {
+    const container = document.getElementById('orders-container-tab1');
+    container.innerHTML = '';
+    
+    orders.forEach(order => {
+        const div = document.createElement('div');
+        div.className = 'order-item';
+        div.innerHTML = `
+            <div class="order-item-header">${order.CP_full_code}</div>
+            <div class="order-item-details">
+                Operator: ${order.operator_code} | Quality: ${order.quality_code} | 
+                Approved: ${order.approved_quantity}
+            </div>
+        `;
+        container.appendChild(div);
+    });
+}
+
+// ============================================================================
+// TAB 2: MOVE ORDER TO BOX
+// ============================================================================
+
+async function searchOrderTab2() {
+    const cpCode = document.getElementById('cp-code-input-tab2').value.trim();
+    
+    if (!cpCode) {
+        showAlert('alert-tab2', 'Please enter a CP code', 'error');
+        return;
+    }
+    
+    hideAlert('alert-tab2');
+    showSpinner('spinner-search-tab2', 'btn-search-tab2-text', 'Searching...');
+    
+    try {
+        const response = await fetch('{{ url_for("warehouse.api_search_orders") }}', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ cp_code: cpCode })
+        });
+        
+        const data = await response.json();
+        
+        if (data.success && data.orders && data.orders.length > 0) {
+            const order = data.orders[0];
+            currentOrderId_Tab2 = order.id;
+            
+            document.getElementById('display-cp-code-tab2').textContent = order.CP_full_code;
+            document.getElementById('display-current-box-tab2').textContent = order.box_id ? 'Assigned' : 'Unassigned';
+            document.getElementById('display-order-status-tab2').textContent = order.quality_code || '-';
+            
+            document.getElementById('order-info-tab2').classList.add('show');
+            
+            if (order.box_id) {
+                document.getElementById('move-section-tab2').style.display = 'block';
+                showAlert('alert-tab2', 'Order found. Select destination box and move.', 'info');
+            } else {
+                document.getElementById('move-section-tab2').style.display = 'none';
+                showAlert('alert-tab2', 'This order is not yet assigned to any box. Use Tab 0 to assign it.', 'warning');
+            }
+        } else {
+            document.getElementById('order-info-tab2').classList.remove('show');
+            document.getElementById('move-section-tab2').style.display = 'none';
+            showAlert('alert-tab2', 'Order not found', 'error');
+        }
+    } catch (error) {
+        console.error('Error:', error);
+        showAlert('alert-tab2', 'An error occurred', 'error');
+    } finally {
+        hideSpinner('spinner-search-tab2', 'btn-search-tab2-text', '🔍 Search Order');
+    }
+}
+
+async function moveOrderToBoxTab2() {
+    const newBoxId = document.getElementById('new-box-select-tab2').value;
+    
+    if (!currentOrderId_Tab2) {
+        showAlert('alert-tab2', 'Please search for an order first', 'error');
+        return;
+    }
+    
+    if (!newBoxId) {
+        showAlert('alert-tab2', 'Please select a destination box', 'error');
+        return;
+    }
+    
+    hideAlert('alert-tab2');
+    showSpinner('spinner-move-tab2', 'btn-move-tab2-text', 'Moving...');
+    
+    try {
+        const response = await fetch('{{ url_for("warehouse.api_move_order_to_box") }}', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ order_id: currentOrderId_Tab2, new_box_id: newBoxId })
+        });
+        
+        const data = await response.json();
+        
+        if (data.success) {
+            showAlert('alert-tab2', data.message, 'success');
+            setTimeout(() => clearTab2(), 1500);
+            loadAllBoxes();
+        } else {
+            showAlert('alert-tab2', data.message || 'Error moving order', 'error');
+        }
+    } catch (error) {
+        console.error('Error:', error);
+        showAlert('alert-tab2', 'An error occurred', 'error');
+    } finally {
+        hideSpinner('spinner-move-tab2', 'btn-move-tab2-text', '🚚 Move Order');
+    }
+}
+
+function clearTab2() {
+    document.getElementById('cp-code-input-tab2').value = '';
+    document.getElementById('new-box-select-tab2').value = '';
+    document.getElementById('order-info-tab2').classList.remove('show');
+    document.getElementById('move-section-tab2').style.display = 'none';
+    hideAlert('alert-tab2');
+    currentOrderId_Tab2 = null;
+}
+
+// ============================================================================
+// TAB 3: VIEW UNASSIGNED ORDERS
+// ============================================================================
+
+async function loadUnassignedOrders() {
+    hideAlert('alert-tab3');
+    showSpinner('spinner-unassigned', 'btn-unassigned-text', 'Loading...');
+    
+    try {
+        const response = await fetch('{{ url_for("warehouse.api_unassigned_orders") }}?limit=500');
+        const data = await response.json();
+        
+        if (data.success && data.orders) {
+            displayUnassignedOrders(data.orders);
+            document.getElementById('unassigned-orders-list').classList.add('show');
+            showAlert('alert-tab3', `Found ${data.orders.length} unassigned order(s)`, 'info');
+        } else {
+            showAlert('alert-tab3', 'No unassigned orders found', 'warning');
+        }
+    } catch (error) {
+        console.error('Error:', error);
+        showAlert('alert-tab3', 'An error occurred', 'error');
+    } finally {
+        hideSpinner('spinner-unassigned', 'btn-unassigned-text', '📋 Load Unassigned Orders');
+    }
+}
+
+function displayUnassignedOrders(orders) {
+    const container = document.getElementById('unassigned-orders-container');
+    container.innerHTML = '';
+    
+    orders.forEach(order => {
+        const div = document.createElement('div');
+        div.className = 'order-item';
+        div.innerHTML = `
+            <div class="order-item-header">${order.CP_full_code}</div>
+            <div class="order-item-details">
+                Operator: ${order.operator_code} | Quality: ${order.quality_code} | 
+                Approved: ${order.approved_quantity} | Date: ${order.date}
+            </div>
+            <span class="order-status unassigned">UNASSIGNED</span>
+        `;
+        container.appendChild(div);
+    });
+}
+
+// ============================================================================
+// INITIALIZATION
+// ============================================================================
+
+document.addEventListener('DOMContentLoaded', function() {
+    loadAllBoxes();
+});
+</script>
+{% endblock %}