V2.1客户信息修改、项目批量停用、项目批量修改、材料批量修改功能上线

2026-01-28 15:26:48 +08:00
parent 98944ecbdc
commit 838453b88f
6 changed files with 674 additions and 228 deletions
@@ -16,6 +16,8 @@ F6 后台执行模块
 - pandas: Excel 文件处理
 - threading: 后台任务处理
 """
+import logging
+import traceback
 import requests
 from urllib.parse import quote
 import pandas as pd
@@ -37,6 +39,7 @@ from app.tasks.delete_tasks import (
 from app.tasks.material_tasks import (
    batch_disable_projects,
    batch_modify_materials,
+    batch_modify_projects
 )
 from app.tasks.customer_tasks import modify_customer_info_background
 from app.tasks.bi_tasks import bi_task_background
@@ -44,6 +47,8 @@ from app.tasks.bi_tasks import bi_task_background
 # 简道云 API 实例，用于调用简道云 API
 api_instance = API()

+logger = logging.getLogger('app')
+

 class F6PluginModule:
    """
@@ -171,8 +176,38 @@ class F6PluginModule:
                    else:
                        print("'msg':'文件上传格式错误'")
                        return {'msg': '文件上传格式错误'}
-                elif action == 'delete_cars':
-                    pass
+                elif action == 'disable_project':
+                    df1 = pd.read_excel(save_path, sheet_name=0)
+                    if "项目编码" in df1.columns[0]:  # 校验表头名字
+                        print('文件校验成功')
+                        return {'msg': f'{save_path}', 'check': '是'}
+                    else:
+                        print("'msg':'文件上传格式错误'")
+                        return {'msg': '文件上传格式错误'}
+                elif action == 'batch_modify_materials':
+                    df2 = pd.read_excel(save_path, sheet_name=0)
+                    required_columns = {'原材料编码', '新材料编码', '品牌', '名称', '规格'}
+                    actual_columns = set(df2.columns)
+                    if required_columns.issubset(actual_columns):
+                        print('文件校验成功')
+                        return {'msg': f'{save_path}', 'check': '是'}
+                    else:
+                        missing = required_columns - actual_columns
+                        print(f"文件上传格式错误：缺少列 {missing}")
+                        return {'msg': '文件上传格式错误'}
+
+                elif action == 'batch_modify_projects':
+                    df3 = pd.read_excel(save_path, sheet_name=0)
+                    required_columns = {'原项目编码', '新项目编码', '项目名称', '业务分类', '销项税率', '项目说明',
+                                        }
+                    actual_columns = set(df3.columns)
+                    if required_columns.issubset(actual_columns):
+                        print('文件校验成功')
+                        return {'msg': f'{save_path}', 'check': '是'}
+                    else:
+                        missing = required_columns - actual_columns
+                        print(f"文件上传格式错误：缺少列 {missing}")
+                        return {'msg': '文件上传格式错误'}
                else:
                    pass

