refactor: rename MaterialsToBeDeleted to MaterialsTypeToBeDeleted

Rename database table and related classes from MaterialsToBeDeleted to MaterialsTypeToBeDeleted for better semantic clarity.

Changes:
- Rename MaterialsToBeDeletedDAO class to MaterialsTypeToBeDeletedDAO
- Update all SQL queries to reference MaterialsTypeToBeDeleted table
- Update import statement in material_status_validator.py
- Update documentation comments

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
Misaka_Company
2026-02-06 14:15:51 +08:00
parent ca1a1f3219
commit 0ef1b86f12
3 changed files with 22 additions and 22 deletions

View File

@@ -1,7 +1,7 @@
""" """
Data Access Object for MaterialsToBeDeleted table. Data Access Object for MaterialsTypeToBeDeleted table.
This module provides CRUD operations for the MaterialsToBeDeleted table, This module provides CRUD operations for the MaterialsTypeToBeDeleted table,
which tracks materials that need to be deleted by their managers. which tracks materials that need to be deleted by their managers.
""" """
@@ -9,8 +9,8 @@ from typing import List, Dict, Any, Tuple, Optional
from db.connection import get_connection from db.connection import get_connection
class MaterialsToBeDeletedDAO: class MaterialsTypeToBeDeletedDAO:
"""Data Access Object for MaterialsToBeDeleted table CRUD operations""" """Data Access Object for MaterialsTypeToBeDeleted table CRUD operations"""
def __init__(self): def __init__(self):
self.db = None self.db = None
@@ -47,7 +47,7 @@ class MaterialsToBeDeletedDAO:
True if successful, False otherwise True if successful, False otherwise
""" """
sql = """ sql = """
INSERT INTO [dbo].[MaterialsToBeDeleted] ([MaterialName], [ManagerName]) INSERT INTO [dbo].[MaterialsTypeToBeDeleted] ([MaterialName], [ManagerName])
VALUES (?, ?) VALUES (?, ?)
""" """
try: try:
@@ -72,7 +72,7 @@ class MaterialsToBeDeletedDAO:
return 0 return 0
sql = """ sql = """
INSERT INTO [dbo].[MaterialsToBeDeleted] ([MaterialName], [ManagerName]) INSERT INTO [dbo].[MaterialsTypeToBeDeleted] ([MaterialName], [ManagerName])
VALUES (?, ?) VALUES (?, ?)
""" """
@@ -98,7 +98,7 @@ class MaterialsToBeDeletedDAO:
""" """
sql = """ sql = """
SELECT [MaterialName], [ManagerName] SELECT [MaterialName], [ManagerName]
FROM [dbo].[MaterialsToBeDeleted] FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [MaterialName] IS NOT NULL WHERE [MaterialName] IS NOT NULL
ORDER BY [ManagerName], [MaterialName] ORDER BY [ManagerName], [MaterialName]
""" """
@@ -117,7 +117,7 @@ class MaterialsToBeDeletedDAO:
""" """
sql = """ sql = """
SELECT [MaterialName], [ManagerName] SELECT [MaterialName], [ManagerName]
FROM [dbo].[MaterialsToBeDeleted] FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [ManagerName] = ? AND [MaterialName] IS NOT NULL WHERE [ManagerName] = ? AND [MaterialName] IS NOT NULL
ORDER BY [MaterialName] ORDER BY [MaterialName]
""" """
@@ -133,7 +133,7 @@ class MaterialsToBeDeletedDAO:
""" """
sql = """ sql = """
SELECT DISTINCT [ManagerName] SELECT DISTINCT [ManagerName]
FROM [dbo].[MaterialsToBeDeleted] FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [ManagerName] IS NOT NULL WHERE [ManagerName] IS NOT NULL
ORDER BY [ManagerName] ORDER BY [ManagerName]
""" """
@@ -174,7 +174,7 @@ class MaterialsToBeDeletedDAO:
True if successful, False otherwise True if successful, False otherwise
""" """
sql = """ sql = """
UPDATE [dbo].[MaterialsToBeDeleted] UPDATE [dbo].[MaterialsTypeToBeDeleted]
SET [ManagerName] = ? SET [ManagerName] = ?
WHERE [MaterialName] = ? AND [ManagerName] = ? WHERE [MaterialName] = ? AND [ManagerName] = ?
""" """
@@ -204,7 +204,7 @@ class MaterialsToBeDeletedDAO:
True if successful, False otherwise True if successful, False otherwise
""" """
sql = """ sql = """
DELETE FROM [dbo].[MaterialsToBeDeleted] DELETE FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [MaterialName] = ? AND [ManagerName] = ? WHERE [MaterialName] = ? AND [ManagerName] = ?
""" """
try: try:
@@ -226,7 +226,7 @@ class MaterialsToBeDeletedDAO:
Number of records deleted Number of records deleted
""" """
sql = """ sql = """
DELETE FROM [dbo].[MaterialsToBeDeleted] DELETE FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [ManagerName] = ? WHERE [ManagerName] = ?
""" """
try: try:
@@ -243,7 +243,7 @@ class MaterialsToBeDeletedDAO:
Returns: Returns:
Number of records deleted Number of records deleted
""" """
sql = "DELETE FROM [dbo].[MaterialsToBeDeleted]" sql = "DELETE FROM [dbo].[MaterialsTypeToBeDeleted]"
try: try:
with get_connection() as db: with get_connection() as db:
return db.execute_update(sql) return db.execute_update(sql)
@@ -265,7 +265,7 @@ class MaterialsToBeDeletedDAO:
""" """
sql = """ sql = """
SELECT COUNT(*) as count SELECT COUNT(*) as count
FROM [dbo].[MaterialsToBeDeleted] FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [MaterialName] = ? WHERE [MaterialName] = ?
""" """
with get_connection() as db: with get_connection() as db:
@@ -284,7 +284,7 @@ class MaterialsToBeDeletedDAO:
""" """
sql = """ sql = """
SELECT COUNT(*) as count SELECT COUNT(*) as count
FROM [dbo].[MaterialsToBeDeleted] FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [ManagerName] = ? WHERE [ManagerName] = ?
""" """
with get_connection() as db: with get_connection() as db:
@@ -303,7 +303,7 @@ class MaterialsToBeDeletedDAO:
SELECT SELECT
COUNT(*) as total_materials, COUNT(*) as total_materials,
COUNT(DISTINCT ManagerName) as unique_managers COUNT(DISTINCT ManagerName) as unique_managers
FROM [dbo].[MaterialsToBeDeleted] FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [MaterialName] IS NOT NULL WHERE [MaterialName] IS NOT NULL
""" """
with get_connection() as db: with get_connection() as db:
@@ -313,7 +313,7 @@ class MaterialsToBeDeletedDAO:
# Get materials per manager # Get materials per manager
manager_sql = """ manager_sql = """
SELECT [ManagerName], COUNT(*) as count SELECT [ManagerName], COUNT(*) as count
FROM [dbo].[MaterialsToBeDeleted] FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [ManagerName] IS NOT NULL WHERE [ManagerName] IS NOT NULL
GROUP BY [ManagerName] GROUP BY [ManagerName]
ORDER BY count DESC ORDER BY count DESC
@@ -337,7 +337,7 @@ class MaterialsToBeDeletedDAO:
""" """
sql = """ sql = """
SELECT [MaterialName], [ManagerName] SELECT [MaterialName], [ManagerName]
FROM [dbo].[MaterialsToBeDeleted] FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [MaterialName] LIKE ? WHERE [MaterialName] LIKE ?
ORDER BY [ManagerName], [MaterialName] ORDER BY [ManagerName], [MaterialName]
""" """

