diff --git a/db/materials_to_be_deleted_dao.py b/db/materials_to_be_deleted_dao.py index a3768c9..33ac34c 100644 --- a/db/materials_to_be_deleted_dao.py +++ b/db/materials_to_be_deleted_dao.py @@ -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. """ @@ -9,8 +9,8 @@ from typing import List, Dict, Any, Tuple, Optional from db.connection import get_connection -class MaterialsToBeDeletedDAO: - """Data Access Object for MaterialsToBeDeleted table CRUD operations""" +class MaterialsTypeToBeDeletedDAO: + """Data Access Object for MaterialsTypeToBeDeleted table CRUD operations""" def __init__(self): self.db = None @@ -47,7 +47,7 @@ class MaterialsToBeDeletedDAO: True if successful, False otherwise """ sql = """ - INSERT INTO [dbo].[MaterialsToBeDeleted] ([MaterialName], [ManagerName]) + INSERT INTO [dbo].[MaterialsTypeToBeDeleted] ([MaterialName], [ManagerName]) VALUES (?, ?) """ try: @@ -72,7 +72,7 @@ class MaterialsToBeDeletedDAO: return 0 sql = """ - INSERT INTO [dbo].[MaterialsToBeDeleted] ([MaterialName], [ManagerName]) + INSERT INTO [dbo].[MaterialsTypeToBeDeleted] ([MaterialName], [ManagerName]) VALUES (?, ?) """ @@ -98,7 +98,7 @@ class MaterialsToBeDeletedDAO: """ sql = """ SELECT [MaterialName], [ManagerName] - FROM [dbo].[MaterialsToBeDeleted] + FROM [dbo].[MaterialsTypeToBeDeleted] WHERE [MaterialName] IS NOT NULL ORDER BY [ManagerName], [MaterialName] """ @@ -117,7 +117,7 @@ class MaterialsToBeDeletedDAO: """ sql = """ SELECT [MaterialName], [ManagerName] - FROM [dbo].[MaterialsToBeDeleted] + FROM [dbo].[MaterialsTypeToBeDeleted] WHERE [ManagerName] = ? AND [MaterialName] IS NOT NULL ORDER BY [MaterialName] """ @@ -133,7 +133,7 @@ class MaterialsToBeDeletedDAO: """ sql = """ SELECT DISTINCT [ManagerName] - FROM [dbo].[MaterialsToBeDeleted] + FROM [dbo].[MaterialsTypeToBeDeleted] WHERE [ManagerName] IS NOT NULL ORDER BY [ManagerName] """ @@ -174,7 +174,7 @@ class MaterialsToBeDeletedDAO: True if successful, False otherwise """ sql = """ - UPDATE [dbo].[MaterialsToBeDeleted] + UPDATE [dbo].[MaterialsTypeToBeDeleted] SET [ManagerName] = ? WHERE [MaterialName] = ? AND [ManagerName] = ? """ @@ -204,7 +204,7 @@ class MaterialsToBeDeletedDAO: True if successful, False otherwise """ sql = """ - DELETE FROM [dbo].[MaterialsToBeDeleted] + DELETE FROM [dbo].[MaterialsTypeToBeDeleted] WHERE [MaterialName] = ? AND [ManagerName] = ? """ try: @@ -226,7 +226,7 @@ class MaterialsToBeDeletedDAO: Number of records deleted """ sql = """ - DELETE FROM [dbo].[MaterialsToBeDeleted] + DELETE FROM [dbo].[MaterialsTypeToBeDeleted] WHERE [ManagerName] = ? """ try: @@ -243,7 +243,7 @@ class MaterialsToBeDeletedDAO: Returns: Number of records deleted """ - sql = "DELETE FROM [dbo].[MaterialsToBeDeleted]" + sql = "DELETE FROM [dbo].[MaterialsTypeToBeDeleted]" try: with get_connection() as db: return db.execute_update(sql) @@ -265,7 +265,7 @@ class MaterialsToBeDeletedDAO: """ sql = """ SELECT COUNT(*) as count - FROM [dbo].[MaterialsToBeDeleted] + FROM [dbo].[MaterialsTypeToBeDeleted] WHERE [MaterialName] = ? """ with get_connection() as db: @@ -284,7 +284,7 @@ class MaterialsToBeDeletedDAO: """ sql = """ SELECT COUNT(*) as count - FROM [dbo].[MaterialsToBeDeleted] + FROM [dbo].[MaterialsTypeToBeDeleted] WHERE [ManagerName] = ? """ with get_connection() as db: @@ -303,7 +303,7 @@ class MaterialsToBeDeletedDAO: SELECT COUNT(*) as total_materials, COUNT(DISTINCT ManagerName) as unique_managers - FROM [dbo].[MaterialsToBeDeleted] + FROM [dbo].[MaterialsTypeToBeDeleted] WHERE [MaterialName] IS NOT NULL """ with get_connection() as db: @@ -313,7 +313,7 @@ class MaterialsToBeDeletedDAO: # Get materials per manager manager_sql = """ SELECT [ManagerName], COUNT(*) as count - FROM [dbo].[MaterialsToBeDeleted] + FROM [dbo].[MaterialsTypeToBeDeleted] WHERE [ManagerName] IS NOT NULL GROUP BY [ManagerName] ORDER BY count DESC @@ -337,7 +337,7 @@ class MaterialsToBeDeletedDAO: """ sql = """ SELECT [MaterialName], [ManagerName] - FROM [dbo].[MaterialsToBeDeleted] + FROM [dbo].[MaterialsTypeToBeDeleted] WHERE [MaterialName] LIKE ? ORDER BY [ManagerName], [MaterialName] """ diff --git a/db/materials_to_delete.py b/db/materials_to_delete.py index b709841..0aa4b3c 100644 --- a/db/materials_to_delete.py +++ b/db/materials_to_delete.py @@ -19,7 +19,7 @@ def get_materials_to_delete(manager_name): """ query = """ SELECT [MaterialName] - FROM [dbo].[MaterialsToBeDeleted] + FROM [dbo].[MaterialsTypeToBeDeleted] WHERE [ManagerName] = ? """ @@ -39,7 +39,7 @@ def get_all_materials_to_delete() -> List[Dict[str, Any]]: """ query = """ SELECT [MaterialName], [ManagerName] - FROM [dbo].[MaterialsToBeDeleted] + FROM [dbo].[MaterialsTypeToBeDeleted] WHERE [MaterialName] IS NOT NULL ORDER BY [ManagerName], [MaterialName] """ diff --git a/utils/material_status_validator.py b/utils/material_status_validator.py index cdb2749..4c057a5 100644 --- a/utils/material_status_validator.py +++ b/utils/material_status_validator.py @@ -14,7 +14,7 @@ from utils.离散备料计划维护数据提取 import DiscreteMaterialPlanExtra 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 -from db.materials_to_be_deleted_dao import MaterialsToBeDeletedDAO +from db.materials_to_be_deleted_dao import MaterialsTypeToBeDeletedDAO class MaterialStatusValidator: @@ -283,7 +283,7 @@ class MaterialStatusValidator: -> productionContractData.26年压力表合同数据.生产订单号 (SourceNumber) -> DiscreteMaterialPlanData.SourceNumber -> DiscreteMaterialPlanData.MaterialName - -> 对比 MaterialsToBeDeleted.MaterialName + -> 对比 MaterialsTypeToBeDeleted.MaterialName Args: production_id_file: ProductionID.txt 路径(模式2)