@@ -410,33 +445,45 @@ class F6PluginModule:
        Returns:
            Dict[str, str]: 包含执行状态的字典，{'msg': '正在执行', 'msg_details': '正在执行，请稍后看结果'}
        """
-        entry_data = api_instance.entry_data_get(data=data, replace=True)
-        print('执行 项目批量停用/启用')
-        username = entry_data['data']['账号']
-        password = entry_data['data']['密码']
-        company_name = entry_data['data']['公司名称']
-        save_path = entry_data['data']['文件保存地址']
-        option = entry_data['data']['项目材料批量操作']
-
-        login_response = F6Module.login_in(username, password, company_name)
-        if login_response is None:
-            return {'msg': '登录失败'}
-
        try:
-            df = pd.read_excel(save_path, sheet_name=0, dtype='string')
+            entry_data = api_instance.entry_data_get(data=data, replace=True)
+            print('执行 项目批量停用/启用')
+            username = entry_data['data']['账号']
+            password = entry_data['data']['密码']
+            company_name = entry_data['data']['公司名称']
+            save_path = entry_data['data']['文件保存地址']
+            option = entry_data['data']['项目材料批量操作']
+
+            login_response = F6Module.login_in(username, password, company_name)
+            if login_response is None:
+                logger.error(f"F6系统登录失败，用户名: {username}")
+                return {'msg': '登录失败'}
+
+            try:
+                df = pd.read_excel(save_path, sheet_name=0, dtype='string')
+            except Exception as e:
+                logger.error(f"读取Excel文件失败: {save_path}, 错误: {str(e)}, 堆栈: {traceback.format_exc()}")
+                return {'msg': f'读取Excel文件失败: {str(e)},文件路径：{save_path}'}
+
+            cookies = requests.utils.dict_from_cookiejar(login_response.cookies)
+            logger.info("当前登录cookies:{}".format(cookies))
+
+            try:
+                thread = threading.Thread(target=batch_disable_projects,
+                                          args=(data, cookies, df, save_path, option))
+                thread.start()
+            except Exception as e:
+                logger.error(f"创建线程失败: {str(e)}, 堆栈: {traceback.format_exc()}")
+                print(f'创建线程失败: {str(e)}')
+                return {'msg': f'创建后台线程失败: {str(e)}'}
+
+            return {'msg': '正在执行', 'msg_details': '正在执行，请稍后看结果'}
+        except KeyError as e:
+            logger.error(f"数据字段缺失: {str(e)}, 堆栈: {traceback.format_exc()}")
+            return {'msg': f'数据字段缺失: {str(e)}'}
        except Exception as e:
-            return {'msg': f'读取Excel文件失败: {str(e)},文件路径：{save_path}'}
-
-        cookies = requests.utils.dict_from_cookiejar(login_response.cookies)
-
-        try:
-            thread = threading.Thread(target=batch_disable_projects,
-                                      args=(data, cookies, df, save_path,option))
-            thread.start()
-        except Exception as e:
-            print(f'创建线程失败: {str(e)}')
-
-        return {'msg': '正在执行', 'msg_details': '正在执行，请稍后看结果'}
+            logger.error(f"项目批量启停任务执行失败: {str(e)}, 堆栈: {traceback.format_exc()}")
+            return {'msg': f'执行失败: {str(e)}'}

    @staticmethod
    def modify_material(data: Dict[str, Any]) -> Dict[str, str]:
@@ -452,33 +499,43 @@ class F6PluginModule:
        Returns:
            Dict[str, str]: 包含执行状态的字典，{'msg': '正在执行', 'msg_details': '正在执行，请稍后看结果'}
        """
-        entry_data = api_instance.entry_data_get(data=data, replace=True)
-        print('执行 材料信息批量修改')
-        username = entry_data['data']['账号']
-        password = entry_data['data']['密码']
-        company_name = entry_data['data']['公司名称']
-        save_path = entry_data['data']['文件保存地址']
-        option = entry_data['data']['材料信息批量修改']
-
-        login_response = F6Module.login_in(username, password, company_name)
-        if login_response is None:
-            return {'msg': '登录失败'}
-
        try:
-            df = pd.read_excel(save_path, sheet_name=0, dtype='string')
+            entry_data = api_instance.entry_data_get(data=data, replace=True)
+            print('执行 材料信息批量修改')
+            username = entry_data['data']['账号']
+            password = entry_data['data']['密码']
+            company_name = entry_data['data']['公司名称']
+            save_path = entry_data['data']['文件保存地址']
+
+            login_response = F6Module.login_in(username, password, company_name)
+            if login_response is None:
+                logger.error(f"F6系统登录失败，用户名: {username}")
+                return {'msg': '登录失败'}
+
+            try:
+                df = pd.read_excel(save_path, sheet_name=0, dtype='string')
+            except Exception as e:
+                logger.error(f"读取Excel文件失败: {save_path}, 错误: {str(e)}, 堆栈: {traceback.format_exc()}")
+                return {'msg': f'读取Excel文件失败: {str(e)},文件路径：{save_path}'}
+
+            cookies = requests.utils.dict_from_cookiejar(login_response.cookies)
+
+            try:
+                thread = threading.Thread(target=batch_modify_materials,
+                                          args=(data, cookies, df, save_path))
+                thread.start()
+            except Exception as e:
+                logger.error(f"创建线程失败: {str(e)}, 堆栈: {traceback.format_exc()}")
+                print(f'创建线程失败: {str(e)}')
+                return {'msg': f'创建后台线程失败: {str(e)}'}
+
+            return {'msg': '正在执行', 'msg_details': '正在执行，请稍后看结果'}
+        except KeyError as e:
+            logger.error(f"数据字段缺失: {str(e)}, 堆栈: {traceback.format_exc()}")
+            return {'msg': f'数据字段缺失: {str(e)}'}
        except Exception as e:
