houhuan/orc-order-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: 预处理文件输出到配置目录而非源文件目录

Browse Source 
烟草/杨碧月/蓉城易购的预处理文件(预处理之后_xxx)之前写入源文件所在目录，
现在改为写入配置的 output_folder 目录。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
侯欢
2026-05-05 02:14:14 +08:00
parent 6f96bf50ac
commit 5cf9a98d9a
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/services/special_suppliers_service.py
+14 -4
View File
@@ -86,8 +86,13 @@ class SpecialSuppliersService:
# 过滤掉空的条码行 # 过滤掉空的条码行
df_clean = df_clean.dropna(subset=['商品条码']) df_clean = df_clean.dropna(subset=['商品条码'])
# 保存预处理文件 # 保存预处理文件到输出目录（而非源文件目录）
out_dir = os.path.dirname(src_path) if self.config_manager and hasattr(self.config_manager, 'get_path'):
out_dir = self.config_manager.get_path('Paths', 'output_folder', fallback='data/output', create=True)
else:
from app.config.settings import ConfigManager
out_dir = ConfigManager().get_path('Paths', 'output_folder', fallback='data/output', create=True)
os.makedirs(out_dir, exist_ok=True)
base = os.path.basename(src_path) base = os.path.basename(src_path)
final_path = os.path.join(out_dir, f"预处理之后_{base}") final_path = os.path.join(out_dir, f"预处理之后_{base}")
df_clean.to_excel(final_path, index=False) df_clean.to_excel(final_path, index=False)
@@ -202,8 +207,13 @@ class SpecialSuppliersService:
rows.append(row) rows.append(row)
df2 = pd.DataFrame(rows) df2 = pd.DataFrame(rows)
# 保存预处理文件 # 保存预处理文件到输出目录（而非源文件目录）
out_dir = os.path.dirname(src_path) if self.config_manager and hasattr(self.config_manager, 'get_path'):
out_dir = self.config_manager.get_path('Paths', 'output_folder', fallback='data/output', create=True)
else:
from app.config.settings import ConfigManager
out_dir = ConfigManager().get_path('Paths', 'output_folder', fallback='data/output', create=True)
os.makedirs(out_dir, exist_ok=True)
base = os.path.basename(src_path) base = os.path.basename(src_path)
final_path = os.path.join(out_dir, f"预处理之后_{base}") final_path = os.path.join(out_dir, f"预处理之后_{base}")
df2.to_excel(final_path, index=False) df2.to_excel(final_path, index=False)
app/services/tobacco_service.py
+3 -2
View File
@@ -132,8 +132,9 @@ class TobaccoService:
final_cols = ['商品条码', '商品名称', '数量', '单价', '金额'] final_cols = ['商品条码', '商品名称', '数量', '单价', '金额']
df_final = df[final_cols].copy() df_final = df[final_cols].copy()
# 保存预处理文件 # 保存预处理文件到输出目录（而非源文件目录）
out_dir = os.path.dirname(file_path) out_dir = self.output_dir
os.makedirs(out_dir, exist_ok=True)
base = os.path.basename(file_path) base = os.path.basename(file_path)
final_path = os.path.join(out_dir, f"预处理之后_{base}") final_path = os.path.join(out_dir, f"预处理之后_{base}")
df_final.to_excel(final_path, index=False) df_final.to_excel(final_path, index=False)