diff --git a/config/barcode_mappings.json b/config/barcode_mappings.json index 7d278cc..dc29ff4 100644 --- a/config/barcode_mappings.json +++ b/config/barcode_mappings.json @@ -15,6 +15,54 @@ "map_to": "6925861571459", "description": "条码映射:6925861571466 -> 6925861571459" }, + "6907992508344": { + "map_to": "6907992508191", + "description": "条码映射:6907992508344 -> 6907992508191" + }, + "6903979000979": { + "map_to": "6903979000962", + "description": "条码映射:6903979000979 -> 6903979000962" + }, + "6923644283582": { + "map_to": "6923644283575", + "description": "条码映射:6923644283582 -> 6923644283575" + }, + "6923644268930": { + "map_to": "6923644268497", + "description": "条码映射:6923644268930 -> 6923644268497" + }, + "6923644268916": { + "map_to": "6923644268503", + "description": "条码映射:6923644268916 -> 6923644268503" + }, + "6923644268909": { + "map_to": "6923644268510", + "description": "条码映射:6923644268909 -> 6923644268510" + }, + "6923644299804": { + "map_to": "6923644299774", + "description": "条码映射:6923644299804 -> 6923644299774" + }, + "6923644266318": { + "map_to": "6923644266066", + "description": "条码映射:6923644266318 -> 6923644266066" + }, + "6923644210151": { + "map_to": "6923644223458", + "description": "条码映射:6923644210151 -> 6923644223458" + }, + "6907992501819": { + "map_to": "6907992500133", + "description": "条码映射:6907992501819 -> 6907992500133" + }, + "6907992502052": { + "map_to": "6907992100272", + "description": "条码映射:6907992502052 -> 6907992100272" + }, + "6907992507385": { + "map_to": "6907992507095", + "description": "条码映射:6907992507385 -> 6907992507095" + }, "6925019900087": { "multiplier": 10, "target_unit": "瓶", diff --git a/data/input/微信图片_20250509142624.jpg b/data/input/微信图片_20250509142624.jpg new file mode 100644 index 0000000..e6ca3aa Binary files /dev/null and b/data/input/微信图片_20250509142624.jpg differ diff --git a/data/output/processed_files.json b/data/output/processed_files.json new file mode 100644 index 0000000..02cc1a7 --- /dev/null +++ b/data/output/processed_files.json @@ -0,0 +1,4 @@ +{ + "data/input\\微信图片_20250509142624.jpg": "data/output\\微信图片_20250509142624.xlsx", + "D:/My Documents/python/orc-order-v2/data/output/微信图片_20250509142624.xlsx": "data/output\\采购单_微信图片_20250509142624.xls" +} \ No newline at end of file diff --git a/data/output/微信图片_20250509142624.xlsx b/data/output/微信图片_20250509142624.xlsx new file mode 100644 index 0000000..f09c6f6 Binary files /dev/null and b/data/output/微信图片_20250509142624.xlsx differ diff --git a/data/output/采购单_微信图片_20250509142624.xls b/data/output/采购单_微信图片_20250509142624.xls new file mode 100644 index 0000000..e210a8a Binary files /dev/null and b/data/output/采购单_微信图片_20250509142624.xls differ diff --git a/logs/__main__.active b/logs/__main__.active index b266a30..7313447 100644 --- a/logs/__main__.active +++ b/logs/__main__.active @@ -1 +1 @@ -Active since: 2025-05-09 16:01:39 \ No newline at end of file +Active since: 2025-05-10 11:55:27 \ No newline at end of file diff --git a/logs/app.core.excel.converter.active b/logs/app.core.excel.converter.active index 617fce6..e883d50 100644 --- a/logs/app.core.excel.converter.active +++ b/logs/app.core.excel.converter.active @@ -1 +1 @@ -Active since: 2025-05-10 11:21:12 \ No newline at end of file +Active since: 2025-05-10 12:00:40 \ No newline at end of file diff --git a/logs/app.core.excel.converter.log b/logs/app.core.excel.converter.log index aebf1fc..b1c2ac6 100644 --- a/logs/app.core.excel.converter.log +++ b/logs/app.core.excel.converter.log @@ -1977,3 +1977,25 @@ 2025-05-09 16:07:24,661 - app.core.excel.converter - INFO - 成功加载条码映射配置,共6项 2025-05-09 16:08:24,335 - app.core.excel.converter - INFO - 条码映射配置保存成功,共7项 2025-05-09 16:08:28,902 - app.core.excel.converter - INFO - 成功加载条码映射配置,共7项 +2025-05-10 11:55:28,006 - app.core.excel.converter - INFO - 成功加载条码映射配置,共7项 +2025-05-10 11:55:28,113 - app.core.excel.converter - INFO - 解析容量(ml)规格: 250ML*12 -> 1*12 +2025-05-10 11:55:28,114 - app.core.excel.converter - INFO - 解析容量(ml)规格: 260ML*24 -> 1*24 +2025-05-10 11:55:28,115 - app.core.excel.converter - INFO - 解析容量(ml)规格: 250ML*12 -> 1*12 +2025-05-10 11:55:28,116 - app.core.excel.converter - INFO - 解析容量(ml)规格: 250ML*12 -> 1*12 +2025-05-10 11:55:28,116 - app.core.excel.converter - INFO - 解析容量(ml)规格: 250ML*12 -> 1*12 +2025-05-10 11:55:28,117 - app.core.excel.converter - INFO - 解析容量(ml)规格: 250ML*12 -> 1*12 +2025-05-10 11:55:28,120 - app.core.excel.converter - INFO - 解析容量(ml)规格: 250ML*12 -> 1*12 +2025-05-10 11:55:28,217 - app.core.excel.converter - INFO - 解析容量(ml)规格: 245ML*12 -> 1*12 +2025-05-10 11:55:28,220 - app.core.excel.converter - INFO - 解析容量(ml)规格: 125ML*36 -> 1*36 +2025-05-10 11:55:28,222 - app.core.excel.converter - INFO - 解析容量(ml)规格: 250ML*12 -> 1*12 +2025-05-10 11:55:28,223 - app.core.excel.converter - INFO - 解析容量(ml)规格: 250ML*24 -> 1*24 +2025-05-10 11:55:28,224 - app.core.excel.converter - INFO - 解析容量(ml)规格: 250ML*24 -> 1*24 +2025-05-10 11:55:28,225 - app.core.excel.converter - INFO - 解析容量(ml)规格: 250ML*24 -> 1*24 +2025-05-10 11:55:28,226 - app.core.excel.converter - INFO - 解析容量(ml)规格: 250ML*12 -> 1*12 +2025-05-10 11:56:08,872 - app.core.excel.converter - INFO - 成功加载条码映射配置,共7项 +2025-05-10 12:00:43,172 - app.core.excel.converter - INFO - 成功加载条码映射配置,共7项 +2025-05-10 12:03:32,705 - app.core.excel.converter - INFO - 条码映射配置保存成功,共8项 +2025-05-10 12:03:54,415 - app.core.excel.converter - INFO - 成功加载条码映射配置,共8项 +2025-05-10 12:04:27,177 - app.core.excel.converter - INFO - 条码映射配置保存成功,共9项 +2025-05-10 12:04:28,985 - app.core.excel.converter - INFO - 成功加载条码映射配置,共9项 +2025-05-10 12:10:44,392 - app.core.excel.converter - INFO - 条码映射配置保存成功,共19项 diff --git a/logs/app.core.excel.handlers.barcode_mapper.active b/logs/app.core.excel.handlers.barcode_mapper.active index 617fce6..e883d50 100644 --- a/logs/app.core.excel.handlers.barcode_mapper.active +++ b/logs/app.core.excel.handlers.barcode_mapper.active @@ -1 +1 @@ -Active since: 2025-05-10 11:21:12 \ No newline at end of file +Active since: 2025-05-10 12:00:40 \ No newline at end of file diff --git a/logs/app.core.excel.handlers.barcode_mapper.log b/logs/app.core.excel.handlers.barcode_mapper.log index bb7f523..751c488 100644 --- a/logs/app.core.excel.handlers.barcode_mapper.log +++ b/logs/app.core.excel.handlers.barcode_mapper.log @@ -7,3 +7,6 @@ 2025-05-09 14:31:54,435 - app.core.excel.handlers.barcode_mapper - INFO - 条码映射: 6907992501819 -> 6907992500133 2025-05-09 16:01:39,710 - app.core.excel.handlers.barcode_mapper - INFO - 条码映射: 6920584471055 -> 6920584471017 2025-05-09 16:01:39,712 - app.core.excel.handlers.barcode_mapper - INFO - 条码映射: 6925861571159 -> 69021824 +2025-05-10 11:55:28,217 - app.core.excel.handlers.barcode_mapper - INFO - 条码映射: 6920584471055 -> 6920584471017 +2025-05-10 11:55:28,220 - app.core.excel.handlers.barcode_mapper - INFO - 条码映射: 6925861571159 -> 69021824 +2025-05-10 11:55:28,222 - app.core.excel.handlers.barcode_mapper - INFO - 条码映射: 6925861571466 -> 6925861571459 diff --git a/logs/app.core.excel.handlers.unit_converter_handlers.active b/logs/app.core.excel.handlers.unit_converter_handlers.active index 617fce6..e883d50 100644 --- a/logs/app.core.excel.handlers.unit_converter_handlers.active +++ b/logs/app.core.excel.handlers.unit_converter_handlers.active @@ -1 +1 @@ -Active since: 2025-05-10 11:21:12 \ No newline at end of file +Active since: 2025-05-10 12:00:40 \ No newline at end of file diff --git a/logs/app.core.excel.handlers.unit_converter_handlers.log b/logs/app.core.excel.handlers.unit_converter_handlers.log index a6a8184..0e3682d 100644 --- a/logs/app.core.excel.handlers.unit_converter_handlers.log +++ b/logs/app.core.excel.handlers.unit_converter_handlers.log @@ -72,3 +72,17 @@ 2025-05-09 16:01:39,715 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 3.0 -> 72.0, 单价: 63.0 -> 2.625, 单位: 件 -> 瓶 2025-05-09 16:01:39,716 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 3.0 -> 72.0, 单价: 54.0 -> 2.25, 单位: 件 -> 瓶 2025-05-09 16:01:39,717 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 2.0 -> 24.0, 单价: 42.0 -> 3.5, 单位: 件 -> 瓶 +2025-05-10 11:55:28,113 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 1.0 -> 12.0, 单价: 52.0 -> 4.333333333333333, 单位: 件 -> 瓶 +2025-05-10 11:55:28,114 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 3.0 -> 72.0, 单价: 50.0 -> 2.0833333333333335, 单位: 件 -> 瓶 +2025-05-10 11:55:28,115 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 1.0 -> 12.0, 单价: 30.0 -> 2.5, 单位: 件 -> 瓶 +2025-05-10 11:55:28,116 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 2.0 -> 24.0, 单价: 30.0 -> 2.5, 单位: 件 -> 瓶 +2025-05-10 11:55:28,117 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 2.0 -> 24.0, 单价: 30.0 -> 2.5, 单位: 件 -> 瓶 +2025-05-10 11:55:28,119 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 2.0 -> 24.0, 单价: 30.0 -> 2.5, 单位: 件 -> 瓶 +2025-05-10 11:55:28,120 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 4.0 -> 48.0, 单价: 45.0 -> 3.75, 单位: 件 -> 瓶 +2025-05-10 11:55:28,218 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 2.0 -> 24.0, 单价: 50.0 -> 4.166666666666667, 单位: 件 -> 瓶 +2025-05-10 11:55:28,220 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 2.0 -> 72.0, 单价: 65.0 -> 1.8055555555555556, 单位: 件 -> 瓶 +2025-05-10 11:55:28,222 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 1.0 -> 12.0, 单价: 45.0 -> 3.75, 单位: 件 -> 瓶 +2025-05-10 11:55:28,223 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 3.0 -> 72.0, 单价: 55.0 -> 2.2916666666666665, 单位: 件 -> 瓶 +2025-05-10 11:55:28,225 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 3.0 -> 72.0, 单价: 63.0 -> 2.625, 单位: 件 -> 瓶 +2025-05-10 11:55:28,225 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 3.0 -> 72.0, 单价: 54.0 -> 2.25, 单位: 件 -> 瓶 +2025-05-10 11:55:28,226 - app.core.excel.handlers.unit_converter_handlers - INFO - 件单位处理: 数量: 2.0 -> 24.0, 单价: 42.0 -> 3.5, 单位: 件 -> 瓶 diff --git a/logs/app.core.excel.merger.active b/logs/app.core.excel.merger.active index 5367524..7313447 100644 --- a/logs/app.core.excel.merger.active +++ b/logs/app.core.excel.merger.active @@ -1 +1 @@ -Active since: 2025-05-09 16:01:38 \ No newline at end of file +Active since: 2025-05-10 11:55:27 \ No newline at end of file diff --git a/logs/app.core.excel.merger.log b/logs/app.core.excel.merger.log index 882f714..076323f 100644 --- a/logs/app.core.excel.merger.log +++ b/logs/app.core.excel.merger.log @@ -512,3 +512,5 @@ 2025-05-09 14:32:20,942 - app.core.excel.merger - INFO - 初始化PurchaseOrderMerger完成,模板文件: templates\银豹-采购单模板.xls 2025-05-09 16:01:39,294 - app.core.excel.merger - INFO - 使用输出目录: D:\My Documents\python\orc-order-v2\data\output 2025-05-09 16:01:39,294 - app.core.excel.merger - INFO - 初始化PurchaseOrderMerger完成,模板文件: templates\银豹-采购单模板.xls +2025-05-10 11:55:28,007 - app.core.excel.merger - INFO - 使用输出目录: D:\My Documents\python\orc-order-v2\data\output +2025-05-10 11:55:28,008 - app.core.excel.merger - INFO - 初始化PurchaseOrderMerger完成,模板文件: templates\银豹-采购单模板.xls diff --git a/logs/app.core.excel.processor.active b/logs/app.core.excel.processor.active index 5367524..7313447 100644 --- a/logs/app.core.excel.processor.active +++ b/logs/app.core.excel.processor.active @@ -1 +1 @@ -Active since: 2025-05-09 16:01:38 \ No newline at end of file +Active since: 2025-05-10 11:55:27 \ No newline at end of file diff --git a/logs/app.core.excel.processor.log b/logs/app.core.excel.processor.log index 19d3197..0d51c51 100644 --- a/logs/app.core.excel.processor.log +++ b/logs/app.core.excel.processor.log @@ -6198,3 +6198,81 @@ ValueError: could not convert string to float: '2\n96' 2025-05-09 16:01:51,983 - app.core.excel.processor - INFO - 条码 6907992507385 处理结果:正常商品数量24.0,单价3.5,赠品数量0 2025-05-09 16:01:51,987 - app.core.excel.processor - INFO - 采购单已保存到: data/output\采购单_微信图片_20250509142624.xls 2025-05-09 16:01:51,989 - app.core.excel.processor - INFO - 采购单已保存到: data/output\采购单_微信图片_20250509142624.xls +2025-05-10 11:55:28,005 - app.core.excel.processor - INFO - 使用输出目录: D:\My Documents\python\orc-order-v2\data\output +2025-05-10 11:55:28,005 - app.core.excel.processor - INFO - 使用临时目录: D:\My Documents\python\orc-order-v2\data\temp +2025-05-10 11:55:28,006 - app.core.excel.processor - INFO - 初始化ExcelProcessor完成,模板文件: templates/银豹-采购单模板.xls +2025-05-10 11:55:28,008 - app.core.excel.processor - INFO - 开始处理Excel文件: D:/My Documents/python/orc-order-v2/data/output/微信图片_20250509142624.xlsx +2025-05-10 11:55:28,061 - app.core.excel.processor - INFO - 成功读取Excel文件: D:/My Documents/python/orc-order-v2/data/output/微信图片_20250509142624.xlsx, 共 16 行 +2025-05-10 11:55:28,066 - app.core.excel.processor - INFO - 找到可能的表头行: 第1行,评分: 45 +2025-05-10 11:55:28,066 - app.core.excel.processor - INFO - 识别到表头在第 1 行 +2025-05-10 11:55:28,105 - app.core.excel.processor - INFO - 使用表头行重新读取数据,共 15 行有效数据 +2025-05-10 11:55:28,106 - app.core.excel.processor - INFO - 找到精确匹配的条码列: 商品条码 +2025-05-10 11:55:28,106 - app.core.excel.processor - INFO - 使用条码列: 商品条码 +2025-05-10 11:55:28,106 - app.core.excel.processor - INFO - 找到name列(部分匹配): 商品条码 +2025-05-10 11:55:28,106 - app.core.excel.processor - INFO - 找到specification列: 规格 +2025-05-10 11:55:28,106 - app.core.excel.processor - INFO - 找到quantity列: 数量 +2025-05-10 11:55:28,106 - app.core.excel.processor - INFO - 找到unit列: 单位 +2025-05-10 11:55:28,107 - app.core.excel.processor - INFO - 找到price列: 单价 +2025-05-10 11:55:28,107 - app.core.excel.processor - INFO - 列名映射结果: {'barcode': '商品条码', 'name': '商品条码', 'specification': '规格', 'quantity': '数量', 'unit': '单位', 'price': '单价'} +2025-05-10 11:55:28,108 - app.core.excel.processor - INFO - 是否存在规格列: True +2025-05-10 11:55:28,108 - app.core.excel.processor - INFO - 第1行: 提取商品信息 条码=6907992508344, 名称=6907992508344.0, 规格=, 数量=1.0, 单位=件, 单价=52.0 +2025-05-10 11:55:28,114 - app.core.excel.processor - INFO - 第2行: 提取商品信息 条码=6903979000979, 名称=6903979000979.0, 规格=, 数量=3.0, 单位=件, 单价=50.0 +2025-05-10 11:55:28,115 - app.core.excel.processor - INFO - 第3行: 提取商品信息 条码=6923644283582, 名称=6923644283582.0, 规格=, 数量=1.0, 单位=件, 单价=30.0 +2025-05-10 11:55:28,116 - app.core.excel.processor - INFO - 第4行: 提取商品信息 条码=6923644268909, 名称=6923644268909.0, 规格=, 数量=2.0, 单位=件, 单价=30.0 +2025-05-10 11:55:28,116 - app.core.excel.processor - INFO - 第5行: 提取商品信息 条码=6923644268930, 名称=6923644268930.0, 规格=, 数量=2.0, 单位=件, 单价=30.0 +2025-05-10 11:55:28,117 - app.core.excel.processor - INFO - 第6行: 提取商品信息 条码=6923644268916, 名称=6923644268916.0, 规格=, 数量=2.0, 单位=件, 单价=30.0 +2025-05-10 11:55:28,119 - app.core.excel.processor - INFO - 第7行: 提取商品信息 条码=6923644266318, 名称=6923644266318.0, 规格=, 数量=4.0, 单位=件, 单价=45.0 +2025-05-10 11:55:28,121 - app.core.excel.processor - INFO - 第8行: 提取商品信息 条码=6920584471055, 名称=6920584471055.0, 规格=, 数量=2.0, 单位=件, 单价=50.0 +2025-05-10 11:55:28,219 - app.core.excel.processor - INFO - 第9行: 提取商品信息 条码=6925861571159, 名称=6925861571159.0, 规格=, 数量=2.0, 单位=件, 单价=65.0 +2025-05-10 11:55:28,221 - app.core.excel.processor - INFO - 第10行: 提取商品信息 条码=6925861571466, 名称=6925861571466.0, 规格=, 数量=1.0, 单位=件, 单价=45.0 +2025-05-10 11:55:28,223 - app.core.excel.processor - INFO - 第11行: 提取商品信息 条码=6923644210151, 名称=6923644210151.0, 规格=, 数量=3.0, 单位=件, 单价=55.0 +2025-05-10 11:55:28,224 - app.core.excel.processor - INFO - 第12行: 提取商品信息 条码=6907992501819, 名称=6907992501819.0, 规格=, 数量=3.0, 单位=件, 单价=63.0 +2025-05-10 11:55:28,225 - app.core.excel.processor - INFO - 第13行: 提取商品信息 条码=6907992502052, 名称=6907992502052.0, 规格=, 数量=3.0, 单位=件, 单价=54.0 +2025-05-10 11:55:28,225 - app.core.excel.processor - INFO - 第14行: 提取商品信息 条码=6907992507385, 名称=6907992507385.0, 规格=, 数量=2.0, 单位=件, 单价=42.0 +2025-05-10 11:55:28,226 - app.core.excel.processor - INFO - 提取到 14 个商品信息 +2025-05-10 11:55:28,234 - app.core.excel.processor - INFO - 开始处理14 个产品信息 +2025-05-10 11:55:28,236 - app.core.excel.processor - INFO - 处理商品: 条码=6907992508344, 数量=12.0, 单价=4.333333333333333, 是否赠品=False +2025-05-10 11:55:28,237 - app.core.excel.processor - INFO - 发现正常商品:条码6907992508344, 数量=12.0, 单价=4.333333333333333 +2025-05-10 11:55:28,237 - app.core.excel.processor - INFO - 处理商品: 条码=6903979000979, 数量=72.0, 单价=2.0833333333333335, 是否赠品=False +2025-05-10 11:55:28,237 - app.core.excel.processor - INFO - 发现正常商品:条码6903979000979, 数量=72.0, 单价=2.0833333333333335 +2025-05-10 11:55:28,238 - app.core.excel.processor - INFO - 处理商品: 条码=6923644283582, 数量=12.0, 单价=2.5, 是否赠品=False +2025-05-10 11:55:28,238 - app.core.excel.processor - INFO - 发现正常商品:条码6923644283582, 数量=12.0, 单价=2.5 +2025-05-10 11:55:28,238 - app.core.excel.processor - INFO - 处理商品: 条码=6923644268909, 数量=24.0, 单价=2.5, 是否赠品=False +2025-05-10 11:55:32,017 - app.core.excel.processor - INFO - 发现正常商品:条码6923644268909, 数量=24.0, 单价=2.5 +2025-05-10 11:55:32,017 - app.core.excel.processor - INFO - 处理商品: 条码=6923644268930, 数量=24.0, 单价=2.5, 是否赠品=False +2025-05-10 11:55:32,017 - app.core.excel.processor - INFO - 发现正常商品:条码6923644268930, 数量=24.0, 单价=2.5 +2025-05-10 11:55:32,017 - app.core.excel.processor - INFO - 处理商品: 条码=6923644268916, 数量=24.0, 单价=2.5, 是否赠品=False +2025-05-10 11:55:32,017 - app.core.excel.processor - INFO - 发现正常商品:条码6923644268916, 数量=24.0, 单价=2.5 +2025-05-10 11:55:32,017 - app.core.excel.processor - INFO - 处理商品: 条码=6923644266318, 数量=48.0, 单价=3.75, 是否赠品=False +2025-05-10 11:55:32,017 - app.core.excel.processor - INFO - 发现正常商品:条码6923644266318, 数量=48.0, 单价=3.75 +2025-05-10 11:55:32,017 - app.core.excel.processor - INFO - 处理商品: 条码=6920584471017, 数量=24.0, 单价=4.166666666666667, 是否赠品=False +2025-05-10 11:55:32,017 - app.core.excel.processor - INFO - 发现正常商品:条码6920584471017, 数量=24.0, 单价=4.166666666666667 +2025-05-10 11:55:32,017 - app.core.excel.processor - INFO - 处理商品: 条码=69021824, 数量=72.0, 单价=1.8055555555555556, 是否赠品=False +2025-05-10 11:55:32,018 - app.core.excel.processor - INFO - 发现正常商品:条码69021824, 数量=72.0, 单价=1.8055555555555556 +2025-05-10 11:55:32,018 - app.core.excel.processor - INFO - 处理商品: 条码=6925861571459, 数量=12.0, 单价=3.75, 是否赠品=False +2025-05-10 11:55:32,018 - app.core.excel.processor - INFO - 发现正常商品:条码6925861571459, 数量=12.0, 单价=3.75 +2025-05-10 11:55:32,018 - app.core.excel.processor - INFO - 处理商品: 条码=6923644210151, 数量=72.0, 单价=2.2916666666666665, 是否赠品=False +2025-05-10 11:55:32,018 - app.core.excel.processor - INFO - 发现正常商品:条码6923644210151, 数量=72.0, 单价=2.2916666666666665 +2025-05-10 11:55:32,018 - app.core.excel.processor - INFO - 处理商品: 条码=6907992501819, 数量=72.0, 单价=2.625, 是否赠品=False +2025-05-10 11:55:32,018 - app.core.excel.processor - INFO - 发现正常商品:条码6907992501819, 数量=72.0, 单价=2.625 +2025-05-10 11:55:32,018 - app.core.excel.processor - INFO - 处理商品: 条码=6907992502052, 数量=72.0, 单价=2.25, 是否赠品=False +2025-05-10 11:55:32,018 - app.core.excel.processor - INFO - 发现正常商品:条码6907992502052, 数量=72.0, 单价=2.25 +2025-05-10 11:55:32,018 - app.core.excel.processor - INFO - 处理商品: 条码=6907992507385, 数量=24.0, 单价=3.5, 是否赠品=False +2025-05-10 11:55:32,018 - app.core.excel.processor - INFO - 发现正常商品:条码6907992507385, 数量=24.0, 单价=3.5 +2025-05-10 11:55:32,018 - app.core.excel.processor - INFO - 分组后共14 个不同条码的商品 +2025-05-10 11:55:32,018 - app.core.excel.processor - INFO - 条码 6907992508344 处理结果:正常商品数量12.0,单价4.333333333333333,赠品数量0 +2025-05-10 11:55:32,018 - app.core.excel.processor - INFO - 条码 6903979000979 处理结果:正常商品数量72.0,单价2.0833333333333335,赠品数量0 +2025-05-10 11:55:32,019 - app.core.excel.processor - INFO - 条码 6923644283582 处理结果:正常商品数量12.0,单价2.5,赠品数量0 +2025-05-10 11:55:32,019 - app.core.excel.processor - INFO - 条码 6923644268909 处理结果:正常商品数量24.0,单价2.5,赠品数量0 +2025-05-10 11:55:32,019 - app.core.excel.processor - INFO - 条码 6923644268930 处理结果:正常商品数量24.0,单价2.5,赠品数量0 +2025-05-10 11:55:32,019 - app.core.excel.processor - INFO - 条码 6923644268916 处理结果:正常商品数量24.0,单价2.5,赠品数量0 +2025-05-10 11:55:32,019 - app.core.excel.processor - INFO - 条码 6923644266318 处理结果:正常商品数量48.0,单价3.75,赠品数量0 +2025-05-10 11:55:32,019 - app.core.excel.processor - INFO - 条码 6920584471017 处理结果:正常商品数量24.0,单价4.166666666666667,赠品数量0 +2025-05-10 11:55:32,019 - app.core.excel.processor - INFO - 条码 69021824 处理结果:正常商品数量72.0,单价1.8055555555555556,赠品数量0 +2025-05-10 11:55:32,019 - app.core.excel.processor - INFO - 条码 6925861571459 处理结果:正常商品数量12.0,单价3.75,赠品数量0 +2025-05-10 11:55:32,019 - app.core.excel.processor - INFO - 条码 6923644210151 处理结果:正常商品数量72.0,单价2.2916666666666665,赠品数量0 +2025-05-10 11:55:36,925 - app.core.excel.processor - INFO - 条码 6907992501819 处理结果:正常商品数量72.0,单价2.625,赠品数量0 +2025-05-10 11:55:36,925 - app.core.excel.processor - INFO - 条码 6907992502052 处理结果:正常商品数量72.0,单价2.25,赠品数量0 +2025-05-10 11:55:36,925 - app.core.excel.processor - INFO - 条码 6907992507385 处理结果:正常商品数量24.0,单价3.5,赠品数量0 +2025-05-10 11:55:36,934 - app.core.excel.processor - INFO - 采购单已保存到: data/output\采购单_微信图片_20250509142624.xls +2025-05-10 11:55:36,939 - app.core.excel.processor - INFO - 采购单已保存到: data/output\采购单_微信图片_20250509142624.xls diff --git a/logs/app.core.excel.validators.active b/logs/app.core.excel.validators.active index 617fce6..e883d50 100644 --- a/logs/app.core.excel.validators.active +++ b/logs/app.core.excel.validators.active @@ -1 +1 @@ -Active since: 2025-05-10 11:21:12 \ No newline at end of file +Active since: 2025-05-10 12:00:40 \ No newline at end of file diff --git a/logs/app.core.ocr.baidu_ocr.active b/logs/app.core.ocr.baidu_ocr.active index 1fe4767..60fd47e 100644 --- a/logs/app.core.ocr.baidu_ocr.active +++ b/logs/app.core.ocr.baidu_ocr.active @@ -1 +1 @@ -Active since: 2025-05-09 16:01:37 \ No newline at end of file +Active since: 2025-05-10 11:55:26 \ No newline at end of file diff --git a/logs/app.core.ocr.baidu_ocr.log b/logs/app.core.ocr.baidu_ocr.log index 2afc301..fe6018e 100644 --- a/logs/app.core.ocr.baidu_ocr.log +++ b/logs/app.core.ocr.baidu_ocr.log @@ -80,3 +80,4 @@ 2025-05-09 14:27:31,660 - app.core.ocr.baidu_ocr - ERROR - 初始化失败: getint() takes 3 positional arguments but 4 were given 2025-05-09 14:31:02,533 - app.core.ocr.baidu_ocr - INFO - 成功获取访问令牌 2025-05-09 14:31:02,581 - app.core.ocr.baidu_ocr - INFO - 成功获取访问令牌 +2025-05-10 11:55:16,591 - app.core.ocr.baidu_ocr - INFO - 成功获取访问令牌 diff --git a/logs/app.core.ocr.table_ocr.active b/logs/app.core.ocr.table_ocr.active index 1fe4767..60fd47e 100644 --- a/logs/app.core.ocr.table_ocr.active +++ b/logs/app.core.ocr.table_ocr.active @@ -1 +1 @@ -Active since: 2025-05-09 16:01:37 \ No newline at end of file +Active since: 2025-05-10 11:55:26 \ No newline at end of file diff --git a/logs/app.core.ocr.table_ocr.log b/logs/app.core.ocr.table_ocr.log index e0a9d6a..c8229b2 100644 --- a/logs/app.core.ocr.table_ocr.log +++ b/logs/app.core.ocr.table_ocr.log @@ -731,3 +731,13 @@ 2025-05-09 14:31:04,140 - app.core.ocr.table_ocr - INFO - 图片处理成功: data/input\微信图片_20250509142624.jpg, 输出文件: data/output\微信图片_20250509142624.xlsx 2025-05-09 14:31:04,271 - app.core.ocr.table_ocr - INFO - 图片处理成功: data/input\微信图片_20250509142700.jpg, 输出文件: data/output\微信图片_20250509142700.xlsx 2025-05-09 14:31:04,274 - app.core.ocr.table_ocr - INFO - 所有图片处理完成, 总计: 2, 成功: 2 +2025-05-10 11:55:16,268 - app.core.ocr.table_ocr - INFO - 使用输入目录: D:\My Documents\python\orc-order-v2\data\input +2025-05-10 11:55:16,270 - app.core.ocr.table_ocr - INFO - 使用输出目录: D:\My Documents\python\orc-order-v2\data\output +2025-05-10 11:55:16,271 - app.core.ocr.table_ocr - INFO - 使用临时目录: D:\My Documents\python\orc-order-v2\data\temp +2025-05-10 11:55:16,271 - app.core.ocr.table_ocr - INFO - 允许的文件类型: ['.jpg', '.jpeg', '.png', '.bmp'] +2025-05-10 11:55:16,272 - app.core.ocr.table_ocr - INFO - 初始化OCRProcessor完成:输入目录=data/input, 输出目录=data/output +2025-05-10 11:55:16,272 - app.core.ocr.table_ocr - INFO - 找到 1 个图片文件,其中 1 个未处理 +2025-05-10 11:55:16,273 - app.core.ocr.table_ocr - INFO - 处理批次 1/1: 1 个文件 +2025-05-10 11:55:16,274 - app.core.ocr.table_ocr - INFO - 开始处理图片: data/input\微信图片_20250509142624.jpg +2025-05-10 11:55:18,016 - app.core.ocr.table_ocr - INFO - 图片处理成功: data/input\微信图片_20250509142624.jpg, 输出文件: data/output\微信图片_20250509142624.xlsx +2025-05-10 11:55:18,045 - app.core.ocr.table_ocr - INFO - 所有图片处理完成, 总计: 1, 成功: 1 diff --git a/logs/app.core.utils.file_utils.active b/logs/app.core.utils.file_utils.active index 2ec83bf..ea21b97 100644 --- a/logs/app.core.utils.file_utils.active +++ b/logs/app.core.utils.file_utils.active @@ -1 +1 @@ -Active since: 2025-05-09 16:01:36 \ No newline at end of file +Active since: 2025-05-10 11:55:25 \ No newline at end of file diff --git a/logs/app.services.ocr_service.active b/logs/app.services.ocr_service.active index 1fe4767..60fd47e 100644 --- a/logs/app.services.ocr_service.active +++ b/logs/app.services.ocr_service.active @@ -1 +1 @@ -Active since: 2025-05-09 16:01:37 \ No newline at end of file +Active since: 2025-05-10 11:55:26 \ No newline at end of file diff --git a/logs/app.services.ocr_service.log b/logs/app.services.ocr_service.log index c7b637f..6003b95 100644 --- a/logs/app.services.ocr_service.log +++ b/logs/app.services.ocr_service.log @@ -296,3 +296,7 @@ 2025-05-09 14:31:02,078 - app.services.ocr_service - INFO - OCRService初始化完成 2025-05-09 14:31:02,078 - app.services.ocr_service - INFO - OCRService.batch_process被调用,转发到process_images_batch 2025-05-09 14:31:02,078 - app.services.ocr_service - INFO - OCRService开始批量处理图片, batch_size=5, max_workers=4 +2025-05-10 11:55:16,265 - app.services.ocr_service - INFO - 初始化OCRService +2025-05-10 11:55:16,272 - app.services.ocr_service - INFO - OCRService初始化完成 +2025-05-10 11:55:16,272 - app.services.ocr_service - INFO - OCRService.batch_process被调用,转发到process_images_batch +2025-05-10 11:55:16,272 - app.services.ocr_service - INFO - OCRService开始批量处理图片, batch_size=5, max_workers=4 diff --git a/logs/app.services.order_service.active b/logs/app.services.order_service.active index 5367524..7313447 100644 --- a/logs/app.services.order_service.active +++ b/logs/app.services.order_service.active @@ -1 +1 @@ -Active since: 2025-05-09 16:01:38 \ No newline at end of file +Active since: 2025-05-10 11:55:27 \ No newline at end of file diff --git a/logs/app.services.order_service.log b/logs/app.services.order_service.log index d2ff2c6..d556dd0 100644 --- a/logs/app.services.order_service.log +++ b/logs/app.services.order_service.log @@ -341,3 +341,6 @@ 2025-05-09 16:01:39,291 - app.services.order_service - INFO - 初始化OrderService 2025-05-09 16:01:39,294 - app.services.order_service - INFO - OrderService初始化完成 2025-05-09 16:01:39,295 - app.services.order_service - INFO - OrderService开始处理指定Excel文件: D:/My Documents/python/orc-order-v2/data/output/微信图片_20250509142624.xlsx +2025-05-10 11:55:28,003 - app.services.order_service - INFO - 初始化OrderService +2025-05-10 11:55:28,008 - app.services.order_service - INFO - OrderService初始化完成 +2025-05-10 11:55:28,008 - app.services.order_service - INFO - OrderService开始处理指定Excel文件: D:/My Documents/python/orc-order-v2/data/output/微信图片_20250509142624.xlsx diff --git a/logs/app.services.tobacco_service.active b/logs/app.services.tobacco_service.active index b266a30..7313447 100644 --- a/logs/app.services.tobacco_service.active +++ b/logs/app.services.tobacco_service.active @@ -1 +1 @@ -Active since: 2025-05-09 16:01:39 \ No newline at end of file +Active since: 2025-05-10 11:55:27 \ No newline at end of file