qrpa 1.0.43__tar.gz → 1.0.45__tar.gz

{qrpa-1.0.43 → qrpa-1.0.45}/PKG-INFO

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

{qrpa-1.0.43 → qrpa-1.0.45}/pyproject.toml

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

{qrpa-1.0.43 → qrpa-1.0.45}/qrpa/fun_excel.py

@@ -171,34 +171,34 @@ def merge_by_column_v2(sheet, column_name, other_columns):
     
     log(f'需要合并的列: {all_columns}')
 
-    # 遍历数据行，从第2行开始（索引1）到最后一行
-    for row in range(2, len(data) + 1):
+    # 遍历数据行，从第3行开始比较（因为第1行是表头，第2行是第一个数据行）
+    for row in range(3, len(data) + 1):
         log(f'查找 {row}/{len(data)}, 当前值: {data[row-1] if row-1 < len(data) else "超出范围"}, 前一个值: {data[row-2] if row-2 < len(data) else "超出范围"}')
         
-        # 检查值是否发生变化（不是最后一行时）
-        value_changed = row < len(data) and data[row - 1] != data[row - 2]
-        
-        if value_changed:
+        # 检查值是否发生变化
+        if row <= len(data) and data[row - 1] != data[row - 2]:
             # 值发生变化，处理前一组
-            if row - start_row > 0:
-                end_row = row - 1
-                log(f'添加合并范围: {start_row} 到 {end_row}')
-                merge_row_ranges.append((start_row, end_row))
+            end_row = row - 1
+            log(f'添加合并范围: {start_row} 到 {end_row}')
+            merge_row_ranges.append((start_row, end_row))
             start_row = row
 
     # 处理最后一组数据（循环结束后，start_row 到数据末尾）
     if start_row <= len(data):
-        log(f'处理最后一组: {start_row} 到 {len(data)}')
-        merge_row_ranges.append((start_row, len(data)))
+        end_row = len(data)
+        log(f'处理最后一组: {start_row} 到 {end_row}')
+        merge_row_ranges.append((start_row, end_row))
 
     log(f'行合并范围: {merge_row_ranges}')
     
     # 对每个行范围，在所有指定列中执行合并
     for start_row, end_row in merge_row_ranges:
-        if start_row < end_row:  # 只有当开始行小于结束行时才合并
+        if start_row < end_row:  # 只有当开始行小于结束行时才合并（多行）
             for col_name in all_columns:
                 log(f'处理 {col_name}{start_row}:{col_name}{end_row} merge')
                 sheet.range(f'{col_name}{start_row}:{col_name}{end_row}').merge()
+        elif start_row == end_row:
+            log(f'单行数据无需合并: {start_row} 到 {end_row}')
         else:
             log(f'跳过无效合并范围: {start_row} 到 {end_row}')
 

{qrpa-1.0.43 → qrpa-1.0.45}/qrpa/shein_excel.py

@@ -217,7 +217,7 @@ class SheinExcel:
         format_to_money(sheet, ['单价', '金额', '成本'])
         column_to_right(sheet, ['单价', '金额', '成本'])
         wrap_column(sheet, ['退货原因', '退货地址', '入库问题图片地址'])
-        autofit_column(sheet, ['店铺别名', 'SKC信息'])
+        autofit_column(sheet, ['店铺信息','店铺别名', 'SKC信息'])
         column_to_left(sheet, ['店铺信息', '商家SKU', '供方货号', '属性集', 'SKC信息', '退货地址'])
         specify_column_width(sheet, ['退货原因', 'SKC信息', '商家SKU', '退货地址'], 200 / 6)
         InsertImageV2(sheet, ['SKC图片'])

{qrpa-1.0.43 → qrpa-1.0.45}/qrpa/shein_lib.py

@@ -146,8 +146,8 @@ class SheinLib:
         error_code = response_text.get('code')
         if str(error_code) != '0':
             raise send_exception(json.dumps(response_text, ensure_ascii=False))
-        report_url = (response_text.get('info', {}).get('data') or [{'reportUrl': '稽查报告生成中,请稍后查看'}])[0].get('reportUrl')
-        log(report_url)
+        log(response_text)
+        report_url = response_text.get('info', {}).get('reportUrl')
         return report_url
 
     def get_return_order_box_detail(self, returnOrderId):
@@ -208,6 +208,7 @@ class SheinLib:
             return_box_detail = self.get_return_order_box_detail(returnOrderId)
             item['qc_report_url'] = ''
             item['report_url'] = ''
+            item['store_username'] = self.store_username
             if has_valid_package and len(return_box_detail) > 0:
 
                 if int(item['returnScrapType']) == 1:

{qrpa-1.0.43 → qrpa-1.0.45}/qrpa.egg-info/PKG-INFO

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