From 4036b664ba77e6396ccb5c213566160a8f9f3048 Mon Sep 17 00:00:00 2001 From: DXC Date: Thu, 22 Jan 2026 14:29:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ASD=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=B7=BB=E5=8A=A0"ASD"=20=20"SciAps"?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=8F=8C=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 带公式版本.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/带公式版本.py b/带公式版本.py index 99eb1df..7c0da37 100644 --- a/带公式版本.py +++ b/带公式版本.py @@ -8,7 +8,6 @@ from datetime import datetime import traceback from openpyxl.utils import get_column_letter - # ========================================== # 第一部分：业务逻辑核心 # ========================================== @@ -600,10 +599,15 @@ class DataProcessor: col_gen = '厂家' col_det = '厂家.1' if '厂家.1' in csv_df.columns else '厂家' + # [修改] 定义判断 ASD 的正则模式：包含 ASD 或 SciAps + asd_pattern = r'ASD|SciAps' + if is_asd: - df_subset = csv_df[csv_df[col_gen].str.contains('ASD', case=False, na=False)] + # 筛选 ASD 表：厂家包含 ASD 或 SciAps + df_subset = csv_df[csv_df[col_gen].str.contains(asd_pattern, case=False, na=False, regex=True)] else: - df_subset = csv_df[~csv_df[col_gen].str.contains('ASD', case=False, na=False)] + # 筛选 NonASD 表：厂家不包含 ASD 且不包含 SciAps + df_subset = csv_df[~csv_df[col_gen].str.contains(asd_pattern, case=False, na=False, regex=True)] csv_foreign = df_subset[df_subset['合同类型'] == '外贸'].copy() csv_domestic = df_subset[df_subset['合同类型'] == '内贸'].copy() @@ -726,7 +730,7 @@ class DataProcessor: class ContractApp: def __init__(self, root): self.root = root - self.root.title("合同数据处理系统 V5.1 (修复发货日期格式)") + self.root.title("合同数据处理系统 V5.2 (含SciAps分类优化)") self.root.geometry("1300x850") self.root.minsize(1000, 700)