diff --git a/DataBase/版本日志/SGGLDB_WH_2024-04-22-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-04-22-bwj.sql new file mode 100644 index 00000000..a715e653 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-04-22-bwj.sql @@ -0,0 +1,7 @@ + +alter table Comprehensive_InspectionPerson add RemarkCode nvarchar(50) +alter table Comprehensive_InspectionMachine add RemarkCode nvarchar(50) +alter table Comprehensive_DesignChangeOrder add RemarkCode nvarchar(50) +alter table Comprehensive_NCRManagement add RemarkCode nvarchar(50) +alter table Comprehensive_DataReceivingDoc add RemarkCode nvarchar(50) + diff --git a/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs b/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs index 9dac14b5..d199e432 100644 --- a/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs @@ -65,6 +65,7 @@ namespace BLL CompileDate = doc.CompileDate, Status = doc.Status, AuditMan = doc.AuditMan, + RemarkCode = doc.RemarkCode }; Funs.DB.Comprehensive_DataReceivingDoc.InsertOnSubmit(newDoc); Funs.DB.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs b/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs index d53ea1f7..8003bf0f 100644 --- a/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs @@ -197,6 +197,7 @@ namespace BLL newDesignChangeOrder.CompileDate = desginChangeOrder.CompileDate; newDesignChangeOrder.CompleteDate = desginChangeOrder.CompleteDate; newDesignChangeOrder.Status = desginChangeOrder.Status; + newDesignChangeOrder.RemarkCode = desginChangeOrder.RemarkCode; db.Comprehensive_DesignChangeOrder.InsertOnSubmit(newDesignChangeOrder); db.SubmitChanges(); } @@ -225,6 +226,7 @@ namespace BLL newDesignChangeOrder.ImplementationFrontState = desginChangeOrder.ImplementationFrontState; newDesignChangeOrder.CompleteDate = desginChangeOrder.CompleteDate; newDesignChangeOrder.Status = desginChangeOrder.Status; + newDesignChangeOrder.RemarkCode = desginChangeOrder.RemarkCode; db.SubmitChanges(); } } diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs index ca1d601b..7d002b8d 100644 --- a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs @@ -128,6 +128,7 @@ namespace BLL newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount; newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate; newInspectionMachine.Status = inspectionMachine.Status; + newInspectionMachine.RemarkCode = inspectionMachine.RemarkCode; db.Comprehensive_InspectionMachine.InsertOnSubmit(newInspectionMachine); db.SubmitChanges(); } @@ -159,6 +160,7 @@ namespace BLL newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount; newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate; newInspectionMachine.Status = inspectionMachine.Status; + newInspectionMachine.RemarkCode = inspectionMachine.RemarkCode; db.SubmitChanges(); } } diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs index 179687e2..c31f907b 100644 --- a/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs @@ -61,6 +61,7 @@ namespace BLL newInspectionPerson.UnitWorkId = inspectionPerson.UnitWorkId; newInspectionPerson.Status = inspectionPerson.Status; newInspectionPerson.IsTrain = inspectionPerson.IsTrain; + newInspectionPerson.RemarkCode = inspectionPerson.RemarkCode; db.Comprehensive_InspectionPerson.InsertOnSubmit(newInspectionPerson); db.SubmitChanges(); } @@ -92,6 +93,7 @@ namespace BLL newInspectionPerson.UnitWorkId = inspectionPerson.UnitWorkId; newInspectionPerson.Status = inspectionPerson.Status; newInspectionPerson.IsTrain = inspectionPerson.IsTrain; + newInspectionPerson.RemarkCode = inspectionPerson.RemarkCode; db.SubmitChanges(); } } diff --git a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs index ea7fe758..1e5b5755 100644 --- a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs @@ -118,6 +118,7 @@ namespace BLL newNCRManagement.Status = nCRManagement.Status; newNCRManagement.Problem = nCRManagement.Problem; newNCRManagement.Measure = nCRManagement.Measure; + newNCRManagement.RemarkCode = nCRManagement.RemarkCode; db.Comprehensive_NCRManagement.InsertOnSubmit(newNCRManagement); db.SubmitChanges(); } diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 841ddca2..69a4d707 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3244,7 +3244,7 @@ namespace BLL /// /// 资料收发文登记记录导入模板原始虚拟路径 /// - public const string CQMS_DataReceivingDocTempUrl = "File\\Excel\\DataIn\\资料收发文登记记录导入模板.xlsx"; + public const string CQMS_DataReceivingDocTempUrl = "File\\Excel\\DataIn\\资料收发文登记记录导入模板.xls"; /// /// 培训记录导入模板原始虚拟路径 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx index 02d5d8a7..0a2e1e10 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx @@ -156,7 +156,7 @@ <%--