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/BoSheng/BOSHENGMonitorService.cs b/SGGL/BLL/BoSheng/BOSHENGMonitorService.cs index 30bf9248..5487933e 100644 --- a/SGGL/BLL/BoSheng/BOSHENGMonitorService.cs +++ b/SGGL/BLL/BoSheng/BOSHENGMonitorService.cs @@ -125,7 +125,7 @@ namespace BLL if (type == "0") { - //isOk = AddPerson(projectId, arr, sysUser); + isOk = AddPerson(projectId, arr, sysUser); } else if (type == "1") { @@ -216,7 +216,7 @@ namespace BLL try { List insertPersons = new List(); - List insertSitePersons = new List(); + //List insertSitePersons = new List(); foreach (var item in arr) { string getID = item["ID"].ToString(); @@ -292,39 +292,39 @@ namespace BLL db.SubmitChanges(); } } - var getSitePerson = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == item["IdentifyID"].ToString()); - if (!string.IsNullOrEmpty(getID)) - { - if (getSitePerson == null) - { - Model.SitePerson_Person newPerson = new Model.SitePerson_Person - { - PersonId = SQLHelper.GetNewID(), - ProjectId = projectId, - PersonName = item["Name"].ToString(), - Sex = item["Sex"].ToString(), - Birthday = Funs.GetNewDateTime(item["BirthDay"].ToString()), - Address = item["Address"].ToString(), - Nation = item["Nation"].ToString(), - IdentityCard = item["IdentifyID"].ToString(), - UnitId = BLL.UnitService.GetUnitIdByUnitName(item["DepartName"].ToString()), - Telephone = item["Telephone"].ToString(), - MaritalStatus = item["MaritalStatus"].ToString(), - }; - insertSitePersons.Add(newPerson); - } - } + //var getSitePerson = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == item["IdentifyID"].ToString()); + //if (!string.IsNullOrEmpty(getID)) + //{ + // if (getSitePerson == null) + // { + // Model.SitePerson_Person newPerson = new Model.SitePerson_Person + // { + // PersonId = SQLHelper.GetNewID(), + // ProjectId = projectId, + // PersonName = item["Name"].ToString(), + // Sex = item["Sex"].ToString(), + // Birthday = Funs.GetNewDateTime(item["BirthDay"].ToString()), + // Address = item["Address"].ToString(), + // Nation = item["Nation"].ToString(), + // IdentityCard = item["IdentifyID"].ToString(), + // UnitId = BLL.UnitService.GetUnitIdByUnitName(item["DepartName"].ToString()), + // Telephone = item["Telephone"].ToString(), + // MaritalStatus = item["MaritalStatus"].ToString(), + // }; + // insertSitePersons.Add(newPerson); + // } + //} if (insertPersons.Count() > 0) { db.Bo_Sheng_Person.InsertAllOnSubmit(insertPersons); db.SubmitChanges(); } - if (insertSitePersons.Count() > 0) - { - db.SitePerson_Person.InsertAllOnSubmit(insertSitePersons); - db.SubmitChanges(); - } + //if (insertSitePersons.Count() > 0) + //{ + // db.SitePerson_Person.InsertAllOnSubmit(insertSitePersons); + // db.SubmitChanges(); + //} } } catch (Exception ex) 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/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/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/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/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/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 00000000..2a88ee73 Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataOut/月度计划情况.xlsx differ 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 @@ - + - + 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); diff --git a/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunPerformanceMonthReport.aspx b/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunPerformanceMonthReport.aspx index 9bd8d7fd..ab73a066 100644 --- a/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunPerformanceMonthReport.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunPerformanceMonthReport.aspx @@ -41,7 +41,7 @@ -