Update app.py

app.py

@@ -41,7 +41,7 @@ def init_sheets():
         sheet.add_worksheet(title=PURCHASE_ORDERS_SHEET, rows="100", cols="20")
         orders = sheet.worksheet(PURCHASE_ORDERS_SHEET)
         orders.append_row([
-            '付款抬头', '合同号', '运编号', '车辆信息', '销售合同价', '采购价',
+            '付款抬头', '合同号', '运编号', '采购编号','车辆信息', '销售合同价', '采购价',
             '费用名称', '费用金额', '采购款收款抬头', '采购款收款账号信息',
             '业务员', '客户名称', '客户国家', '在途状态', '开票类型',
             '收款状态', '审批状态', '退款说明', '备注', 'timestamp', '毛利'
@@ -66,24 +66,24 @@ def approve_order(order_id, approver_role):
     try:
         orders = sheet.worksheet(PURCHASE_ORDERS_SHEET)
         order_records = orders.get_all_records()
-        order_records = sorted(order_records, key=lambda x: x['timestamp'], reverse=True)
-        order_indexes = [index for index, d in enumerate(order_records) if d["运编号"] == order_id]
 
-        if not order_indexes:
+        order_index = next((index for (index, d) in enumerate(order_records) if d["采购编号"] == order_id), None)
+
+        if order_index is None:
             return '订单未找到'
 
-        for order_index in order_indexes:
-            current_status = order_records[order_index]['审批状态']
+        current_status = order_records[order_index]['审批状态']
+
+        if (current_status == '待单证审批' and approver_role != '单证') or \
+                (current_status == '待财务审批' and approver_role != '财务') or \
+                (current_status == '待总经理审批' and approver_role != '总经理'):
+            return f'只有{current_status}角色可以批准当前订单'
 
-            if (current_status == '待单证审批' and approver_role == '单证') or \
-                    (current_status == '待财务审批' and approver_role == '财务') or \
-                    (current_status == '待总经理审批' and approver_role == '总经理'):
-                
-                next_status = get_next_approval_status(current_status)
-                headers = list(order_records[0].keys())
-                orders.update_cell(order_index + 2, headers.index('审批状态') + 1, next_status)  # 更新审批状态
-                orders.update_cell(order_index + 2, headers.index('timestamp') + 1,
-                                   datetime.now().strftime('%m/%d/%Y %H:%M'))  # 更新时间戳
+        next_status = get_next_approval_status(current_status)
+        headers = list(order_records[0].keys())
+        orders.update_cell(order_index + 2, headers.index('审批状态') + 1, next_status)  # Update approval status
+        orders.update_cell(order_index + 2, headers.index('timestamp') + 1,
+                           datetime.now().strftime('%Y-%m-%dT%H:%M'))  # Update timestamp
 
         return '订单已批准'
     except Exception as e:
@@ -145,6 +145,7 @@ def format_order(order):
                 <tr><th>付款抬头</th><td>{order['付款抬头']}</td></tr>
                 <tr><th>合同号</th><td>{order['合同号']}</td></tr>
                 <tr><th>运编号</th><td>{order['运编号']}</td></tr>
+                <tr><th>采购编号</th><td>{order['采购编号']}</td></tr>
                 <tr><th>车辆信息</th><td>{order['车辆信息']}</td></tr>
                 <tr><th>销售合同价(FOB美元)</th><td>{order['销售合同价']}</td></tr>
                 <tr><th>采购价(人民币)</th><td>{order['采购价']}</td></tr>
@@ -215,6 +216,7 @@ with gr.Blocks() as app:
         付款抬头 = gr.Textbox(label="付款抬头")
         合同号 = gr.Textbox(label="合同号")
         运编号 = gr.Textbox(label="运编号")
+        采购编号 = gr.Textbox(label="采购编号")
         车辆信息 = gr.Textbox(label="车辆信息")
         销售合同价 = gr.Textbox(label="销售合同价(FOB美元)")
         采购价 = gr.Textbox(label="采购价(人民币)")