qrpa 1.1.29__tar.gz → 1.1.31__tar.gz

{qrpa-1.1.29 → qrpa-1.1.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrpa
-Version: 1.1.29
+Version: 1.1.31
 Summary: qsir's rpa library
 Author: QSir
 Author-email: QSir <1171725650@qq.com>

{qrpa-1.1.29 → qrpa-1.1.31}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qrpa"
-version = "1.1.29"
+version = "1.1.31"
 description = "qsir's rpa library"
 authors = [{ name = "QSir", email = "1171725650@qq.com" }]
 readme = "README.md"

{qrpa-1.1.29 → qrpa-1.1.31}/qrpa/fun_excel.py

@@ -2060,7 +2060,7 @@ def pre_format_columns_safe(sheet, columns, data_rows):
 
 def post_format_columns_safe(sheet, columns, data_rows):
     """
-    后格式化函数：在写入数据后确认列格式
+    后格式化函数：在写入数据后确认列格式并强制转换为文本
     
     Args:
         sheet: Excel工作表对象
@@ -2080,8 +2080,32 @@ def post_format_columns_safe(sheet, columns, data_rows):
             # 只对实际有数据的行进行格式化
             if data_rows > 0:
                 range_str = f'{col_name}1:{col_name}{data_rows}'
-                sheet.range(range_str).number_format = '@'
-                log(f'后格式化成功: {range_str}')
+                target_range = sheet.range(range_str)
+                
+                # 设置格式为文本
+                target_range.number_format = '@'
+                
+                # 关键步骤：读取数据并重新写入，触发文本转换
+                # 这样可以将已经写入的数字转换为文本格式
+                values = target_range.value
+                if values is not None:
+                    # 处理单个值的情况
+                    if not isinstance(values, list):
+                        if values != '':
+                            target_range.value = str(values)
+                    # 处理列表的情况（单列多行）
+                    elif len(values) > 0:
+                        # 检查是否是二维数组（实际上单列应该是一维数组）
+                        if isinstance(values[0], list):
+                            # 二维数组，取第一列
+                            converted_values = [[str(row[0]) if row[0] is not None and row[0] != '' else row[0]] for row in values]
+                        else:
+                            # 一维数组
+                            converted_values = [[str(val)] if val is not None and val != '' else [val] for val in values]
+                        # 重新写入（这次会按照文本格式写入）
+                        target_range.value = converted_values
+                
+                log(f'后格式化并转换成功: {range_str}')
 
         except Exception as e:
             log(f'后格式化列 {col_name} 失败: {e}，继续处理其他列')

{qrpa-1.1.29 → qrpa-1.1.31}/qrpa/shein_excel.py

@@ -2828,28 +2828,298 @@ class SheinExcel:
             (sheet_name, 'move', 1),
         ])
 
+    def merge_finance_details_to_summary(self, source_dir, start_date, end_date, output_dir=None):
+        """
+        将多个店铺的财务收支明细Excel文件合并到一个汇总Excel中
+        
+        Args:
+            source_dir: 源文件目录路径
+            start_date: 开始日期，格式: YYYY-MM-DD
+            end_date: 结束日期，格式: YYYY-MM-DD
+            output_dir: 输出目录，默认为None则使用source_dir
+            
+        Returns:
+            汇总Excel文件路径
+        """
+        import os
+        import glob
+
+        # 确定输出目录
+        if output_dir is None:
+            output_dir = source_dir
+        os.makedirs(output_dir, exist_ok=True)
+
+        # 提取月份（从start_date中提取）
+        from datetime import datetime
+        start_dt = datetime.strptime(start_date, '%Y-%m-%d')
+        month_str = f"{start_dt.month}月"
+
+        # 生成输出文件名
+        output_filename = f'希音财务月报POP-{month_str}.xlsx'
+        output_path = os.path.join(output_dir, output_filename)
+
+        log(f'开始合并财务收支明细: {source_dir}')
+
+        # 查找所有匹配的Excel文件
+        pattern = os.path.join(source_dir, f'finance_details_*_{start_date}_{end_date}.xlsx')
+        excel_files = glob.glob(pattern)
+
+        if len(excel_files) == 0:
+            log(f'未找到匹配的文件: {pattern}')
+            raise Exception(f'未找到匹配的财务收支明细文件')
+
+        log(f'找到 {len(excel_files)} 个Excel文件待合并')
+
+        # 读取所有Excel文件并合并数据
+        all_detail_data = []
+        store_list = []  # 存储店铺账号列表
+        header = None
+
+        for idx, excel_file in enumerate(excel_files):
+            log(f'读取文件 {idx + 1}/{len(excel_files)}: {os.path.basename(excel_file)}')
+
+            # 从文件名中提取店铺账号
+            filename = os.path.basename(excel_file)
+            # 格式: finance_details_{store_username}_{start_date}_{end_date}.xlsx
+            parts = filename.replace('.xlsx', '').split('_')
+            if len(parts) >= 5:
+                store_username = parts[2]  # finance_details_{store_username}_...
+                store_list.append(store_username)
+            else:
+                log(f'警告：无法从文件名提取店铺账号: {filename}')
+                store_username = 'unknown'
+                store_list.append(store_username)
+
+            # 读取Excel文件
+            try:
+                df = pd.read_excel(excel_file, sheet_name=0)
+
+                if idx == 0:
+                    # 第一个文件，保存表头
+                    header = df.columns.tolist()
+                    log(f'表头列数: {len(header)}')
+
+                # 读取数据（跳过表头）
+                data_rows = df.values.tolist()
+                log(f'读取到 {len(data_rows)} 行数据')
+
+                # 添加到总数据中
+                all_detail_data.extend(data_rows)
+
+            except Exception as e:
+                log(f'读取文件失败: {excel_file}, 错误: {str(e)}')
+                continue
+
+        log(f'合并完成，总共 {len(all_detail_data)} 行数据')
+
+        dict_store_manager_shein = self.config.shein_store_manager
+        dict_store_name = read_dict_from_file(self.config.shein_store_alias)
+
+        # 在"金额"列后面添加"ERP成本"和"成本总额"两列
+        if header:
+            # 查找"金额"列和"商家SKU"列的位置
+            amount_col_idx = None
+            sku_col_idx = None
+            business_no_col_idx = None  # 业务单号列索引
+
+            for i, col_name in enumerate(header):
+                if '金额' in str(col_name):
+                    amount_col_idx = i
+                if '商家SKU' in str(col_name) or 'SKU' in str(col_name):
+                    sku_col_idx = i
+                if '店铺名称' in str(col_name):
+                    store_name_idx = i
+                if '店长' in str(col_name):
+                    store_manager_idx = i
+                if '业务单号' in str(col_name):
+                    business_no_col_idx = i
+
+            if amount_col_idx is not None:
+                # 在"金额"列后面插入两列
+                new_header = header[:amount_col_idx + 1] + ['ERP成本', '成本总额'] + header[amount_col_idx + 1:]
+                log(f'在第{amount_col_idx + 1}列（金额）后面插入"ERP成本"和"成本总额"两列')
+                
+                # 业务单号列在插入新列后的索引需要调整
+                if business_no_col_idx is not None and business_no_col_idx > amount_col_idx:
+                    business_no_col_idx_adjusted = business_no_col_idx + 2  # 因为插入了2列
+                else:
+                    business_no_col_idx_adjusted = business_no_col_idx
+
+                # 处理数据行：在相应位置插入ERP成本和成本总额
+                new_data = []
+                for row_idx, row in enumerate(all_detail_data):
+                    # 转换为list（如果是tuple）
+                    row_list = list(row)
+
+                    store_username = row_list[0]
+                    store_name = dict_store_name.get(store_username)
+                    store_manager = dict_store_manager_shein.get(str(store_username).lower(), '-')
+                    row_list[1] = store_name
+                    row_list[2] = store_manager
+
+                    # 获取商家SKU
+                    sku = None
+                    if sku_col_idx is not None and sku_col_idx < len(row_list):
+                        sku = row_list[sku_col_idx]
+
+                    # 获取ERP成本
+                    erp_cost = ''
+                    if sku and self.bridge:
+                        try:
+                            erp_cost = self.bridge.get_sku_cost(str(sku), self.config.erp_source)
+                        except Exception as e:
+                            log(f'获取SKU成本失败: {sku}, 错误: {str(e)}')
+
+                    # 在"金额"列后面插入两列数据
+                    new_row = row_list[:amount_col_idx + 1] + [erp_cost, ''] + row_list[amount_col_idx + 1:]
+                    new_data.append(new_row)
+
+                    # 每1000行输出一次进度
+                    if (row_idx + 1) % 1000 == 0:
+                        log(f'处理进度: {row_idx + 1}/{len(all_detail_data)}')
+
+                # 更新表头和数据
+                header = new_header
+                all_detail_data = new_data
+                log(f'ERP成本数据处理完成，新表头列数: {len(header)}')
+                if business_no_col_idx_adjusted is not None:
+                    log(f'业务单号列已转换为字符串格式，列索引: {business_no_col_idx_adjusted}')
+            else:
+                log('警告：未找到"金额"列，无法添加ERP成本和成本总额列')
+
+        # 准备汇总表数据
+        summary_header = ['店铺账号', '店铺别名', '店长', '出库金额', '出库成本', '备货作业费',
+                          '代收服务费', '订单履约服务费', '订单退货', '退货处理费', '退货单履约服务费', '利润']
+        summary_data = [summary_header]
+
+        # 为每个店铺创建一行（其他字段留空，由公式计算）
+        for store_username in store_list:
+            store_name = dict_store_name.get(store_username)
+            store_manager = dict_store_manager_shein.get(str(store_username).lower(), '-')
+            row = [store_username, store_name, store_manager, '', '', '', '', '', '', '', '', '']
+            summary_data.append(row)
+
+        # 写入Excel文件
+        log(f'开始写入汇总Excel: {output_path}')
+
+        # 查找需要格式化为文本的列
+        text_format_columns = []
+        str_keywords = ['业务单号']
+        
+        def col_idx_to_letter(idx):
+            """将列索引转换为Excel列字母 (0->A, 1->B, ..., 25->Z, 26->AA, ...)"""
+            result = ''
+            idx += 1  # Excel列从1开始
+            while idx > 0:
+                idx -= 1
+                result = chr(65 + idx % 26) + result
+                idx //= 26
+            return result
+        
+        for col_idx, col_name in enumerate(header):
+            col_name_str = str(col_name)
+            # 检查列名是否包含需要保持为文本的关键词
+            if any(keyword in col_name_str for keyword in str_keywords):
+                col_letter = col_idx_to_letter(col_idx)
+                text_format_columns.append(col_letter)
+                log(f'列"{col_name}"（第{col_idx}列，Excel列{col_letter}）将格式化为文本')
+        
+        log(f'共{len(text_format_columns)}列需要格式化为文本: {text_format_columns}')
+
+        # 使用batch_excel_operations批量写入和格式化
+        operations = [
+            ('财务收支明细', 'write', [header] + all_detail_data, text_format_columns),
+            ('财务收支明细', 'format', self.format_check_order),
+            ('总表', 'write', summary_data),
+            ('总表', 'format', self.format_check_order),
+            ('Sheet1', 'delete'),
+            ('总表', 'move', 1),
+        ]
+
+        batch_excel_operations(output_path, operations)
+
+        log(f'合并完成，文件已保存: {output_path}')
+        return output_path
+
     def format_check_order(self, sheet):
-        if sheet.name == '收支明细':
+        if sheet.name == '收支明细' or sheet.name == '财务收支明细':
             beautify_title(sheet)
             add_borders(sheet)
             format_to_datetime(sheet, ['时间'])
             format_to_date(sheet, ['日期'])
-            format_to_money(sheet, ['金额', '成本'])
-            column_to_right(sheet, ['金额', '成本'])
+            format_to_money(sheet, ['金额', '成本', 'ERP成本', '成本总额'])
+            column_to_right(sheet, ['金额', '成本', 'ERP成本', '成本总额'])
             column_to_left(sheet, ['货号', '商家SKU'])
-            add_formula_for_column(sheet, '成本总额', '=IF(ISNUMBER(P2),P2*J2,0)')
+
+            # 将业务单号列格式化为文本格式
+            try:
+                from .fun_excel import find_column_by_data
+                business_no_col = find_column_by_data(sheet, 1, '业务单号')
+                if business_no_col:
+                    # 设置整列为文本格式
+                    last_row = sheet.range('A' + str(sheet.cells.last_cell.row)).end('up').row
+                    sheet.range(f'{business_no_col}2:{business_no_col}{last_row}').number_format = '@'
+                    log(f'业务单号列（{business_no_col}）已设置为文本格式')
+            except Exception as e:
+                log(f'设置业务单号列格式失败: {str(e)}')
+
+            # 为成本总额列添加公式
+            # 成本总额 = 数量 * ERP成本
+            try:
+                # 查找"数量"列和"ERP成本"列的位置
+                from .fun_excel import find_column_by_data
+                quantity_col = find_column_by_data(sheet, 1, '商品数量')
+                erp_cost_col = find_column_by_data(sheet, 1, 'ERP成本')
+
+                log("数量,ERP成本", quantity_col, erp_cost_col)
+                if quantity_col and erp_cost_col:
+                    # 添加公式：成本总额 = 数量 * ERP成本
+                    add_formula_for_column(sheet, '成本总额', f'=IF(ISNUMBER({erp_cost_col}2),{quantity_col}2*{erp_cost_col}2,"-")')
+                    log('成本总额公式已添加')
+            except Exception as e:
+                log(f'添加成本总额公式失败: {str(e)}')
 
         if sheet.name == '总表':
             beautify_title(sheet)
             add_borders(sheet)
             format_to_money(sheet, ['金额', '成本', '费', '订单退货', '利润'])
             column_to_right(sheet, ['金额', '成本', '费', '订单退货', '利润'])
-            add_formula_for_column(sheet, '出库金额', '=SUMIFS(收支明细!O:O,收支明细!A:A,A2,收支明细!L:L,"收入")')
-            add_formula_for_column(sheet, '出库成本', '=SUMIFS(收支明细!P:P,收支明细!A:A,A2,收支明细!L:L,"收入")')
-            add_formula_for_column(sheet, '备货作业费', '=SUMIFS(收支明细!O:O,收支明细!A:A,A2,收支明细!L:L,"支出",收支明细!K:K,"备货作业费")')
-            add_formula_for_column(sheet, '代收服务费', '=SUMIFS(收支明细!O:O,收支明细!A:A,A2,收支明细!L:L,"支出",收支明细!K:K,"代收服务费")')
-            add_formula_for_column(sheet, '订单履约服务费', '=SUMIFS(收支明细!O:O,收支明细!A:A,A2,收支明细!L:L,"支出",收支明细!K:K,"订单履约服务费")')
-            add_formula_for_column(sheet, '订单退货', '=SUMIFS(收支明细!O:O,收支明细!A:A,A2,收支明细!L:L,"支出",收支明细!K:K,"订单退货")')
-            add_formula_for_column(sheet, '退货处理费', '=SUMIFS(收支明细!O:O,收支明细!A:A,A2,收支明细!L:L,"支出",收支明细!K:K,"退货处理费")')
-            add_formula_for_column(sheet, '退货单履约服务费', '=SUMIFS(收支明细!O:O,收支明细!A:A,A2,收支明细!L:L,"支出",收支明细!K:K,"退货单履约服务费")')
+
+            # 使用财务收支明细sheet的引用
+            detail_sheet = '财务收支明细' if '财务收支明细' in [s.name for s in sheet.book.sheets] else '收支明细'
+
+            # 查找财务收支明细sheet中各列的位置
+            from .fun_excel import find_column_by_data
+            detail_ws = None
+            for ws in sheet.book.sheets:
+                if ws.name == detail_sheet:
+                    detail_ws = ws
+                    break
+
+            if detail_ws:
+                # 查找关键列的位置
+                amount_col = find_column_by_data(detail_ws, 1, '金额')  # 金额列
+                cost_total_col = find_column_by_data(detail_ws, 1, '成本总额')  # 成本总额列
+                store_col = find_column_by_data(detail_ws, 1, '店铺账号')  # 店铺账号列
+                type_col = find_column_by_data(detail_ws, 1, '收支类型')  # 收支类型列
+                bill_type_col = find_column_by_data(detail_ws, 1, '账单类型')  # 账单类型列
+
+                log(f'找到列位置: 金额={amount_col}, 成本总额={cost_total_col}, 店铺账号={store_col}, 收支类型={type_col}, 账单类型={bill_type_col}')
+
+                # 使用找到的列位置生成公式
+                if amount_col and store_col and type_col:
+                    add_formula_for_column(sheet, '出库金额', f'=SUMIFS({detail_sheet}!{amount_col}:{amount_col},{detail_sheet}!{store_col}:{store_col},A2,{detail_sheet}!{type_col}:{type_col},"收入")')
+
+                if cost_total_col and store_col and type_col:
+                    # 使用成本总额列
+                    add_formula_for_column(sheet, '出库成本', f'=SUMIFS({detail_sheet}!{cost_total_col}:{cost_total_col},{detail_sheet}!{store_col}:{store_col},A2,{detail_sheet}!{type_col}:{type_col},"收入")')
+
+                if amount_col and store_col and type_col and bill_type_col:
+                    add_formula_for_column(sheet, '备货作业费', f'=SUMIFS({detail_sheet}!{amount_col}:{amount_col},{detail_sheet}!{store_col}:{store_col},A2,{detail_sheet}!{type_col}:{type_col},"支出",{detail_sheet}!{bill_type_col}:{bill_type_col},"备货作业费")')
+                    add_formula_for_column(sheet, '代收服务费', f'=SUMIFS({detail_sheet}!{amount_col}:{amount_col},{detail_sheet}!{store_col}:{store_col},A2,{detail_sheet}!{type_col}:{type_col},"支出",{detail_sheet}!{bill_type_col}:{bill_type_col},"代收服务费")')
+                    add_formula_for_column(sheet, '订单履约服务费', f'=SUMIFS({detail_sheet}!{amount_col}:{amount_col},{detail_sheet}!{store_col}:{store_col},A2,{detail_sheet}!{type_col}:{type_col},"支出",{detail_sheet}!{bill_type_col}:{bill_type_col},"订单履约服务费")')
+                    add_formula_for_column(sheet, '订单退货', f'=SUMIFS({detail_sheet}!{amount_col}:{amount_col},{detail_sheet}!{store_col}:{store_col},A2,{detail_sheet}!{type_col}:{type_col},"支出",{detail_sheet}!{bill_type_col}:{bill_type_col},"订单退货")')
+                    add_formula_for_column(sheet, '退货处理费', f'=SUMIFS({detail_sheet}!{amount_col}:{amount_col},{detail_sheet}!{store_col}:{store_col},A2,{detail_sheet}!{type_col}:{type_col},"支出",{detail_sheet}!{bill_type_col}:{bill_type_col},"退货处理费")')
+                    add_formula_for_column(sheet, '退货单履约服务费', f'=SUMIFS({detail_sheet}!{amount_col}:{amount_col},{detail_sheet}!{store_col}:{store_col},A2,{detail_sheet}!{type_col}:{type_col},"支出",{detail_sheet}!{bill_type_col}:{bill_type_col},"退货单履约服务费")')
+
             add_formula_for_column(sheet, '利润', '=D2-E2-F2-G2-H2-I2-J2-K2')