Update app.py

app.py

@@ -1,4 +1,3 @@
-
 import pandas as pd
 import gradio as gr
 from datetime import datetime
@@ -8,7 +7,7 @@ import os
 
 # Google Sheets settings
 SHEET_ID = os.getenv('SHEET_ID')  # Replace with your Google Sheet ID
-log = os.getenv('USER')
+log = 'cevauto'
 password = os.getenv('PASSWORD')
 USERS_SHEET = 'Users'
 PURCHASE_ORDERS_SHEET = 'PurchaseOrders'
@@ -22,6 +21,7 @@ creds = Credentials.from_service_account_file(CREDENTIALS_FILE, scopes=SCOPES)
 gc = gspread.authorize(creds)
 sheet = gc.open_by_key(SHEET_ID)
 
+
 # Initialize Google Sheets
 def init_sheets():
     if USERS_SHEET not in [s.title for s in sheet.worksheets()]:
@@ -44,14 +44,16 @@ def init_sheets():
         sheet.add_worksheet(title=PURCHASE_ORDERS_SHEET, rows="100", cols="20")
         orders = sheet.worksheet(PURCHASE_ORDERS_SHEET)
         orders.append_row([
-            '付款抬头', '合同号', '运编号', '采购编号','车辆信息', '销售合同价', '采购价',
+            '付款抬头', '合同号', '运编号', '采购编号', '车辆信息', '销售合同价', '采购价',
             '费用名称', '费用金额', '采购款收款抬头', '采购款收款账号信息',
             '业务员', '客户名称', '客户国家', '在途状态', '开票类型',
             '收款状态', '审批状态', '退款说明', '备注', 'timestamp', '毛利'
         ])
 
+
 init_sheets()
 
+
 # Approval process control
 def get_next_approval_status(current_status):
     try:
@@ -65,6 +67,7 @@ def get_next_approval_status(current_status):
     except Exception as e:
         return "操作有误: {}".format(e)
 
+
 def approve_order(order_id, approver_role):
     try:
         orders = sheet.worksheet(PURCHASE_ORDERS_SHEET)
@@ -92,8 +95,10 @@ def approve_order(order_id, approver_role):
     except Exception as e:
         return "操作有误: {}".format(e)
 
+
 # Global session state
-session_state = {'user_id': None, 'username': None, 'role': None}
+session_state = {'user_id': None, 'username': None, 'role': None, 'order_id': None}
+
 
 def login(username):
     try:
@@ -109,12 +114,65 @@ def login(username):
     except Exception as e:
         return "操作有误: {}".format(e)
 