View File

@@ -19,7 +19,7 @@ def get_materials_to_delete(manager_name):
""" """
query = """ query = """
SELECT [MaterialName] SELECT [MaterialName]
FROM [dbo].[MaterialsToBeDeleted] FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [ManagerName] = ? WHERE [ManagerName] = ?
""" """
@@ -39,7 +39,7 @@ def get_all_materials_to_delete() -> List[Dict[str, Any]]:
""" """
query = """ query = """
SELECT [MaterialName], [ManagerName] SELECT [MaterialName], [ManagerName]
FROM [dbo].[MaterialsToBeDeleted] FROM [dbo].[MaterialsTypeToBeDeleted]
WHERE [MaterialName] IS NOT NULL WHERE [MaterialName] IS NOT NULL
ORDER BY [ManagerName], [MaterialName] ORDER BY [ManagerName], [MaterialName]
""" """

View File

@@ -14,7 +14,7 @@ from utils.离散备料计划维护数据提取 import DiscreteMaterialPlanExtra
from db.materials_to_delete import get_all_materials_to_delete from db.materials_to_delete import get_all_materials_to_delete
from db.production_contract_data_dao import ProductionContractDataDAO from db.production_contract_data_dao import ProductionContractDataDAO
from db.discrete_material_plan_dao import DiscreteMaterialPlanDAO from db.discrete_material_plan_dao import DiscreteMaterialPlanDAO
from db.materials_to_be_deleted_dao import MaterialsToBeDeletedDAO from db.materials_to_be_deleted_dao import MaterialsTypeToBeDeletedDAO
class MaterialStatusValidator: class MaterialStatusValidator:
@@ -283,7 +283,7 @@ class MaterialStatusValidator:
-> productionContractData.26年压力表合同数据.生产订单号 (SourceNumber) -> productionContractData.26年压力表合同数据.生产订单号 (SourceNumber)
-> DiscreteMaterialPlanData.SourceNumber -> DiscreteMaterialPlanData.SourceNumber
-> DiscreteMaterialPlanData.MaterialName -> DiscreteMaterialPlanData.MaterialName
-> 对比 MaterialsToBeDeleted.MaterialName -> 对比 MaterialsTypeToBeDeleted.MaterialName
Args: Args:
production_id_file: ProductionID.txt 路径模式2 production_id_file: ProductionID.txt 路径模式2