From 49d5dd38a11815fbcf5a36f1ac302ce75053efbf Mon Sep 17 00:00:00 2001 From: zzh Date: Thu, 26 Mar 2026 10:53:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9C=AA=E4=BA=A4=E8=AE=A2=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在客户订单管理表格中新增已发货和未交订单列 - 根据合同编号和物料名称匹配对账单发货数量 - 添加刷新按钮手动更新未交订单数据 - 订单变化时自动刷新未交订单数量 - 采用物料名称互相包含的灵活匹配策略 --- frontend/js/components/customer-order.js | 44 +++++++++++++++++++---- server/app.py | 46 ++++++++++++++++++++++-- 2 files changed, 82 insertions(+), 8 deletions(-) diff --git a/frontend/js/components/customer-order.js b/frontend/js/components/customer-order.js index 81f9647..cb7b1c4 100755 --- a/frontend/js/components/customer-order.js +++ b/frontend/js/components/customer-order.js @@ -12,6 +12,11 @@ height: 100vh; } + @keyframes spin { + from { transform: rotate(0deg); } + to { transform: rotate(360deg); } + } + #customer-order-page { display: flex; flex-direction: column; @@ -88,8 +93,14 @@

客户订单管理

-
+
+
@@ -103,13 +114,15 @@ 客户名称 物料 订单数量 + 已发货 + 未交订单 单价 操作 - 加载中... + 加载中... @@ -176,6 +189,19 @@ openModal(); }); } + + const refreshBtn = document.getElementById('refresh-undelivered-btn'); + if (refreshBtn) { + refreshBtn.addEventListener('click', async () => { + refreshBtn.disabled = true; + refreshBtn.innerHTML = '刷新中...'; + await loadOrders(); + refreshBtn.disabled = false; + refreshBtn.innerHTML = '刷新未交订单'; + API.toast('未交订单数据已更新', 'success'); + }); + } + loadOrders(); }, 100); @@ -197,30 +223,36 @@ } if (!data.list || data.list.length === 0) { - tbody.innerHTML = '暂无数据'; + tbody.innerHTML = '暂无数据'; return; } - tbody.innerHTML = data.list.map(order => ` + tbody.innerHTML = data.list.map(order => { + const undeliveredQty = order.undelivered_qty || 0; + const shippedQty = order.shipped_qty || 0; + const undeliveredStyle = undeliveredQty > 0 ? 'color: #f59e0b; font-weight: 700;' : 'color: #10b981;'; + return ` ${order.order_date || '—'} ${order.order_no || '—'} ${order.customer_name || '—'} ${order.material || '—'} ${order.quantity || 0} + ${shippedQty} + ${undeliveredQty} ${order.unit_price || 0} - `).join(''); + `}).join(''); console.log('订单列表加载完成'); } catch (err) { console.error('加载订单失败:', err); const tbody = document.getElementById('order-list'); if (tbody) { - tbody.innerHTML = '加载失败，请刷新重试'; + tbody.innerHTML = '加载失败，请刷新重试'; } API.toast('加载订单失败', 'error'); } diff --git a/server/app.py b/server/app.py index cc51602..348bb21 100755 --- a/server/app.py +++ b/server/app.py @@ -5049,7 +5049,7 @@ def upload_material_purchase_file(): @require_login @require_any_role('superadmin') def get_customer_orders(): - """获取客户订单列表""" + """获取客户订单列表，包含未交订单数量""" conn = get_db() c = conn.cursor() c.execute('''SELECT id, order_date, order_no, customer_name, material, quantity, unit_price, @@ -5057,10 +5057,49 @@ def get_customer_orders(): FROM customer_orders ORDER BY order_date DESC, id DESC''') rows = c.fetchall() - conn.close() orders = [] for row in rows: + # 计算未交订单数量 + # 根据订单编号（合同编号）和物料信息匹配对账单的发货数量 + order_no = row['order_no'] + material = row['material'] or '' + order_qty = row['quantity'] or 0 + + # 解析客户订单物料信息（格式：物料名称\n规格型号） + material_lines = material.strip().split('\n') + order_material_name = material_lines[0].strip() if len(material_lines) > 0 else '' + order_spec_model = material_lines[1].strip() if len(material_lines) > 1 else '' + + # 查询对账单中已发货数量 + # 匹配策略：根据合同编号，判断物料名称是否互相包含 + shipped_qty = 0 + try: + if order_material_name: + # 获取该合同号下的所有对账单记录 + c.execute('''SELECT material_name, quantity + FROM reconciliations + WHERE contract_no = ?''', (order_no,)) + reconciliation_rows = c.fetchall() + + for rec_row in reconciliation_rows: + rec_material = (rec_row['material_name'] or '').strip() + rec_qty = rec_row['quantity'] or 0 + + # 判断物料名称是否互相包含（忽略大小写） + if rec_material and ( + order_material_name.lower() in rec_material.lower() or + rec_material.lower() in order_material_name.lower() + ): + shipped_qty += rec_qty + + except Exception as e: + log('calculate_undelivered_error', f'订单ID {row["id"]}: {str(e)}') + shipped_qty = 0 + + # 计算未交数量 + undelivered_qty = max(0, order_qty - shipped_qty) + orders.append({ 'id': row['id'], 'order_date': row['order_date'], @@ -5069,11 +5108,14 @@ def get_customer_orders(): 'material': row['material'], 'quantity': row['quantity'], 'unit_price': row['unit_price'], + 'shipped_qty': shipped_qty, + 'undelivered_qty': undelivered_qty, 'created_by': row['created_by'], 'created_at': row['created_at'], 'updated_at': row['updated_at'] }) + conn.close() return jsonify({'list': orders})