-def submit_order(
-    username,
-    付款抬头, 合同号, 运编号, 采购编号, 车辆信息, 销售合同价, 采购价,
-    费用名称, 费用金额, 采购款收款抬头, 采购款收款账号信息,
-    业务员, 客户名称, 客户国家, 在途状态, 开票类型,
-    收款状态, 退款说明, 备注
+
+def submit_order1(
+        username,
+        运编号,
+        费用名称, 费用金额, 采购款收款抬头, 采购款收款账号信息,
+        在途状态, 开票类型,
+        收款状态, 退款说明, 备注
+):
+    try:
+        global profit
+        login(username)
+
+        if session_state['role'] not in ['采购', '采购经理']:
+            return "只有采购角色可以提交订单"
+
+        orders = sheet.worksheet(PURCHASE_ORDERS_SHEET)
+
+        # Generate purchase order name based on username
+        prefix = 'DING00000'
+        if session_state['username'] == 'cevcaigou159':
+            prefix = 'SHEN00000'
+        elif session_state['username'] == 'cevcaigou888':
+            prefix = 'NIU00000'
+
+        all_records = orders.get_all_records()
+        existing_records = [record for record in all_records if record['采购编号'].startswith(prefix)]
+        n = len(existing_records)
+        i = n + 1
+        order_name = f"{prefix}{i}"
+
+        existing_records1 = [record for record in all_records if record['运编号'] == 运编号]
+
+        existing_record = existing_records1[0]
+        profit = float(existing_record['销售合同价']) * 7 - float(existing_record['采购价']) + float(
+            existing_record['采购价']) * 0.115
+
+        new_order = [
+            existing_record['付款抬头'], existing_record['合同号'], 运编号, order_name, existing_record['车辆信息'],
+            existing_record['销售合同价'], existing_record['采购价'],
+            费用名称, 费用金额, 采购款收款抬头, 采购款收款账号信息,
+            existing_record['业务员'], existing_record['客户名称'], existing_record['客户国家'], 在途状态, 开票类型,
+            收款状态, '待单证审批', 退款说明, 备注,
+            datetime.now().strftime('%Y-%m-%d'), profit
+        ]
+        orders.append_row(new_order)
+        session_state.clear()
+        return "订单已提交"
+        session_state.clear()
+
+    except Exception as e:
+        return "操作有误: {}".format(e)
+
+
+def submit_order2(
+        username,
+        付款抬头, 合同号, 运编号, 车辆信息, 销售合同价, 采购价,
+        费用名称, 费用金额, 采购款收款抬头, 采购款收款账号信息,
+        业务员, 客户名称, 客户国家, 在途状态, 开票类型,
+        收款状态, 退款说明, 备注
 ):
     try:
         global profit
@@ -124,10 +182,23 @@ def submit_order(
             return "只有采购角色���以提交订单"
 
         orders = sheet.worksheet(PURCHASE_ORDERS_SHEET)
-        profit = float(销售合同价)*7.25 - float(采购价) + float(采购价)*0.115
 
+        # Generate purchase order name based on username
+        prefix = 'DING00000'
+        if session_state['username'] == 'cevcaigou159':
+            prefix = 'SHEN00000'
+        elif session_state['username'] == 'cevcaigou888':
+            prefix = 'NIU00000'
+
+        all_records = orders.get_all_records()
+        existing_records = [record for record in all_records if record['采购编号'].startswith(prefix)]
+        n = len(existing_records)
+        i = n + 1
+        order_name = f"{prefix}{i}"
+
+        profit = float(销售合同价) * 7.25 - float(采购价) + float(采购价) * 0.115
         new_order = [
-            付款抬头, 合同号, 运编号, 采购编号, 车辆信息, 销售合同价, 采购价,
+            付款抬头, 合同号, 运编号, order_name, 车辆信息, 销售合同价, 采购价,
             费用名称, 费用金额, 采购款收款抬头, 采购款收款账号信息,
             业务员, 客户名称, 客户国家, 在途状态, 开票类型,
             收款状态, '待单证审批', 退款说明, 备注,
@@ -140,6 +211,7 @@ def submit_order(
     except Exception as e:
         return "操作有误: {}".format(e)
 
+
 def format_order(order):
     try:
         return f"""
@@ -172,6 +244,7 @@ def format_order(order):
     except Exception as e:
         return "操作有误: {}".format(e)
 
+
 def display_orders(username):
     try:
 
@@ -198,6 +271,7 @@ def display_orders(username):
     except Exception as e:
         return "操作有误: {}".format(e)
 
+
 def approve_order_interface(username, order_id):
     try:
         login(username)
@@ -215,22 +289,62 @@ def approve_order_interface(username, order_id):
     except Exception as e:
         return "操作有误: {}".format(e)
 
+
 with gr.Blocks() as app:
-    with gr.TabItem("提交订单"):
+    with gr.TabItem("提交费用（旧运编号）"):
         username_submit = gr.Textbox(label="用户名")
+        运编号 = gr.Textbox(label="运编号")
+        费用名称 = gr.Dropdown(
+            choices=[
+                '采车定金', '采车定金（抵车款）', '采车定金（全额退回）', '采车定金（部分退回）',
+                '采车尾款（含背户费）', '采车尾款', '背户手续费', '系统刷机费', '充电桩费',
+                '保险费（短期交强）', '保险费（长期交强）', '保险费（全险）', '国内运费（市内）', '国内运费',
+                '购置税费', '仓储费', '检测报告费', '车辆用品费', '车辆改装费', '港杂费', '海运费', '海运费+港杂费',
+                '其他费用'
+            ],
+            label="费用名称")
+        费用金额 = gr.Textbox(label="费用金额")
+        采购款收款抬头 = gr.Textbox(label="采购款收款抬头")
+        采购款收款账号信息 = gr.Textbox(label="采购款收款账号信息")
+        在途状态 = gr.Dropdown(
+            choices=[
+                '工厂', '4S店', '车管所',
+                '改装店', '运输中', '物流站点', '货代仓库', '装箱',
+                '发运', '到达目的港'
+            ],
+            label="在途状态")
+        开票类型 = gr.Dropdown(
+            choices=[
+                '增票', '普票', '低开', '无票'
+            ],
+            label="开票类型")
+        收款状态 = gr.Textbox(label="收款状态")
+        退款说明 = gr.Textbox(label="退款说明")
+        备注 = gr.Textbox(label="备注")
+        submit_button = gr.Button("提交订单")
+        submit_output = gr.HTML(label="输出")
+        submit_button.click(fn=submit_order1, inputs=[
+            username_submit, 运编号,
+            费用名称, 费用金额, 采购款收款抬头, 采购款收款账号信息,
+            在途状态, 开票类型,
+            收款状态, 退款说明, 备注
+        ], outputs=submit_output)
+
+    with gr.TabItem("提交订单(新运编号)"):
+        username_submit = gr.Textbox(label="用户名")
+        运编号_submit = gr.Textbox(label="运编号")
         付款抬头 = gr.Textbox(label="付款抬头")
         合同号 = gr.Textbox(label="合同号")
-        运编号 = gr.Textbox(label="运编号")
-        采购编号 = gr.Textbox(label="采购编号")
         车辆信息 = gr.Textbox(label="车辆信息")
         销售合同价 = gr.Textbox(label="销售合同价(FOB美元)")
         采购价 = gr.Textbox(label="采购价(人民币)")
         费用名称 = gr.Dropdown(
-            choices = [
-                '采车定金','采车定金（抵车款）','采车定金（全额退回）','采车定金（部分退回）',
-                '采车尾款（含背户费）','采车尾款','背户手续费','系统刷机费','充电桩费',
-                '保险费（短期交强）','保险费（长期交强）','保险费（全险）' ,'国内运费（市内）','国内运费',
-                '购置税费','仓储费','检测报告费','车辆用品费','车辆改装费','港杂费','海运费','海运费+港杂费','其他费用'
+            choices=[
+                '采车定金', '采车定金（抵车款）', '采车定金（全额退回）', '采车定金（部分退回）',
+                '采车尾款（含背户费）', '采车尾款', '背户手续费', '系统刷机费', '充电桩费',
+                '保险费（短期交强）', '保险费（长期交强）', '保险费（全险）', '国内运费（市内）', '国内运费',
+                '购置税费', '仓储费', '检测报告费', '车辆用品费', '车辆改装费', '港杂费', '海运费', '海运费+港杂费',
+                '其他费用'
             ],
             label="费用名称")
         费用金额 = gr.Textbox(label="费用金额")
@@ -240,15 +354,15 @@ with gr.Blocks() as app:
         客户名称 = gr.Textbox(label="客户名称")
         客户国家 = gr.Textbox(label="客户国家")
         在途状态 = gr.Dropdown(
-            choices = [
-              '工厂','4S店','车管所',
-                '改装店','运输中','物流站点','货代仓库','装箱',
-                '发运','到达目的港'
+            choices=[
+                '工厂', '4S店', '车管所',
+                '改装店', '运输中', '物流站点', '货代仓库', '装箱',
+                '发运', '到达目的港'
             ],
             label="在途状态")
         开票类型 = gr.Dropdown(
-            choices = [
-              '增票','普票','低开','无票'
+            choices=[
+                '增票', '普票', '低开', '无票'
             ],
             label="开票类型")
         收款状态 = gr.Textbox(label="收款状态")
@@ -256,8 +370,8 @@ with gr.Blocks() as app:
         备注 = gr.Textbox(label="备注")
         submit_button = gr.Button("提交订单")
         submit_output = gr.HTML(label="输出")
-        submit_button.click(fn=submit_order, inputs=[
-            username_submit, 付款抬头, 合同号, 运编号, 采购编号,车辆信息, 销售合同价, 采购价,
+        submit_button.click(fn=submit_order2, inputs=[
+            username_submit, 运编号_submit, 付款抬头, 合同号, 车辆信息, 销售合同价, 采购价,
             费用名称, 费用金额, 采购款收款抬头, 采购款收款账号信息,
             业务员, 客户名称, 客户国家, 在途状态, 开票类型,
             收款状态, 退款说明, 备注
@@ -274,6 +388,8 @@ with gr.Blocks() as app:
         order_id = gr.Textbox(label="采购编号")
         approve_order_button = gr.Button("批准订单")
         approve_order_output = gr.HTML(label="输出")
-        approve_order_button.click(fn=approve_order_interface, inputs=[username_approve, order_id], outputs=approve_order_output)
+        approve_order_button.click(fn=approve_order_interface, inputs=[username_approve, order_id],
+                                   outputs=approve_order_output)
 
-app.launch(auth=(log, password))
+app.launch(auth=(log, password))
+# app.launch()