updated view in label preview

This commit is contained in:
Quality System Admin
2025-10-27 20:25:31 +02:00
parent d142129de6
commit a960285d59
15 changed files with 1889 additions and 685 deletions

View File

@@ -605,11 +605,11 @@ def api_get_orders_data():
if search:
where_conditions.append("""
(order_id LIKE ? OR customer_name LIKE ? OR article_code LIKE ? OR
article_description LIKE ? OR client_order LIKE ?)
(order_id LIKE ? OR order_line LIKE ? OR customer_name LIKE ? OR article_code LIKE ? OR
article_description LIKE ? OR client_order_line LIKE ?)
""")
search_param = f'%{search}%'
params.extend([search_param] * 5)
params.extend([search_param] * 6)
if status_filter:
where_conditions.append("order_status = ?")
@@ -631,13 +631,15 @@ def api_get_orders_data():
# Calculate offset
offset = (page - 1) * per_page
# Get paginated data
# Get paginated data with all new fields
data_query = f"""
SELECT id, order_id, customer_code, customer_name, client_order,
article_code, article_description, quantity_requested,
delivery_date, order_status, priority, product_group, order_date
SELECT id, order_line, order_id, line_number, customer_code, customer_name,
client_order_line, article_code, article_description,
quantity_requested, balance, unit_of_measure, delivery_date, order_date,
order_status, article_status, priority, product_group,
production_order, production_status, model, closed
FROM dm_orders {where_clause}
ORDER BY order_date DESC, order_id
ORDER BY order_date DESC, order_id, line_number
LIMIT ? OFFSET ?
"""
cursor.execute(data_query, params + [per_page, offset])
@@ -648,18 +650,27 @@ def api_get_orders_data():
for record in records:
data.append({
'id': record[0],
'order_id': record[1],
'customer_code': record[2],
'customer_name': record[3],
'client_order': record[4],
'article_code': record[5],
'article_description': record[6],
'quantity_requested': record[7],
'delivery_date': record[8].strftime('%Y-%m-%d') if record[8] else '',
'order_status': record[9],
'priority': record[10],
'product_group': record[11],
'order_date': record[12].strftime('%Y-%m-%d') if record[12] else ''
'order_line': record[1],
'order_id': record[2],
'line_number': record[3],
'customer_code': record[4],
'customer_name': record[5],
'client_order_line': record[6],
'article_code': record[7],
'article_description': record[8],
'quantity_requested': record[9],
'balance': record[10],
'unit_of_measure': record[11],
'delivery_date': record[12].strftime('%Y-%m-%d') if record[12] else '',
'order_date': record[13].strftime('%Y-%m-%d') if record[13] else '',
'order_status': record[14],
'article_status': record[15],
'priority': record[16],
'product_group': record[17],
'production_order': record[18],
'production_status': record[19],
'model': record[20],
'closed': record[21]
})
# Get unique customers for filter dropdown
@@ -699,22 +710,31 @@ def api_update_orders_data(record_id):
db.connect()
cursor = db.connection.cursor()
# Update the record
# Update the record with all new fields
update_query = """
UPDATE dm_orders SET
customer_code = ?, customer_name = ?, client_order = ?,
article_code = ?, article_description = ?, quantity_requested = ?,
delivery_date = ?, order_status = ?, priority = ?, product_group = ?,
order_date = ?, updated_at = CURRENT_TIMESTAMP
order_line = ?, order_id = ?, line_number = ?,
customer_code = ?, customer_name = ?, client_order_line = ?,
article_code = ?, article_description = ?,
quantity_requested = ?, balance = ?, unit_of_measure = ?,
delivery_date = ?, order_date = ?,
order_status = ?, article_status = ?, priority = ?,
product_group = ?, production_order = ?, production_status = ?,
model = ?, closed = ?,
updated_at = CURRENT_TIMESTAMP
WHERE id = ?
"""
cursor.execute(update_query, (
data['customer_code'], data['customer_name'], data['client_order'],
data['article_code'], data['article_description'], data['quantity_requested'],
data['order_line'], data['order_id'], data['line_number'],
data['customer_code'], data['customer_name'], data['client_order_line'],
data['article_code'], data['article_description'],
data['quantity_requested'], data.get('balance'), data.get('unit_of_measure'),
data['delivery_date'] if data['delivery_date'] else None,
data['order_status'], data['priority'], data['product_group'],
data['order_date'] if data['order_date'] else None,
data['order_status'], data.get('article_status'), data.get('priority'),
data.get('product_group'), data.get('production_order'), data.get('production_status'),
data.get('model'), data.get('closed'),
record_id
))
@@ -727,6 +747,31 @@ def api_update_orders_data(record_id):
return jsonify({'success': False, 'error': str(e)}), 500
@daily_mirror_bp.route('/api/tune/orders_data/<int:record_id>', methods=['DELETE'])
def api_delete_orders_data(record_id):
"""API endpoint to delete an order record"""
access_check = check_daily_mirror_access()
if access_check:
return access_check
try:
db = DailyMirrorDatabase()
db.connect()
cursor = db.connection.cursor()
# Delete the record
delete_query = "DELETE FROM dm_orders WHERE id = ?"
cursor.execute(delete_query, (record_id,))
db.connection.commit()
return jsonify({'success': True, 'message': 'Order deleted successfully'})
except Exception as e:
current_app.logger.error(f"Error deleting orders record: {e}")
return jsonify({'success': False, 'error': str(e)}), 500
@daily_mirror_bp.route('/tune/delivery')
def tune_delivery_data():
"""Tune Delivery Records Data - Edit and update delivery information"""