From 550e142e8833ef67352655fb4dc648672ecaf5c3 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 9 Jul 2024 09:15:08 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comprehensive/InspectionMachineService.cs | 46 +++++++------ .../InspectionMachineDataIn.aspx.cs | 2 +- SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- .../TestRun/DriverSchemeEdit.aspx.cs | 4 +- SGGL/FineUIPro.Web/Web.config | 4 +- SGGL/Model/Model.cs | 69 ------------------- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 7 files changed, 31 insertions(+), 98 deletions(-) diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs index 7d002b8d..a5bfa9f8 100644 --- a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs @@ -139,29 +139,31 @@ namespace BLL /// public static void UpdateInspectionMachine(Model.Comprehensive_InspectionMachine inspectionMachine) { - Model.SGGLDB db = Funs.DB; - Model.Comprehensive_InspectionMachine newInspectionMachine = db.Comprehensive_InspectionMachine.FirstOrDefault(e => e.InspectionMachineId == inspectionMachine.InspectionMachineId); - if (newInspectionMachine != null) + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - newInspectionMachine.ProjectId = inspectionMachine.ProjectId; - newInspectionMachine.UnitId = inspectionMachine.UnitId; - newInspectionMachine.InspectionMachineCode = inspectionMachine.InspectionMachineCode; - newInspectionMachine.InspectionMachineName = inspectionMachine.InspectionMachineName; - newInspectionMachine.SpecificationModel = inspectionMachine.SpecificationModel; - newInspectionMachine.IsCheckOK = inspectionMachine.IsCheckOK; - newInspectionMachine.InspectionType = inspectionMachine.InspectionType; - newInspectionMachine.NextTestDate = inspectionMachine.NextTestDate; - newInspectionMachine.TestCycle = inspectionMachine.TestCycle; - newInspectionMachine.IsVerification = inspectionMachine.IsVerification; - newInspectionMachine.InspectionDate = inspectionMachine.InspectionDate; - newInspectionMachine.AttachUrl = inspectionMachine.AttachUrl; - newInspectionMachine.CNProfessionalId = inspectionMachine.CNProfessionalId; - newInspectionMachine.IsOnSite = inspectionMachine.IsOnSite; - newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount; - newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate; - newInspectionMachine.Status = inspectionMachine.Status; - newInspectionMachine.RemarkCode = inspectionMachine.RemarkCode; - db.SubmitChanges(); + Model.Comprehensive_InspectionMachine newInspectionMachine = db.Comprehensive_InspectionMachine.FirstOrDefault(e => e.InspectionMachineId == inspectionMachine.InspectionMachineId); + if (newInspectionMachine != null) + { + newInspectionMachine.ProjectId = inspectionMachine.ProjectId; + newInspectionMachine.UnitId = inspectionMachine.UnitId; + newInspectionMachine.InspectionMachineCode = inspectionMachine.InspectionMachineCode; + newInspectionMachine.InspectionMachineName = inspectionMachine.InspectionMachineName; + newInspectionMachine.SpecificationModel = inspectionMachine.SpecificationModel; + newInspectionMachine.IsCheckOK = inspectionMachine.IsCheckOK; + newInspectionMachine.InspectionType = inspectionMachine.InspectionType; + newInspectionMachine.NextTestDate = inspectionMachine.NextTestDate; + newInspectionMachine.TestCycle = inspectionMachine.TestCycle; + newInspectionMachine.IsVerification = inspectionMachine.IsVerification; + newInspectionMachine.InspectionDate = inspectionMachine.InspectionDate; + newInspectionMachine.AttachUrl = inspectionMachine.AttachUrl; + newInspectionMachine.CNProfessionalId = inspectionMachine.CNProfessionalId; + newInspectionMachine.IsOnSite = inspectionMachine.IsOnSite; + newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount; + newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate; + newInspectionMachine.Status = inspectionMachine.Status; + newInspectionMachine.RemarkCode = inspectionMachine.RemarkCode; + db.SubmitChanges(); + } } } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs index 06dba038..2360fcd0 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs @@ -459,7 +459,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { Model.Comprehensive_InspectionMachine oldViewInfo = new Model.Comprehensive_InspectionMachine(); oldViewInfo = oldViewInfos.FirstOrDefault(x => x.UnitId == unitInfo.UnitId - && x.RemarkCode ==Funs.GetNewInt(pds.Rows[i][13].ToString().Trim())); + && x.RemarkCode ==Funs.GetNewInt(pds.Rows[i][14].ToString().Trim())); if (oldViewInfo==null) { Model.Comprehensive_InspectionMachine Ins = new Model.Comprehensive_InspectionMachine(); diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 63722353..cb873201 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true false diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSchemeEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverSchemeEdit.aspx.cs index 11f99973..951ff6d7 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSchemeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverSchemeEdit.aspx.cs @@ -187,8 +187,8 @@ namespace FineUIPro.Web.TestRun private void InitDropDownList() { //SolutionTempleteTypeService.InitSolutionTempleteDropDownList(drpModelType, false); - UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, CurrUser.LoginProjectId, - Const.ProjectUnitType_2, false); + UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId, + false); } /// diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 9fc55c34..963148f2 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,7 +12,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 2b748888..cd4039c8 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -39688,8 +39688,6 @@ namespace Model private EntitySet _Check_CheckRectify; - private EntitySet _Check_CheckSpecialDetail; - private EntitySet _Check_ContactList; private EntitySet _Check_IncentiveNotice; @@ -40081,7 +40079,6 @@ namespace Model this._Check_CheckDayDetail = new EntitySet(new Action(this.attach_Check_CheckDayDetail), new Action(this.detach_Check_CheckDayDetail)); this._Check_CheckInfo = new EntitySet(new Action(this.attach_Check_CheckInfo), new Action(this.detach_Check_CheckInfo)); this._Check_CheckRectify = new EntitySet(new Action(this.attach_Check_CheckRectify), new Action(this.detach_Check_CheckRectify)); - this._Check_CheckSpecialDetail = new EntitySet(new Action(this.attach_Check_CheckSpecialDetail), new Action(this.detach_Check_CheckSpecialDetail)); this._Check_ContactList = new EntitySet(new Action(this.attach_Check_ContactList), new Action(this.detach_Check_ContactList)); this._Check_IncentiveNotice = new EntitySet(new Action(this.attach_Check_IncentiveNotice), new Action(this.detach_Check_IncentiveNotice)); this._Check_JointCheck = new EntitySet(new Action(this.attach_Check_JointCheck), new Action(this.detach_Check_JointCheck)); @@ -40989,19 +40986,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecialDetail_Base_Unit", Storage="_Check_CheckSpecialDetail", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")] - public EntitySet Check_CheckSpecialDetail - { - get - { - return this._Check_CheckSpecialDetail; - } - set - { - this._Check_CheckSpecialDetail.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_ContactList_Base_Unit", Storage="_Check_ContactList", ThisKey="UnitId", OtherKey="SponsorUnitId", DeleteRule="NO ACTION")] public EntitySet Check_ContactList { @@ -43291,18 +43275,6 @@ namespace Model entity.Base_Unit = null; } - private void attach_Check_CheckSpecialDetail(Check_CheckSpecialDetail entity) - { - this.SendPropertyChanging(); - entity.Base_Unit = this; - } - - private void detach_Check_CheckSpecialDetail(Check_CheckSpecialDetail entity) - { - this.SendPropertyChanging(); - entity.Base_Unit = null; - } - private void attach_Check_ContactList(Check_ContactList entity) { this.SendPropertyChanging(); @@ -62600,8 +62572,6 @@ namespace Model private string _CheckOpinions; - private EntityRef _Base_Unit; - private EntityRef _WBS_UnitWork; #region 可扩展性方法定义 @@ -62658,7 +62628,6 @@ namespace Model public Check_CheckSpecialDetail() { - this._Base_Unit = default(EntityRef); this._WBS_UnitWork = default(EntityRef); OnCreated(); } @@ -62798,10 +62767,6 @@ namespace Model { if ((this._UnitId != value)) { - if (this._Base_Unit.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnUnitIdChanging(value); this.SendPropertyChanging(); this._UnitId = value; @@ -63131,40 +63096,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecialDetail_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)] - public Base_Unit Base_Unit - { - get - { - return this._Base_Unit.Entity; - } - set - { - Base_Unit previousValue = this._Base_Unit.Entity; - if (((previousValue != value) - || (this._Base_Unit.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Base_Unit.Entity = null; - previousValue.Check_CheckSpecialDetail.Remove(this); - } - this._Base_Unit.Entity = value; - if ((value != null)) - { - value.Check_CheckSpecialDetail.Add(this); - this._UnitId = value.UnitId; - } - else - { - this._UnitId = default(string); - } - this.SendPropertyChanged("Base_Unit"); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecialDetail_ProjectData_WorkArea", Storage="_WBS_UnitWork", ThisKey="CheckArea", OtherKey="UnitWorkId", IsForeignKey=true)] public WBS_UnitWork WBS_UnitWork { diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 5fe155da..bd497c6b 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true From 2d0b999f828440ba9d652a47195a94ca20a62700 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Wed, 10 Jul 2024 09:46:40 +0800 Subject: [PATCH 2/8] =?UTF-8?q?20240710=20=E4=BF=AE=E6=94=B9=E8=B5=84?= =?UTF-8?q?=E6=96=99=E6=94=B6=E5=8F=91=E6=96=87=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs | 6 +----- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs index fbe491e8..a438e5df 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs @@ -261,11 +261,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive } string row9 = pds.Rows[i][9].ToString(); - if (string.IsNullOrEmpty(row9)) - { - result += (i + 2).ToString() + "," + "上报日期" + "," + "此项为必填项！" + "|"; - } - else + if (!string.IsNullOrEmpty(row9)) { try { diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 9a02d7c9..67a02b30 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -19048,7 +19048,7 @@ - + - + @@ -77,7 +77,7 @@ - + diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index bd497c6b..5fe155da 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true From 3ce8cfca6acbdd1930b309723b3c5c6bd0f864b7 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 10 Jul 2024 16:54:22 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 63722353..cb873201 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true false From 2fed6b84afed8408628a65f36c6209237469d4ee Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Mon, 15 Jul 2024 15:06:42 +0800 Subject: [PATCH 6/8] =?UTF-8?q?20240715=20=E4=BF=AE=E6=94=B9=E5=90=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=B7=A1=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ZHGL/InspectionSummary/InspectionSummary.aspx.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs index f5c41381..1e5e7c7d 100644 --- a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs @@ -277,10 +277,10 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary //一次共检合格数 var list20 = (from x in Funs.DB.ProcessControl_InspectionManagement where x.IsOnceQualified == true - select new { x.ProjectId,x.CompileDate,x.IsOnceQualified,x.InspectionId, Isid= x.InspectionId }).ToList(); + select new { x.ProjectId,x.InspectionDate,x.IsOnceQualified,x.InspectionId, Isid= x.InspectionId }).ToList(); ////总数 var list21 = (from x in Funs.DB.ProcessControl_InspectionManagement - select new { x.ProjectId, x.InspectionId, Isid = x.InspectionId,x.CompileDate }).ToList(); + select new { x.ProjectId, x.InspectionId, Isid = x.InspectionId,x.InspectionDate }).ToList(); //关键事项 var list22 = (from x in Funs.DB.GJSX @@ -729,7 +729,7 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary if (hgs>0) { //验收日期 - model.CompileDate = list20.Where(x => x.ProjectId == pid).OrderByDescending(x => x.CompileDate).FirstOrDefault().CompileDate; + model.CompileDate = list20.Where(x => x.ProjectId == pid).OrderByDescending(x => x.InspectionDate).FirstOrDefault().InspectionDate; } model.SummeryResult = hgs.ToString(); allList.Add(model); From 81afc4684a543db156fcb432499eaf560b9ae0c1 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Mon, 15 Jul 2024 15:11:50 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/Common/Const.cs | 4 + SGGL/FineUIPro.Web/ErrLog.txt | 148 ++++++++++++++++++ .../File/Excel/DataOut/月度计划情况.xlsx | Bin 0 -> 9803 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx | 3 + .../JDGL/Check/MonthPlan.aspx.cs | 121 ++++++++++++++ .../JDGL/Check/MonthPlan.aspx.designer.cs | 9 ++ .../JDGL/Check/MonthPlanStatisc.aspx.cs | 20 ++- .../JDGL/Check/WeekPlanStatisc.aspx.cs | 24 +++ SGGL/FineUIPro.Web/Web.config | 2 +- 10 files changed, 330 insertions(+), 3 deletions(-) create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataOut/月度计划情况.xlsx diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 8f6e97aa..8127544e 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -4731,6 +4731,10 @@ namespace BLL /// 开车人员月绩效报告模板文件原始虚拟路径 /// public const string TestRunPerformanceMonthReportTemplateUrl = "File\\Excel\\DataOut\\开车人员月绩效报告.xlsx"; + /// + /// 月度计划情况模板文件原始虚拟路径 + /// + public const string MonthPlanOutTemplateUrl = "File\\Excel\\DataOut\\月度计划情况.xlsx"; #endregion #endregion diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index c7ce3afc..f2ada3bd 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -302,3 +302,151 @@ IP地址:::1 出错时间:07/04/2024 09:53:49 + +错误信息开始=====> +错误类型:InvalidOperationException +错误信息:不能添加已经存在的实体。 +错误堆栈: + 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) + 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) + 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 320 +出错时间:07/15/2024 11:49:20 +出错时间:07/15/2024 11:49:21 + + +错误信息开始=====> +错误类型:InvalidOperationException +错误信息:不能添加已经存在的实体。 +错误堆栈: + 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) + 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) + 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 320 +出错时间:07/15/2024 12:19:20 +出错时间:07/15/2024 12:19:20 + + +错误信息开始=====> +错误类型:InvalidOperationException +错误信息:不能添加已经存在的实体。 +错误堆栈: + 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) + 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) + 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 320 +出错时间:07/15/2024 12:49:20 +出错时间:07/15/2024 12:49:20 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13827 + 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181 +出错时间:07/15/2024 13:19:20 +出错时间:07/15/2024 13:19:20 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13851 + 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046 +出错时间:07/15/2024 13:19:20 +出错时间:07/15/2024 13:19:20 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13843 + 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942 +出错时间:07/15/2024 13:19:20 +出错时间:07/15/2024 13:19:20 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13643 + 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884 +出错时间:07/15/2024 13:19:20 +出错时间:07/15/2024 13:19:20 + + +错误信息开始=====> +错误类型:InvalidOperationException +错误信息:不能添加已经存在的实体。 +错误堆栈: + 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) + 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) + 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 320 +出错时间:07/15/2024 13:19:20 +出错时间:07/15/2024 13:19:20 + diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/月度计划情况.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/月度计划情况.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..2a88ee73f1dec9d41c98af955cb2c9d5db5a68db GIT binary patch literal 9803 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 F^*^dl_G175 literal 0 HcmV?d00001 diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index cb873201..63722353 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true false diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx index 921a15fd..48c47606 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx @@ -41,6 +41,9 @@ + + diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.cs index 594d2512..6b2c5397 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.cs @@ -8,6 +8,7 @@ using System.Data; using System.Data.SqlClient; using BLL; using Newtonsoft.Json.Linq; +using System.IO; namespace FineUIPro.Web.JDGL.Check { @@ -170,5 +171,125 @@ left join Sys_User us on us.UserId=mp.DutyPerson where mp.ProjectId=@ProjectId a PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthPlanStatisc.aspx", "统计 - "))); } #endregion + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + if (Grid1.Rows.Count == 0) + { + ShowNotify("无数据可导出！", MessageBoxIcon.Warning); + return; + } + string rootPath = Server.MapPath("~/"); + string initTemplatePath = string.Empty; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + string filePath = string.Empty; + initTemplatePath = Const.MonthPlanOutTemplateUrl; + uploadfilepath = rootPath + initTemplatePath; + newUrl = uploadfilepath.Replace(".xlsx", "(" + this.txtMonths.Text.Trim() + ").xlsx"); + File.Copy(uploadfilepath, newUrl); + // 第一步：读取文件流 + NPOI.SS.UserModel.IWorkbook workbook; + using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) + { + workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); + } + Model.SGGLDB db = Funs.DB; + var units = from x in db.Base_Unit select x; + var users = from x in db.Sys_User select x; + DateTime months = Convert.ToDateTime(this.txtMonths.Text.Trim() + "-01"); + var lists = from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.Months == months orderby x.SortIndex select x; + // 创建单元格样式 + NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle(); + cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true; + var font = workbook.CreateFont(); + font.FontHeightInPoints = 10; + //font.FontHeightInPoints = (short)8.5;字号为小数时要转为short + cellStyle.SetFont(font); + // 第二步：创建新数据行 + NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); + int i = 1; + int sum = 0; + foreach (var item in lists) + { + // 第二步：创建新数据行 + NPOI.SS.UserModel.IRow row = sheet.GetRow(i); + NPOI.SS.UserModel.ICell cell; + // 添加数据 + cell = row.CreateCell(0); + cell.CellStyle = cellStyle; + cell.SetCellValue(i.ToString()); + cell = row.CreateCell(1); + cell.CellStyle = cellStyle; + string unitName = string.Empty; + var unit = units.FirstOrDefault(x => x.UnitId == item.UnitId); + if (unit != null) + { + unitName = unit.UnitName; + } + cell.SetCellValue(unitName); + cell = row.CreateCell(2); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.NodeContent); + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; + string planDate = string.Empty; + if (item.PlanDate != null) + { + planDate = string.Format("{0:yyyy-MM-dd}", item.PlanDate); + } + cell.SetCellValue(planDate); + cell = row.CreateCell(4); + cell.CellStyle = cellStyle; + string userName = string.Empty; + var user = users.FirstOrDefault(x => x.UserId == item.DutyPerson); + if (user != null) + { + userName = user.UserName; + } + cell.SetCellValue(userName); + cell = row.CreateCell(5); + cell.CellStyle = cellStyle; + string realDate = string.Empty; + if (item.RealDate != null) + { + realDate = string.Format("{0:yyyy-MM-dd}", item.RealDate); + } + cell.SetCellValue(realDate); + cell = row.CreateCell(6); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Remark); + i++; + } + // 第三步：写入文件流 + using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write)) + { + workbook.Write(stream); + workbook.Close(); + } + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.designer.cs index 4f1d79dd..875c7425 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.designer.cs @@ -111,6 +111,15 @@ namespace FineUIPro.Web.JDGL.Check { /// protected global::FineUIPro.Button btnImport; + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + /// /// lblPageIndex 控件。 /// diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.cs index faf76327..d65a237e 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.cs @@ -45,6 +45,8 @@ namespace FineUIPro.Web.JDGL.Check Model.SGGLDB db = Funs.DB; //所有集合 var totalList = from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.Months == months select x; + //所有集合 + var sumTotalList = from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.Months <= months select x; if (this.ckType.SelectedValue == "1") //按责任单位 { var pUnit = from x in db.Project_ProjectUnit @@ -103,7 +105,7 @@ namespace FineUIPro.Web.JDGL.Check i++; } } - if (StatisticsList.Count() > 0) //增加总计 + if (StatisticsList.Count() > 0) //增加合计 { Model.JDGL_MonthPlan StatisticsLast = new Model.JDGL_MonthPlan(); StatisticsLast.NodeContent = "合计"; @@ -121,6 +123,22 @@ namespace FineUIPro.Web.JDGL.Check } StatisticsList.Add(StatisticsLast); } + //增加累计 + Model.JDGL_MonthPlan StatisticsSum = new Model.JDGL_MonthPlan(); + StatisticsSum.NodeContent = "累计"; + int c = sumTotalList.Count(); + int d = sumTotalList.Count(x => x.RealDate.HasValue); + StatisticsSum.UnitId = c.ToString(); + StatisticsSum.DutyPerson = d.ToString(); + if (c != 0)//被除数不能为零 + { + StatisticsSum.Remark = Math.Round((double)d / (double)c * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + StatisticsSum.Remark = "0%"; + } + StatisticsList.Add(StatisticsSum); this.Grid1.DataSource = StatisticsList; this.Grid1.DataBind(); } diff --git a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx.cs index c9bf0b46..0ae3d588 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx.cs @@ -161,6 +161,30 @@ namespace FineUIPro.Web.JDGL.Check } StatisticsList.Add(StatisticsLast); } + //增加累计 + List sumTotalList = new List(); + if (totalList.Count() > 0) + { + var startDate = totalList.First().StartDate; + sumTotalList = (from x in db.JDGL_WeekPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.StartDate <= startDate select x).ToList(); + } + Model.JDGL_WeekPlan StatisticsSum = new Model.JDGL_WeekPlan(); + StatisticsSum.WorkContent = "累计"; + int c = sumTotalList.Count(); + int d = sumTotalList.Count(x => x.IsOK == true); + StatisticsSum.UnitId = c.ToString(); + StatisticsSum.DutyPerson = d.ToString(); + if (c != 0)//被除数不能为零 + { + StatisticsSum.Remark = Math.Round((double)d / (double)c * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + StatisticsSum.Remark = "0%"; + } + StatisticsList.Add(StatisticsSum); + this.Grid1.DataSource = StatisticsList; + this.Grid1.DataBind(); this.Grid1.DataSource = StatisticsList; this.Grid1.DataBind(); } diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 9fc55c34..f50b26d3 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,7 +12,7 @@ - + From 1a2eca2e8e85db1957ddb040a8595862601ac3b6 Mon Sep 17 00:00:00 2001 From: "754998852@qq.com" <754998852@qq.com> Date: Mon, 15 Jul 2024 16:49:33 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=B9=E7=A7=8D?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=8F=9C=E5=8D=95=EF=BC=8C=E5=92=8C=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E8=B5=84=E8=B4=A8=E4=BA=92=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_WH_2024-7-11-phf.sql | 36 +++++++ .../QualityAudit/SafePersonQualityService.cs | 4 + SGGL/FineUIPro.Web/ErrLog.txt | 21 +++++ .../QualityAudit/PersonQualityEdit.aspx.cs | 2 + .../QualityAudit/SafePersonQualityEdit.aspx | 13 ++- .../SafePersonQualityEdit.aspx.cs | 27 +++++- .../SafePersonQualityEdit.aspx.designer.cs | 66 ++++++------- .../HSSE/SitePerson/PersonListEdit.aspx.cs | 11 +++ SGGL/Model/Model.cs | 93 +++++-------------- 9 files changed, 166 insertions(+), 107 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-7-11-phf.sql diff --git a/DataBase/版本日志/SGGLDB_WH_2024-7-11-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-7-11-phf.sql new file mode 100644 index 00000000..4929dc09 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-7-11-phf.sql @@ -0,0 +1,36 @@ +--Աظ֤ +alter table QualityAudit_SafePersonQuality +add CertificateId nvarchar(50) null; + +update sys_menu set MenuName='ʩߺ豸' where menuid='28C8EDB9-F1C2-4287-8013-28A976B093E2' + +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('2556CFA6-63F7-4FC1-9B2B-5E43A84640EC','豸','',1,'28C8EDB9-F1C2-4287-8013-28A976B093E2','Menu_HSSE',0,0,1) +go + +update sys_menu set menuname='볡ռ¼',SuperMenu='2556CFA6-63F7-4FC1-9B2B-5E43A84640EC' ,SortIndex='20' +where menuid='9703D711-85DA-4A0B-B08B-70F791418696'; + +update sys_menu set menuname='ʱ󼰼鱨',SuperMenu='2556CFA6-63F7-4FC1-9B2B-5E43A84640EC' ,SortIndex='10' +where menuid='2DEDD752-8BAF-43CD-933D-932AF9AF2F58'; +go + +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('8E2FB782-66B3-46C4-8F71-8A5A37585785','ͨ豸','',2,'28C8EDB9-F1C2-4287-8013-28A976B093E2','Menu_HSSE',0,0,1) +go + +update sys_menu set menuname='ʱ󼰼¼',SuperMenu='8E2FB782-66B3-46C4-8F71-8A5A37585785',SortIndex='10' +where menuid='BFD62699-47F0-49FA-AD39-FAEE8A6C3313'; +go + +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('CE2687BF-7BBB-4FD5-8FFE-B3B26F712D34','볡ռ¼','HSSE/License/EquipmentSafetyList.aspx', +20,'8E2FB782-66B3-46C4-8F71-8A5A37585785','Menu_HSSE',0,1,1) +go + + +update sys_menu set IsUsed=0 where menuid='3E167389-4775-4AC3-9D31-2E570682EDA1'; +update sys_menu set IsUsed=0 where menuid='A4832598-E3D4-4906-88E5-A3886A85FC5A'; +update sys_menu set IsUsed=0 where menuid='56F241A9-0AA3-4EDB-8C5C-999C487C06DA'; +update sys_menu set IsUsed=0 where menuid='06EA1483-7397-46DD-818D-56911EA7B679'; +update sys_menu set IsUsed=0 where menuid='42E7E869-67EA-446E-A910-BE7BF95EDC00'; \ No newline at end of file diff --git a/SGGL/BLL/HSSE/QualityAudit/SafePersonQualityService.cs b/SGGL/BLL/HSSE/QualityAudit/SafePersonQualityService.cs index 8b3781e0..55df88a1 100644 --- a/SGGL/BLL/HSSE/QualityAudit/SafePersonQualityService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/SafePersonQualityService.cs @@ -46,6 +46,8 @@ namespace BLL CompileDate = SafePersonQuality.CompileDate, AuditDate = SafePersonQuality.AuditDate, AuditorId = SafePersonQuality.AuditorId, + + CertificateId= SafePersonQuality.CertificateId, }; db.QualityAudit_SafePersonQuality.InsertOnSubmit(newSafePersonQuality); db.SubmitChanges(); @@ -74,6 +76,8 @@ namespace BLL newSafePersonQuality.CompileDate = SafePersonQuality.CompileDate; newSafePersonQuality.AuditDate = SafePersonQuality.AuditDate; newSafePersonQuality.AuditorId = SafePersonQuality.AuditorId; + + newSafePersonQuality.CertificateId = SafePersonQuality.CertificateId; db.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index c7ce3afc..5530f9a8 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -302,3 +302,24 @@ IP地址:::1 出错时间:07/04/2024 09:53:49 + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\QualityAudit\SafePersonQualityEdit.aspx(36): error CS1061: “ASP.hsse_qualityaudit_safepersonqualityedit_aspx”不包含“drpCertificate_TextChanged”的定义，并且找不到可接受类型为“ASP.hsse_qualityaudit_safepersonqualityedit_aspx”的第一个参数的扩展方法“drpCertificate_TextChanged”(是否缺少 using 指令或程序集引用?) +错误堆栈: + 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:07/11/2024 10:52:14 +出错文件:http://localhost:8579/HSSE/QualityAudit/SafePersonQualityEdit.aspx?PersonId=21a0bfc7-516b-4bda-9f09-2f628b256541 +IP地址:::1 + +出错时间:07/11/2024 10:52:14 + diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs index 6f70938a..2b6189b3 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs @@ -203,6 +203,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit BLL.PersonQualityService.AddPersonQuality(personQuality); BLL.LogService.AddSys_Log(this.CurrUser, personQuality.CertificateNo, personQuality.PersonQualityId, BLL.Const.PersonQualityMenuId, BLL.Const.BtnAdd); } + + if (isClose) { PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx index 73c575c7..a7fbf64a 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx @@ -33,9 +33,10 @@ - - + + + @@ -76,8 +77,10 @@ - - + + + diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.cs index d95b0553..691acdfb 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.cs @@ -1,5 +1,6 @@ using BLL; using System; +using System.Linq; namespace FineUIPro.Web.HSSE.QualityAudit { @@ -61,6 +62,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit { if (!IsPostBack) { + CertificateService.InitCertificateDropDownList(this.drpCertificate, true); + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.PersonId = Request.Params["PersonId"]; this.ProjectId = this.CurrUser.LoginProjectId; @@ -102,6 +105,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit } this.txtRemark.Text = SafePersonQuality.Remark; this.txtAuditDate.Text = string.Format("{0:yyyy-MM-dd}", SafePersonQuality.AuditDate); + + this.drpCertificate.SelectedValue = SafePersonQuality.CertificateId; } } else @@ -135,6 +140,12 @@ namespace FineUIPro.Web.HSSE.QualityAudit { if (string.IsNullOrEmpty(this.SafePersonQualityId)) { + if (this.drpCertificate.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.drpCertificate.SelectedValue)) + { + Alert.ShowInTop("请选择特岗证书！", MessageBoxIcon.Warning); + return; + } + SaveData(false); } PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SafePersonQualityAttachUrl&menuId={1}", SafePersonQualityId, BLL.Const.SafePersonQualityMenuId))); @@ -150,9 +161,22 @@ namespace FineUIPro.Web.HSSE.QualityAudit /// protected void btnSave_Click(object sender, EventArgs e) { + if (this.drpCertificate.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.drpCertificate.SelectedValue)) + { + Alert.ShowInTop("请选择特岗证书！", MessageBoxIcon.Warning); + return; + } + SaveData(true); } + protected void drpCertificate_TextChanged(object sender, EventArgs e) { + if (this.drpCertificate.SelectedValue!=Const._Null) + { + this.txtCertificateName.Text = this.drpCertificate.SelectedItem.Text; + } + } + /// /// 保存数据 /// @@ -165,7 +189,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit { PersonId = this.PersonId, CertificateNo = this.txtCertificateNo.Text.Trim(), - CertificateName = this.txtCertificateName.Text.Trim(), + CertificateId = this.drpCertificate.SelectedValue, + CertificateName = this.drpCertificate.SelectedItem.Text, Grade = this.txtGrade.Text.Trim(), SendUnit = this.txtSendUnit.Text.Trim(), SendDate = Funs.GetNewDateTime(this.txtSendDate.Text.Trim()), diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.designer.cs index 5c23cbeb..e8a2e360 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.QualityAudit { - - - public partial class SafePersonQualityEdit { - +namespace FineUIPro.Web.HSSE.QualityAudit +{ + + + public partial class SafePersonQualityEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtUnitCode 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtUnitCode; - + /// /// txtUnitName 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtUnitName; - + /// /// txtPersonName 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPersonName; - + /// /// txtWorkPostName 控件。 /// @@ -74,16 +76,16 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkPostName; - + /// - /// txtCertificateName 控件。 + /// drpCertificate 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtCertificateName; - + protected global::FineUIPro.DropDownList drpCertificate; + /// /// txtCertificateNo 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCertificateNo; - + /// /// txtGrade 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtGrade; - + /// /// txtSendUnit 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSendUnit; - + /// /// txtSendDate 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtSendDate; - + /// /// txtLimitDate 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtLimitDate; - + /// /// drpAuditor 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpAuditor; - + /// /// txtAuditDate 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtAuditDate; - + /// /// txtLateCheckDate 控件。 /// @@ -155,16 +157,16 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtLateCheckDate; - + /// - /// Label1 控件。 + /// txtCertificateName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label1; - + protected global::FineUIPro.TextBox txtCertificateName; + /// /// txtRemark 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtRemark; - + /// /// Toolbar1 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// btnAttachUrl 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttachUrl; - + /// /// ToolbarFill1 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSave 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnClose 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs index 464c3574..57608a50 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs @@ -244,6 +244,14 @@ namespace FineUIPro.Web.HSSE.SitePerson this.txtCertificateCode.Text = personQuality.CertificateNo; this.txtCertificateLimitTime.Text = string.Format("{0:yyyy-MM-dd}", personQuality.LimitDate); } + + var safePersonQuality = BLL.SafePersonQualityService.GetSafePersonQualityByPersonId(person.PersonId); + if (safePersonQuality!=null) + { + this.drpCertificate.SelectedValue = safePersonQuality.CertificateId; + this.txtCertificateCode.Text = safePersonQuality.CertificateNo; + this.txtCertificateLimitTime.Text = string.Format("{0:yyyy-MM-dd}", safePersonQuality.LimitDate); + } } else { @@ -625,8 +633,10 @@ namespace FineUIPro.Web.HSSE.SitePerson { if (this.drpCertificate.SelectedValue != BLL.Const._Null) { + safePersonQuality.CertificateId = this.drpCertificate.SelectedValue; safePersonQuality.CertificateName = this.drpCertificate.SelectedItem.Text; } + safePersonQuality.CertificateNo = this.txtCertificateCode.Text.Trim(); safePersonQuality.LimitDate = Funs.GetNewDateTime(this.txtCertificateLimitTime.Text); safePersonQuality.CompileMan = this.CurrUser.UserId; @@ -644,6 +654,7 @@ namespace FineUIPro.Web.HSSE.SitePerson }; if (this.drpCertificate.SelectedValue != BLL.Const._Null) { + newSafePersonQuality.CertificateId = drpCertificate.SelectedValue; newSafePersonQuality.CertificateName = this.drpCertificate.SelectedItem.Text; } newSafePersonQuality.CertificateNo = this.txtCertificateCode.Text.Trim(); diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index f2b986f6..3d323f69 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -61968,8 +61968,6 @@ namespace Model private EntityRef _Base_Project; - private EntityRef _Technique_CheckItemSet; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -62021,7 +62019,6 @@ namespace Model public Check_CheckSpecial() { this._Base_Project = default(EntityRef); - this._Technique_CheckItemSet = default(EntityRef); OnCreated(); } @@ -62340,10 +62337,6 @@ namespace Model { if ((this._CheckItemSetId != value)) { - if (this._Technique_CheckItemSet.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnCheckItemSetIdChanging(value); this.SendPropertyChanging(); this._CheckItemSetId = value; @@ -62487,40 +62480,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Technique_CheckItemSet", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", IsForeignKey=true)] - public Technique_CheckItemSet Technique_CheckItemSet - { - get - { - return this._Technique_CheckItemSet.Entity; - } - set - { - Technique_CheckItemSet previousValue = this._Technique_CheckItemSet.Entity; - if (((previousValue != value) - || (this._Technique_CheckItemSet.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Technique_CheckItemSet.Entity = null; - previousValue.Check_CheckSpecial.Remove(this); - } - this._Technique_CheckItemSet.Entity = value; - if ((value != null)) - { - value.Check_CheckSpecial.Add(this); - this._CheckItemSetId = value.CheckItemSetId; - } - else - { - this._CheckItemSetId = default(string); - } - this.SendPropertyChanged("Technique_CheckItemSet"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -312343,6 +312302,8 @@ namespace Model private string _States; + private string _CertificateId; + private EntityRef _SitePerson_Person; private EntityRef _Sys_User; @@ -312387,6 +312348,8 @@ namespace Model partial void OnAuditOpinionChanged(); partial void OnStatesChanging(string value); partial void OnStatesChanged(); + partial void OnCertificateIdChanging(string value); + partial void OnCertificateIdChanged(); #endregion public QualityAudit_SafePersonQuality() @@ -312749,6 +312712,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateId", DbType="NVarChar(50)")] + public string CertificateId + { + get + { + return this._CertificateId; + } + set + { + if ((this._CertificateId != value)) + { + this.OnCertificateIdChanging(value); + this.SendPropertyChanging(); + this._CertificateId = value; + this.SendPropertyChanged("CertificateId"); + this.OnCertificateIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_QualityAudit_SafePersonQuality_SitePerson_Person", Storage="_SitePerson_Person", ThisKey="PersonId", OtherKey="PersonId", IsForeignKey=true)] public SitePerson_Person SitePerson_Person { @@ -370337,8 +370320,6 @@ namespace Model private System.Nullable _IsBuiltIn; - private EntitySet _Check_CheckSpecial; - private EntitySet _Technique_CheckItemDetail; #region 可扩展性方法定义 @@ -370365,7 +370346,6 @@ namespace Model public Technique_CheckItemSet() { - this._Check_CheckSpecial = new EntitySet(new Action(this.attach_Check_CheckSpecial), new Action(this.detach_Check_CheckSpecial)); this._Technique_CheckItemDetail = new EntitySet(new Action(this.attach_Technique_CheckItemDetail), new Action(this.detach_Technique_CheckItemDetail)); OnCreated(); } @@ -370530,19 +370510,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Check_CheckSpecial", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")] - public EntitySet Check_CheckSpecial - { - get - { - return this._Check_CheckSpecial; - } - set - { - this._Check_CheckSpecial.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Technique_CheckItemDetail_Technique_CheckItemSet", Storage="_Technique_CheckItemDetail", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")] public EntitySet Technique_CheckItemDetail { @@ -370576,18 +370543,6 @@ namespace Model } } - private void attach_Check_CheckSpecial(Check_CheckSpecial entity) - { - this.SendPropertyChanging(); - entity.Technique_CheckItemSet = this; - } - - private void detach_Check_CheckSpecial(Check_CheckSpecial entity) - { - this.SendPropertyChanging(); - entity.Technique_CheckItemSet = null; - } - private void attach_Technique_CheckItemDetail(Technique_CheckItemDetail entity) { this.SendPropertyChanging();