style: normalize code formatting across the codebase
- Standardize quote style (single to double quotes) - Improve code formatting consistency - Apply formatting to utilities, GUI components, and tools - Update imports and docstrings for consistency Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -10,7 +10,7 @@ from config.schema import (
|
|||||||
DatabaseConfig,
|
DatabaseConfig,
|
||||||
PathConfig,
|
PathConfig,
|
||||||
ExtractionConfig,
|
ExtractionConfig,
|
||||||
AppConfig
|
AppConfig,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -43,7 +43,7 @@ DEFAULT_APP_CONFIG = AppConfig(
|
|||||||
verbose=True,
|
verbose=True,
|
||||||
auto_convert=True,
|
auto_convert=True,
|
||||||
merge_batches=True,
|
merge_batches=True,
|
||||||
)
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -28,10 +28,12 @@ class ConfigLoader:
|
|||||||
"""
|
"""
|
||||||
if os.path.exists(config_file):
|
if os.path.exists(config_file):
|
||||||
try:
|
try:
|
||||||
with open(config_file, 'r', encoding='utf-8') as f:
|
with open(config_file, "r", encoding="utf-8") as f:
|
||||||
loaded_settings = json.load(f)
|
loaded_settings = json.load(f)
|
||||||
# 合并默认配置和加载的配置
|
# 合并默认配置和加载的配置
|
||||||
merged_settings = ConfigLoader._merge_settings(DEFAULT_SETTINGS_DICT, loaded_settings)
|
merged_settings = ConfigLoader._merge_settings(
|
||||||
|
DEFAULT_SETTINGS_DICT, loaded_settings
|
||||||
|
)
|
||||||
return ConfigLoader._dict_to_config(merged_settings)
|
return ConfigLoader._dict_to_config(merged_settings)
|
||||||
except (json.JSONDecodeError, IOError) as e:
|
except (json.JSONDecodeError, IOError) as e:
|
||||||
print(f"加载配置文件失败: {e},使用默认配置")
|
print(f"加载配置文件失败: {e},使用默认配置")
|
||||||
@@ -57,7 +59,7 @@ class ConfigLoader:
|
|||||||
# 确保配置目录存在
|
# 确保配置目录存在
|
||||||
os.makedirs(os.path.dirname(config_file), exist_ok=True)
|
os.makedirs(os.path.dirname(config_file), exist_ok=True)
|
||||||
|
|
||||||
with open(config_file, 'w', encoding='utf-8') as f:
|
with open(config_file, "w", encoding="utf-8") as f:
|
||||||
json.dump(config.to_dict(), f, ensure_ascii=False, indent=2)
|
json.dump(config.to_dict(), f, ensure_ascii=False, indent=2)
|
||||||
return True
|
return True
|
||||||
except IOError as e:
|
except IOError as e:
|
||||||
@@ -79,7 +81,11 @@ class ConfigLoader:
|
|||||||
result = defaults.copy()
|
result = defaults.copy()
|
||||||
|
|
||||||
for key, value in loaded.items():
|
for key, value in loaded.items():
|
||||||
if key in result and isinstance(result[key], dict) and isinstance(value, dict):
|
if (
|
||||||
|
key in result
|
||||||
|
and isinstance(result[key], dict)
|
||||||
|
and isinstance(value, dict)
|
||||||
|
):
|
||||||
result[key] = ConfigLoader._merge_settings(result[key], value)
|
result[key] = ConfigLoader._merge_settings(result[key], value)
|
||||||
else:
|
else:
|
||||||
result[key] = value
|
result[key] = value
|
||||||
@@ -117,20 +123,26 @@ class ConfigLoader:
|
|||||||
username=database_dict.get("username", ""),
|
username=database_dict.get("username", ""),
|
||||||
password=database_dict.get("password", ""),
|
password=database_dict.get("password", ""),
|
||||||
driver=database_dict.get("driver", "ODBC Driver 18 for SQL Server"),
|
driver=database_dict.get("driver", "ODBC Driver 18 for SQL Server"),
|
||||||
trust_server_certificate=database_dict.get("trust_server_certificate", "yes"),
|
trust_server_certificate=database_dict.get(
|
||||||
|
"trust_server_certificate", "yes"
|
||||||
|
),
|
||||||
),
|
),
|
||||||
paths=PathConfig(
|
paths=PathConfig(
|
||||||
data_dir=paths_dict.get("data_dir", ""),
|
data_dir=paths_dict.get("data_dir", ""),
|
||||||
production_id_file=paths_dict.get("production_id_file", ""),
|
production_id_file=paths_dict.get("production_id_file", ""),
|
||||||
default_output=paths_dict.get("default_output", "离散备料计划维护_合并.xlsx"),
|
default_output=paths_dict.get(
|
||||||
validation_output=paths_dict.get("validation_output", "物料状态校验结果.xlsx"),
|
"default_output", "离散备料计划维护_合并.xlsx"
|
||||||
|
),
|
||||||
|
validation_output=paths_dict.get(
|
||||||
|
"validation_output", "物料状态校验结果.xlsx"
|
||||||
|
),
|
||||||
),
|
),
|
||||||
extraction=ExtractionConfig(
|
extraction=ExtractionConfig(
|
||||||
batch_size=extraction_dict.get("batch_size", 100),
|
batch_size=extraction_dict.get("batch_size", 100),
|
||||||
verbose=extraction_dict.get("verbose", True),
|
verbose=extraction_dict.get("verbose", True),
|
||||||
auto_convert=extraction_dict.get("auto_convert", True),
|
auto_convert=extraction_dict.get("auto_convert", True),
|
||||||
merge_batches=extraction_dict.get("merge_batches", True),
|
merge_batches=extraction_dict.get("merge_batches", True),
|
||||||
)
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ from pathlib import Path
|
|||||||
@dataclass
|
@dataclass
|
||||||
class ERPConfig:
|
class ERPConfig:
|
||||||
"""ERP 系统配置"""
|
"""ERP 系统配置"""
|
||||||
|
|
||||||
url: str
|
url: str
|
||||||
username: str
|
username: str
|
||||||
password: str
|
password: str
|
||||||
@@ -35,6 +36,7 @@ class ERPConfig:
|
|||||||
@dataclass
|
@dataclass
|
||||||
class DatabaseConfig:
|
class DatabaseConfig:
|
||||||
"""数据库配置"""
|
"""数据库配置"""
|
||||||
|
|
||||||
server: str
|
server: str
|
||||||
database: str
|
database: str
|
||||||
username: str
|
username: str
|
||||||
@@ -59,6 +61,7 @@ class DatabaseConfig:
|
|||||||
@dataclass
|
@dataclass
|
||||||
class PathConfig:
|
class PathConfig:
|
||||||
"""文件路径配置"""
|
"""文件路径配置"""
|
||||||
|
|
||||||
data_dir: str
|
data_dir: str
|
||||||
production_id_file: str
|
production_id_file: str
|
||||||
default_output: str = "离散备料计划维护_合并.xlsx"
|
default_output: str = "离散备料计划维护_合并.xlsx"
|
||||||
@@ -77,6 +80,7 @@ class PathConfig:
|
|||||||
@dataclass
|
@dataclass
|
||||||
class ExtractionConfig:
|
class ExtractionConfig:
|
||||||
"""数据提取配置"""
|
"""数据提取配置"""
|
||||||
|
|
||||||
batch_size: int = 100
|
batch_size: int = 100
|
||||||
verbose: bool = True
|
verbose: bool = True
|
||||||
auto_convert: bool = True
|
auto_convert: bool = True
|
||||||
@@ -95,6 +99,7 @@ class ExtractionConfig:
|
|||||||
@dataclass
|
@dataclass
|
||||||
class AppConfig:
|
class AppConfig:
|
||||||
"""应用总配置"""
|
"""应用总配置"""
|
||||||
|
|
||||||
erp: ERPConfig
|
erp: ERPConfig
|
||||||
database: DatabaseConfig
|
database: DatabaseConfig
|
||||||
paths: PathConfig
|
paths: PathConfig
|
||||||
@@ -139,5 +144,5 @@ class AppConfig:
|
|||||||
"verbose": self.extraction.verbose,
|
"verbose": self.extraction.verbose,
|
||||||
"auto_convert": self.extraction.auto_convert,
|
"auto_convert": self.extraction.auto_convert,
|
||||||
"merge_batches": self.extraction.merge_batches,
|
"merge_batches": self.extraction.merge_batches,
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ SQL Server 数据库连接组件
|
|||||||
|
|
||||||
提供数据库连接和查询接口
|
提供数据库连接和查询接口
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import pyodbc
|
import pyodbc
|
||||||
from typing import List, Dict, Any, Optional
|
from typing import List, Dict, Any, Optional
|
||||||
import sys
|
import sys
|
||||||
@@ -17,12 +18,12 @@ from config.defaults import DEFAULT_APP_CONFIG
|
|||||||
|
|
||||||
# 从默认配置获取数据库配置
|
# 从默认配置获取数据库配置
|
||||||
SQL_SERVER_CONFIG = {
|
SQL_SERVER_CONFIG = {
|
||||||
'driver': DEFAULT_APP_CONFIG.database.driver,
|
"driver": DEFAULT_APP_CONFIG.database.driver,
|
||||||
'server': DEFAULT_APP_CONFIG.database.server,
|
"server": DEFAULT_APP_CONFIG.database.server,
|
||||||
'database': DEFAULT_APP_CONFIG.database.database,
|
"database": DEFAULT_APP_CONFIG.database.database,
|
||||||
'username': DEFAULT_APP_CONFIG.database.username,
|
"username": DEFAULT_APP_CONFIG.database.username,
|
||||||
'password': DEFAULT_APP_CONFIG.database.password,
|
"password": DEFAULT_APP_CONFIG.database.password,
|
||||||
'TrustServerCertificate': DEFAULT_APP_CONFIG.database.trust_server_certificate,
|
"TrustServerCertificate": DEFAULT_APP_CONFIG.database.trust_server_certificate,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -61,7 +62,9 @@ class DatabaseConnection:
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
self.connection = pyodbc.connect(conn_str)
|
self.connection = pyodbc.connect(conn_str)
|
||||||
print(f"成功连接到数据库: {self.config['server']}/{self.config['database']}")
|
print(
|
||||||
|
f"成功连接到数据库: {self.config['server']}/{self.config['database']}"
|
||||||
|
)
|
||||||
return self.connection
|
return self.connection
|
||||||
except pyodbc.Error as e:
|
except pyodbc.Error as e:
|
||||||
print(f"数据库连接失败: {e}")
|
print(f"数据库连接失败: {e}")
|
||||||
@@ -74,7 +77,9 @@ class DatabaseConnection:
|
|||||||
self.connection = None
|
self.connection = None
|
||||||
print("数据库连接已关闭")
|
print("数据库连接已关闭")
|
||||||
|
|
||||||
def execute_query(self, sql: str, params: Optional[tuple] = None) -> List[Dict[str, Any]]:
|
def execute_query(
|
||||||
|
self, sql: str, params: Optional[tuple] = None
|
||||||
|
) -> List[Dict[str, Any]]:
|
||||||
"""
|
"""
|
||||||
执行查询语句并返回结果
|
执行查询语句并返回结果
|
||||||
|
|
||||||
@@ -168,7 +173,7 @@ def query_production_orders(总排号_list: List[str]) -> List[Dict[str, Any]]:
|
|||||||
db = DatabaseConnection()
|
db = DatabaseConnection()
|
||||||
|
|
||||||
# 构建占位符字符串
|
# 构建占位符字符串
|
||||||
placeholders = ','.join(['?' for _ in 总排号_list])
|
placeholders = ",".join(["?" for _ in 总排号_list])
|
||||||
|
|
||||||
sql = f"""
|
sql = f"""
|
||||||
SELECT [总排号], [生产订单号], [序号], [订单号], [客户名称], [产品型号]
|
SELECT [总排号], [生产订单号], [序号], [订单号], [客户名称], [产品型号]
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
待删除物料查询组件
|
待删除物料查询组件
|
||||||
从数据库查询指定负责人需要删除的物料名称
|
从数据库查询指定负责人需要删除的物料名称
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from typing import List, Dict, Any
|
from typing import List, Dict, Any
|
||||||
from db.connection import get_connection
|
from db.connection import get_connection
|
||||||
|
|
||||||
@@ -25,7 +26,7 @@ def get_materials_to_delete(manager_name):
|
|||||||
with get_connection() as conn:
|
with get_connection() as conn:
|
||||||
results = conn.execute_query(query, (manager_name,))
|
results = conn.execute_query(query, (manager_name,))
|
||||||
# 提取物料名称并去除空值
|
# 提取物料名称并去除空值
|
||||||
material_names = [row['MaterialName'] for row in results if row['MaterialName']]
|
material_names = [row["MaterialName"] for row in results if row["MaterialName"]]
|
||||||
return material_names
|
return material_names
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
生产订单号查询组件
|
生产订单号查询组件
|
||||||
从 ProductionID.txt 读取总排号,查询数据库获取生产订单号
|
从 ProductionID.txt 读取总排号,查询数据库获取生产订单号
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from db.connection import get_connection
|
from db.connection import get_connection
|
||||||
|
|
||||||
|
|
||||||
@@ -15,7 +16,7 @@ def read_production_ids(file_path):
|
|||||||
Returns:
|
Returns:
|
||||||
总排号列表
|
总排号列表
|
||||||
"""
|
"""
|
||||||
with open(file_path, 'r', encoding='utf-8') as f:
|
with open(file_path, "r", encoding="utf-8") as f:
|
||||||
# 去除空白行和空格
|
# 去除空白行和空格
|
||||||
production_ids = [line.strip() for line in f if line.strip()]
|
production_ids = [line.strip() for line in f if line.strip()]
|
||||||
return production_ids
|
return production_ids
|
||||||
@@ -41,7 +42,7 @@ def query_production_order_numbers(production_ids):
|
|||||||
# 分批查询
|
# 分批查询
|
||||||
for i in range(0, len(production_ids), BATCH_SIZE):
|
for i in range(0, len(production_ids), BATCH_SIZE):
|
||||||
batch = production_ids[i : i + BATCH_SIZE]
|
batch = production_ids[i : i + BATCH_SIZE]
|
||||||
placeholders = ','.join(['?' for _ in batch])
|
placeholders = ",".join(["?" for _ in batch])
|
||||||
|
|
||||||
query = f"""
|
query = f"""
|
||||||
SELECT [生产订单号]
|
SELECT [生产订单号]
|
||||||
@@ -52,7 +53,7 @@ def query_production_order_numbers(production_ids):
|
|||||||
with get_connection() as conn:
|
with get_connection() as conn:
|
||||||
results = conn.execute_query(query, tuple(batch))
|
results = conn.execute_query(query, tuple(batch))
|
||||||
# 提取生产订单号并去除空值
|
# 提取生产订单号并去除空值
|
||||||
batch_numbers = [row['生产订单号'] for row in results if row['生产订单号']]
|
batch_numbers = [row["生产订单号"] for row in results if row["生产订单号"]]
|
||||||
all_results.extend(batch_numbers)
|
all_results.extend(batch_numbers)
|
||||||
|
|
||||||
return all_results
|
return all_results
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ class ConfigManager:
|
|||||||
Returns:
|
Returns:
|
||||||
配置值
|
配置值
|
||||||
"""
|
"""
|
||||||
keys = key.split('.')
|
keys = key.split(".")
|
||||||
value = self.config
|
value = self.config
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@@ -78,7 +78,7 @@ class ConfigManager:
|
|||||||
key: 配置键
|
key: 配置键
|
||||||
value: 配置值
|
value: 配置值
|
||||||
"""
|
"""
|
||||||
keys = key.split('.')
|
keys = key.split(".")
|
||||||
obj = self.config
|
obj = self.config
|
||||||
|
|
||||||
# 导航到父对象
|
# 导航到父对象
|
||||||
|
|||||||
@@ -78,12 +78,12 @@ class DataExtractionTab(ttk.Frame):
|
|||||||
label_text="ProductionID 文件:",
|
label_text="ProductionID 文件:",
|
||||||
file_type="file",
|
file_type="file",
|
||||||
file_types=[("文本文件", "*.txt"), ("所有文件", "*.*")],
|
file_types=[("文本文件", "*.txt"), ("所有文件", "*.*")],
|
||||||
initial_dir="D:/python/playwrite/"
|
initial_dir="D:/python/playwrite/",
|
||||||
)
|
)
|
||||||
self.input_file_selector.pack(fill=tk.X)
|
self.input_file_selector.pack(fill=tk.X)
|
||||||
|
|
||||||
# 设置默认文件
|
# 设置默认文件
|
||||||
default_input = self.config.get('paths.production_id_file', 'ProductionID.txt')
|
default_input = self.config.get("paths.production_id_file", "ProductionID.txt")
|
||||||
if os.path.exists(default_input):
|
if os.path.exists(default_input):
|
||||||
self.input_file_selector.set(default_input)
|
self.input_file_selector.set(default_input)
|
||||||
|
|
||||||
@@ -96,14 +96,14 @@ class DataExtractionTab(ttk.Frame):
|
|||||||
label_text="保存为:",
|
label_text="保存为:",
|
||||||
file_type="file",
|
file_type="file",
|
||||||
file_types=[("Excel 文件", "*.xlsx"), ("所有文件", "*.*")],
|
file_types=[("Excel 文件", "*.xlsx"), ("所有文件", "*.*")],
|
||||||
initial_dir=self.config.get('paths.data_dir', 'data/')
|
initial_dir=self.config.get("paths.data_dir", "data/"),
|
||||||
)
|
)
|
||||||
self.output_file_selector.pack(fill=tk.X)
|
self.output_file_selector.pack(fill=tk.X)
|
||||||
|
|
||||||
# 设置默认输出文件
|
# 设置默认输出文件
|
||||||
default_output = os.path.join(
|
default_output = os.path.join(
|
||||||
self.config.get('paths.data_dir', 'data/'),
|
self.config.get("paths.data_dir", "data/"),
|
||||||
self.config.get('paths.default_output', '离散备料计划维护_合并.xlsx')
|
self.config.get("paths.default_output", "离散备料计划维护_合并.xlsx"),
|
||||||
)
|
)
|
||||||
self.output_file_selector.set(default_output)
|
self.output_file_selector.set(default_output)
|
||||||
|
|
||||||
@@ -111,30 +111,42 @@ class DataExtractionTab(ttk.Frame):
|
|||||||
options_group = ttk.LabelFrame(parent, text="提取选项", padding=10)
|
options_group = ttk.LabelFrame(parent, text="提取选项", padding=10)
|
||||||
options_group.pack(fill=tk.X, pady=5)
|
options_group.pack(fill=tk.X, pady=5)
|
||||||
|
|
||||||
self.verbose_var = tk.BooleanVar(value=self.config.get('extraction.verbose', True))
|
self.verbose_var = tk.BooleanVar(
|
||||||
ttk.Checkbutton(options_group, text="详细日志", variable=self.verbose_var).grid(row=0, column=0, sticky="w", padx=5)
|
value=self.config.get("extraction.verbose", True)
|
||||||
|
)
|
||||||
|
ttk.Checkbutton(options_group, text="详细日志", variable=self.verbose_var).grid(
|
||||||
|
row=0, column=0, sticky="w", padx=5
|
||||||
|
)
|
||||||
|
|
||||||
self.headless_var = tk.BooleanVar(value=self.config.get('erp.headless', True))
|
self.headless_var = tk.BooleanVar(value=self.config.get("erp.headless", True))
|
||||||
ttk.Checkbutton(options_group, text="无头模式 (不显示浏览器)", variable=self.headless_var).grid(row=0, column=1, sticky="w", padx=5)
|
ttk.Checkbutton(
|
||||||
|
options_group, text="无头模式 (不显示浏览器)", variable=self.headless_var
|
||||||
|
).grid(row=0, column=1, sticky="w", padx=5)
|
||||||
|
|
||||||
# 进度显示
|
# 进度显示
|
||||||
progress_group = ttk.LabelFrame(parent, text="进度", padding=10)
|
progress_group = ttk.LabelFrame(parent, text="进度", padding=10)
|
||||||
progress_group.pack(fill=tk.X, pady=5)
|
progress_group.pack(fill=tk.X, pady=5)
|
||||||
|
|
||||||
self.progress_bar = ttk.Progressbar(progress_group, mode='determinate')
|
self.progress_bar = ttk.Progressbar(progress_group, mode="determinate")
|
||||||
self.progress_bar.pack(fill=tk.X, pady=5)
|
self.progress_bar.pack(fill=tk.X, pady=5)
|
||||||
|
|
||||||
self.status_label = ttk.Label(progress_group, text="就绪", relief=tk.SUNKEN, anchor=tk.W)
|
self.status_label = ttk.Label(
|
||||||
|
progress_group, text="就绪", relief=tk.SUNKEN, anchor=tk.W
|
||||||
|
)
|
||||||
self.status_label.pack(fill=tk.X)
|
self.status_label.pack(fill=tk.X)
|
||||||
|
|
||||||
# 控制按钮
|
# 控制按钮
|
||||||
button_frame = ttk.Frame(parent)
|
button_frame = ttk.Frame(parent)
|
||||||
button_frame.pack(fill=tk.X, pady=10)
|
button_frame.pack(fill=tk.X, pady=10)
|
||||||
|
|
||||||
self.start_button = ttk.Button(button_frame, text="开始提取", command=self.start_extraction)
|
self.start_button = ttk.Button(
|
||||||
|
button_frame, text="开始提取", command=self.start_extraction
|
||||||
|
)
|
||||||
self.start_button.pack(side=tk.LEFT, padx=5)
|
self.start_button.pack(side=tk.LEFT, padx=5)
|
||||||
|
|
||||||
self.stop_button = ttk.Button(button_frame, text="停止", command=self.stop_extraction, state=tk.DISABLED)
|
self.stop_button = ttk.Button(
|
||||||
|
button_frame, text="停止", command=self.stop_extraction, state=tk.DISABLED
|
||||||
|
)
|
||||||
self.stop_button.pack(side=tk.LEFT, padx=5)
|
self.stop_button.pack(side=tk.LEFT, padx=5)
|
||||||
|
|
||||||
def _create_log_panel(self, parent):
|
def _create_log_panel(self, parent):
|
||||||
@@ -169,16 +181,14 @@ class DataExtractionTab(ttk.Frame):
|
|||||||
self.extracting = True
|
self.extracting = True
|
||||||
self.start_button.config(state=tk.DISABLED)
|
self.start_button.config(state=tk.DISABLED)
|
||||||
self.stop_button.config(state=tk.NORMAL)
|
self.stop_button.config(state=tk.NORMAL)
|
||||||
self.progress_bar['value'] = 0
|
self.progress_bar["value"] = 0
|
||||||
self.status_label.config(text="正在登录...")
|
self.status_label.config(text="正在登录...")
|
||||||
self.log_text.clear()
|
self.log_text.clear()
|
||||||
self.log_text.info("开始数据提取...")
|
self.log_text.info("开始数据提取...")
|
||||||
|
|
||||||
# 在后台线程中执行提取
|
# 在后台线程中执行提取
|
||||||
self.extraction_thread = threading.Thread(
|
self.extraction_thread = threading.Thread(
|
||||||
target=self._extraction_worker,
|
target=self._extraction_worker, args=(input_file, output_file), daemon=True
|
||||||
args=(input_file, output_file),
|
|
||||||
daemon=True
|
|
||||||
)
|
)
|
||||||
self.extraction_thread.start()
|
self.extraction_thread.start()
|
||||||
|
|
||||||
@@ -197,20 +207,24 @@ class DataExtractionTab(ttk.Frame):
|
|||||||
|
|
||||||
# 创建提取器实例
|
# 创建提取器实例
|
||||||
self.extractor = DiscreteMaterialPlanExtractor(
|
self.extractor = DiscreteMaterialPlanExtractor(
|
||||||
username=self.config.get('erp.username'),
|
username=self.config.get("erp.username"),
|
||||||
password=self.config.get('erp.password'),
|
password=self.config.get("erp.password"),
|
||||||
headless=self.headless_var.get(),
|
headless=self.headless_var.get(),
|
||||||
verbose=self.verbose_var.get(),
|
verbose=self.verbose_var.get(),
|
||||||
batch_size=self.config.get('extraction.batch_size', 100)
|
batch_size=self.config.get("extraction.batch_size", 100),
|
||||||
)
|
)
|
||||||
|
|
||||||
# 创建实时输出流,每次写入立即更新 GUI
|
# 创建实时输出流,每次写入立即更新 GUI
|
||||||
realtime_output = RealtimeOutput(lambda line: self._update_log(line, "INFO"))
|
realtime_output = RealtimeOutput(
|
||||||
|
lambda line: self._update_log(line, "INFO")
|
||||||
|
)
|
||||||
|
|
||||||
# 创建进度回调函数
|
# 创建进度回调函数
|
||||||
def progress_callback(progress_info: ProgressInfo):
|
def progress_callback(progress_info: ProgressInfo):
|
||||||
# 计算总体进度百分比
|
# 计算总体进度百分比
|
||||||
overall_percent = self.progress_calculator.calculate_overall_percent(progress_info)
|
overall_percent = self.progress_calculator.calculate_overall_percent(
|
||||||
|
progress_info
|
||||||
|
)
|
||||||
self._update_progress(overall_percent, progress_info.message)
|
self._update_progress(overall_percent, progress_info.message)
|
||||||
|
|
||||||
# 重定向 stdout 并执行提取(带进度回调)
|
# 重定向 stdout 并执行提取(带进度回调)
|
||||||
@@ -218,7 +232,7 @@ class DataExtractionTab(ttk.Frame):
|
|||||||
result = self.extractor.extract(
|
result = self.extractor.extract(
|
||||||
production_id_file=input_file,
|
production_id_file=input_file,
|
||||||
output_file=output_file,
|
output_file=output_file,
|
||||||
progress_callback=progress_callback
|
progress_callback=progress_callback,
|
||||||
)
|
)
|
||||||
|
|
||||||
if result and self.extracting:
|
if result and self.extracting:
|
||||||
@@ -249,7 +263,7 @@ class DataExtractionTab(ttk.Frame):
|
|||||||
try:
|
try:
|
||||||
progress_data = self.progress_queue.get_nowait()
|
progress_data = self.progress_queue.get_nowait()
|
||||||
value, message = progress_data
|
value, message = progress_data
|
||||||
self.progress_bar['value'] = value
|
self.progress_bar["value"] = value
|
||||||
self.status_label.config(text=message)
|
self.status_label.config(text=message)
|
||||||
except queue.Empty:
|
except queue.Empty:
|
||||||
break
|
break
|
||||||
@@ -266,6 +280,7 @@ class DataExtractionTab(ttk.Frame):
|
|||||||
|
|
||||||
def _update_log(self, message: str, level: str = "INFO"):
|
def _update_log(self, message: str, level: str = "INFO"):
|
||||||
"""线程安全的日志更新"""
|
"""线程安全的日志更新"""
|
||||||
|
|
||||||
def update():
|
def update():
|
||||||
if self.extracting or level in ["ERROR", "WARNING", "SUCCESS"]:
|
if self.extracting or level in ["ERROR", "WARNING", "SUCCESS"]:
|
||||||
if level == "INFO":
|
if level == "INFO":
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ class DataQueryTab(ttk.Frame):
|
|||||||
info_label = ttk.Label(
|
info_label = ttk.Label(
|
||||||
parent,
|
parent,
|
||||||
text="输入总排号列表(每行一个),查询对应的生产订单号信息",
|
text="输入总排号列表(每行一个),查询对应的生产订单号信息",
|
||||||
foreground="#666666"
|
foreground="#666666",
|
||||||
)
|
)
|
||||||
info_label.pack(anchor=tk.W, pady=(0, 5))
|
info_label.pack(anchor=tk.W, pady=(0, 5))
|
||||||
|
|
||||||
@@ -82,7 +82,9 @@ class DataQueryTab(ttk.Frame):
|
|||||||
self.input_text = tk.Text(text_frame, height=10, wrap=tk.WORD)
|
self.input_text = tk.Text(text_frame, height=10, wrap=tk.WORD)
|
||||||
self.input_text.pack(side=tk.LEFT, fill=tk.BOTH, expand=True)
|
self.input_text.pack(side=tk.LEFT, fill=tk.BOTH, expand=True)
|
||||||
|
|
||||||
text_scrollbar = ttk.Scrollbar(text_frame, orient=tk.VERTICAL, command=self.input_text.yview)
|
text_scrollbar = ttk.Scrollbar(
|
||||||
|
text_frame, orient=tk.VERTICAL, command=self.input_text.yview
|
||||||
|
)
|
||||||
text_scrollbar.pack(side=tk.RIGHT, fill=tk.Y)
|
text_scrollbar.pack(side=tk.RIGHT, fill=tk.Y)
|
||||||
self.input_text.configure(yscrollcommand=text_scrollbar.set)
|
self.input_text.configure(yscrollcommand=text_scrollbar.set)
|
||||||
|
|
||||||
@@ -102,20 +104,31 @@ class DataQueryTab(ttk.Frame):
|
|||||||
# 快捷按钮
|
# 快捷按钮
|
||||||
ttk.Separator(right_frame, orient=tk.HORIZONTAL).pack(fill=tk.X, pady=10)
|
ttk.Separator(right_frame, orient=tk.HORIZONTAL).pack(fill=tk.X, pady=10)
|
||||||
|
|
||||||
ttk.Button(right_frame, text="加载 ProductionID.txt", command=self._load_production_id).pack(fill=tk.X, pady=2)
|
ttk.Button(
|
||||||
ttk.Button(right_frame, text="清空输入", command=self._clear_input).pack(fill=tk.X, pady=2)
|
right_frame, text="加载 ProductionID.txt", command=self._load_production_id
|
||||||
|
).pack(fill=tk.X, pady=2)
|
||||||
|
ttk.Button(right_frame, text="清空输入", command=self._clear_input).pack(
|
||||||
|
fill=tk.X, pady=2
|
||||||
|
)
|
||||||
|
|
||||||
# 查询按钮
|
# 查询按钮
|
||||||
button_frame = ttk.Frame(parent)
|
button_frame = ttk.Frame(parent)
|
||||||
button_frame.pack(fill=tk.X, pady=(10, 0))
|
button_frame.pack(fill=tk.X, pady=(10, 0))
|
||||||
|
|
||||||
self.query_button = ttk.Button(button_frame, text="执行查询", command=self.execute_query)
|
self.query_button = ttk.Button(
|
||||||
|
button_frame, text="执行查询", command=self.execute_query
|
||||||
|
)
|
||||||
self.query_button.pack(side=tk.LEFT, padx=5)
|
self.query_button.pack(side=tk.LEFT, padx=5)
|
||||||
|
|
||||||
self.export_button = ttk.Button(button_frame, text="导出结果", command=self.export_results, state=tk.DISABLED)
|
self.export_button = ttk.Button(
|
||||||
|
button_frame,
|
||||||
|
text="导出结果",
|
||||||
|
command=self.export_results,
|
||||||
|
state=tk.DISABLED,
|
||||||
|
)
|
||||||
self.export_button.pack(side=tk.LEFT, padx=5)
|
self.export_button.pack(side=tk.LEFT, padx=5)
|
||||||
|
|
||||||
self.progress = ttk.Progressbar(parent, mode='indeterminate')
|
self.progress = ttk.Progressbar(parent, mode="indeterminate")
|
||||||
self.progress.pack(side=tk.LEFT, fill=tk.X, expand=True, padx=5)
|
self.progress.pack(side=tk.LEFT, fill=tk.X, expand=True, padx=5)
|
||||||
|
|
||||||
def _create_result_table(self, parent):
|
def _create_result_table(self, parent):
|
||||||
@@ -135,9 +148,13 @@ class DataQueryTab(ttk.Frame):
|
|||||||
|
|
||||||
# 添加滚动条
|
# 添加滚动条
|
||||||
scrollbar_y = ttk.Scrollbar(parent, orient=tk.VERTICAL, command=self.tree.yview)
|
scrollbar_y = ttk.Scrollbar(parent, orient=tk.VERTICAL, command=self.tree.yview)
|
||||||
scrollbar_x = ttk.Scrollbar(parent, orient=tk.HORIZONTAL, command=self.tree.xview)
|
scrollbar_x = ttk.Scrollbar(
|
||||||
|
parent, orient=tk.HORIZONTAL, command=self.tree.xview
|
||||||
|
)
|
||||||
|
|
||||||
self.tree.configure(yscrollcommand=scrollbar_y.set, xscrollcommand=scrollbar_x.set)
|
self.tree.configure(
|
||||||
|
yscrollcommand=scrollbar_y.set, xscrollcommand=scrollbar_x.set
|
||||||
|
)
|
||||||
|
|
||||||
# 布局
|
# 布局
|
||||||
self.tree.grid(row=0, column=0, sticky="nsew")
|
self.tree.grid(row=0, column=0, sticky="nsew")
|
||||||
@@ -154,7 +171,7 @@ class DataQueryTab(ttk.Frame):
|
|||||||
|
|
||||||
def _load_production_id(self):
|
def _load_production_id(self):
|
||||||
"""加载 ProductionID.txt 文件"""
|
"""加载 ProductionID.txt 文件"""
|
||||||
default_path = self.config.get('paths.production_id_file', 'ProductionID.txt')
|
default_path = self.config.get("paths.production_id_file", "ProductionID.txt")
|
||||||
|
|
||||||
# 检查默认路径
|
# 检查默认路径
|
||||||
if os.path.exists(default_path):
|
if os.path.exists(default_path):
|
||||||
@@ -162,16 +179,17 @@ class DataQueryTab(ttk.Frame):
|
|||||||
else:
|
else:
|
||||||
# 打开文件选择对话框
|
# 打开文件选择对话框
|
||||||
from tkinter import filedialog
|
from tkinter import filedialog
|
||||||
|
|
||||||
file_path = filedialog.askopenfilename(
|
file_path = filedialog.askopenfilename(
|
||||||
title="选择 ProductionID 文件",
|
title="选择 ProductionID 文件",
|
||||||
filetypes=[("文本文件", "*.txt"), ("所有文件", "*.*")]
|
filetypes=[("文本文件", "*.txt"), ("所有文件", "*.*")],
|
||||||
)
|
)
|
||||||
|
|
||||||
if not file_path:
|
if not file_path:
|
||||||
return
|
return
|
||||||
|
|
||||||
try:
|
try:
|
||||||
with open(file_path, 'r', encoding='utf-8') as f:
|
with open(file_path, "r", encoding="utf-8") as f:
|
||||||
content = f.read()
|
content = f.read()
|
||||||
|
|
||||||
self.input_text.delete("1.0", tk.END)
|
self.input_text.delete("1.0", tk.END)
|
||||||
@@ -196,7 +214,9 @@ class DataQueryTab(ttk.Frame):
|
|||||||
return
|
return
|
||||||
|
|
||||||
# 解析总排号
|
# 解析总排号
|
||||||
production_ids = [line.strip() for line in input_text.split('\n') if line.strip()]
|
production_ids = [
|
||||||
|
line.strip() for line in input_text.split("\n") if line.strip()
|
||||||
|
]
|
||||||
|
|
||||||
if not production_ids:
|
if not production_ids:
|
||||||
messagebox.showwarning("警告", "没有有效的总排号")
|
messagebox.showwarning("警告", "没有有效的总排号")
|
||||||
@@ -215,9 +235,7 @@ class DataQueryTab(ttk.Frame):
|
|||||||
|
|
||||||
# 在后台线程中执行查询
|
# 在后台线程中执行查询
|
||||||
query_thread = threading.Thread(
|
query_thread = threading.Thread(
|
||||||
target=self._query_worker,
|
target=self._query_worker, args=(production_ids,), daemon=True
|
||||||
args=(production_ids,),
|
|
||||||
daemon=True
|
|
||||||
)
|
)
|
||||||
query_thread.start()
|
query_thread.start()
|
||||||
|
|
||||||
@@ -253,6 +271,7 @@ class DataQueryTab(ttk.Frame):
|
|||||||
|
|
||||||
def _display_results(self, results: list):
|
def _display_results(self, results: list):
|
||||||
"""在主线程中显示结果"""
|
"""在主线程中显示结果"""
|
||||||
|
|
||||||
def update():
|
def update():
|
||||||
for 总排号, 生产订单号 in results:
|
for 总排号, 生产订单号 in results:
|
||||||
self.tree.insert("", tk.END, values=(总排号, 生产订单号, ""))
|
self.tree.insert("", tk.END, values=(总排号, 生产订单号, ""))
|
||||||
@@ -265,6 +284,7 @@ class DataQueryTab(ttk.Frame):
|
|||||||
|
|
||||||
def _update_log(self, message: str, level: str = "INFO"):
|
def _update_log(self, message: str, level: str = "INFO"):
|
||||||
"""线程安全的日志更新"""
|
"""线程安全的日志更新"""
|
||||||
|
|
||||||
def update():
|
def update():
|
||||||
if level == "INFO":
|
if level == "INFO":
|
||||||
self.log_text.info(message)
|
self.log_text.info(message)
|
||||||
@@ -287,7 +307,7 @@ class DataQueryTab(ttk.Frame):
|
|||||||
title="导出查询结果",
|
title="导出查询结果",
|
||||||
defaultextension=".xlsx",
|
defaultextension=".xlsx",
|
||||||
filetypes=[("Excel 文件", "*.xlsx"), ("所有文件", "*.*")],
|
filetypes=[("Excel 文件", "*.xlsx"), ("所有文件", "*.*")],
|
||||||
initialfile="生产订单号查询结果.xlsx"
|
initialfile="生产订单号查询结果.xlsx",
|
||||||
)
|
)
|
||||||
|
|
||||||
if not output_file:
|
if not output_file:
|
||||||
|
|||||||
@@ -92,13 +92,17 @@ class MainWindow:
|
|||||||
# 状态文本
|
# 状态文本
|
||||||
self.status_text = tk.StringVar()
|
self.status_text = tk.StringVar()
|
||||||
self.status_text.set("就绪")
|
self.status_text.set("就绪")
|
||||||
status_label = ttk.Label(self.status_bar, textvariable=self.status_text, anchor=tk.W)
|
status_label = ttk.Label(
|
||||||
|
self.status_bar, textvariable=self.status_text, anchor=tk.W
|
||||||
|
)
|
||||||
status_label.pack(side=tk.LEFT, padx=5)
|
status_label.pack(side=tk.LEFT, padx=5)
|
||||||
|
|
||||||
# 配置状态指示
|
# 配置状态指示
|
||||||
self.config_status = tk.StringVar()
|
self.config_status = tk.StringVar()
|
||||||
self.config_status.set("配置已加载")
|
self.config_status.set("配置已加载")
|
||||||
config_label = ttk.Label(self.status_bar, textvariable=self.config_status, anchor=tk.E)
|
config_label = ttk.Label(
|
||||||
|
self.status_bar, textvariable=self.config_status, anchor=tk.E
|
||||||
|
)
|
||||||
config_label.pack(side=tk.RIGHT, padx=5)
|
config_label.pack(side=tk.RIGHT, padx=5)
|
||||||
|
|
||||||
def _center_window(self):
|
def _center_window(self):
|
||||||
@@ -113,6 +117,7 @@ class MainWindow:
|
|||||||
def show_about(self):
|
def show_about(self):
|
||||||
"""显示关于对话框"""
|
"""显示关于对话框"""
|
||||||
from tkinter import messagebox
|
from tkinter import messagebox
|
||||||
|
|
||||||
messagebox.showinfo(
|
messagebox.showinfo(
|
||||||
"关于 ERP 自动化工具",
|
"关于 ERP 自动化工具",
|
||||||
"ERP 自动化工具 v1.0\n\n"
|
"ERP 自动化工具 v1.0\n\n"
|
||||||
@@ -121,5 +126,5 @@ class MainWindow:
|
|||||||
"• 物料校验 - 校验物料状态并匹配待删除物料\n"
|
"• 物料校验 - 校验物料状态并匹配待删除物料\n"
|
||||||
"• 数据查询 - 查询生产订单号等信息\n"
|
"• 数据查询 - 查询生产订单号等信息\n"
|
||||||
"• 设置管理 - 管理系统配置\n\n"
|
"• 设置管理 - 管理系统配置\n\n"
|
||||||
"基于 Playwright 和 Python 开发"
|
"基于 Playwright 和 Python 开发",
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ class MaterialValidationTab(ttk.Frame):
|
|||||||
text="使用现有 Excel 文件",
|
text="使用现有 Excel 文件",
|
||||||
variable=self.source_mode,
|
variable=self.source_mode,
|
||||||
value="existing",
|
value="existing",
|
||||||
command=self._on_source_mode_change
|
command=self._on_source_mode_change,
|
||||||
).grid(row=0, column=0, sticky="w", padx=5)
|
).grid(row=0, column=0, sticky="w", padx=5)
|
||||||
|
|
||||||
ttk.Radiobutton(
|
ttk.Radiobutton(
|
||||||
@@ -84,7 +84,7 @@ class MaterialValidationTab(ttk.Frame):
|
|||||||
text="完整工作流 (提取 + 校验)",
|
text="完整工作流 (提取 + 校验)",
|
||||||
variable=self.source_mode,
|
variable=self.source_mode,
|
||||||
value="full",
|
value="full",
|
||||||
command=self._on_source_mode_change
|
command=self._on_source_mode_change,
|
||||||
).grid(row=0, column=1, sticky="w", padx=5)
|
).grid(row=0, column=1, sticky="w", padx=5)
|
||||||
|
|
||||||
# 文件选择
|
# 文件选择
|
||||||
@@ -100,7 +100,7 @@ class MaterialValidationTab(ttk.Frame):
|
|||||||
label_text="现有 Excel 文件:",
|
label_text="现有 Excel 文件:",
|
||||||
file_type="file",
|
file_type="file",
|
||||||
file_types=[("Excel 文件", "*.xlsx"), ("所有文件", "*.*")],
|
file_types=[("Excel 文件", "*.xlsx"), ("所有文件", "*.*")],
|
||||||
initial_dir=self.config.get('paths.data_dir', 'data/')
|
initial_dir=self.config.get("paths.data_dir", "data/"),
|
||||||
)
|
)
|
||||||
self.existing_excel_selector.pack(fill=tk.X)
|
self.existing_excel_selector.pack(fill=tk.X)
|
||||||
|
|
||||||
@@ -113,7 +113,7 @@ class MaterialValidationTab(ttk.Frame):
|
|||||||
label_text="ProductionID 文件:",
|
label_text="ProductionID 文件:",
|
||||||
file_type="file",
|
file_type="file",
|
||||||
file_types=[("文本文件", "*.txt"), ("所有文件", "*.*")],
|
file_types=[("文本文件", "*.txt"), ("所有文件", "*.*")],
|
||||||
initial_dir="D:/python/playwrite/"
|
initial_dir="D:/python/playwrite/",
|
||||||
)
|
)
|
||||||
self.production_id_selector.pack(fill=tk.X)
|
self.production_id_selector.pack(fill=tk.X)
|
||||||
|
|
||||||
@@ -126,14 +126,14 @@ class MaterialValidationTab(ttk.Frame):
|
|||||||
label_text="输出文件:",
|
label_text="输出文件:",
|
||||||
file_type="file",
|
file_type="file",
|
||||||
file_types=[("Excel 文件", "*.xlsx"), ("所有文件", "*.*")],
|
file_types=[("Excel 文件", "*.xlsx"), ("所有文件", "*.*")],
|
||||||
initial_dir=self.config.get('paths.data_dir', 'data/')
|
initial_dir=self.config.get("paths.data_dir", "data/"),
|
||||||
)
|
)
|
||||||
self.output_file_selector.pack(fill=tk.X)
|
self.output_file_selector.pack(fill=tk.X)
|
||||||
|
|
||||||
# 设置默认输出
|
# 设置默认输出
|
||||||
default_output = os.path.join(
|
default_output = os.path.join(
|
||||||
self.config.get('paths.data_dir', 'data/'),
|
self.config.get("paths.data_dir", "data/"),
|
||||||
self.config.get('paths.validation_output', '物料状态校验结果.xlsx')
|
self.config.get("paths.validation_output", "物料状态校验结果.xlsx"),
|
||||||
)
|
)
|
||||||
self.output_file_selector.set(default_output)
|
self.output_file_selector.set(default_output)
|
||||||
|
|
||||||
@@ -141,10 +141,17 @@ class MaterialValidationTab(ttk.Frame):
|
|||||||
button_frame = ttk.Frame(parent)
|
button_frame = ttk.Frame(parent)
|
||||||
button_frame.pack(fill=tk.X, pady=10)
|
button_frame.pack(fill=tk.X, pady=10)
|
||||||
|
|
||||||
self.start_button = ttk.Button(button_frame, text="开始校验", command=self.start_validation)
|
self.start_button = ttk.Button(
|
||||||
|
button_frame, text="开始校验", command=self.start_validation
|
||||||
|
)
|
||||||
self.start_button.pack(side=tk.LEFT, padx=5)
|
self.start_button.pack(side=tk.LEFT, padx=5)
|
||||||
|
|
||||||
self.export_button = ttk.Button(button_frame, text="导出结果", command=self.export_results, state=tk.DISABLED)
|
self.export_button = ttk.Button(
|
||||||
|
button_frame,
|
||||||
|
text="导出结果",
|
||||||
|
command=self.export_results,
|
||||||
|
state=tk.DISABLED,
|
||||||
|
)
|
||||||
self.export_button.pack(side=tk.LEFT, padx=5)
|
self.export_button.pack(side=tk.LEFT, padx=5)
|
||||||
|
|
||||||
def _create_result_table(self, parent):
|
def _create_result_table(self, parent):
|
||||||
@@ -166,9 +173,13 @@ class MaterialValidationTab(ttk.Frame):
|
|||||||
|
|
||||||
# 添加滚动条
|
# 添加滚动条
|
||||||
scrollbar_y = ttk.Scrollbar(parent, orient=tk.VERTICAL, command=self.tree.yview)
|
scrollbar_y = ttk.Scrollbar(parent, orient=tk.VERTICAL, command=self.tree.yview)
|
||||||
scrollbar_x = ttk.Scrollbar(parent, orient=tk.HORIZONTAL, command=self.tree.xview)
|
scrollbar_x = ttk.Scrollbar(
|
||||||
|
parent, orient=tk.HORIZONTAL, command=self.tree.xview
|
||||||
|
)
|
||||||
|
|
||||||
self.tree.configure(yscrollcommand=scrollbar_y.set, xscrollcommand=scrollbar_x.set)
|
self.tree.configure(
|
||||||
|
yscrollcommand=scrollbar_y.set, xscrollcommand=scrollbar_x.set
|
||||||
|
)
|
||||||
|
|
||||||
# 布局
|
# 布局
|
||||||
self.tree.grid(row=0, column=0, sticky="nsew")
|
self.tree.grid(row=0, column=0, sticky="nsew")
|
||||||
@@ -239,11 +250,13 @@ class MaterialValidationTab(ttk.Frame):
|
|||||||
validation_thread = threading.Thread(
|
validation_thread = threading.Thread(
|
||||||
target=self._validation_worker,
|
target=self._validation_worker,
|
||||||
args=(input_file, production_id_file, output_file),
|
args=(input_file, production_id_file, output_file),
|
||||||
daemon=True
|
daemon=True,
|
||||||
)
|
)
|
||||||
validation_thread.start()
|
validation_thread.start()
|
||||||
|
|
||||||
def _validation_worker(self, input_file: str, production_id_file: str, output_file: str):
|
def _validation_worker(
|
||||||
|
self, input_file: str, production_id_file: str, output_file: str
|
||||||
|
):
|
||||||
"""校验工作线程"""
|
"""校验工作线程"""
|
||||||
try:
|
try:
|
||||||
# 导入校验器
|
# 导入校验器
|
||||||
@@ -251,10 +264,10 @@ class MaterialValidationTab(ttk.Frame):
|
|||||||
|
|
||||||
# 创建校验器实例(需要 ERP 凭据,因为可能需要登录系统)
|
# 创建校验器实例(需要 ERP 凭据,因为可能需要登录系统)
|
||||||
validator = MaterialStatusValidator(
|
validator = MaterialStatusValidator(
|
||||||
username=self.config.get('erp.username'),
|
username=self.config.get("erp.username"),
|
||||||
password=self.config.get('erp.password'),
|
password=self.config.get("erp.password"),
|
||||||
headless=self.config.get('erp.headless', True),
|
headless=self.config.get("erp.headless", True),
|
||||||
verbose=True
|
verbose=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
# 捕获 stdout 输出
|
# 捕获 stdout 输出
|
||||||
@@ -264,20 +277,19 @@ class MaterialValidationTab(ttk.Frame):
|
|||||||
with redirect_stdout(captured_output):
|
with redirect_stdout(captured_output):
|
||||||
if self.source_mode.get() == "existing":
|
if self.source_mode.get() == "existing":
|
||||||
result = validator.validate_from_existing_excel(
|
result = validator.validate_from_existing_excel(
|
||||||
excel_file=input_file,
|
excel_file=input_file, output_file=output_file
|
||||||
output_file=output_file
|
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
result = validator.validate(
|
result = validator.validate(
|
||||||
production_id_file=production_id_file,
|
production_id_file=production_id_file,
|
||||||
merged_excel_file=None, # 将在内部生成
|
merged_excel_file=None, # 将在内部生成
|
||||||
output_file=output_file
|
output_file=output_file,
|
||||||
)
|
)
|
||||||
|
|
||||||
# 获取捕获的输出并显示到日志
|
# 获取捕获的输出并显示到日志
|
||||||
output_text = captured_output.getvalue()
|
output_text = captured_output.getvalue()
|
||||||
if output_text:
|
if output_text:
|
||||||
for line in output_text.split('\n'):
|
for line in output_text.split("\n"):
|
||||||
if line.strip():
|
if line.strip():
|
||||||
self._update_log(line, "INFO")
|
self._update_log(line, "INFO")
|
||||||
|
|
||||||
@@ -307,12 +319,16 @@ class MaterialValidationTab(ttk.Frame):
|
|||||||
# 在主线程中更新表格
|
# 在主线程中更新表格
|
||||||
def update_table():
|
def update_table():
|
||||||
for _, row in df.iterrows():
|
for _, row in df.iterrows():
|
||||||
self.tree.insert("", tk.END, values=(
|
self.tree.insert(
|
||||||
row.get('材料名称', ''),
|
"",
|
||||||
row.get('匹配的MaterialName', ''),
|
tk.END,
|
||||||
row.get('负责人', ''),
|
values=(
|
||||||
row.get('匹配状态', '')
|
row.get("材料名称", ""),
|
||||||
))
|
row.get("匹配的MaterialName", ""),
|
||||||
|
row.get("负责人", ""),
|
||||||
|
row.get("匹配状态", ""),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
if len(df) > 0:
|
if len(df) > 0:
|
||||||
self.export_button.config(state=tk.NORMAL)
|
self.export_button.config(state=tk.NORMAL)
|
||||||
@@ -325,6 +341,7 @@ class MaterialValidationTab(ttk.Frame):
|
|||||||
|
|
||||||
def _update_log(self, message: str, level: str = "INFO"):
|
def _update_log(self, message: str, level: str = "INFO"):
|
||||||
"""线程安全的日志更新"""
|
"""线程安全的日志更新"""
|
||||||
|
|
||||||
def update():
|
def update():
|
||||||
if level == "INFO":
|
if level == "INFO":
|
||||||
self.log_text.info(message)
|
self.log_text.info(message)
|
||||||
@@ -345,7 +362,7 @@ class MaterialValidationTab(ttk.Frame):
|
|||||||
output_file = filedialog.asksaveasfilename(
|
output_file = filedialog.asksaveasfilename(
|
||||||
title="保存结果",
|
title="保存结果",
|
||||||
defaultextension=".xlsx",
|
defaultextension=".xlsx",
|
||||||
filetypes=[("Excel 文件", "*.xlsx"), ("所有文件", "*.*")]
|
filetypes=[("Excel 文件", "*.xlsx"), ("所有文件", "*.*")],
|
||||||
)
|
)
|
||||||
|
|
||||||
if not output_file:
|
if not output_file:
|
||||||
@@ -355,7 +372,7 @@ class MaterialValidationTab(ttk.Frame):
|
|||||||
# 收集表格数据
|
# 收集表格数据
|
||||||
data = []
|
data = []
|
||||||
for item in self.tree.get_children():
|
for item in self.tree.get_children():
|
||||||
values = self.tree.item(item)['values']
|
values = self.tree.item(item)["values"]
|
||||||
data.append(values)
|
data.append(values)
|
||||||
|
|
||||||
if not data:
|
if not data:
|
||||||
@@ -363,7 +380,9 @@ class MaterialValidationTab(ttk.Frame):
|
|||||||
return
|
return
|
||||||
|
|
||||||
# 创建 DataFrame 并保存
|
# 创建 DataFrame 并保存
|
||||||
df = pd.DataFrame(data, columns=["材料名称", "匹配的MaterialName", "负责人", "匹配状态"])
|
df = pd.DataFrame(
|
||||||
|
data, columns=["材料名称", "匹配的MaterialName", "负责人", "匹配状态"]
|
||||||
|
)
|
||||||
df.to_excel(output_file, index=False)
|
df.to_excel(output_file, index=False)
|
||||||
|
|
||||||
messagebox.showinfo("成功", f"结果已导出到:{output_file}")
|
messagebox.showinfo("成功", f"结果已导出到:{output_file}")
|
||||||
|
|||||||
@@ -17,7 +17,10 @@ class ProgressInfo:
|
|||||||
|
|
||||||
用于在后台任务和 GUI 之间传递进度信息。
|
用于在后台任务和 GUI 之间传递进度信息。
|
||||||
"""
|
"""
|
||||||
stage: str # 阶段标识: 'login', 'query', 'download', 'logout', 'convert', 'complete'
|
|
||||||
|
stage: (
|
||||||
|
str # 阶段标识: 'login', 'query', 'download', 'logout', 'convert', 'complete'
|
||||||
|
)
|
||||||
current: int # 当前进度值
|
current: int # 当前进度值
|
||||||
total: int # 总量
|
total: int # 总量
|
||||||
message: str # 显示给用户的消息
|
message: str # 显示给用户的消息
|
||||||
@@ -43,12 +46,12 @@ class ProgressCalculator:
|
|||||||
|
|
||||||
# 各阶段在总进度中的占比
|
# 各阶段在总进度中的占比
|
||||||
STAGE_WEIGHTS = {
|
STAGE_WEIGHTS = {
|
||||||
'login': 5, # 登录: 0-5%
|
"login": 5, # 登录: 0-5%
|
||||||
'query': 5, # 查询: 5-10%
|
"query": 5, # 查询: 5-10%
|
||||||
'download': 65, # 下载: 10-75%
|
"download": 65, # 下载: 10-75%
|
||||||
'logout': 5, # 注销: 75-80%
|
"logout": 5, # 注销: 75-80%
|
||||||
'convert': 15, # 转换: 80-95%
|
"convert": 15, # 转换: 80-95%
|
||||||
'complete': 5, # 完成: 95-100%
|
"complete": 5, # 完成: 95-100%
|
||||||
}
|
}
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
@@ -76,7 +79,7 @@ class ProgressCalculator:
|
|||||||
"""
|
"""
|
||||||
stage = progress.stage
|
stage = progress.stage
|
||||||
|
|
||||||
if stage == 'complete':
|
if stage == "complete":
|
||||||
return 100
|
return 100
|
||||||
|
|
||||||
if stage not in self._stage_offsets:
|
if stage not in self._stage_offsets:
|
||||||
|
|||||||
@@ -36,8 +36,7 @@ class SettingsTab(ttk.Frame):
|
|||||||
scrollable_frame = ttk.Frame(canvas)
|
scrollable_frame = ttk.Frame(canvas)
|
||||||
|
|
||||||
scrollable_frame.bind(
|
scrollable_frame.bind(
|
||||||
"<Configure>",
|
"<Configure>", lambda e: canvas.configure(scrollregion=canvas.bbox("all"))
|
||||||
lambda e: canvas.configure(scrollregion=canvas.bbox("all"))
|
|
||||||
)
|
)
|
||||||
|
|
||||||
canvas.create_window((0, 0), window=scrollable_frame, anchor="nw")
|
canvas.create_window((0, 0), window=scrollable_frame, anchor="nw")
|
||||||
@@ -62,10 +61,18 @@ class SettingsTab(ttk.Frame):
|
|||||||
button_frame = ttk.Frame(scrollable_frame)
|
button_frame = ttk.Frame(scrollable_frame)
|
||||||
button_frame.grid(row=5, column=0, columnspan=2, pady=20, sticky="ew")
|
button_frame.grid(row=5, column=0, columnspan=2, pady=20, sticky="ew")
|
||||||
|
|
||||||
ttk.Button(button_frame, text="测试 ERP 连接", command=self.test_erp_connection).pack(side="left", padx=5)
|
ttk.Button(
|
||||||
ttk.Button(button_frame, text="测试数据库连接", command=self.test_db_connection).pack(side="left", padx=5)
|
button_frame, text="测试 ERP 连接", command=self.test_erp_connection
|
||||||
ttk.Button(button_frame, text="保存设置", command=self.save_settings).pack(side="left", padx=5)
|
).pack(side="left", padx=5)
|
||||||
ttk.Button(button_frame, text="恢复默认", command=self.reset_defaults).pack(side="left", padx=5)
|
ttk.Button(
|
||||||
|
button_frame, text="测试数据库连接", command=self.test_db_connection
|
||||||
|
).pack(side="left", padx=5)
|
||||||
|
ttk.Button(button_frame, text="保存设置", command=self.save_settings).pack(
|
||||||
|
side="left", padx=5
|
||||||
|
)
|
||||||
|
ttk.Button(button_frame, text="恢复默认", command=self.reset_defaults).pack(
|
||||||
|
side="left", padx=5
|
||||||
|
)
|
||||||
|
|
||||||
# 布局
|
# 布局
|
||||||
canvas.grid(row=0, column=0, sticky="nsew")
|
canvas.grid(row=0, column=0, sticky="nsew")
|
||||||
@@ -82,12 +89,16 @@ class SettingsTab(ttk.Frame):
|
|||||||
# URL
|
# URL
|
||||||
ttk.Label(group, text="ERP URL:").grid(row=0, column=0, sticky="w", pady=5)
|
ttk.Label(group, text="ERP URL:").grid(row=0, column=0, sticky="w", pady=5)
|
||||||
self.erp_url_var = tk.StringVar()
|
self.erp_url_var = tk.StringVar()
|
||||||
ttk.Entry(group, textvariable=self.erp_url_var, width=50).grid(row=0, column=1, pady=5, sticky="ew")
|
ttk.Entry(group, textvariable=self.erp_url_var, width=50).grid(
|
||||||
|
row=0, column=1, pady=5, sticky="ew"
|
||||||
|
)
|
||||||
|
|
||||||
# 用户名
|
# 用户名
|
||||||
ttk.Label(group, text="用户名:").grid(row=1, column=0, sticky="w", pady=5)
|
ttk.Label(group, text="用户名:").grid(row=1, column=0, sticky="w", pady=5)
|
||||||
self.erp_username_var = tk.StringVar()
|
self.erp_username_var = tk.StringVar()
|
||||||
ttk.Entry(group, textvariable=self.erp_username_var, width=50).grid(row=1, column=1, pady=5, sticky="ew")
|
ttk.Entry(group, textvariable=self.erp_username_var, width=50).grid(
|
||||||
|
row=1, column=1, pady=5, sticky="ew"
|
||||||
|
)
|
||||||
|
|
||||||
# 密码
|
# 密码
|
||||||
ttk.Label(group, text="密码:").grid(row=2, column=0, sticky="w", pady=5)
|
ttk.Label(group, text="密码:").grid(row=2, column=0, sticky="w", pady=5)
|
||||||
@@ -105,17 +116,23 @@ class SettingsTab(ttk.Frame):
|
|||||||
# 服务器
|
# 服务器
|
||||||
ttk.Label(group, text="服务器:").grid(row=0, column=0, sticky="w", pady=5)
|
ttk.Label(group, text="服务器:").grid(row=0, column=0, sticky="w", pady=5)
|
||||||
self.db_server_var = tk.StringVar()
|
self.db_server_var = tk.StringVar()
|
||||||
ttk.Entry(group, textvariable=self.db_server_var, width=50).grid(row=0, column=1, pady=5, sticky="ew")
|
ttk.Entry(group, textvariable=self.db_server_var, width=50).grid(
|
||||||
|
row=0, column=1, pady=5, sticky="ew"
|
||||||
|
)
|
||||||
|
|
||||||
# 数据库名
|
# 数据库名
|
||||||
ttk.Label(group, text="数据库:").grid(row=1, column=0, sticky="w", pady=5)
|
ttk.Label(group, text="数据库:").grid(row=1, column=0, sticky="w", pady=5)
|
||||||
self.db_name_var = tk.StringVar()
|
self.db_name_var = tk.StringVar()
|
||||||
ttk.Entry(group, textvariable=self.db_name_var, width=50).grid(row=1, column=1, pady=5, sticky="ew")
|
ttk.Entry(group, textvariable=self.db_name_var, width=50).grid(
|
||||||
|
row=1, column=1, pady=5, sticky="ew"
|
||||||
|
)
|
||||||
|
|
||||||
# 用户名
|
# 用户名
|
||||||
ttk.Label(group, text="用户名:").grid(row=2, column=0, sticky="w", pady=5)
|
ttk.Label(group, text="用户名:").grid(row=2, column=0, sticky="w", pady=5)
|
||||||
self.db_username_var = tk.StringVar()
|
self.db_username_var = tk.StringVar()
|
||||||
ttk.Entry(group, textvariable=self.db_username_var, width=50).grid(row=2, column=1, pady=5, sticky="ew")
|
ttk.Entry(group, textvariable=self.db_username_var, width=50).grid(
|
||||||
|
row=2, column=1, pady=5, sticky="ew"
|
||||||
|
)
|
||||||
|
|
||||||
# 密码
|
# 密码
|
||||||
ttk.Label(group, text="密码:").grid(row=3, column=0, sticky="w", pady=5)
|
ttk.Label(group, text="密码:").grid(row=3, column=0, sticky="w", pady=5)
|
||||||
@@ -131,13 +148,19 @@ class SettingsTab(ttk.Frame):
|
|||||||
group.grid(row=2, column=0, pady=10, padx=10, sticky="ew")
|
group.grid(row=2, column=0, pady=10, padx=10, sticky="ew")
|
||||||
|
|
||||||
self.browser_headless_var = tk.BooleanVar()
|
self.browser_headless_var = tk.BooleanVar()
|
||||||
ttk.Checkbutton(group, text="无头模式 (不显示浏览器)", variable=self.browser_headless_var).grid(row=0, column=0, sticky="w", pady=5)
|
ttk.Checkbutton(
|
||||||
|
group, text="无头模式 (不显示浏览器)", variable=self.browser_headless_var
|
||||||
|
).grid(row=0, column=0, sticky="w", pady=5)
|
||||||
|
|
||||||
self.browser_ignore_https_var = tk.BooleanVar()
|
self.browser_ignore_https_var = tk.BooleanVar()
|
||||||
ttk.Checkbutton(group, text="忽略 HTTPS 错误", variable=self.browser_ignore_https_var).grid(row=1, column=0, sticky="w", pady=5)
|
ttk.Checkbutton(
|
||||||
|
group, text="忽略 HTTPS 错误", variable=self.browser_ignore_https_var
|
||||||
|
).grid(row=1, column=0, sticky="w", pady=5)
|
||||||
|
|
||||||
self.browser_auto_close_var = tk.BooleanVar()
|
self.browser_auto_close_var = tk.BooleanVar()
|
||||||
ttk.Checkbutton(group, text="操作完成后自动关闭浏览器", variable=self.browser_auto_close_var).grid(row=2, column=0, sticky="w", pady=5)
|
ttk.Checkbutton(
|
||||||
|
group, text="操作完成后自动关闭浏览器", variable=self.browser_auto_close_var
|
||||||
|
).grid(row=2, column=0, sticky="w", pady=5)
|
||||||
|
|
||||||
def _create_paths_group(self, parent):
|
def _create_paths_group(self, parent):
|
||||||
"""创建路径配置组"""
|
"""创建路径配置组"""
|
||||||
@@ -152,14 +175,16 @@ class SettingsTab(ttk.Frame):
|
|||||||
group,
|
group,
|
||||||
label_text="",
|
label_text="",
|
||||||
file_type="directory",
|
file_type="directory",
|
||||||
initial_dir="D:/python/playwrite/data/"
|
initial_dir="D:/python/playwrite/data/",
|
||||||
)
|
)
|
||||||
self.data_dir_selector.grid(row=1, column=0, columnspan=2, sticky="ew", pady=5)
|
self.data_dir_selector.grid(row=1, column=0, columnspan=2, sticky="ew", pady=5)
|
||||||
|
|
||||||
# 默认输出文件
|
# 默认输出文件
|
||||||
ttk.Label(group, text="默认输出文件:").grid(row=2, column=0, sticky="w", pady=5)
|
ttk.Label(group, text="默认输出文件:").grid(row=2, column=0, sticky="w", pady=5)
|
||||||
self.default_output_var = tk.StringVar()
|
self.default_output_var = tk.StringVar()
|
||||||
ttk.Entry(group, textvariable=self.default_output_var, width=40).grid(row=3, column=0, columnspan=2, sticky="ew", pady=5)
|
ttk.Entry(group, textvariable=self.default_output_var, width=40).grid(
|
||||||
|
row=3, column=0, columnspan=2, sticky="ew", pady=5
|
||||||
|
)
|
||||||
|
|
||||||
group.columnconfigure(0, weight=1)
|
group.columnconfigure(0, weight=1)
|
||||||
|
|
||||||
@@ -171,75 +196,85 @@ class SettingsTab(ttk.Frame):
|
|||||||
# 批次大小
|
# 批次大小
|
||||||
ttk.Label(group, text="批次大小:").grid(row=0, column=0, sticky="w", pady=5)
|
ttk.Label(group, text="批次大小:").grid(row=0, column=0, sticky="w", pady=5)
|
||||||
self.batch_size_var = tk.IntVar(value=100)
|
self.batch_size_var = tk.IntVar(value=100)
|
||||||
ttk.Spinbox(group, from_=10, to=500, textvariable=self.batch_size_var, width=10).grid(row=0, column=1, sticky="w", pady=5)
|
ttk.Spinbox(
|
||||||
|
group, from_=10, to=500, textvariable=self.batch_size_var, width=10
|
||||||
|
).grid(row=0, column=1, sticky="w", pady=5)
|
||||||
|
|
||||||
# 详细日志
|
# 详细日志
|
||||||
self.verbose_var = tk.BooleanVar()
|
self.verbose_var = tk.BooleanVar()
|
||||||
ttk.Checkbutton(group, text="启用详细日志", variable=self.verbose_var).grid(row=1, column=0, columnspan=2, sticky="w", pady=5)
|
ttk.Checkbutton(group, text="启用详细日志", variable=self.verbose_var).grid(
|
||||||
|
row=1, column=0, columnspan=2, sticky="w", pady=5
|
||||||
|
)
|
||||||
|
|
||||||
# 自动转换
|
# 自动转换
|
||||||
self.auto_convert_var = tk.BooleanVar()
|
self.auto_convert_var = tk.BooleanVar()
|
||||||
ttk.Checkbutton(group, text="自动转换 Excel 格式", variable=self.auto_convert_var).grid(row=2, column=0, columnspan=2, sticky="w", pady=5)
|
ttk.Checkbutton(
|
||||||
|
group, text="自动转换 Excel 格式", variable=self.auto_convert_var
|
||||||
|
).grid(row=2, column=0, columnspan=2, sticky="w", pady=5)
|
||||||
|
|
||||||
# 合并批次
|
# 合并批次
|
||||||
self.merge_batches_var = tk.BooleanVar()
|
self.merge_batches_var = tk.BooleanVar()
|
||||||
ttk.Checkbutton(group, text="自动合并批次数据", variable=self.merge_batches_var).grid(row=3, column=0, columnspan=2, sticky="w", pady=5)
|
ttk.Checkbutton(
|
||||||
|
group, text="自动合并批次数据", variable=self.merge_batches_var
|
||||||
|
).grid(row=3, column=0, columnspan=2, sticky="w", pady=5)
|
||||||
|
|
||||||
def load_settings(self):
|
def load_settings(self):
|
||||||
"""从配置加载设置到界面"""
|
"""从配置加载设置到界面"""
|
||||||
# ERP 设置
|
# ERP 设置
|
||||||
self.erp_url_var.set(self.config.get('erp.url', ''))
|
self.erp_url_var.set(self.config.get("erp.url", ""))
|
||||||
self.erp_username_var.set(self.config.get('erp.username', ''))
|
self.erp_username_var.set(self.config.get("erp.username", ""))
|
||||||
self.erp_password_var.set(self.config.get('erp.password', ''))
|
self.erp_password_var.set(self.config.get("erp.password", ""))
|
||||||
|
|
||||||
# 数据库设置
|
# 数据库设置
|
||||||
self.db_server_var.set(self.config.get('database.server', ''))
|
self.db_server_var.set(self.config.get("database.server", ""))
|
||||||
self.db_name_var.set(self.config.get('database.database', ''))
|
self.db_name_var.set(self.config.get("database.database", ""))
|
||||||
self.db_username_var.set(self.config.get('database.username', ''))
|
self.db_username_var.set(self.config.get("database.username", ""))
|
||||||
self.db_password_var.set(self.config.get('database.password', ''))
|
self.db_password_var.set(self.config.get("database.password", ""))
|
||||||
|
|
||||||
# 浏览器设置(已合并到 ERP 配置中)
|
# 浏览器设置(已合并到 ERP 配置中)
|
||||||
self.browser_headless_var.set(self.config.get('erp.headless', True))
|
self.browser_headless_var.set(self.config.get("erp.headless", True))
|
||||||
self.browser_ignore_https_var.set(self.config.get('erp.ignore_https_errors', True))
|
self.browser_ignore_https_var.set(
|
||||||
self.browser_auto_close_var.set(self.config.get('erp.auto_close_browser', True))
|
self.config.get("erp.ignore_https_errors", True)
|
||||||
|
)
|
||||||
|
self.browser_auto_close_var.set(self.config.get("erp.auto_close_browser", True))
|
||||||
|
|
||||||
# 路径设置
|
# 路径设置
|
||||||
self.data_dir_selector.set(self.config.get('paths.data_dir', ''))
|
self.data_dir_selector.set(self.config.get("paths.data_dir", ""))
|
||||||
self.default_output_var.set(self.config.get('paths.default_output', ''))
|
self.default_output_var.set(self.config.get("paths.default_output", ""))
|
||||||
|
|
||||||
# 处理设置
|
# 处理设置
|
||||||
self.batch_size_var.set(self.config.get('extraction.batch_size', 100))
|
self.batch_size_var.set(self.config.get("extraction.batch_size", 100))
|
||||||
self.verbose_var.set(self.config.get('extraction.verbose', True))
|
self.verbose_var.set(self.config.get("extraction.verbose", True))
|
||||||
self.auto_convert_var.set(self.config.get('extraction.auto_convert', True))
|
self.auto_convert_var.set(self.config.get("extraction.auto_convert", True))
|
||||||
self.merge_batches_var.set(self.config.get('extraction.merge_batches', True))
|
self.merge_batches_var.set(self.config.get("extraction.merge_batches", True))
|
||||||
|
|
||||||
def save_settings(self):
|
def save_settings(self):
|
||||||
"""保存界面设置到配置"""
|
"""保存界面设置到配置"""
|
||||||
# ERP 设置
|
# ERP 设置
|
||||||
self.config.set('erp.url', self.erp_url_var.get())
|
self.config.set("erp.url", self.erp_url_var.get())
|
||||||
self.config.set('erp.username', self.erp_username_var.get())
|
self.config.set("erp.username", self.erp_username_var.get())
|
||||||
self.config.set('erp.password', self.erp_password_var.get())
|
self.config.set("erp.password", self.erp_password_var.get())
|
||||||
|
|
||||||
# 数据库设置
|
# 数据库设置
|
||||||
self.config.set('database.server', self.db_server_var.get())
|
self.config.set("database.server", self.db_server_var.get())
|
||||||
self.config.set('database.database', self.db_name_var.get())
|
self.config.set("database.database", self.db_name_var.get())
|
||||||
self.config.set('database.username', self.db_username_var.get())
|
self.config.set("database.username", self.db_username_var.get())
|
||||||
self.config.set('database.password', self.db_password_var.get())
|
self.config.set("database.password", self.db_password_var.get())
|
||||||
|
|
||||||
# 浏览器设置(已合并到 ERP 配置中)
|
# 浏览器设置(已合并到 ERP 配置中)
|
||||||
self.config.set('erp.headless', self.browser_headless_var.get())
|
self.config.set("erp.headless", self.browser_headless_var.get())
|
||||||
self.config.set('erp.ignore_https_errors', self.browser_ignore_https_var.get())
|
self.config.set("erp.ignore_https_errors", self.browser_ignore_https_var.get())
|
||||||
self.config.set('erp.auto_close_browser', self.browser_auto_close_var.get())
|
self.config.set("erp.auto_close_browser", self.browser_auto_close_var.get())
|
||||||
|
|
||||||
# 路径设置
|
# 路径设置
|
||||||
self.config.set('paths.data_dir', self.data_dir_selector.get())
|
self.config.set("paths.data_dir", self.data_dir_selector.get())
|
||||||
self.config.set('paths.default_output', self.default_output_var.get())
|
self.config.set("paths.default_output", self.default_output_var.get())
|
||||||
|
|
||||||
# 处理设置
|
# 处理设置
|
||||||
self.config.set('extraction.batch_size', self.batch_size_var.get())
|
self.config.set("extraction.batch_size", self.batch_size_var.get())
|
||||||
self.config.set('extraction.verbose', self.verbose_var.get())
|
self.config.set("extraction.verbose", self.verbose_var.get())
|
||||||
self.config.set('extraction.auto_convert', self.auto_convert_var.get())
|
self.config.set("extraction.auto_convert", self.auto_convert_var.get())
|
||||||
self.config.set('extraction.merge_batches', self.merge_batches_var.get())
|
self.config.set("extraction.merge_batches", self.merge_batches_var.get())
|
||||||
|
|
||||||
# 保存到文件
|
# 保存到文件
|
||||||
if self.config.save():
|
if self.config.save():
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ class RealtimeOutput:
|
|||||||
"""写入文本"""
|
"""写入文本"""
|
||||||
if text:
|
if text:
|
||||||
# 将文本按行分割,逐行回调
|
# 将文本按行分割,逐行回调
|
||||||
lines = text.split('\n')
|
lines = text.split("\n")
|
||||||
for line in lines:
|
for line in lines:
|
||||||
if line: # 忽略空行(由 split 产生)
|
if line: # 忽略空行(由 split 产生)
|
||||||
self.callback(line)
|
self.callback(line)
|
||||||
|
|||||||
4
main.py
4
main.py
@@ -1,6 +1,7 @@
|
|||||||
"""
|
"""
|
||||||
主程序 - 使用离散备料计划维护数据提取工具
|
主程序 - 使用离散备料计划维护数据提取工具
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
from utils.离散备料计划维护数据提取 import DiscreteMaterialPlanExtractor
|
from utils.离散备料计划维护数据提取 import DiscreteMaterialPlanExtractor
|
||||||
|
|
||||||
@@ -11,7 +12,7 @@ def main():
|
|||||||
username="BLDpengqiangqiang",
|
username="BLDpengqiangqiang",
|
||||||
password="Cqbld123456.",
|
password="Cqbld123456.",
|
||||||
headless=True,
|
headless=True,
|
||||||
verbose=True
|
verbose=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
# 设置文件路径
|
# 设置文件路径
|
||||||
@@ -22,6 +23,5 @@ def main():
|
|||||||
extractor.extract(order_id_file, output_file)
|
extractor.extract(order_id_file, output_file)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main()
|
main()
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
"""
|
"""
|
||||||
主程序 - 使用离散备料计划维护数据清理工具
|
主程序 - 使用离散备料计划维护数据清理工具
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
from utils.离散备料计划维护数据清理 import DiscreteMaterialPlanCleaner
|
from utils.离散备料计划维护数据清理 import DiscreteMaterialPlanCleaner
|
||||||
|
|
||||||
@@ -12,7 +13,7 @@ def main():
|
|||||||
password="Cqbld123456.",
|
password="Cqbld123456.",
|
||||||
manager_name="彭羽",
|
manager_name="彭羽",
|
||||||
headless=True,
|
headless=True,
|
||||||
verbose=True
|
verbose=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
# 设置文件路径
|
# 设置文件路径
|
||||||
@@ -22,6 +23,5 @@ def main():
|
|||||||
cleaner.clean(order_id_file)
|
cleaner.clean(order_id_file)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main()
|
main()
|
||||||
|
|||||||
39
record.py
39
record.py
@@ -1,9 +1,17 @@
|
|||||||
import re
|
import re
|
||||||
import time
|
import time
|
||||||
from playwright.sync_api import Playwright, sync_playwright, expect, TimeoutError as PWTimeoutError
|
from playwright.sync_api import (
|
||||||
|
Playwright,
|
||||||
|
sync_playwright,
|
||||||
|
expect,
|
||||||
|
TimeoutError as PWTimeoutError,
|
||||||
|
)
|
||||||
from utils.auth import login
|
from utils.auth import login
|
||||||
|
|
||||||
def click_button_until_disappear(frame, button_name="保存提交", interval=5, max_attempts=None, max_duration=None):
|
|
||||||
|
def click_button_until_disappear(
|
||||||
|
frame, button_name="保存提交", interval=5, max_attempts=None, max_duration=None
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
持续点击按钮直到按钮消失
|
持续点击按钮直到按钮消失
|
||||||
|
|
||||||
@@ -32,7 +40,9 @@ def click_button_until_disappear(frame, button_name="保存提交", interval=5,
|
|||||||
# 检查最大持续时间
|
# 检查最大持续时间
|
||||||
if max_duration and (time.time() - start_time) >= max_duration:
|
if max_duration and (time.time() - start_time) >= max_duration:
|
||||||
elapsed = time.time() - start_time
|
elapsed = time.time() - start_time
|
||||||
print(f"已达到最大持续时间{max_duration}秒(实际{elapsed:.1f}秒),停止操作")
|
print(
|
||||||
|
f"已达到最大持续时间{max_duration}秒(实际{elapsed:.1f}秒),停止操作"
|
||||||
|
)
|
||||||
break
|
break
|
||||||
|
|
||||||
button = frame.get_by_role("button", name=button_name)
|
button = frame.get_by_role("button", name=button_name)
|
||||||
@@ -45,7 +55,7 @@ def click_button_until_disappear(frame, button_name="保存提交", interval=5,
|
|||||||
return {
|
return {
|
||||||
"success": True,
|
"success": True,
|
||||||
"click_count": click_count,
|
"click_count": click_count,
|
||||||
"elapsed_time": elapsed
|
"elapsed_time": elapsed,
|
||||||
}
|
}
|
||||||
|
|
||||||
# 点击按钮
|
# 点击按钮
|
||||||
@@ -63,11 +73,10 @@ def click_button_until_disappear(frame, button_name="保存提交", interval=5,
|
|||||||
"success": False,
|
"success": False,
|
||||||
"click_count": click_count,
|
"click_count": click_count,
|
||||||
"elapsed_time": elapsed,
|
"elapsed_time": elapsed,
|
||||||
"error": str(e)
|
"error": str(e),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def get_input_by_label(frame, label_text: str, label_locator=None):
|
def get_input_by_label(frame, label_text: str, label_locator=None):
|
||||||
"""
|
"""
|
||||||
通过标签文本获取对应的输入框对象
|
通过标签文本获取对应的输入框对象
|
||||||
@@ -84,7 +93,11 @@ def get_input_by_label(frame, label_text: str, label_locator=None):
|
|||||||
try:
|
try:
|
||||||
# 如果没有传入label_locator,则根据label_text查找
|
# 如果没有传入label_locator,则根据label_text查找
|
||||||
if label_locator is None:
|
if label_locator is None:
|
||||||
label_locator = frame.locator("div").filter(has_text=re.compile(f"^{label_text}$")).first
|
label_locator = (
|
||||||
|
frame.locator("div")
|
||||||
|
.filter(has_text=re.compile(f"^{label_text}$"))
|
||||||
|
.first
|
||||||
|
)
|
||||||
print(f"找到{label_text}标签")
|
print(f"找到{label_text}标签")
|
||||||
|
|
||||||
# 向上找到包含标签和输入框的共同父容器
|
# 向上找到包含标签和输入框的共同父容器
|
||||||
@@ -114,6 +127,7 @@ def get_input_by_label(frame, label_text: str, label_locator=None):
|
|||||||
print(f"✗ {label_text}失败: {e}")
|
print(f"✗ {label_text}失败: {e}")
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
def run(playwright: Playwright) -> None:
|
def run(playwright: Playwright) -> None:
|
||||||
# 1. 登录
|
# 1. 登录
|
||||||
browser, context, page, main_frame = login(
|
browser, context, page, main_frame = login(
|
||||||
@@ -121,7 +135,7 @@ def run(playwright: Playwright) -> None:
|
|||||||
username="BLDpengqiangqiang",
|
username="BLDpengqiangqiang",
|
||||||
password="Cqbld123456.",
|
password="Cqbld123456.",
|
||||||
headless=False,
|
headless=False,
|
||||||
ignore_https_errors=True
|
ignore_https_errors=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
# 3. 点击打开“补货安排”
|
# 3. 点击打开“补货安排”
|
||||||
@@ -181,7 +195,6 @@ def run(playwright: Playwright) -> None:
|
|||||||
print("未匹配到行数")
|
print("未匹配到行数")
|
||||||
row_count = 0
|
row_count = 0
|
||||||
|
|
||||||
|
|
||||||
inner_frame.get_by_role("button").filter(has_text="补货安排").hover()
|
inner_frame.get_by_role("button").filter(has_text="补货安排").hover()
|
||||||
inner_frame.get_by_text("生产订单").click()
|
inner_frame.get_by_text("生产订单").click()
|
||||||
inner_frame.get_by_role("textbox", name="工厂").fill("10010705")
|
inner_frame.get_by_role("textbox", name="工厂").fill("10010705")
|
||||||
@@ -189,7 +202,6 @@ def run(playwright: Playwright) -> None:
|
|||||||
inner_frame.get_by_role("button", name="确定(Y)").click()
|
inner_frame.get_by_role("button", name="确定(Y)").click()
|
||||||
page2 = page2_info.value
|
page2 = page2_info.value
|
||||||
|
|
||||||
|
|
||||||
# 新页面:等待页面加载完成 + 提取嵌套 iframe
|
# 新页面:等待页面加载完成 + 提取嵌套 iframe
|
||||||
print("新页面已打开,正在等待内层 iframe 加载...")
|
print("新页面已打开,正在等待内层 iframe 加载...")
|
||||||
page2.wait_for_load_state("domcontentloaded") # 等待 DOM 加载
|
page2.wait_for_load_state("domcontentloaded") # 等待 DOM 加载
|
||||||
@@ -205,7 +217,6 @@ def run(playwright: Playwright) -> None:
|
|||||||
# input_box = label_div.locator("..").locator(".wui-input-close > .wui-input")
|
# input_box = label_div.locator("..").locator(".wui-input-close > .wui-input")
|
||||||
time.sleep(25) # 等待页面完全加载
|
time.sleep(25) # 等待页面完全加载
|
||||||
|
|
||||||
|
|
||||||
# pro_dep_input = get_input_by_label(inner_frame, "生产部门")
|
# pro_dep_input = get_input_by_label(inner_frame, "生产部门")
|
||||||
# if pro_dep_input:
|
# if pro_dep_input:
|
||||||
# print(pro_dep_input.input_value())
|
# print(pro_dep_input.input_value())
|
||||||
@@ -216,18 +227,14 @@ def run(playwright: Playwright) -> None:
|
|||||||
# if pro_SN_input:
|
# if pro_SN_input:
|
||||||
# print(pro_SN_input.input_value())
|
# print(pro_SN_input.input_value())
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# result = click_button_until_disappear(inner_frame, "保存提交", interval=5)
|
# result = click_button_until_disappear(inner_frame, "保存提交", interval=5)
|
||||||
# print(result)
|
# print(result)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
input("操作完成,按回车关闭...")
|
input("操作完成,按回车关闭...")
|
||||||
|
|
||||||
context.close()
|
context.close()
|
||||||
browser.close()
|
browser.close()
|
||||||
|
|
||||||
|
|
||||||
with sync_playwright() as playwright:
|
with sync_playwright() as playwright:
|
||||||
run(playwright)
|
run(playwright)
|
||||||
@@ -1,14 +1,16 @@
|
|||||||
"""
|
"""
|
||||||
分析 Excel 文件的数据结构
|
分析 Excel 文件的数据结构
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
import openpyxl
|
import openpyxl
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
# 设置输出编码
|
# 设置输出编码
|
||||||
if sys.platform == 'win32':
|
if sys.platform == "win32":
|
||||||
import io
|
import io
|
||||||
sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8')
|
|
||||||
|
sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding="utf-8")
|
||||||
|
|
||||||
# 读取 Excel 文件
|
# 读取 Excel 文件
|
||||||
file_path = "data/导出文件.xlsx"
|
file_path = "data/导出文件.xlsx"
|
||||||
@@ -52,12 +54,12 @@ for sheet_name in sheet_names:
|
|||||||
for i, col in enumerate(df.columns):
|
for i, col in enumerate(df.columns):
|
||||||
print(f" 列 {i}: {col}")
|
print(f" 列 {i}: {col}")
|
||||||
print(f"\n数据预览:")
|
print(f"\n数据预览:")
|
||||||
pd.set_option('display.max_rows', 25)
|
pd.set_option("display.max_rows", 25)
|
||||||
pd.set_option('display.max_columns', 20)
|
pd.set_option("display.max_columns", 20)
|
||||||
pd.set_option('display.width', 200)
|
pd.set_option("display.width", 200)
|
||||||
pd.set_option('display.max_colwidth', 30)
|
pd.set_option("display.max_colwidth", 30)
|
||||||
print(df)
|
print(df)
|
||||||
pd.reset_option('display.max_rows')
|
pd.reset_option("display.max_rows")
|
||||||
pd.reset_option('display.max_columns')
|
pd.reset_option("display.max_columns")
|
||||||
pd.reset_option('display.width')
|
pd.reset_option("display.width")
|
||||||
pd.reset_option('display.max_colwidth')
|
pd.reset_option("display.max_colwidth")
|
||||||
|
|||||||
@@ -15,12 +15,18 @@ def number_to_excel_col(n):
|
|||||||
result = ""
|
result = ""
|
||||||
while n > 0:
|
while n > 0:
|
||||||
n -= 1
|
n -= 1
|
||||||
result = chr(n % 26 + ord('A')) + result
|
result = chr(n % 26 + ord("A")) + result
|
||||||
n //= 26
|
n //= 26
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
def excel_to_markdown(input_file, output_file=None, sheet_name=0, include_row_numbers=True, include_col_numbers=True):
|
def excel_to_markdown(
|
||||||
|
input_file,
|
||||||
|
output_file=None,
|
||||||
|
sheet_name=0,
|
||||||
|
include_row_numbers=True,
|
||||||
|
include_col_numbers=True,
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
将Excel文件转换为Markdown表格
|
将Excel文件转换为Markdown表格
|
||||||
|
|
||||||
@@ -39,7 +45,7 @@ def excel_to_markdown(input_file, output_file=None, sheet_name=0, include_row_nu
|
|||||||
|
|
||||||
# 设置默认输出文件名
|
# 设置默认输出文件名
|
||||||
if output_file is None:
|
if output_file is None:
|
||||||
output_file = input_path.with_suffix('.md')
|
output_file = input_path.with_suffix(".md")
|
||||||
else:
|
else:
|
||||||
output_file = Path(output_file)
|
output_file = Path(output_file)
|
||||||
|
|
||||||
@@ -80,7 +86,7 @@ def excel_to_markdown(input_file, output_file=None, sheet_name=0, include_row_nu
|
|||||||
|
|
||||||
for sheet_key, df in dfs.items():
|
for sheet_key, df in dfs.items():
|
||||||
# 转换数据为字符串,处理NaN值
|
# 转换数据为字符串,处理NaN值
|
||||||
df = df.fillna('')
|
df = df.fillna("")
|
||||||
df = df.astype(str)
|
df = df.astype(str)
|
||||||
|
|
||||||
# 生成Markdown表格
|
# 生成Markdown表格
|
||||||
@@ -92,10 +98,14 @@ def excel_to_markdown(input_file, output_file=None, sheet_name=0, include_row_nu
|
|||||||
|
|
||||||
# 添加列号行
|
# 添加列号行
|
||||||
if include_col_numbers:
|
if include_col_numbers:
|
||||||
col_headers = [''] if include_row_numbers else []
|
col_headers = [""] if include_row_numbers else []
|
||||||
col_headers.extend(number_to_excel_col(i + 1) for i in range(len(df.columns)))
|
col_headers.extend(
|
||||||
markdown_lines.append('| ' + ' | '.join(col_headers) + ' |')
|
number_to_excel_col(i + 1) for i in range(len(df.columns))
|
||||||
markdown_lines.append('| ' + ' | '.join(['---' for _ in col_headers]) + ' |')
|
)
|
||||||
|
markdown_lines.append("| " + " | ".join(col_headers) + " |")
|
||||||
|
markdown_lines.append(
|
||||||
|
"| " + " | ".join(["---" for _ in col_headers]) + " |"
|
||||||
|
)
|
||||||
|
|
||||||
# 添加数据行
|
# 添加数据行
|
||||||
for idx, row in df.iterrows():
|
for idx, row in df.iterrows():
|
||||||
@@ -103,15 +113,17 @@ def excel_to_markdown(input_file, output_file=None, sheet_name=0, include_row_nu
|
|||||||
if include_row_numbers:
|
if include_row_numbers:
|
||||||
row_data.append(str(idx + 1))
|
row_data.append(str(idx + 1))
|
||||||
row_data.extend(row)
|
row_data.extend(row)
|
||||||
markdown_lines.append('| ' + ' | '.join(row_data) + ' |')
|
markdown_lines.append("| " + " | ".join(row_data) + " |")
|
||||||
|
|
||||||
# 添加统计信息
|
# 添加统计信息
|
||||||
markdown_lines.append(f"\n**统计信息:**")
|
markdown_lines.append(f"\n**统计信息:**")
|
||||||
markdown_lines.append(f"- 总行数: {len(df)}")
|
markdown_lines.append(f"- 总行数: {len(df)}")
|
||||||
markdown_lines.append(f"- 总列数: {len(df.columns)}")
|
markdown_lines.append(f"- 总列数: {len(df.columns)}")
|
||||||
markdown_lines.append(f"- 数据范围: A1:{number_to_excel_col(len(df.columns))}{len(df)}")
|
markdown_lines.append(
|
||||||
|
f"- 数据范围: A1:{number_to_excel_col(len(df.columns))}{len(df)}"
|
||||||
|
)
|
||||||
|
|
||||||
all_sheets_content[sheet_key] = '\n'.join(markdown_lines)
|
all_sheets_content[sheet_key] = "\n".join(markdown_lines)
|
||||||
|
|
||||||
# 写入文件
|
# 写入文件
|
||||||
if len(dfs) == 1:
|
if len(dfs) == 1:
|
||||||
@@ -120,7 +132,7 @@ def excel_to_markdown(input_file, output_file=None, sheet_name=0, include_row_nu
|
|||||||
output_content = f"# {input_path.stem}\n\n"
|
output_content = f"# {input_path.stem}\n\n"
|
||||||
output_content += f"从 `{input_file}` (工作表: {sheet_key}) 转换\n\n"
|
output_content += f"从 `{input_file}` (工作表: {sheet_key}) 转换\n\n"
|
||||||
output_content += all_sheets_content[sheet_key]
|
output_content += all_sheets_content[sheet_key]
|
||||||
output_file.write_text(output_content, encoding='utf-8')
|
output_file.write_text(output_content, encoding="utf-8")
|
||||||
|
|
||||||
print(f"✓ 转换成功!")
|
print(f"✓ 转换成功!")
|
||||||
print(f" 输入文件: {input_file}")
|
print(f" 输入文件: {input_file}")
|
||||||
@@ -133,11 +145,19 @@ def excel_to_markdown(input_file, output_file=None, sheet_name=0, include_row_nu
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"错误: {str(e)}")
|
print(f"错误: {str(e)}")
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def convert_multiple_sheets(input_file, output_file=None, sheet_names=None, include_row_numbers=True, include_col_numbers=True, merge_to_one_file=True):
|
def convert_multiple_sheets(
|
||||||
|
input_file,
|
||||||
|
output_file=None,
|
||||||
|
sheet_names=None,
|
||||||
|
include_row_numbers=True,
|
||||||
|
include_col_numbers=True,
|
||||||
|
merge_to_one_file=True,
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
转换多个工作表
|
转换多个工作表
|
||||||
|
|
||||||
@@ -157,7 +177,7 @@ def convert_multiple_sheets(input_file, output_file=None, sheet_names=None, incl
|
|||||||
|
|
||||||
# 设置默认输出文件名
|
# 设置默认输出文件名
|
||||||
if output_file is None:
|
if output_file is None:
|
||||||
output_file = input_path.with_suffix('.md')
|
output_file = input_path.with_suffix(".md")
|
||||||
else:
|
else:
|
||||||
output_file = Path(output_file)
|
output_file = Path(output_file)
|
||||||
|
|
||||||
@@ -200,7 +220,7 @@ def convert_multiple_sheets(input_file, output_file=None, sheet_names=None, incl
|
|||||||
|
|
||||||
for sheet_key, df in dfs.items():
|
for sheet_key, df in dfs.items():
|
||||||
# 转换数据为字符串,处理NaN值
|
# 转换数据为字符串,处理NaN值
|
||||||
df = df.fillna('')
|
df = df.fillna("")
|
||||||
df = df.astype(str)
|
df = df.astype(str)
|
||||||
|
|
||||||
# 生成Markdown表格
|
# 生成Markdown表格
|
||||||
@@ -212,10 +232,14 @@ def convert_multiple_sheets(input_file, output_file=None, sheet_names=None, incl
|
|||||||
|
|
||||||
# 添加列号行
|
# 添加列号行
|
||||||
if include_col_numbers:
|
if include_col_numbers:
|
||||||
col_headers = [''] if include_row_numbers else []
|
col_headers = [""] if include_row_numbers else []
|
||||||
col_headers.extend(number_to_excel_col(i + 1) for i in range(len(df.columns)))
|
col_headers.extend(
|
||||||
markdown_lines.append('| ' + ' | '.join(col_headers) + ' |')
|
number_to_excel_col(i + 1) for i in range(len(df.columns))
|
||||||
markdown_lines.append('| ' + ' | '.join(['---' for _ in col_headers]) + ' |')
|
)
|
||||||
|
markdown_lines.append("| " + " | ".join(col_headers) + " |")
|
||||||
|
markdown_lines.append(
|
||||||
|
"| " + " | ".join(["---" for _ in col_headers]) + " |"
|
||||||
|
)
|
||||||
|
|
||||||
# 添加数据行
|
# 添加数据行
|
||||||
for idx, row in df.iterrows():
|
for idx, row in df.iterrows():
|
||||||
@@ -223,15 +247,17 @@ def convert_multiple_sheets(input_file, output_file=None, sheet_names=None, incl
|
|||||||
if include_row_numbers:
|
if include_row_numbers:
|
||||||
row_data.append(str(idx + 1))
|
row_data.append(str(idx + 1))
|
||||||
row_data.extend(row)
|
row_data.extend(row)
|
||||||
markdown_lines.append('| ' + ' | '.join(row_data) + ' |')
|
markdown_lines.append("| " + " | ".join(row_data) + " |")
|
||||||
|
|
||||||
# 添加统计信息
|
# 添加统计信息
|
||||||
markdown_lines.append(f"\n**统计信息:**")
|
markdown_lines.append(f"\n**统计信息:**")
|
||||||
markdown_lines.append(f"- 总行数: {len(df)}")
|
markdown_lines.append(f"- 总行数: {len(df)}")
|
||||||
markdown_lines.append(f"- 总列数: {len(df.columns)}")
|
markdown_lines.append(f"- 总列数: {len(df.columns)}")
|
||||||
markdown_lines.append(f"- 数据范围: A1:{number_to_excel_col(len(df.columns))}{len(df)}")
|
markdown_lines.append(
|
||||||
|
f"- 数据范围: A1:{number_to_excel_col(len(df.columns))}{len(df)}"
|
||||||
|
)
|
||||||
|
|
||||||
all_sheets_content[sheet_key] = '\n'.join(markdown_lines)
|
all_sheets_content[sheet_key] = "\n".join(markdown_lines)
|
||||||
|
|
||||||
# 写入文件
|
# 写入文件
|
||||||
if merge_to_one_file:
|
if merge_to_one_file:
|
||||||
@@ -244,7 +270,7 @@ def convert_multiple_sheets(input_file, output_file=None, sheet_names=None, incl
|
|||||||
if sheet_key in all_sheets_content:
|
if sheet_key in all_sheets_content:
|
||||||
output_content += all_sheets_content[sheet_key] + "\n\n---\n\n"
|
output_content += all_sheets_content[sheet_key] + "\n\n---\n\n"
|
||||||
|
|
||||||
output_file.write_text(output_content, encoding='utf-8')
|
output_file.write_text(output_content, encoding="utf-8")
|
||||||
|
|
||||||
print(f"✓ 转换成功!")
|
print(f"✓ 转换成功!")
|
||||||
print(f" 输入文件: {input_file}")
|
print(f" 输入文件: {input_file}")
|
||||||
@@ -252,7 +278,9 @@ def convert_multiple_sheets(input_file, output_file=None, sheet_names=None, incl
|
|||||||
print(f" 工作表数量: {len(dfs)}")
|
print(f" 工作表数量: {len(dfs)}")
|
||||||
for sheet_key in sheet_names:
|
for sheet_key in sheet_names:
|
||||||
if sheet_key in dfs:
|
if sheet_key in dfs:
|
||||||
print(f" - {sheet_key}: {len(dfs[sheet_key])}行 x {len(dfs[sheet_key].columns)}列")
|
print(
|
||||||
|
f" - {sheet_key}: {len(dfs[sheet_key])}行 x {len(dfs[sheet_key].columns)}列"
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
# 分别输出到多个文件
|
# 分别输出到多个文件
|
||||||
output_stem = output_file.stem
|
output_stem = output_file.stem
|
||||||
@@ -271,7 +299,7 @@ def convert_multiple_sheets(input_file, output_file=None, sheet_names=None, incl
|
|||||||
output_content += f"从 `{input_file}` (工作表: {sheet_key}) 转换\n\n"
|
output_content += f"从 `{input_file}` (工作表: {sheet_key}) 转换\n\n"
|
||||||
output_content += all_sheets_content[sheet_key]
|
output_content += all_sheets_content[sheet_key]
|
||||||
|
|
||||||
sheet_output_file.write_text(output_content, encoding='utf-8')
|
sheet_output_file.write_text(output_content, encoding="utf-8")
|
||||||
|
|
||||||
print(f"✓ 转换成功!")
|
print(f"✓ 转换成功!")
|
||||||
print(f" 输入文件: {input_file}")
|
print(f" 输入文件: {input_file}")
|
||||||
@@ -280,13 +308,16 @@ def convert_multiple_sheets(input_file, output_file=None, sheet_names=None, incl
|
|||||||
for sheet_key in sheet_names:
|
for sheet_key in sheet_names:
|
||||||
if sheet_key in dfs:
|
if sheet_key in dfs:
|
||||||
sheet_filename = f"{output_stem}_{sheet_key}{output_suffix}"
|
sheet_filename = f"{output_stem}_{sheet_key}{output_suffix}"
|
||||||
print(f" - {sheet_key} -> {sheet_filename} ({len(dfs[sheet_key])}行 x {len(dfs[sheet_key].columns)}列)")
|
print(
|
||||||
|
f" - {sheet_key} -> {sheet_filename} ({len(dfs[sheet_key])}行 x {len(dfs[sheet_key].columns)}列)"
|
||||||
|
)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"错误: {str(e)}")
|
print(f"错误: {str(e)}")
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@@ -332,19 +363,23 @@ def main():
|
|||||||
sheet_names=SHEET_NAMES,
|
sheet_names=SHEET_NAMES,
|
||||||
include_row_numbers=INCLUDE_ROW_NUMBERS,
|
include_row_numbers=INCLUDE_ROW_NUMBERS,
|
||||||
include_col_numbers=INCLUDE_COL_NUMBERS,
|
include_col_numbers=INCLUDE_COL_NUMBERS,
|
||||||
merge_to_one_file=MULTI_SHEETS_TO_ONE_FILE
|
merge_to_one_file=MULTI_SHEETS_TO_ONE_FILE,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
# 单个工作表
|
# 单个工作表
|
||||||
sheet_name = SHEET_NAMES if isinstance(SHEET_NAMES, list) and len(SHEET_NAMES) == 1 else SHEET_NAMES
|
sheet_name = (
|
||||||
|
SHEET_NAMES
|
||||||
|
if isinstance(SHEET_NAMES, list) and len(SHEET_NAMES) == 1
|
||||||
|
else SHEET_NAMES
|
||||||
|
)
|
||||||
excel_to_markdown(
|
excel_to_markdown(
|
||||||
input_file=INPUT_FILE,
|
input_file=INPUT_FILE,
|
||||||
output_file=OUTPUT_FILE,
|
output_file=OUTPUT_FILE,
|
||||||
sheet_name=sheet_name,
|
sheet_name=sheet_name,
|
||||||
include_row_numbers=INCLUDE_ROW_NUMBERS,
|
include_row_numbers=INCLUDE_ROW_NUMBERS,
|
||||||
include_col_numbers=INCLUDE_COL_NUMBERS
|
include_col_numbers=INCLUDE_COL_NUMBERS,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == "__main__":
|
||||||
main()
|
main()
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
"""
|
"""
|
||||||
元素定位辅助工具 - 用于快速验证定位是否有效
|
元素定位辅助工具 - 用于快速验证定位是否有效
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from playwright.sync_api import Page, Frame, Locator
|
from playwright.sync_api import Page, Frame, Locator
|
||||||
|
|
||||||
|
|
||||||
@@ -38,7 +39,9 @@ def debug_locator(frame: Frame, locator: Locator, timeout: int = 5000):
|
|||||||
try:
|
try:
|
||||||
if element.is_visible(timeout=1000):
|
if element.is_visible(timeout=1000):
|
||||||
text = element.inner_text(timeout=1000)
|
text = element.inner_text(timeout=1000)
|
||||||
print(f" 元素{i + 1}文本: {text[:100] if len(text) > 100 else text}")
|
print(
|
||||||
|
f" 元素{i + 1}文本: {text[:100] if len(text) > 100 else text}"
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
print(f" 元素{i + 1}: 存在但不可见")
|
print(f" 元素{i + 1}: 存在但不可见")
|
||||||
except:
|
except:
|
||||||
@@ -53,7 +56,9 @@ def debug_locator(frame: Frame, locator: Locator, timeout: int = 5000):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def try_multiple_locators(frame: Frame, selectors: list[str], timeout: int = 5000) -> Locator:
|
def try_multiple_locators(
|
||||||
|
frame: Frame, selectors: list[str], timeout: int = 5000
|
||||||
|
) -> Locator:
|
||||||
"""
|
"""
|
||||||
尝试多个选择器,返回第一个有效的定位器
|
尝试多个选择器,返回第一个有效的定位器
|
||||||
|
|
||||||
@@ -73,7 +78,9 @@ def try_multiple_locators(frame: Frame, selectors: list[str], timeout: int = 500
|
|||||||
try:
|
try:
|
||||||
locator = frame.locator(selector)
|
locator = frame.locator(selector)
|
||||||
count = locator.count()
|
count = locator.count()
|
||||||
visible_count = sum(1 for j in range(count) if locator.nth(j).is_visible(timeout=1000))
|
visible_count = sum(
|
||||||
|
1 for j in range(count) if locator.nth(j).is_visible(timeout=1000)
|
||||||
|
)
|
||||||
|
|
||||||
print(f" 找到 {count} 个元素,其中 {visible_count} 个可见")
|
print(f" 找到 {count} 个元素,其中 {visible_count} 个可见")
|
||||||
|
|
||||||
@@ -101,7 +108,7 @@ def interactive_locate(frame: Frame):
|
|||||||
selector = input("\n>>> ")
|
selector = input("\n>>> ")
|
||||||
selector = selector.strip()
|
selector = selector.strip()
|
||||||
|
|
||||||
if selector.lower() in ('q', 'quit'):
|
if selector.lower() in ("q", "quit"):
|
||||||
break
|
break
|
||||||
|
|
||||||
if not selector:
|
if not selector:
|
||||||
@@ -128,7 +135,9 @@ if __name__ == "__main__":
|
|||||||
page = context.new_page()
|
page = context.new_page()
|
||||||
|
|
||||||
# 登录
|
# 登录
|
||||||
page.goto("https://68.11.34.30:8082/yonbip/resources/uap/rbac/login/main/index.html")
|
page.goto(
|
||||||
|
"https://68.11.34.30:8082/yonbip/resources/uap/rbac/login/main/index.html"
|
||||||
|
)
|
||||||
main_frame = page.locator("#forwardFrame").content_frame
|
main_frame = page.locator("#forwardFrame").content_frame
|
||||||
main_frame.get_by_role("textbox", name="用户名").fill("BLDpengqiangqiang")
|
main_frame.get_by_role("textbox", name="用户名").fill("BLDpengqiangqiang")
|
||||||
main_frame.get_by_role("textbox", name="密码").fill("Cqbld123456.")
|
main_frame.get_by_role("textbox", name="密码").fill("Cqbld123456.")
|
||||||
@@ -158,10 +167,10 @@ if __name__ == "__main__":
|
|||||||
|
|
||||||
# 询问是否继续
|
# 询问是否继续
|
||||||
choice = input("\n是否继续下一轮调试?(y/n/q): ").strip().lower()
|
choice = input("\n是否继续下一轮调试?(y/n/q): ").strip().lower()
|
||||||
if choice in ('n', 'q', 'quit'):
|
if choice in ("n", "q", "quit"):
|
||||||
print("退出程序")
|
print("退出程序")
|
||||||
break
|
break
|
||||||
elif choice in ('y', ''): # 默认继续
|
elif choice in ("y", ""): # 默认继续
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
print("未知选项,退出程序")
|
print("未知选项,退出程序")
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
"""
|
"""
|
||||||
工具组件包
|
工具组件包
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from .excel_converter import ExcelConverter
|
from .excel_converter import ExcelConverter
|
||||||
from .离散备料计划维护数据提取 import DiscreteMaterialPlanExtractor
|
from .离散备料计划维护数据提取 import DiscreteMaterialPlanExtractor
|
||||||
|
|
||||||
__all__ = ['ExcelConverter', 'DiscreteMaterialPlanExtractor']
|
__all__ = ["ExcelConverter", "DiscreteMaterialPlanExtractor"]
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
"""
|
"""
|
||||||
认证模块 - 负责用友BIP系统的登录和退出操作
|
认证模块 - 负责用友BIP系统的登录和退出操作
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from playwright.sync_api import Playwright, Browser, BrowserContext, Page, Frame
|
from playwright.sync_api import Playwright, Browser, BrowserContext, Page, Frame
|
||||||
|
|
||||||
|
|
||||||
@@ -11,7 +12,7 @@ def login(
|
|||||||
url: str = "https://68.11.34.30:8082/yonbip/resources/uap/rbac/login/main/index.html",
|
url: str = "https://68.11.34.30:8082/yonbip/resources/uap/rbac/login/main/index.html",
|
||||||
headless: bool = False,
|
headless: bool = False,
|
||||||
ignore_https_errors: bool = True,
|
ignore_https_errors: bool = True,
|
||||||
verbose: bool = True
|
verbose: bool = True,
|
||||||
) -> tuple[Browser, BrowserContext, Page, Frame]:
|
) -> tuple[Browser, BrowserContext, Page, Frame]:
|
||||||
"""
|
"""
|
||||||
登录用友BIP系统
|
登录用友BIP系统
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
Excel 报表数据转换工具组件
|
Excel 报表数据转换工具组件
|
||||||
将 Excel 报表数据转换为数据库记录形式
|
将 Excel 报表数据转换为数据库记录形式
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
import openpyxl
|
import openpyxl
|
||||||
from typing import List, Dict, Optional
|
from typing import List, Dict, Optional
|
||||||
@@ -12,10 +13,7 @@ class ExcelConverter:
|
|||||||
"""Excel 报表数据转换器"""
|
"""Excel 报表数据转换器"""
|
||||||
|
|
||||||
# 字段名称映射(解决字段名冲突)
|
# 字段名称映射(解决字段名冲突)
|
||||||
FIELD_NAME_MAPPING = {
|
FIELD_NAME_MAPPING = {"计划数量": "产品计划数量", "单位": "产品单位"}
|
||||||
'计划数量': '产品计划数量',
|
|
||||||
'单位': '产品单位'
|
|
||||||
}
|
|
||||||
|
|
||||||
def __init__(self, verbose: bool = True):
|
def __init__(self, verbose: bool = True):
|
||||||
"""
|
"""
|
||||||
@@ -115,7 +113,7 @@ class ExcelConverter:
|
|||||||
row = all_rows[i]
|
row = all_rows[i]
|
||||||
|
|
||||||
# 检查是否是订单标题行
|
# 检查是否是订单标题行
|
||||||
if row and '离散备料计划' in str(row[0]):
|
if row and "离散备料计划" in str(row[0]):
|
||||||
# 解析订单头信息(接下来的4行)
|
# 解析订单头信息(接下来的4行)
|
||||||
order_info = {}
|
order_info = {}
|
||||||
for j in range(1, 5):
|
for j in range(1, 5):
|
||||||
@@ -124,16 +122,27 @@ class ExcelConverter:
|
|||||||
|
|
||||||
# 跳过空行,找到表格标题行
|
# 跳过空行,找到表格标题行
|
||||||
table_row = i + 5
|
table_row = i + 5
|
||||||
while table_row < len(all_rows) and (not all_rows[table_row] or not all_rows[table_row][0]):
|
while table_row < len(all_rows) and (
|
||||||
|
not all_rows[table_row] or not all_rows[table_row][0]
|
||||||
|
):
|
||||||
table_row += 1
|
table_row += 1
|
||||||
|
|
||||||
# 检查是否是表格标题行
|
# 检查是否是表格标题行
|
||||||
if table_row < len(all_rows) and all_rows[table_row] and all_rows[table_row][0] == '序号':
|
if (
|
||||||
|
table_row < len(all_rows)
|
||||||
|
and all_rows[table_row]
|
||||||
|
and all_rows[table_row][0] == "序号"
|
||||||
|
):
|
||||||
# 检查表头下一行是否为空,判断是否存在数据
|
# 检查表头下一行是否为空,判断是否存在数据
|
||||||
next_row = table_row + 1
|
next_row = table_row + 1
|
||||||
is_empty_row = (next_row < len(all_rows) and
|
is_empty_row = (
|
||||||
all_rows[next_row] and
|
next_row < len(all_rows)
|
||||||
all(cell is None or str(cell).strip() == "" for cell in all_rows[next_row]))
|
and all_rows[next_row]
|
||||||
|
and all(
|
||||||
|
cell is None or str(cell).strip() == ""
|
||||||
|
for cell in all_rows[next_row]
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
if is_empty_row:
|
if is_empty_row:
|
||||||
# 没有数据,查找页脚信息
|
# 没有数据,查找页脚信息
|
||||||
@@ -141,17 +150,27 @@ class ExcelConverter:
|
|||||||
footer_info = {}
|
footer_info = {}
|
||||||
data_row = next_row + 1
|
data_row = next_row + 1
|
||||||
while data_row < len(all_rows) and all_rows[data_row]:
|
while data_row < len(all_rows) and all_rows[data_row]:
|
||||||
if all_rows[data_row][0] and ('制单人' in str(all_rows[data_row][0]) or '打印人' in str(all_rows[data_row][0])):
|
if all_rows[data_row][0] and (
|
||||||
|
"制单人" in str(all_rows[data_row][0])
|
||||||
|
or "打印人" in str(all_rows[data_row][0])
|
||||||
|
):
|
||||||
self._parse_header_row(all_rows[data_row], footer_info)
|
self._parse_header_row(all_rows[data_row], footer_info)
|
||||||
if data_row + 1 < len(all_rows) and all_rows[data_row + 1]:
|
if (
|
||||||
self._parse_header_row(all_rows[data_row + 1], footer_info)
|
data_row + 1 < len(all_rows)
|
||||||
|
and all_rows[data_row + 1]
|
||||||
|
):
|
||||||
|
self._parse_header_row(
|
||||||
|
all_rows[data_row + 1], footer_info
|
||||||
|
)
|
||||||
break
|
break
|
||||||
data_row += 1
|
data_row += 1
|
||||||
|
|
||||||
orders.append({
|
orders.append(
|
||||||
'order_info': {**order_info, **footer_info},
|
{
|
||||||
'materials': materials
|
"order_info": {**order_info, **footer_info},
|
||||||
})
|
"materials": materials,
|
||||||
|
}
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
# 有数据,开始提取物料
|
# 有数据,开始提取物料
|
||||||
materials = []
|
materials = []
|
||||||
@@ -159,39 +178,48 @@ class ExcelConverter:
|
|||||||
data_row = table_row + 1
|
data_row = table_row + 1
|
||||||
while data_row < len(all_rows) and all_rows[data_row]:
|
while data_row < len(all_rows) and all_rows[data_row]:
|
||||||
# 检查是否是页脚信息(制单人、打印人)
|
# 检查是否是页脚信息(制单人、打印人)
|
||||||
if all_rows[data_row+1][0] and '制单人' in str(all_rows[data_row+1][0]) :
|
if all_rows[data_row + 1][0] and "制单人" in str(
|
||||||
|
all_rows[data_row + 1][0]
|
||||||
|
):
|
||||||
# 解析页脚信息
|
# 解析页脚信息
|
||||||
self._parse_header_row(all_rows[data_row], footer_info)
|
self._parse_header_row(all_rows[data_row], footer_info)
|
||||||
# 检查下一行是否也是页脚信息
|
# 检查下一行是否也是页脚信息
|
||||||
if data_row + 1 < len(all_rows) and all_rows[data_row + 1]:
|
if (
|
||||||
self._parse_header_row(all_rows[data_row + 1], footer_info)
|
data_row + 1 < len(all_rows)
|
||||||
|
and all_rows[data_row + 1]
|
||||||
|
):
|
||||||
|
self._parse_header_row(
|
||||||
|
all_rows[data_row + 1], footer_info
|
||||||
|
)
|
||||||
break
|
break
|
||||||
|
|
||||||
# 提取物料数据
|
# 提取物料数据
|
||||||
material_row = all_rows[data_row]
|
material_row = all_rows[data_row]
|
||||||
material = {
|
material = {
|
||||||
'序号': material_row[0],
|
"序号": material_row[0],
|
||||||
'材料编码': material_row[1],
|
"材料编码": material_row[1],
|
||||||
'材料名称': material_row[2],
|
"材料名称": material_row[2],
|
||||||
'规格': material_row[3],
|
"规格": material_row[3],
|
||||||
'型号': material_row[4],
|
"型号": material_row[4],
|
||||||
'图号': material_row[5],
|
"图号": material_row[5],
|
||||||
'物料材质': material_row[6],
|
"物料材质": material_row[6],
|
||||||
'计划数量': material_row[7],
|
"计划数量": material_row[7],
|
||||||
'单位': material_row[8],
|
"单位": material_row[8],
|
||||||
'需用日期': material_row[9],
|
"需用日期": material_row[9],
|
||||||
'发料仓库': material_row[10],
|
"发料仓库": material_row[10],
|
||||||
'单位用量': material_row[11],
|
"单位用量": material_row[11],
|
||||||
'累计出库数量': material_row[12],
|
"累计出库数量": material_row[12],
|
||||||
}
|
}
|
||||||
materials.append(material)
|
materials.append(material)
|
||||||
|
|
||||||
data_row += 1
|
data_row += 1
|
||||||
|
|
||||||
orders.append({
|
orders.append(
|
||||||
'order_info': {**order_info, **footer_info},
|
{
|
||||||
'materials': materials
|
"order_info": {**order_info, **footer_info},
|
||||||
})
|
"materials": materials,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
i += 1
|
i += 1
|
||||||
|
|
||||||
@@ -208,9 +236,9 @@ class ExcelConverter:
|
|||||||
i = 0
|
i = 0
|
||||||
while i < len(row):
|
while i < len(row):
|
||||||
cell = row[i]
|
cell = row[i]
|
||||||
if cell and str(cell).strip() and ':' in str(cell):
|
if cell and str(cell).strip() and ":" in str(cell):
|
||||||
# 找到字段名
|
# 找到字段名
|
||||||
field_name = str(cell).replace(':', '').strip()
|
field_name = str(cell).replace(":", "").strip()
|
||||||
|
|
||||||
# 应用字段名映射
|
# 应用字段名映射
|
||||||
if field_name in self.FIELD_NAME_MAPPING:
|
if field_name in self.FIELD_NAME_MAPPING:
|
||||||
@@ -218,9 +246,11 @@ class ExcelConverter:
|
|||||||
|
|
||||||
# 跳过空单元格,找到第一个非字段名的值
|
# 跳过空单元格,找到第一个非字段名的值
|
||||||
j = i + 1
|
j = i + 1
|
||||||
while j < len(row) and (not row[j] or not str(row[j]).strip() or ':' in str(row[j])):
|
while j < len(row) and (
|
||||||
|
not row[j] or not str(row[j]).strip() or ":" in str(row[j])
|
||||||
|
):
|
||||||
j += 1
|
j += 1
|
||||||
if j < len(row) and row[j] and not ':' in str(row[j]):
|
if j < len(row) and row[j] and not ":" in str(row[j]):
|
||||||
info[field_name] = str(row[j]).strip()
|
info[field_name] = str(row[j]).strip()
|
||||||
# 跳过已处理的值,继续找下一个字段名
|
# 跳过已处理的值,继续找下一个字段名
|
||||||
i = j + 1
|
i = j + 1
|
||||||
@@ -240,14 +270,11 @@ class ExcelConverter:
|
|||||||
all_records = []
|
all_records = []
|
||||||
|
|
||||||
for order in orders:
|
for order in orders:
|
||||||
order_info = order['order_info']
|
order_info = order["order_info"]
|
||||||
materials = order['materials']
|
materials = order["materials"]
|
||||||
|
|
||||||
for material in materials:
|
for material in materials:
|
||||||
record = {
|
record = {**order_info, **material}
|
||||||
**order_info,
|
|
||||||
**material
|
|
||||||
}
|
|
||||||
all_records.append(record)
|
all_records.append(record)
|
||||||
|
|
||||||
return pd.DataFrame(all_records)
|
return pd.DataFrame(all_records)
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
物料状态校验工具
|
物料状态校验工具
|
||||||
校验订单中的物料状态,匹配待删除物料
|
校验订单中的物料状态,匹配待删除物料
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
from typing import List, Dict, Any
|
from typing import List, Dict, Any
|
||||||
@@ -49,8 +50,9 @@ class MaterialStatusValidator:
|
|||||||
material_names = [str(name) for name in material_names]
|
material_names = [str(name) for name in material_names]
|
||||||
return material_names
|
return material_names
|
||||||
|
|
||||||
def match_materials(self, material_names: List[str],
|
def match_materials(
|
||||||
db_materials: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
|
self, material_names: List[str], db_materials: List[Dict[str, Any]]
|
||||||
|
) -> List[Dict[str, Any]]:
|
||||||
"""
|
"""
|
||||||
匹配材料名称
|
匹配材料名称
|
||||||
|
|
||||||
@@ -66,22 +68,27 @@ class MaterialStatusValidator:
|
|||||||
matched = None
|
matched = None
|
||||||
for db_record in db_materials:
|
for db_record in db_materials:
|
||||||
# 如果数据库的MaterialName出现在Excel的材料名称中
|
# 如果数据库的MaterialName出现在Excel的材料名称中
|
||||||
if db_record['MaterialName'] in material_name:
|
if db_record["MaterialName"] in material_name:
|
||||||
matched = db_record
|
matched = db_record
|
||||||
break
|
break
|
||||||
|
|
||||||
results.append({
|
results.append(
|
||||||
'材料名称': material_name,
|
{
|
||||||
'匹配的MaterialName': matched['MaterialName'] if matched else None,
|
"材料名称": material_name,
|
||||||
'负责人': matched['ManagerName'] if matched else None,
|
"匹配的MaterialName": matched["MaterialName"] if matched else None,
|
||||||
'匹配状态': '匹配成功' if matched else '未匹配'
|
"负责人": matched["ManagerName"] if matched else None,
|
||||||
})
|
"匹配状态": "匹配成功" if matched else "未匹配",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
return results
|
return results
|
||||||
|
|
||||||
def validate(self, production_id_file: str,
|
def validate(
|
||||||
|
self,
|
||||||
|
production_id_file: str,
|
||||||
merged_excel_file: str = None,
|
merged_excel_file: str = None,
|
||||||
output_file: str = None) -> str:
|
output_file: str = None,
|
||||||
|
) -> str:
|
||||||
"""
|
"""
|
||||||
执行完整的校验流程
|
执行完整的校验流程
|
||||||
|
|
||||||
@@ -106,7 +113,7 @@ class MaterialStatusValidator:
|
|||||||
username=self.username,
|
username=self.username,
|
||||||
password=self.password,
|
password=self.password,
|
||||||
headless=self.headless,
|
headless=self.headless,
|
||||||
verbose=self.verbose
|
verbose=self.verbose,
|
||||||
)
|
)
|
||||||
extractor.extract(production_id_file, output_file=merged_excel_file)
|
extractor.extract(production_id_file, output_file=merged_excel_file)
|
||||||
self._print(f"数据提取完成: {merged_excel_file}")
|
self._print(f"数据提取完成: {merged_excel_file}")
|
||||||
@@ -132,7 +139,7 @@ class MaterialStatusValidator:
|
|||||||
self._print(f"结果已保存: {output_file}")
|
self._print(f"结果已保存: {output_file}")
|
||||||
|
|
||||||
# 打印统计信息
|
# 打印统计信息
|
||||||
matched_count = sum(1 for r in results if r['匹配状态'] == '匹配成功')
|
matched_count = sum(1 for r in results if r["匹配状态"] == "匹配成功")
|
||||||
self._print(f"\n统计信息:")
|
self._print(f"\n统计信息:")
|
||||||
self._print(f" 总材料数: {len(results)}")
|
self._print(f" 总材料数: {len(results)}")
|
||||||
self._print(f" 匹配成功: {matched_count}")
|
self._print(f" 匹配成功: {matched_count}")
|
||||||
@@ -140,7 +147,9 @@ class MaterialStatusValidator:
|
|||||||
|
|
||||||
return output_file
|
return output_file
|
||||||
|
|
||||||
def validate_from_existing_excel(self, excel_file: str, output_file: str = None) -> str:
|
def validate_from_existing_excel(
|
||||||
|
self, excel_file: str, output_file: str = None
|
||||||
|
) -> str:
|
||||||
"""
|
"""
|
||||||
从已存在的Excel文件执行校验(不需要重新提取数据)
|
从已存在的Excel文件执行校验(不需要重新提取数据)
|
||||||
|
|
||||||
@@ -179,7 +188,7 @@ class MaterialStatusValidator:
|
|||||||
self._print(f"结果已保存: {output_file}")
|
self._print(f"结果已保存: {output_file}")
|
||||||
|
|
||||||
# 打印统计信息
|
# 打印统计信息
|
||||||
matched_count = sum(1 for r in results if r['匹配状态'] == '匹配成功')
|
matched_count = sum(1 for r in results if r["匹配状态"] == "匹配成功")
|
||||||
self._print(f"\n统计信息:")
|
self._print(f"\n统计信息:")
|
||||||
self._print(f" 总材料数: {len(results)}")
|
self._print(f" 总材料数: {len(results)}")
|
||||||
self._print(f" 匹配成功: {matched_count}")
|
self._print(f" 匹配成功: {matched_count}")
|
||||||
|
|||||||
@@ -2,19 +2,25 @@
|
|||||||
离散备料计划维护数据提取工具
|
离散备料计划维护数据提取工具
|
||||||
负责登录、批量下载、转换数据
|
负责登录、批量下载、转换数据
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
from playwright.sync_api import sync_playwright
|
from playwright.sync_api import sync_playwright
|
||||||
from utils.excel_converter import ExcelConverter
|
from utils.excel_converter import ExcelConverter
|
||||||
from utils.auth import login, logout
|
from utils.auth import login, logout
|
||||||
from db.production_order_query import read_production_ids, query_production_order_numbers
|
from db.production_order_query import (
|
||||||
|
read_production_ids,
|
||||||
|
query_production_order_numbers,
|
||||||
|
)
|
||||||
from typing import Callable, Optional
|
from typing import Callable, Optional
|
||||||
|
|
||||||
|
|
||||||
class DiscreteMaterialPlanExtractor:
|
class DiscreteMaterialPlanExtractor:
|
||||||
"""离散备料计划维护数据提取器"""
|
"""离散备料计划维护数据提取器"""
|
||||||
|
|
||||||
def __init__(self, username, password, headless=False, verbose=True, batch_size=100):
|
def __init__(
|
||||||
|
self, username, password, headless=False, verbose=True, batch_size=100
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
初始化提取器
|
初始化提取器
|
||||||
|
|
||||||
@@ -38,7 +44,9 @@ class DiscreteMaterialPlanExtractor:
|
|||||||
if self.verbose:
|
if self.verbose:
|
||||||
print(*args, **kwargs)
|
print(*args, **kwargs)
|
||||||
|
|
||||||
def _report_progress(self, stage: str, current: int, total: int, message: str, **detail):
|
def _report_progress(
|
||||||
|
self, stage: str, current: int, total: int, message: str, **detail
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
报告进度
|
报告进度
|
||||||
|
|
||||||
@@ -52,12 +60,13 @@ class DiscreteMaterialPlanExtractor:
|
|||||||
if self.progress_callback:
|
if self.progress_callback:
|
||||||
try:
|
try:
|
||||||
from gui.progress import ProgressInfo
|
from gui.progress import ProgressInfo
|
||||||
|
|
||||||
progress_info = ProgressInfo(
|
progress_info = ProgressInfo(
|
||||||
stage=stage,
|
stage=stage,
|
||||||
current=current,
|
current=current,
|
||||||
total=total,
|
total=total,
|
||||||
message=message,
|
message=message,
|
||||||
detail=detail
|
detail=detail,
|
||||||
)
|
)
|
||||||
self.progress_callback(progress_info)
|
self.progress_callback(progress_info)
|
||||||
except Exception:
|
except Exception:
|
||||||
@@ -84,7 +93,13 @@ class DiscreteMaterialPlanExtractor:
|
|||||||
self._print(f"查询到 {len(order_ids)} 个生产订单号")
|
self._print(f"查询到 {len(order_ids)} 个生产订单号")
|
||||||
|
|
||||||
if report_progress:
|
if report_progress:
|
||||||
self._report_progress('query', 1, 1, f"查询到 {len(order_ids)} 个生产订单号", count=len(order_ids))
|
self._report_progress(
|
||||||
|
"query",
|
||||||
|
1,
|
||||||
|
1,
|
||||||
|
f"查询到 {len(order_ids)} 个生产订单号",
|
||||||
|
count=len(order_ids),
|
||||||
|
)
|
||||||
|
|
||||||
return order_ids
|
return order_ids
|
||||||
|
|
||||||
@@ -93,7 +108,16 @@ class DiscreteMaterialPlanExtractor:
|
|||||||
for i in range(0, len(order_ids), group_size):
|
for i in range(0, len(order_ids), group_size):
|
||||||
yield order_ids[i : i + group_size]
|
yield order_ids[i : i + group_size]
|
||||||
|
|
||||||
def download_batch(self, inner_frame, order_ids, batch_index, total_batches, page1, debug_mode=False, debug_batch=None):
|
def download_batch(
|
||||||
|
self,
|
||||||
|
inner_frame,
|
||||||
|
order_ids,
|
||||||
|
batch_index,
|
||||||
|
total_batches,
|
||||||
|
page1,
|
||||||
|
debug_mode=False,
|
||||||
|
debug_batch=None,
|
||||||
|
):
|
||||||
"""下载一批订单号的数据"""
|
"""下载一批订单号的数据"""
|
||||||
from playwright.sync_api import TimeoutError
|
from playwright.sync_api import TimeoutError
|
||||||
import re
|
import re
|
||||||
@@ -133,7 +157,11 @@ class DiscreteMaterialPlanExtractor:
|
|||||||
inner_frame.get_by_text("输出", exact=True).click()
|
inner_frame.get_by_text("输出", exact=True).click()
|
||||||
|
|
||||||
# 设置行数阈值
|
# 设置行数阈值
|
||||||
input_box = inner_frame.locator("div").filter(has_text=re.compile(r"^行数阈值$")).locator("input[type='text']")
|
input_box = (
|
||||||
|
inner_frame.locator("div")
|
||||||
|
.filter(has_text=re.compile(r"^行数阈值$"))
|
||||||
|
.locator("input[type='text']")
|
||||||
|
)
|
||||||
input_box.fill("300000")
|
input_box.fill("300000")
|
||||||
|
|
||||||
# 下载文件
|
# 下载文件
|
||||||
@@ -147,11 +175,11 @@ class DiscreteMaterialPlanExtractor:
|
|||||||
|
|
||||||
# 报告进度
|
# 报告进度
|
||||||
self._report_progress(
|
self._report_progress(
|
||||||
'download',
|
"download",
|
||||||
batch_index + 1,
|
batch_index + 1,
|
||||||
total_batches,
|
total_batches,
|
||||||
f"第 {batch_index + 1}/{total_batches} 批下载完成",
|
f"第 {batch_index + 1}/{total_batches} 批下载完成",
|
||||||
batch_index=batch_index + 1
|
batch_index=batch_index + 1,
|
||||||
)
|
)
|
||||||
|
|
||||||
# 关闭输出对话框(如果有的话)
|
# 关闭输出对话框(如果有的话)
|
||||||
@@ -188,12 +216,12 @@ class DiscreteMaterialPlanExtractor:
|
|||||||
|
|
||||||
# 报告进度
|
# 报告进度
|
||||||
self._report_progress(
|
self._report_progress(
|
||||||
'convert',
|
"convert",
|
||||||
i,
|
i,
|
||||||
len(file_paths),
|
len(file_paths),
|
||||||
f"转换第 {i}/{len(file_paths)} 个文件",
|
f"转换第 {i}/{len(file_paths)} 个文件",
|
||||||
file_index=i,
|
file_index=i,
|
||||||
file_path=file_path
|
file_path=file_path,
|
||||||
)
|
)
|
||||||
|
|
||||||
df = self.converter.convert(file_path, output_file=None) # 只转换,不保存
|
df = self.converter.convert(file_path, output_file=None) # 只转换,不保存
|
||||||
@@ -235,13 +263,23 @@ class DiscreteMaterialPlanExtractor:
|
|||||||
self._print(f"文本框填充成功: {expected_value}")
|
self._print(f"文本框填充成功: {expected_value}")
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
self._print(f"第 {attempt + 1} 次填充失败,实际值: {actual_value},重试...")
|
self._print(
|
||||||
|
f"第 {attempt + 1} 次填充失败,实际值: {actual_value},重试..."
|
||||||
|
)
|
||||||
if attempt == max_retries - 1:
|
if attempt == max_retries - 1:
|
||||||
self._print(f"警告: {max_retries} 次尝试后仍未成功填充,继续执行...")
|
self._print(
|
||||||
|
f"警告: {max_retries} 次尝试后仍未成功填充,继续执行..."
|
||||||
|
)
|
||||||
|
|
||||||
def extract(self, production_id_file, data_dir="D:/python/playwrite/data",
|
def extract(
|
||||||
|
self,
|
||||||
|
production_id_file,
|
||||||
|
data_dir="D:/python/playwrite/data",
|
||||||
output_file="D:/python/playwrite/data/离散备料计划维护_合并.xlsx",
|
output_file="D:/python/playwrite/data/离散备料计划维护_合并.xlsx",
|
||||||
debug_mode=False, debug_batch=None, progress_callback=None):
|
debug_mode=False,
|
||||||
|
debug_batch=None,
|
||||||
|
progress_callback=None,
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
执行完整的数据提取流程
|
执行完整的数据提取流程
|
||||||
|
|
||||||
@@ -269,11 +307,11 @@ class DiscreteMaterialPlanExtractor:
|
|||||||
username=self.username,
|
username=self.username,
|
||||||
password=self.password,
|
password=self.password,
|
||||||
headless=self.headless,
|
headless=self.headless,
|
||||||
ignore_https_errors=True
|
ignore_https_errors=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
# 登录完成
|
# 登录完成
|
||||||
self._report_progress('login', 1, 1, "登录成功")
|
self._report_progress("login", 1, 1, "登录成功")
|
||||||
|
|
||||||
self._print("=" * 80)
|
self._print("=" * 80)
|
||||||
self._print("开始执行离散备料计划维护数据提取")
|
self._print("开始执行离散备料计划维护数据提取")
|
||||||
@@ -285,7 +323,9 @@ class DiscreteMaterialPlanExtractor:
|
|||||||
|
|
||||||
# 点击打开"离散备料计划维护"
|
# 点击打开"离散备料计划维护"
|
||||||
with page.expect_popup() as page1_info:
|
with page.expect_popup() as page1_info:
|
||||||
main_frame.get_by_title("离散备料计划维护", exact=True).first.click()
|
main_frame.get_by_title(
|
||||||
|
"离散备料计划维护", exact=True
|
||||||
|
).first.click()
|
||||||
page1 = page1_info.value
|
page1 = page1_info.value
|
||||||
|
|
||||||
# 获取 nested iframe
|
# 获取 nested iframe
|
||||||
@@ -298,47 +338,62 @@ class DiscreteMaterialPlanExtractor:
|
|||||||
self.setup_query_interface(inner_frame)
|
self.setup_query_interface(inner_frame)
|
||||||
|
|
||||||
# 读取总排号并查询生产订单号
|
# 读取总排号并查询生产订单号
|
||||||
order_ids = self.get_production_order_numbers(production_id_file, report_progress=True)
|
order_ids = self.get_production_order_numbers(
|
||||||
|
production_id_file, report_progress=True
|
||||||
|
)
|
||||||
|
|
||||||
# 按批次下载
|
# 按批次下载
|
||||||
downloaded_files = []
|
downloaded_files = []
|
||||||
# 计算总批次数
|
# 计算总批次数
|
||||||
total_batches = sum(1 for _ in self.group_order_ids(order_ids, self.batch_size))
|
total_batches = sum(
|
||||||
|
1 for _ in self.group_order_ids(order_ids, self.batch_size)
|
||||||
|
)
|
||||||
|
|
||||||
for batch_index, order_ids_batch in enumerate(self.group_order_ids(order_ids, self.batch_size)):
|
for batch_index, order_ids_batch in enumerate(
|
||||||
self._print(f"\n=== 开始处理第 {batch_index + 1} 批,共 {len(order_ids_batch)} 个订单号 ===")
|
self.group_order_ids(order_ids, self.batch_size)
|
||||||
|
):
|
||||||
|
self._print(
|
||||||
|
f"\n=== 开始处理第 {batch_index + 1} 批,共 {len(order_ids_batch)} 个订单号 ==="
|
||||||
|
)
|
||||||
|
|
||||||
# 报告开始下载批次
|
# 报告开始下载批次
|
||||||
self._report_progress(
|
self._report_progress(
|
||||||
'download',
|
"download",
|
||||||
batch_index,
|
batch_index,
|
||||||
total_batches,
|
total_batches,
|
||||||
f"正在下载第 {batch_index + 1}/{total_batches} 批...",
|
f"正在下载第 {batch_index + 1}/{total_batches} 批...",
|
||||||
batch_index=batch_index + 1,
|
batch_index=batch_index + 1,
|
||||||
batch_size=len(order_ids_batch)
|
batch_size=len(order_ids_batch),
|
||||||
)
|
)
|
||||||
|
|
||||||
downloaded_file = self.download_batch(
|
downloaded_file = self.download_batch(
|
||||||
inner_frame, order_ids_batch, batch_index, total_batches, page1,
|
inner_frame,
|
||||||
debug_mode=debug_mode, debug_batch=debug_batch
|
order_ids_batch,
|
||||||
|
batch_index,
|
||||||
|
total_batches,
|
||||||
|
page1,
|
||||||
|
debug_mode=debug_mode,
|
||||||
|
debug_batch=debug_batch,
|
||||||
)
|
)
|
||||||
downloaded_files.append(downloaded_file)
|
downloaded_files.append(downloaded_file)
|
||||||
|
|
||||||
# 执行账号注销
|
# 执行账号注销
|
||||||
self._print("\n开始执行账号注销...")
|
self._print("\n开始执行账号注销...")
|
||||||
self._report_progress('logout', 1, 1, "正在注销账号...")
|
self._report_progress("logout", 1, 1, "正在注销账号...")
|
||||||
logout(main_frame, verbose=self.verbose)
|
logout(main_frame, verbose=self.verbose)
|
||||||
|
|
||||||
# 转换并合并文件
|
# 转换并合并文件
|
||||||
if downloaded_files:
|
if downloaded_files:
|
||||||
self._report_progress(
|
self._report_progress(
|
||||||
'convert',
|
"convert",
|
||||||
0,
|
0,
|
||||||
len(downloaded_files),
|
len(downloaded_files),
|
||||||
f"开始转换并合并 {len(downloaded_files)} 个文件",
|
f"开始转换并合并 {len(downloaded_files)} 个文件",
|
||||||
file_count=len(downloaded_files)
|
file_count=len(downloaded_files),
|
||||||
|
)
|
||||||
|
self._print(
|
||||||
|
f"\n=== 开始转换并合并 {len(downloaded_files)} 个文件 ==="
|
||||||
)
|
)
|
||||||
self._print(f"\n=== 开始转换并合并 {len(downloaded_files)} 个文件 ===")
|
|
||||||
self.convert_and_merge_files(downloaded_files, output_file)
|
self.convert_and_merge_files(downloaded_files, output_file)
|
||||||
else:
|
else:
|
||||||
self._print("\n没有下载到任何文件")
|
self._print("\n没有下载到任何文件")
|
||||||
@@ -347,7 +402,9 @@ class DiscreteMaterialPlanExtractor:
|
|||||||
self._print(f"最终文件: {output_file}")
|
self._print(f"最终文件: {output_file}")
|
||||||
|
|
||||||
# 报告完成
|
# 报告完成
|
||||||
self._report_progress('complete', 1, 1, "提取完成", output_file=output_file)
|
self._report_progress(
|
||||||
|
"complete", 1, 1, "提取完成", output_file=output_file
|
||||||
|
)
|
||||||
|
|
||||||
# 关闭浏览器
|
# 关闭浏览器
|
||||||
context.close()
|
context.close()
|
||||||
@@ -359,13 +416,14 @@ class DiscreteMaterialPlanExtractor:
|
|||||||
# 恢复原始回调
|
# 恢复原始回调
|
||||||
self.progress_callback = original_callback
|
self.progress_callback = original_callback
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
"""测试函数"""
|
"""测试函数"""
|
||||||
extractor = DiscreteMaterialPlanExtractor(
|
extractor = DiscreteMaterialPlanExtractor(
|
||||||
username="BLDpengqiangqiang",
|
username="BLDpengqiangqiang",
|
||||||
password="Cqbld123456.",
|
password="Cqbld123456.",
|
||||||
headless=False,
|
headless=False,
|
||||||
verbose=True
|
verbose=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
production_id_file = os.path.join(os.path.dirname(__file__), "productionID.txt")
|
production_id_file = os.path.join(os.path.dirname(__file__), "productionID.txt")
|
||||||
|
|||||||
@@ -2,10 +2,14 @@
|
|||||||
离散备料计划维护数据清理工具
|
离散备料计划维护数据清理工具
|
||||||
负责登录、逐个清理订单数据
|
负责登录、逐个清理订单数据
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
from playwright.sync_api import sync_playwright
|
from playwright.sync_api import sync_playwright
|
||||||
from utils.auth import login, logout
|
from utils.auth import login, logout
|
||||||
from db.production_order_query import read_production_ids, query_production_order_numbers
|
from db.production_order_query import (
|
||||||
|
read_production_ids,
|
||||||
|
query_production_order_numbers,
|
||||||
|
)
|
||||||
from db.materials_to_delete import get_materials_to_delete
|
from db.materials_to_delete import get_materials_to_delete
|
||||||
|
|
||||||
|
|
||||||
@@ -54,7 +58,16 @@ class DiscreteMaterialPlanCleaner:
|
|||||||
|
|
||||||
return order_ids
|
return order_ids
|
||||||
|
|
||||||
def process_order(self, inner_frame, order_id, order_index, page1, materials_to_delete=None, debug_mode=False, debug_order=None):
|
def process_order(
|
||||||
|
self,
|
||||||
|
inner_frame,
|
||||||
|
order_id,
|
||||||
|
order_index,
|
||||||
|
page1,
|
||||||
|
materials_to_delete=None,
|
||||||
|
debug_mode=False,
|
||||||
|
debug_order=None,
|
||||||
|
):
|
||||||
"""清理单个订单的数据
|
"""清理单个订单的数据
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
@@ -100,7 +113,6 @@ class DiscreteMaterialPlanCleaner:
|
|||||||
|
|
||||||
inner_frame.locator("#hot-key-head_list").get_by_text("更多").click()
|
inner_frame.locator("#hot-key-head_list").get_by_text("更多").click()
|
||||||
|
|
||||||
|
|
||||||
with page1.expect_popup() as page2_info:
|
with page1.expect_popup() as page2_info:
|
||||||
inner_frame.get_by_text("备料计划").click()
|
inner_frame.get_by_text("备料计划").click()
|
||||||
page2 = page2_info.value
|
page2 = page2_info.value
|
||||||
@@ -153,8 +165,6 @@ class DiscreteMaterialPlanCleaner:
|
|||||||
detail_status = match.group(1)
|
detail_status = match.group(1)
|
||||||
self._print(f"备料状态: {detail_status}")
|
self._print(f"备料状态: {detail_status}")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# page2.pause()
|
# page2.pause()
|
||||||
if detail_count > 0 and detail_status == "审批通过":
|
if detail_count > 0 and detail_status == "审批通过":
|
||||||
inner_frame.get_by_role("button", name="修改").click()
|
inner_frame.get_by_role("button", name="修改").click()
|
||||||
@@ -163,7 +173,6 @@ class DiscreteMaterialPlanCleaner:
|
|||||||
|
|
||||||
inner_frame.get_by_text("展开").first.click()
|
inner_frame.get_by_text("展开").first.click()
|
||||||
|
|
||||||
|
|
||||||
# 获取展开后的父容器,基于它定位子元素更加精确
|
# 获取展开后的父容器,基于它定位子元素更加精确
|
||||||
# 父元素 class="card-table-side-box undefined"
|
# 父元素 class="card-table-side-box undefined"
|
||||||
child_form = inner_frame.locator(".card-table-side-box")
|
child_form = inner_frame.locator(".card-table-side-box")
|
||||||
@@ -171,7 +180,6 @@ class DiscreteMaterialPlanCleaner:
|
|||||||
child_form.wait_for(state="visible", timeout=5000)
|
child_form.wait_for(state="visible", timeout=5000)
|
||||||
self._print(f"父容器 .card-table-side-box 已找到")
|
self._print(f"父容器 .card-table-side-box 已找到")
|
||||||
|
|
||||||
|
|
||||||
page2.pause()
|
page2.pause()
|
||||||
for id in range(detail_count):
|
for id in range(detail_count):
|
||||||
id_lable_locator = child_form.get_by_text("序号 " + str(id + 1))
|
id_lable_locator = child_form.get_by_text("序号 " + str(id + 1))
|
||||||
@@ -179,20 +187,37 @@ class DiscreteMaterialPlanCleaner:
|
|||||||
self._print(f"处理 {id_lable_locator.inner_text()} ")
|
self._print(f"处理 {id_lable_locator.inner_text()} ")
|
||||||
|
|
||||||
# 获取材料编码(通过文本定位,取第一个input)
|
# 获取材料编码(通过文本定位,取第一个input)
|
||||||
input_box = child_form.locator("div").filter(has_text=re.compile(r"^材料编码\d{11}$", re.MULTILINE)).locator("input").first
|
input_box = (
|
||||||
|
child_form.locator("div")
|
||||||
|
.filter(has_text=re.compile(r"^材料编码\d{11}$", re.MULTILINE))
|
||||||
|
.locator("input")
|
||||||
|
.first
|
||||||
|
)
|
||||||
self._print(f"材料编码:{input_box.input_value()}")
|
self._print(f"材料编码:{input_box.input_value()}")
|
||||||
|
|
||||||
# 获取材料名称
|
# 获取材料名称
|
||||||
input_box = child_form.locator("div").filter(has_text=re.compile(r"^材料名称$")).locator("input[type='text']")
|
input_box = (
|
||||||
|
child_form.locator("div")
|
||||||
|
.filter(has_text=re.compile(r"^材料名称$"))
|
||||||
|
.locator("input[type='text']")
|
||||||
|
)
|
||||||
material_name = input_box.input_value()
|
material_name = input_box.input_value()
|
||||||
self._print(f"材料名称:{material_name}")
|
self._print(f"材料名称:{material_name}")
|
||||||
|
|
||||||
# 获取累计待发数量
|
# 获取累计待发数量
|
||||||
input_box = child_form.locator("div").filter(has_text=re.compile(r"^累计待发数量$")).locator("input[type='text']")
|
input_box = (
|
||||||
|
child_form.locator("div")
|
||||||
|
.filter(has_text=re.compile(r"^累计待发数量$"))
|
||||||
|
.locator("input[type='text']")
|
||||||
|
)
|
||||||
self._print(f"累计待发数量:{input_box.input_value()}")
|
self._print(f"累计待发数量:{input_box.input_value()}")
|
||||||
|
|
||||||
# 获取累计出库数量
|
# 获取累计出库数量
|
||||||
input_box = child_form.locator("div").filter(has_text=re.compile(r"^累计出库数量$")).locator("input[type='text']")
|
input_box = (
|
||||||
|
child_form.locator("div")
|
||||||
|
.filter(has_text=re.compile(r"^累计出库数量$"))
|
||||||
|
.locator("input[type='text']")
|
||||||
|
)
|
||||||
self._print(f"累计出库数量:{input_box.input_value()}")
|
self._print(f"累计出库数量:{input_box.input_value()}")
|
||||||
|
|
||||||
# 检查是否需要清理该物料
|
# 检查是否需要清理该物料
|
||||||
@@ -205,15 +230,21 @@ class DiscreteMaterialPlanCleaner:
|
|||||||
break
|
break
|
||||||
|
|
||||||
if should_delete:
|
if should_delete:
|
||||||
self._print(f">>> 需要清理:材料名称【{material_name}】匹配关键字【{matched_keyword}】")
|
self._print(
|
||||||
|
f">>> 需要清理:材料名称【{material_name}】匹配关键字【{matched_keyword}】"
|
||||||
|
)
|
||||||
# TODO: 执行删除操作
|
# TODO: 执行删除操作
|
||||||
else:
|
else:
|
||||||
self._print(f"保留:材料名称【{material_name}】无需清理")
|
self._print(f"保留:材料名称【{material_name}】无需清理")
|
||||||
|
|
||||||
if id != detail_count - 1:
|
if id != detail_count - 1:
|
||||||
child_form.get_by_role("button").filter(has_text=re.compile(r"^$")).nth(2).click()
|
child_form.get_by_role("button").filter(
|
||||||
|
has_text=re.compile(r"^$")
|
||||||
|
).nth(2).click()
|
||||||
else:
|
else:
|
||||||
child_form.get_by_role("button").filter(has_text=re.compile(r"^$")).nth(4).click()
|
child_form.get_by_role("button").filter(
|
||||||
|
has_text=re.compile(r"^$")
|
||||||
|
).nth(4).click()
|
||||||
# page2.pause()
|
# page2.pause()
|
||||||
|
|
||||||
elif detail_count == 0:
|
elif detail_count == 0:
|
||||||
@@ -225,11 +256,6 @@ class DiscreteMaterialPlanCleaner:
|
|||||||
page2.close()
|
page2.close()
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
page2.close()
|
page2.close()
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
pass
|
pass
|
||||||
@@ -255,9 +281,13 @@ class DiscreteMaterialPlanCleaner:
|
|||||||
self._print(f"文本框填充成功: {expected_value}")
|
self._print(f"文本框填充成功: {expected_value}")
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
self._print(f"第 {attempt + 1} 次填充失败,实际值: {actual_value},重试...")
|
self._print(
|
||||||
|
f"第 {attempt + 1} 次填充失败,实际值: {actual_value},重试..."
|
||||||
|
)
|
||||||
if attempt == max_retries - 1:
|
if attempt == max_retries - 1:
|
||||||
self._print(f"警告: {max_retries} 次尝试后仍未成功填充,继续执行...")
|
self._print(
|
||||||
|
f"警告: {max_retries} 次尝试后仍未成功填充,继续执行..."
|
||||||
|
)
|
||||||
|
|
||||||
def clean(self, production_id_file, debug_mode=False, debug_order=None):
|
def clean(self, production_id_file, debug_mode=False, debug_order=None):
|
||||||
"""
|
"""
|
||||||
@@ -280,7 +310,7 @@ class DiscreteMaterialPlanCleaner:
|
|||||||
username=self.username,
|
username=self.username,
|
||||||
password=self.password,
|
password=self.password,
|
||||||
headless=self.headless,
|
headless=self.headless,
|
||||||
ignore_https_errors=True
|
ignore_https_errors=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
self._print("=" * 80)
|
self._print("=" * 80)
|
||||||
@@ -310,10 +340,17 @@ class DiscreteMaterialPlanCleaner:
|
|||||||
|
|
||||||
# 按订单清理
|
# 按订单清理
|
||||||
for order_index, order_id in enumerate(order_ids):
|
for order_index, order_id in enumerate(order_ids):
|
||||||
self._print(f"\n=== 开始处理第 {order_index + 1} 个订单,订单号: {order_id} ===")
|
self._print(
|
||||||
|
f"\n=== 开始处理第 {order_index + 1} 个订单,订单号: {order_id} ==="
|
||||||
|
)
|
||||||
self.process_order(
|
self.process_order(
|
||||||
inner_frame, order_id, order_index, page1, materials_to_delete,
|
inner_frame,
|
||||||
debug_mode=debug_mode, debug_order=debug_order
|
order_id,
|
||||||
|
order_index,
|
||||||
|
page1,
|
||||||
|
materials_to_delete,
|
||||||
|
debug_mode=debug_mode,
|
||||||
|
debug_order=debug_order,
|
||||||
)
|
)
|
||||||
|
|
||||||
# 执行账号注销
|
# 执行账号注销
|
||||||
@@ -334,7 +371,7 @@ def main():
|
|||||||
password="Cqbld123456.",
|
password="Cqbld123456.",
|
||||||
manager_name="彭羽",
|
manager_name="彭羽",
|
||||||
headless=False,
|
headless=False,
|
||||||
verbose=True
|
verbose=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
production_id_file = os.path.join(os.path.dirname(__file__), "productionID.txt")
|
production_id_file = os.path.join(os.path.dirname(__file__), "productionID.txt")
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
物料状态校验脚本
|
物料状态校验脚本
|
||||||
校验订单中的物料状态,匹配待删除物料
|
校验订单中的物料状态,匹配待删除物料
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
@@ -20,7 +21,7 @@ def main():
|
|||||||
username="BLDpengqiangqiang",
|
username="BLDpengqiangqiang",
|
||||||
password="Cqbld123456.",
|
password="Cqbld123456.",
|
||||||
headless=True,
|
headless=True,
|
||||||
verbose=True
|
verbose=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
# 设置文件路径
|
# 设置文件路径
|
||||||
|
|||||||
Reference in New Issue
Block a user