qrpa 1.1.14__py3-none-any.whl → 1.1.15__py3-none-any.whl

qrpa/shein_excel.py

@@ -339,9 +339,13 @@ class SheinExcel:
         data.sort(key=lambda row: row[8], reverse=True)
         excel_path = create_file_path(self.config.excel_week_report)
         sheet_name = '按店铺汇总'
+
+        date_A = f'新品上架数量({TimeUtils.get_past_nth_day(29, TimeUtils.get_month_first_day())},{TimeUtils.get_past_nth_day(29, TimeUtils.get_yesterday())})'
+        date_B = f'成功转备货款({TimeUtils.get_month_first_day()},{TimeUtils.get_yesterday()})'
+
         data.insert(0, ['汇总', '', '', '', '', '', '', '', '', '', '', '', ''])
         data.insert(0, ['店铺名称', '店铺账号', '店长', '在途商品金额', '在仓商品金额', '待结算金额', '可提现金额', '汇总',
-                        '销售出库金额', '新品上架数量', '成功转备货款', '成功率', '导出时间'])
+                        '销售出库金额', date_A, date_B, '成功率', '导出时间'])
         write_data(excel_path, sheet_name, data)
         app, wb, sheet = open_excel(excel_path, sheet_name)
         beautify_title(sheet)
@@ -349,9 +353,9 @@ class SheinExcel:
         self.dealFundsExcelFormat(sheet)
         format_to_percent(sheet, ['成功率'], 0)
         add_formula_for_column(sheet, '成功率', '=IF(J2=0, 0, k2/J2)', 2)
-        add_formula_for_column(sheet, '新品上架数量', "=COUNTIF('新品转备货款明细'!A:A, B3)", 3)
-        add_formula_for_column(sheet, '成功转备货款', "=COUNTIFS('新品转备货款明细'!A:A, B3, '新品转备货款明细'!G:G, 1)", 3)
-        add_sum_for_cell(sheet, ['新品上架数量', '成功转备货款'])
+        add_formula_for_column(sheet, date_A, "=COUNTIF('新品转备货款明细'!A:A, B3)", 3)
+        add_formula_for_column(sheet, date_B, "=COUNTIFS('新品转备货款明细'!A:A, B3, '新品转备货款明细'!G:G, 1)", 3)
+        add_sum_for_cell(sheet, [date_A, date_B])
         column_to_right(sheet, ['金额', '汇总'])
         sheet.autofit()
         delete_sheet_if_exists(wb, 'Sheet1')

qrpa/time_utils.py

@@ -159,6 +159,34 @@ class TimeUtils:
 
         return start_date.strftime(format_str), end_date.strftime(format_str)
 
