diff --git a/README.md b/README.md index 436473f..5567f8c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,13 @@ -# OCR订单处理系统 v2.0 +# OCR订单处理系统 v1.0 基于百度OCR API的订单处理系统,用于识别采购订单图片并生成Excel采购单。 +## 版本信息 + +- **当前版本**: v1.0 +- **发布日期**: 2025-05-02 +- **作者**: OCR订单处理团队 + ## 功能特点 - **图像OCR识别**:支持对采购单图片进行OCR识别并生成Excel文件 @@ -216,6 +222,26 @@ python run.py --merge MIT License +## 更新日志 + +### v1.0 (2025-05-02) + +#### 主要功能 +- 图像OCR识别:支持对采购单图片进行OCR识别并生成Excel文件 +- Excel数据处理:智能处理Excel文件,提取和转换商品信息 +- 采购单生成:按照模板格式生成标准采购单Excel文件 +- 采购单合并:支持多个采购单合并为一个总单 +- 图形界面:提供简洁直观的操作界面 +- 命令行支持:支持命令行调用,方便自动化处理 + +#### 技术改进 +- 模块化架构:重构代码为配置、核心功能、服务和CLI等模块 +- 单位智能处理:完善的单位转换规则,支持多种计量单位 +- 规格智能推断:从商品名称自动推断规格信息 +- 日志管理:完善的日志记录系统,支持终端和GUI同步显示 +- 表头智能识别:自动识别Excel中的表头位置,兼容多种格式 +- 改进用户体验:界面优化,批量处理支持,实时状态反馈 + ## 联系方式 如有问题,请提交Issue或联系开发者。 \ No newline at end of file diff --git a/app/core/excel/processor.py b/app/core/excel/processor.py index c36affe..5d4b9fd 100644 --- a/app/core/excel/processor.py +++ b/app/core/excel/processor.py @@ -568,6 +568,14 @@ class ExcelProcessor: # 记录已处理文件 self.processed_files[file_path] = output_file self._save_processed_files() + + # 自动打开输出目录 + try: + os.startfile(os.path.abspath(self.output_dir)) + logger.info(f"已自动打开输出目录: {self.output_dir}") + except Exception as e: + logger.warning(f"无法自动打开输出目录: {e}") + return output_file return None diff --git a/v1/.gitignore b/backup/v1_backup_20250502190248/.gitignore similarity index 100% rename from v1/.gitignore rename to backup/v1_backup_20250502190248/.gitignore diff --git a/v1/README.md b/backup/v1_backup_20250502190248/README.md similarity index 100% rename from v1/README.md rename to backup/v1_backup_20250502190248/README.md diff --git a/v1/baidu_ocr.py b/backup/v1_backup_20250502190248/baidu_ocr.py similarity index 100% rename from v1/baidu_ocr.py rename to backup/v1_backup_20250502190248/baidu_ocr.py diff --git a/v1/baidu_table_ocr.py b/backup/v1_backup_20250502190248/baidu_table_ocr.py similarity index 100% rename from v1/baidu_table_ocr.py rename to backup/v1_backup_20250502190248/baidu_table_ocr.py diff --git a/v1/clean_files.py b/backup/v1_backup_20250502190248/clean_files.py similarity index 100% rename from v1/clean_files.py rename to backup/v1_backup_20250502190248/clean_files.py diff --git a/v1/clean_logs.py b/backup/v1_backup_20250502190248/clean_logs.py similarity index 100% rename from v1/clean_logs.py rename to backup/v1_backup_20250502190248/clean_logs.py diff --git a/v1/excel_processor_step2.py b/backup/v1_backup_20250502190248/excel_processor_step2.py similarity index 100% rename from v1/excel_processor_step2.py rename to backup/v1_backup_20250502190248/excel_processor_step2.py diff --git a/v1/input/微信图片_20250227193150(1).xlsx b/backup/v1_backup_20250502190248/input/微信图片_20250227193150(1).xlsx similarity index 100% rename from v1/input/微信图片_20250227193150(1).xlsx rename to backup/v1_backup_20250502190248/input/微信图片_20250227193150(1).xlsx diff --git a/v1/input/微信图片_20250227193150.jpg b/backup/v1_backup_20250502190248/input/微信图片_20250227193150.jpg similarity index 100% rename from v1/input/微信图片_20250227193150.jpg rename to backup/v1_backup_20250502190248/input/微信图片_20250227193150.jpg diff --git a/v1/logs/.keep b/backup/v1_backup_20250502190248/logs/.keep similarity index 100% rename from v1/logs/.keep rename to backup/v1_backup_20250502190248/logs/.keep diff --git a/v1/logs/clean_logs.active b/backup/v1_backup_20250502190248/logs/clean_logs.active similarity index 100% rename from v1/logs/clean_logs.active rename to backup/v1_backup_20250502190248/logs/clean_logs.active diff --git a/v1/logs/ocr_processor.active b/backup/v1_backup_20250502190248/logs/ocr_processor.active similarity index 100% rename from v1/logs/ocr_processor.active rename to backup/v1_backup_20250502190248/logs/ocr_processor.active diff --git a/v1/merge_purchase_orders.py b/backup/v1_backup_20250502190248/merge_purchase_orders.py similarity index 100% rename from v1/merge_purchase_orders.py rename to backup/v1_backup_20250502190248/merge_purchase_orders.py diff --git a/v1/output/merged_files.json b/backup/v1_backup_20250502190248/output/merged_files.json similarity index 100% rename from v1/output/merged_files.json rename to backup/v1_backup_20250502190248/output/merged_files.json diff --git a/v1/requirements.txt b/backup/v1_backup_20250502190248/requirements.txt similarity index 100% rename from v1/requirements.txt rename to backup/v1_backup_20250502190248/requirements.txt diff --git a/v1/run_ocr.py b/backup/v1_backup_20250502190248/run_ocr.py similarity index 100% rename from v1/run_ocr.py rename to backup/v1_backup_20250502190248/run_ocr.py diff --git a/v1/templets/银豹-采购单模板.xls b/backup/v1_backup_20250502190248/templets/银豹-采购单模板.xls similarity index 100% rename from v1/templets/银豹-采购单模板.xls rename to backup/v1_backup_20250502190248/templets/银豹-采购单模板.xls diff --git a/v1/test_ocr_log.py b/backup/v1_backup_20250502190248/test_ocr_log.py similarity index 100% rename from v1/test_ocr_log.py rename to backup/v1_backup_20250502190248/test_ocr_log.py diff --git a/v1/test_unit_conversion.py b/backup/v1_backup_20250502190248/test_unit_conversion.py similarity index 100% rename from v1/test_unit_conversion.py rename to backup/v1_backup_20250502190248/test_unit_conversion.py diff --git a/data/input/微信图片_20250227193150(1).jpg b/data/input/微信图片_20250227193150(1).jpg deleted file mode 100644 index 4bd7897..0000000 Binary files a/data/input/微信图片_20250227193150(1).jpg and /dev/null differ diff --git a/data/output/processed_files.json b/data/output/processed_files.json deleted file mode 100644 index 3cc8c6b..0000000 --- a/data/output/processed_files.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "D:\\My Documents\\python\\orc-order-v2\\data\\output\\微信图片_20250227193150(1).xlsx": "D:\\My Documents\\python\\orc-order-v2\\data\\output\\采购单_微信图片_20250227193150(1).xls" -} \ No newline at end of file diff --git a/data/output/微信图片_20250227193150(1).xlsx b/data/output/微信图片_20250227193150(1).xlsx deleted file mode 100644 index 7db12e3..0000000 Binary files a/data/output/微信图片_20250227193150(1).xlsx and /dev/null differ diff --git a/data/output/采购单_微信图片_20250227193150(1).xls b/data/output/采购单_微信图片_20250227193150(1).xls deleted file mode 100644 index e843746..0000000 Binary files a/data/output/采购单_微信图片_20250227193150(1).xls and /dev/null differ diff --git a/启动器.py b/启动器.py index 94dd603..84afc4a 100644 --- a/启动器.py +++ b/启动器.py @@ -435,7 +435,7 @@ def main(): # 创建窗口 root = tk.Tk() - root.title("OCR订单处理系统 v2.0") + root.title("OCR订单处理系统 v1.0") root.geometry("1200x600") # 增加窗口宽度以容纳日志 # 创建主区域分割 @@ -447,7 +447,7 @@ def main(): main_pane.add(left_frame) # 标题 - tk.Label(left_frame, text="益选-OCR订单处理系统", font=("Arial", 16)).pack(pady=10) + tk.Label(left_frame, text="OCR订单处理系统", font=("Arial", 16)).pack(pady=10) # 功能按钮区域 buttons_frame = tk.Frame(left_frame) @@ -466,7 +466,7 @@ def main(): log_text.configure(state=tk.DISABLED) # 设置为只读 # 日志初始内容 - add_to_log(log_text, "OCR订单处理系统启动器 v2.0\n") + add_to_log(log_text, "OCR订单处理系统启动器 v1.0\n") add_to_log(log_text, f"当前工作目录: {os.getcwd()}\n") add_to_log(log_text, "系统已准备就绪,请选择要执行的操作。\n") @@ -558,7 +558,7 @@ def main(): ).pack(pady=5) # 底部说明 - tk.Label(left_frame, text="© 2025 OCR订单处理系统", font=("Arial", 10)).pack(side=tk.BOTTOM, pady=10) + tk.Label(left_frame, text="© 2025 OCR订单处理系统 v1.0", font=("Arial", 10)).pack(side=tk.BOTTOM, pady=10) # 启动主循环 root.mainloop()