diff --git a/DataBase/版本日志/SUBQHSE_V2026-01-16-xiaj(现场质量问题台账).sql b/DataBase/版本日志/SUBQHSE_V2026-01-16-xiaj(现场质量问题台账).sql
new file mode 100644
index 00000000..245ac0df
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2026-01-16-xiaj(现场质量问题台账).sql
@@ -0,0 +1,44 @@
+
+
+
+
+
+--ֳ̨
+
+/*******************************************************************************
+
+ֳ̨
+1˵ƵNCR = ֳ̨
+2ͬʷ
+3ֶΣֳԴĿǰʵʩչ״
+
+*******************************************************************************/
+
+update Sys_Menu set MenuName='ֳ̨' where MenuName='NCR'
+
+go
+
+update Sys_Menu set MenuName='ֳ̨ͳ' where MenuName='NCRͳ'
+
+go
+
+
+--ʷݴԭ״̬ǰ油䣺ʩ-
+update Comprehensive_NCRManagement
+set Problem=REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(Problem, 'Ʒλ', 'ʩ-Ʒλ'), 'ʩ', 'ʩ-ʩ'), 'Ҫʩ', 'ʩ-Ҫʩ'), '', 'ʩ-'), 'ȱ', 'ʩ-ȱ'), '̼ලλ', 'ʩ-̼ලλ')
+where Problem is not null and Problem not like '%ʩ-%'
+
+go
+
+
+
+--ֶΣֳԴĿǰʵʩչ״
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Comprehensive_NCRManagement' AND COLUMN_NAME = 'Source')
+BEGIN
+ ALTER TABLE Comprehensive_NCRManagement ADD Source nvarchar(100);
+ ALTER TABLE Comprehensive_NCRManagement ADD ProgressStatus nvarchar(100);
+ EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ֳԴ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_NCRManagement', @level2type=N'COLUMN',@level2name=N'Source'
+ EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀǰʵʩչ״' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_NCRManagement', @level2type=N'COLUMN',@level2name=N'ProgressStatus'
+END
+GO
+
diff --git a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs
index ab6f1e80..ac597017 100644
--- a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs
@@ -7,7 +7,7 @@ using System.Collections;
namespace BLL
{
///
- /// NCR管理
+ /// 现场质量问题台账
///
public static class NCRManagementService
{
@@ -84,7 +84,7 @@ namespace BLL
}
///
- /// 根据主键获取NCR管理
+ /// 根据主键获取现场质量问题台账
///
///
///
@@ -94,7 +94,7 @@ namespace BLL
}
///
- /// 添加NCR管理
+ /// 添加现场质量问题台账
///
///
public static void AddNCRManagement(Model.Comprehensive_NCRManagement nCRManagement)
@@ -120,6 +120,8 @@ namespace BLL
newNCRManagement.Status = nCRManagement.Status;
newNCRManagement.Problem = nCRManagement.Problem;
newNCRManagement.Measure = nCRManagement.Measure;
+ newNCRManagement.Source = nCRManagement.Source;
+ newNCRManagement.ProgressStatus = nCRManagement.ProgressStatus;
newNCRManagement.RemarkCode = nCRManagement.RemarkCode;
newNCRManagement.Supervisor = nCRManagement.Supervisor;
db.Comprehensive_NCRManagement.InsertOnSubmit(newNCRManagement);
@@ -127,7 +129,7 @@ namespace BLL
}
///
- /// 修改NCR管理
+ /// 修改现场质量问题台账
///
///
public static void UpdateNCRManagement(Model.Comprehensive_NCRManagement nCRManagement)
@@ -153,6 +155,8 @@ namespace BLL
newNCRManagement.Status = nCRManagement.Status;
newNCRManagement.Problem = nCRManagement.Problem;
newNCRManagement.Measure = nCRManagement.Measure;
+ newNCRManagement.Source = nCRManagement.Source;
+ newNCRManagement.ProgressStatus = nCRManagement.ProgressStatus;
newNCRManagement.RemarkCode = nCRManagement.RemarkCode;
newNCRManagement.Supervisor = nCRManagement.Supervisor;
db.SubmitChanges();
@@ -160,7 +164,7 @@ namespace BLL
}
///
- /// 根据主键删除NCR管理
+ /// 根据主键删除现场质量问题台账
///
///
public static void DeleteNCRManagement(string nCRManagementId)
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 901ff015..9ca3f0f7 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -3290,9 +3290,10 @@ namespace BLL
///
public const string TechnologyUrl = "File\\Excel\\TestRun\\设备一览表.xlsx";
///
- /// NCR管理导入模版文件原始的虚拟路径
+ /// 现场质量问题台账导入模版文件原始的虚拟路径
///
public const string NCRManagementDataInUrl = "File\\Excel\\DataIn\\NCR管理导入模板.xls";
+ public const string NCRManagementDataInUrlOld = "File\\Excel\\DataIn\\现场质量问题台账导入模板.xls";
///
/// WBS导入模版文件原始的虚拟路径
///
@@ -4224,7 +4225,7 @@ namespace BLL
public const string Inspection_Test_PlanMenuId = "A70EA41D-0B45-4753-AC77-BF28DA066402";
///
- /// NCR管理
+ /// 现场质量问题台账
///
public const string NCRManagementMenuId = "7e628f48-385f-4d52-8063-d0f812514316";
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
index 326dfbe2..20f2c8da 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
@@ -5,7 +5,7 @@
- NCR管理
+ 现场质量问题台账