-            return {'msg': f'读取Excel文件失败: {str(e)},文件路径：{save_path}'}
-
-        cookies = requests.utils.dict_from_cookiejar(login_response.cookies)
-
-        try:
-            thread = threading.Thread(target=batch_modify_materials,
-                                      args=(data, cookies, df, save_path, option))
-            thread.start()
-        except Exception as e:
-            print(f'创建线程失败: {str(e)}')
-
-        return {'msg': '正在执行', 'msg_details': '正在执行，请稍后看结果'}
+            logger.error(f"材料批量修改任务执行失败: {str(e)}, 堆栈: {traceback.format_exc()}")
+            return {'msg': f'执行失败: {str(e)}'}

    @staticmethod
    def modify_project(data: Dict[str, Any]) -> Dict[str, str]:
@@ -494,33 +551,43 @@ class F6PluginModule:
        Returns:
            Dict[str, str]: 包含执行状态的字典，{'msg': '正在执行', 'msg_details': '正在执行，请稍后看结果'}
        """
-        entry_data = api_instance.entry_data_get(data=data, replace=True)
-        print('执行 项目信息批量修改')
-        username = entry_data['data']['账号']
-        password = entry_data['data']['密码']
-        company_name = entry_data['data']['公司名称']
-        save_path = entry_data['data']['文件保存地址']
-        option = entry_data['data']['项目信息批量修改']
-
-        login_response = F6Module.login_in(username, password, company_name)
-        if login_response is None:
-            return {'msg': '登录失败'}
-
        try:
-            df = pd.read_excel(save_path, sheet_name=0, dtype='string')
+            entry_data = api_instance.entry_data_get(data=data, replace=True)
+            print('执行 项目信息批量修改')
+            username = entry_data['data']['账号']
+            password = entry_data['data']['密码']
+            company_name = entry_data['data']['公司名称']
+            save_path = entry_data['data']['文件保存地址']
+
+            login_response = F6Module.login_in(username, password, company_name)
+            if login_response is None:
+                logger.error(f"F6系统登录失败，用户名: {username}")
+                return {'msg': '登录失败'}
+
+            try:
+                df = pd.read_excel(save_path, sheet_name=0, dtype='string')
+            except Exception as e:
+                logger.error(f"读取Excel文件失败: {save_path}, 错误: {str(e)}, 堆栈: {traceback.format_exc()}")
+                return {'msg': f'读取Excel文件失败: {str(e)},文件路径：{save_path}'}
+
+            cookies = requests.utils.dict_from_cookiejar(login_response.cookies)
+
+            try:
+                thread = threading.Thread(target=batch_modify_projects,
+                                          args=(data, cookies, df, save_path))
+                thread.start()
+            except Exception as e:
+                logger.error(f"创建线程失败: {str(e)}, 堆栈: {traceback.format_exc()}")
+                print(f'创建线程失败: {str(e)}')
+                return {'msg': f'创建后台线程失败: {str(e)}'}
+
+            return {'msg': '正在执行', 'msg_details': '正在执行，请稍后看结果'}
+        except KeyError as e:
+            logger.error(f"数据字段缺失: {str(e)}, 堆栈: {traceback.format_exc()}")
+            return {'msg': f'数据字段缺失: {str(e)}'}
        except Exception as e:
-            return {'msg': f'读取Excel文件失败: {str(e)},文件路径：{save_path}'}
-
-        cookies = requests.utils.dict_from_cookiejar(login_response.cookies)
-
-        try:
-            thread = threading.Thread(target=batch_modify_projects,
-                                      args=(data, cookies, df, save_path, option))
-            thread.start()
-        except Exception as e:
-            print(f'创建线程失败: {str(e)}')
-
-        return {'msg': '正在执行', 'msg_details': '正在执行，请稍后看结果'}
+            logger.error(f"项目批量修改任务执行失败: {str(e)}, 堆栈: {traceback.format_exc()}")
+            return {'msg': f'执行失败: {str(e)}'}

    @staticmethod
    def bi_task(data: Dict[str, Any]) -> Dict[str, str]: