admin/playwrite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mysql' into dev

Browse Source 
Resolved merge conflict in utils/material_status_validator.py by keeping
both deduplication statistics and error messages for empty results.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
Misaka
2026-02-24 20:44:52 +08:00
parent 24053c6a3b 19dfe5b09e
commit f2bbcfc426
14 changed files with 1998 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
utils/material_status_validator.py
View File

@@ -11,7 +11,7 @@ import os
import pandas as pd
from typing import List, Dict, Any, Optional, Set
from dataclasses import dataclass
from utils.离散备料计划维护数据提取 import DiscreteMaterialPlanExtractor
from utils.discrete_material_plan_extractor import DiscreteMaterialPlanExtractor
from db.materials_to_delete import get_all_materials_to_delete
from db.production_contract_data_dao import ProductionContractDataDAO
from db.discrete_material_plan_dao import DiscreteMaterialPlanDAO
@@ -446,10 +446,18 @@ class MaterialStatusValidator:
# Get material records (complete records, not just MaterialName)
if full_table:
self._print("\n模式: 全表校验")
self._print("[INFO] 查询 DiscreteMaterialPlanData 表中的所有完整记录...")
self._print("[INFO] 查询 DiscreteMaterialPlanData 表中的所有完整记录（启用 MaterialCode 去重）...")
dao = DiscreteMaterialPlanDAO()
material_records = dao.query_all()
# Get original count for deduplication statistics
original_count = dao.count_all()
material_records = dao.query_all_distinct_by_material_code()
dedup_count = original_count - len(material_records)
self._print(f"[INFO] 获取到 {len(material_records)} 条记录")
if dedup_count > 0:
self._print(f"[INFO] 基于 MaterialCode 去重：移除了 {dedup_count} 条重复记录")
elif production_id_file:
self._print("\n模式: ProductionID 过滤校验")
self._print(f"[INFO] 读取 ProductionID 文件: {production_id_file}")
@@ -461,12 +469,21 @@ class MaterialStatusValidator:
# 2. Query SourceNumbers
source_numbers = self._get_source_numbers_from_production_ids(production_ids)
# 3. Get complete material records
self._print(f"[INFO] 查询 {len(source_numbers)} 个生产订单对应的完整物料记录...")
# 3. Get complete material records with deduplication
self._print(f"[INFO] 查询 {len(source_numbers)} 个生产订单对应的完整物料记录（启用 MaterialCode 去重）...")
dao = DiscreteMaterialPlanDAO()
material_records = dao.query_by_source_numbers(source_numbers)
# Get original count for deduplication statistics
original_records = dao.query_by_source_numbers(source_numbers)
material_records = dao.query_by_source_numbers_distinct(source_numbers)
dedup_count = len(original_records) - len(material_records)
self._print(f"[INFO] 获取到 {len(material_records)} 条记录")
if dedup_count > 0:
self._print(f"[INFO] 基于 MaterialCode 去重：移除了 {dedup_count} 条重复记录")
# 如果没有找到物料记录，给出友好提示
if not material_records:
self._print("\n[ERROR] 校验失败：未找到物料记录")