+    @staticmethod
+    def get_month_first_day(start_from: Optional[str] = None, format_str: str = '%Y-%m-%d') -> str:
+        """
+        获取某月的第一天
+
+        Args:
+            start_from: 参考日期，格式为'YYYY-MM-DD'，默认使用今天
+            format_str: 返回的日期格式，默认是'%Y-%m-%d'
+
+        Returns:
+            指定格式的某月第一天日期字符串
+
+        Example:
+            >>> get_month_first_day('2025-07-02')
+            '2025-07-01'
+        """
+        if start_from:
+            try:
+                base_date = datetime.strptime(start_from, '%Y-%m-%d')
+            except ValueError:
+                raise ValueError("start_from 格式必须是 'YYYY-MM-DD'")
+        else:
+            base_date = datetime.today()
+
+        # 获取当月第一天
+        first_day = base_date.replace(day=1)
+        return first_day.strftime(format_str)
+
     @staticmethod
     def get_past_nth_day(n: int, start_from: Optional[str] = None, format_str: str = '%Y-%m-%d') -> str:
         """

{qrpa-1.1.14.dist-info → qrpa-1.1.15.dist-info}/METADATA

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

{qrpa-1.1.14.dist-info → qrpa-1.1.15.dist-info}/RECORD

@@ -10,7 +10,7 @@ qrpa/fun_file.py,sha256=yzjDV16WL5vRys7J4uQcNzIFkX4D5MAlSCwxcD-mwQo,11966
 qrpa/fun_web.py,sha256=2aYrtRlf-p-P6AyjrlIcmMVq8oSDePEY48YLm4ZRS1A,11857
 qrpa/fun_win.py,sha256=-LnTeocdTt72NVH6VgLdpAT9_C5oV9okeudXG6CftMA,8034
 qrpa/shein_daily_report_model.py,sha256=H8oZmIN5Pyqe306W1_xuz87lOqLQ_LI5RjXbaxDkIzE,12589
-qrpa/shein_excel.py,sha256=8TYZt45BZ9e6oM2Z1G48SzUWrGpSI4Q5vBxvGm8433U,147408
+qrpa/shein_excel.py,sha256=Bp9_QEXZ7Z74WvbQ0mbXAdDH1YBzLkDDTIwQ4HsWBNA,147598
 qrpa/shein_lib.py,sha256=yOHww1FMetuTgYzpUlxgcl65iIh3FvR_gc554Jnjn-k,148318
 qrpa/shein_mysql.py,sha256=XvEolaorH307PcPZMg10tZzFAtpVUlFM9rKIaNYA9VI,3335
 qrpa/shein_sqlite.py,sha256=ZQwD0Gz81q9WY7tY2HMEYvSF9r3N_G_Aur3bYfST9WY,5707
@@ -18,14 +18,14 @@ qrpa/shein_ziniao.py,sha256=B7HNz31YWDcWDIhX3ETDZpIe6_BRyEbtwyqlkFNsPNE,21945
 qrpa/temu_chrome.py,sha256=CbtFy1QPan9xJdJcNZj-EsVGhUvv3ZTEPVDEA4-im40,2803
 qrpa/temu_excel.py,sha256=2hGw76YWzkTZGyFCuuUAab4oHptYX9a6U6yjpNsL7FE,6990
 qrpa/temu_lib.py,sha256=hYB59zsLS3m3NTic_duTwPMOTSxlHyQVa8OhHnHm-1g,7199
-qrpa/time_utils.py,sha256=jKD8MJPNF-SFPJTlN9308Izb9TCctHQHesQaQ1SaeR4,31391
+qrpa/time_utils.py,sha256=5fe4wbjwzUecfmvEND6WMrogGofVm_Rqpc3hSHQRRvE,32325
 qrpa/time_utils_example.py,sha256=shHOXKKF3QSzb0SHsNc34M61wEkkLuM30U9X1THKNS8,8053
 qrpa/wxwork.py,sha256=gIytG19DZ5g7Tsl0-W3EbjfSnpIqZw-ua24gcB78YEg,11264
 qrpa/mysql_module/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qrpa/mysql_module/shein_ledger_model.py,sha256=O1pUFwXGC9hySU7-h07sAu70Xhzl0OxnXPMzRwphiGU,18629
 qrpa/mysql_module/shein_product_model.py,sha256=v21_juWsZqTHj2k08GUGNkoRZ4hkKZKjaE-wmRl2a2k,19257
 qrpa/mysql_module/shein_return_order_model.py,sha256=Zt-bGOH_kCDbakW7uaTmqqo_qTT8v424yidcYSfWvWM,26562
-qrpa-1.1.14.dist-info/METADATA,sha256=VvlT5eBC3uT2pdTL2VnDAhllw-i0HtM7dlVe206t3zA,231
-qrpa-1.1.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-qrpa-1.1.14.dist-info/top_level.txt,sha256=F6T5igi0fhXDucPPUbmmSC0qFCDEsH5eVijfVF48OFU,5
-qrpa-1.1.14.dist-info/RECORD,,
+qrpa-1.1.15.dist-info/METADATA,sha256=m8ZIFLxaR_JDXxd69g-g0cqLa5e-U0h3nLFmfJdH8BY,231
+qrpa-1.1.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qrpa-1.1.15.dist-info/top_level.txt,sha256=F6T5igi0fhXDucPPUbmmSC0qFCDEsH5eVijfVF48OFU,5
+qrpa-1.1.15.dist-info/RECORD,,