diff --git a/DataBase/版本日志/SGGLDB_WH_2024-04-10-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-04-10-bwj.sql new file mode 100644 index 00000000..f19c9368 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-04-10-bwj.sql @@ -0,0 +1,32 @@ + +update Sys_Menu set IsUsed=0 where MenuId='6549EF60-1DED-4912-8D2D-7B32A80A2DEC'--Ƶ +go +update Sys_Menu set MenuName='Ŀܽ' where MenuId='ECDC614F-6239-44D2-9523-6A25D42C6A45' +go +update Sys_Menu set MenuName='깤',SortIndex=30 where MenuId='AA88BD56-E0B4-4B9C-9238-3F48EA59C50A' +go +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('D215165B-95BA-4298-9736-B7A20F27B5D1','רܽ','TestRun/DriverSummary/SpecialSummary.aspx',10,'ECDC614F-6239-44D2-9523-6A25D42C6A45','Menu_TestRun',0,1,1) +go + insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + values('5ED79CA3-F5C5-4987-85CD-F0797FA4D5C8','D215165B-95BA-4298-9736-B7A20F27B5D1','',1) + insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + values('9C985452-F943-42B5-AC58-FE5DDDB91831','D215165B-95BA-4298-9736-B7A20F27B5D1','޸',2) + insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + values('8A359D94-434A-4275-935F-796C464711FC','D215165B-95BA-4298-9736-B7A20F27B5D1','ɾ',3) + insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + values('69A30098-93DE-45DE-B982-82362ABD0BEF','D215165B-95BA-4298-9736-B7A20F27B5D1','',4) + go +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('9EBA628D-E725-4A0B-B765-171F405D0821','깤ܽ','TestRun/DriverSummary/PersonalSummary.aspx',20,'ECDC614F-6239-44D2-9523-6A25D42C6A45','Menu_TestRun',0,1,1) +go + insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + values('FF57ECA6-DB21-48A1-8F14-7AAD7F698C13','9EBA628D-E725-4A0B-B765-171F405D0821','',1) + insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + values('A0B04474-8F27-4DE2-9471-444163B04E8E','9EBA628D-E725-4A0B-B765-171F405D0821','޸',2) + insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + values('F3D17AC8-F40C-4E9B-9F11-34E4820E5095','9EBA628D-E725-4A0B-B765-171F405D0821','ɾ',3) + insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + values('CCAFE438-A71E-41D9-A727-AC5A5C92D2A8','9EBA628D-E725-4A0B-B765-171F405D0821','',4) + go + diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 180e10e2..ff413696 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -773,6 +773,7 @@ + diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 8629a6f4..ac637d6d 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -5518,10 +5518,20 @@ namespace BLL public const string MonthSummaryMenuId = "9B32C4BF-62E9-4561-8632-97AC0F581701"; /// - /// 项目完工总结 + /// 开车完工总结 /// public const string CompleteSummaryMenuId = "AA88BD56-E0B4-4B9C-9238-3F48EA59C50A"; + /// + /// 专项总结 + /// + public const string SpecialSummaryMenuId = "D215165B-95BA-4298-9736-B7A20F27B5D1"; + + /// + /// 完工后个人总结 + /// + public const string PersonalSummaryMenuId = "9EBA628D-E725-4A0B-B765-171F405D0821"; + #endregion #region 进度管理 diff --git a/SGGL/BLL/TestRun/DriverSummary/DriverSummaryService.cs b/SGGL/BLL/TestRun/DriverSummary/DriverSummaryService.cs index fe68adef..5a9dde7f 100644 --- a/SGGL/BLL/TestRun/DriverSummary/DriverSummaryService.cs +++ b/SGGL/BLL/TestRun/DriverSummary/DriverSummaryService.cs @@ -18,6 +18,15 @@ namespace BLL return Funs.DB.Driver_DriverSummary.FirstOrDefault(e => e.DriverSummaryId == driverSummaryId); } + /// + /// 获取总结列表 + /// + /// + public static List GetSummaryList(string projectId, string summaryType) + { + return (from x in Funs.DB.Driver_DriverSummary where x.ProjectId == projectId && x.SummaryType == summaryType select x).ToList(); + } + /// /// 添加总结 /// diff --git a/SGGL/BLL/TestRun/Meeting/MeetingMinutesService.cs b/SGGL/BLL/TestRun/Meeting/MeetingMinutesService.cs new file mode 100644 index 00000000..a5d762e3 --- /dev/null +++ b/SGGL/BLL/TestRun/Meeting/MeetingMinutesService.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 会议纪要 + /// + public class MeetingMinutesService + { + /// + /// 根据主键获取会议纪要 + /// + /// + /// + public static Model.Driver_MeetingMinutes GetMinutesById(string meetingMinutesId) + { + return Funs.DB.Driver_MeetingMinutes.FirstOrDefault(e => e.MeetingMinutesId == meetingMinutesId); + } + + /// + /// 添加会议纪要 + /// + /// + public static void AddMeetingMinutes(Model.Driver_MeetingMinutes meetingMinutes) + { + Model.Driver_MeetingMinutes newMeetingMinutes = new Model.Driver_MeetingMinutes + { + MeetingMinutesId = meetingMinutes.MeetingMinutesId, + ProjectId = meetingMinutes.ProjectId, + MinutesCode = meetingMinutes.MinutesCode, + MeetingType = meetingMinutes.MeetingType, + CompileMan = meetingMinutes.CompileMan, + CompileDate = meetingMinutes.CompileDate, + Statues = meetingMinutes.Statues + }; + Funs.DB.Driver_MeetingMinutes.InsertOnSubmit(newMeetingMinutes); + Funs.DB.SubmitChanges(); + } + + /// + /// 修改会议纪要 + /// + /// + public static void UpdateMeetingMinutes(Model.Driver_MeetingMinutes meetingMinutes) + { + Model.Driver_MeetingMinutes newMeetingMinutes = Funs.DB.Driver_MeetingMinutes.FirstOrDefault(e => e.MeetingMinutesId == meetingMinutes.MeetingMinutesId); + if (newMeetingMinutes != null) + { + newMeetingMinutes.ProjectId = meetingMinutes.ProjectId; + newMeetingMinutes.MinutesCode = meetingMinutes.MinutesCode; + newMeetingMinutes.MeetingType = meetingMinutes.MeetingType; + newMeetingMinutes.CompileMan = meetingMinutes.CompileMan; + newMeetingMinutes.CompileDate = meetingMinutes.CompileDate; + newMeetingMinutes.Statues = meetingMinutes.Statues; + Funs.DB.SubmitChanges(); + } + } + + /// + /// 根据主键删除会议纪要 + /// + /// + public static void DeleteMeetingMinutesById(string meetingMinutesId) + { + Model.Driver_MeetingMinutes newMeetingMinutes = Funs.DB.Driver_MeetingMinutes.FirstOrDefault(e => e.MeetingMinutesId == meetingMinutesId); + if (newMeetingMinutes != null) + { + Funs.DB.Driver_MeetingMinutes.DeleteOnSubmit(newMeetingMinutes); + Funs.DB.SubmitChanges(); + } + } + } +} diff --git a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs index b1472893..8f7fdbe8 100644 --- a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs +++ b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs @@ -134,6 +134,12 @@ namespace FineUIPro.Web.AttachFile //Request.QueryString["type"]; ////类型：0时是上传资源页面，附件权限不需要判断 -1时只查看权限 -2查看集团公司 this.GetButtonPower(); this.BindGrid(); + + //用于开车总结签字版附件，不可编辑 + if (Request.QueryString["strParam"] == "2" && (this.MenuId == BLL.Const.SpecialSummaryMenuId || this.MenuId == BLL.Const.PersonalSummaryMenuId || this.MenuId == BLL.Const.CompleteSummaryMenuId)) + { + btnOnlineEdit.Hidden = true; + } } else { diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx index 9503b3a8..a6024155 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx @@ -61,6 +61,12 @@ + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs index 35d34990..717d0d45 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs @@ -28,7 +28,7 @@ namespace FineUIPro.Web.Comprehensive } public void BindGrid() { - string strSql = @"select NCRManagementId, ProjectId, SendUnit, NCRCode, Contents, IssuedDate, ReceiveUnit,Status, + string strSql = @"select NCRManagementId, ProjectId, SendUnit, NCRCode, Contents,Problem,Measure,IssuedDate, ReceiveUnit,Status, ClosedDate, CompleteDate, ResponsibleMan, AttachUrl, ImplementationFrontState, CompileMan, UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,u.UnitName from Comprehensive_NCRManagement C diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs index 0265053e..c03761d7 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs @@ -83,8 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.ddlProblem.SelectedValue = nCRManagement.Problem; } - this.txtMeasure.Text = nCRManagement.Measure; - + this.txtMeasure.Text = nCRManagement.Measure; this.txtResponsibleMan.Text = nCRManagement.ResponsibleMan; this.txtImplementationFrontState.Text = nCRManagement.ImplementationFrontState; diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 0b301999..e69de29b 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1,330 +0,0 @@ - -错误信息开始=====> -错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204 - 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181 -出错时间:04/03/2024 17:51:45 -出错时间:04/03/2024 17:51:46 - - -错误信息开始=====> -错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228 - 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046 -出错时间:04/03/2024 17:51:46 -出错时间:04/03/2024 17:51:46 - - -错误信息开始=====> -错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220 - 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942 -出错时间:04/03/2024 17:51:46 -出错时间:04/03/2024 17:51:46 - - -错误信息开始=====> -错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020 - 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884 -出错时间:04/03/2024 17:51:46 -出错时间:04/03/2024 17:51:46 - - -错误信息开始=====> -错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204 - 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181 -出错时间:04/03/2024 19:51:41 -出错时间:04/03/2024 19:51:41 - - -错误信息开始=====> -错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228 - 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046 -出错时间:04/03/2024 19:51:41 -出错时间:04/03/2024 19:51:41 - - -错误信息开始=====> -错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220 - 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942 -出错时间:04/03/2024 19:51:42 -出错时间:04/03/2024 19:51:42 - - -错误信息开始=====> -错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020 - 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884 -出错时间:04/03/2024 19:51:42 -出错时间:04/03/2024 19:51:42 - - -错误信息开始=====> -错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204 - 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181 -出错时间:04/03/2024 21:51:41 -出错时间:04/03/2024 21:51:42 - - -错误信息开始=====> -错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228 - 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046 -出错时间:04/03/2024 21:51:42 -出错时间:04/03/2024 21:51:42 - - -错误信息开始=====> -错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220 - 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942 -出错时间:04/03/2024 21:51:42 -出错时间:04/03/2024 21:51:42 - - -错误信息开始=====> -错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020 - 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884 -出错时间:04/03/2024 21:51:42 -出错时间:04/03/2024 21:51:42 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web.CQMS.ManageReportNew.MonthReportEdit.Page_Load(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ManageReportNew\MonthReportEdit.aspx.cs:行号 193 - 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) - 在 System.EventHandler.Invoke(Object sender, EventArgs e) - 在 System.Web.UI.Control.OnLoad(EventArgs e) - 在 System.Web.UI.Control.LoadRecursive() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:04/03/2024 23:11:43 -出错文件:http://localhost:8579/CQMS/ManageReportNew/MonthReportEdit.aspx?reportId=a5209a38-af66-4082-90ab-2585e44c3760 -IP地址:::1 -操作人员:JT - -出错时间:04/03/2024 23:11:43 - diff --git a/SGGL/FineUIPro.Web/FileUpload/ContactListAttachUrl/2024-04/638481866385673396_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/ContactListAttachUrl/2024-04/638481866385673396_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/ContactListAttachUrl/2024-04/638481866385673396_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/DocManage/2024-04/638481864145978296_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/DocManage/2024-04/638481864145978296_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/DocManage/2024-04/638481864145978296_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/DriverRunComplete/2024-04/638481924943334928_中建三局管道焊接管理信息系统简易手册.docx b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/DriverRunComplete/2024-04/638481924943334928_中建三局管道焊接管理信息系统简易手册.docx new file mode 100644 index 00000000..125dc4a5 --- /dev/null +++ b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/DriverRunComplete/2024-04/638481924943334928_中建三局管道焊接管理信息系统简易手册.docx @@ -0,0 +1,102 @@ + 目录 +1 焊接模块看板 1 +1.1 基础信息 2 +1.2 焊工管理 2 +1.3 焊接工艺评定 3 +1.4 焊接管理 4 +1.5 热处理/硬度管理 8 +1.6 无损委托 10 +1.7 返修委托 11 +1.8 检测管理 12 +1.9 试压管理 13 +1.10 焊接报表 14 +1.11 通用导入 15 +1.12 焊材管理 15 + + +1看板 + 包括基础信息、焊工管理、焊接工艺评定、焊接管理、热处理和硬度管理、无损委托、检测管理、返修委托、试压管理、焊接报表、通用导入、焊材管理等功能菜单。 + +看板包括：一次合格率（总数）、焊工总人数（在岗）、焊接一次合格率（按工区和分包单位）、焊接进度分析（单位:万，按工区和分包单位）、近七日工效分析（当日总焊接量/当日焊工人数）。 +1.1 基础信息管理 + + 施工单位可以在项目查看和维护本单位图纸上面对应的基础信息（建议只能增加，不要修改，里面存在的可能其他项目已经使用）。 +1.2 焊工管理 + + +注意：1、焊工增加的时候，焊工类型需要勾选是管道还是设备类型； + 焊接方法、壁厚和母材类别默认没有勾选，如果本项目日报录入启用这三个条件筛选焊工，需设置，不勾选和条件全选一致。 +1.3 焊接工艺评定 +焊接工艺评定查询显示公司级增加的工艺评定，也可增加本项目的工艺评定。 + + + +1.4 焊接管理 +1.4.1管线管理 + 管线可通过批量导入，也可单个录入 + +1.4.2 焊口信息管理 + 焊口信息可通过批量导入，也可单个录入 + + + 焊口信息可直接在线按3503的2017版打印交工资料 + +1.4.3 焊接日报 + 焊接日报可以录入和批量导入 + + +1.4.4 点口管理 + 点口查询的焊口是已经焊接的焊口，没有焊接过的焊口不能点口，点口中不会查询出来。 + + +1.5 热处理/硬度管理 +1.5.1 热处理委托 +热处理委托按工区查找需要热处理的焊口信息。 + +1.5.2 热处理报告 +做完热处理委托会自动生成热处理报告，可以对此报告进行修改、打印。 + +1.5.3 硬度检测委托 +操作方法同热处理委托单 +1.5.4 硬度检测报告 +操作方法同热处理报告 +1.6 无损委托 +1.6.1 无损委托单录入 +通过点口单可直接生成委托单（点口单右上角有生成按钮），或者直接增加、查找。 + + + +1.6.2 无损委托单审核 + +审核后的委托单才能在检测单录入中找到。 +1.7返修委托 +1.7.1 返修委托单录入 +操作方法同委托单录入。 +1.7.2 返修单审核 +操作方法同委托单审核。 +1.8 检测管理 +1.8.1 检测单录入 + +操作方法同委托单录入。 +1.8.2 检测单审核 +操作方法同委托单审核。 +1.8.3 检测导入 +检测导入按系统模板整理批量导入，并能自动校验数据的正确性。 + +检测导入是一次导入点口、委托、检测，并且是已审核状态。 +1.8.4 检测统计 +检测统计按检测方法导入，并可修改，打印。 + +1.9 试压管理 + +试压包台账可以通过导入方法增加，审核完成后可打印出交工资料。 +1.10 焊接报表 + + 焊接报表包括：单位工区进度分析、单位工区质量分析、焊工业绩分析、管线综合分析、预制安装进度、介质综合分析、探伤综合报告、焊口综合信息、管线综合信息、委托检测数据一览表、无损检测周报、无损检测月报、储罐/管道每日焊接量统计表、管道焊接周报、管道焊接月报。上图以单位工区进度分析为例，按不同的查询条件可查询统计需要查询的数据，其他报表查询方法一致。 + +周报月报可以在线打印： +1.11 通用导入 + 管线焊口按系统模板整理批量导入，并能自动校验数据的正确性 +1.12 焊材管理 + 焊材管理包括：厂家管理、材料到货登记及验收记录、焊条烘烤记录、焊条发放记录、焊条回收记录、二次焊条烘烤记录和今日统计。 +上述功能菜单都可以单条记录增加，也可以批量按模板导入。自动生成今日统计表数据。 diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/DriverRunComplete/2024-04/638481925044436293_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/DriverRunComplete/2024-04/638481925044436293_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx new file mode 100644 index 00000000..127dc425 Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/DriverRunComplete/2024-04/638481925044436293_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/DriverRunComplete/2024-04/638483563777030227_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/DriverRunComplete/2024-04/638483563777030227_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx new file mode 100644 index 00000000..127dc425 Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/DriverRunComplete/2024-04/638483563777030227_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/FeedTestRunReport/2024-04/638481924357125459_中建三局管道焊接管理信息系统源代码（部分）.docx b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/FeedTestRunReport/2024-04/638481924357125459_中建三局管道焊接管理信息系统源代码（部分）.docx new file mode 100644 index 00000000..0c44f0c3 --- /dev/null +++ b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/FeedTestRunReport/2024-04/638481924357125459_中建三局管道焊接管理信息系统源代码（部分）.docx @@ -0,0 +1,2965 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PipelineManage.aspx.cs" Inherits="FineUIPro.Web.HJGL.WeldingManage.PipelineManage" %> + + + + + + + 管线管理 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 编辑CAD + + + + + 编辑CAD + + + + + 编辑CAD + + + + + 编辑CAD + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.HJGL.WeldingManage +{ + public partial class PipelineManage : PageBase + { + + public string treeNodeId + { + get + { + return (string)ViewState["treeNodeId"]; + } + set + { + ViewState["treeNodeId"] = value; + } + } + public string unitId + { + get + { + return (string)ViewState["unitId"]; + } + set + { + ViewState["unitId"] = value; + } + } + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + BLL.Base_TestMediumService.InitMediumDropDownList(this.drpSer, true);//介质 + BLL.Base_DetectionTypeService.InitDetectionTypeDropDownList(this.drpNDT, true);//探伤类型 + BLL.Base_MaterialService.InitMaterialDropDownList(this.drpSteId, true,this.CurrUser.LoginProjectId);//材质 + ListItem[] lis = new ListItem[3]; + lis[0] = new ListItem("- 请选择 -", ""); + lis[1] = new ListItem("是","1"); + lis[2] = new ListItem("否", "0"); + this.drpIsStanded.DataValueField = "Value"; + this.drpIsStanded.DataTextField = "Text"; + this.drpIsStanded.DataSource = lis; + this.drpIsStanded.DataBind(); + this.drpIsStanded.SelectedIndex = 0; + this.InitTreeMenu();//加载树 + //显示列 + Model.Sys_UserShowColumns c = BLL.UserShowColumnsService.GetColumnsByUserId(this.CurrUser.UserId, "Iso"); + if (c != null) + { + this.GetShowColumn(c.Columns); + } + } + } + #endregion + + #region 加载树装置-单位-工作区 + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "装置-单位-工作区"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + this.tvControlItem.Nodes.Add(rootNode); + ////装置 + var pInstallation = (from x in Funs.DB.Project_Installation where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); + ////区域 + var pWorkArea = (from x in Funs.DB.ProjectData_WorkArea where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); + ////单位 + var pUnits = (from x in Funs.DB.Project_ProjectUnit where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); + + if (!string.IsNullOrEmpty(this.txtWorkArea.Text)) + { + pWorkArea = pWorkArea.Where(x => x.WorkAreaCode.Contains(this.txtWorkArea.Text.Trim())).OrderBy(x => x.WorkAreaCode).ToList(); + pInstallation = (from x in pInstallation + join y in pWorkArea on x.InstallationId equals y.InstallationId + select x).Distinct().ToList(); + pUnits = (from x in pUnits + join y in pWorkArea on x.UnitId equals y.UnitId + select x).Distinct().ToList(); + } + this.BindNodes(rootNode, pInstallation, pWorkArea, pUnits); + } + #endregion + + #region 绑定树节点 + /// + /// 绑定树节点 + /// + /// + private void BindNodes(TreeNode node, List pInstallation, List pWorkArea, List pUnits) + { + if (string.IsNullOrEmpty(node.ToolTip)) + { + List installations = pInstallation; + var pUnit = pUnits.FirstOrDefault(x => x.UnitId == this.CurrUser.UnitId); + if (pUnit != null && pUnit.UnitType != Const.ProjectUnitType_1 && pUnit.UnitType != Const.ProjectUnitType_5) + { + installations = (from x in pInstallation + join y in pWorkArea on x.InstallationId equals y.InstallationId + where y.UnitId == this.CurrUser.UnitId + orderby x.InstallationId + select x).Distinct().ToList(); + } + + foreach (var q in installations) + { + TreeNode newNode = new TreeNode(); + newNode.NodeID = q.InstallationId; + newNode.Text = q.InstallationName; + newNode.ToolTip = "装置"; + newNode.Expanded = true; + node.Nodes.Add(newNode); + this.BindNodes(newNode, pInstallation, pWorkArea, pUnits); + } + } + else if (node.ToolTip == "装置") + { + List units = null; + var pUnitDepth = pUnits.FirstOrDefault(x => x.UnitId == this.CurrUser.UnitId); + if (pUnitDepth == null || pUnitDepth.UnitType == Const.ProjectUnitType_1 || pUnitDepth.UnitType == Const.ProjectUnitType_5) + { + units = (from x in pUnits + join y in pWorkArea on x.UnitId equals y.UnitId + where y.InstallationId == node.NodeID && x.UnitType == Const.ProjectUnitType_2 + select x).ToList(); + + } + else + { + units = (from x in pUnits + join y in pWorkArea on x.UnitId equals y.UnitId + where y.InstallationId == node.NodeID && x.UnitType == Const.ProjectUnitType_2 && x.UnitId == this.CurrUser.UnitId + select x).ToList(); + } + + units = units.OrderBy(x => x.InTime).Distinct().ToList(); + foreach (var q in units) + { + var unit = BLL.UnitService.GetUnitByUnitId(q.UnitId); + if (unit != null) + { + TreeNode newNode = new TreeNode(); + newNode.Text = unit.UnitName; + newNode.NodeID = q.UnitId + "|" + node.NodeID; + newNode.ToolTip = "单位"; + node.Nodes.Add(newNode); + this.BindNodes(newNode, pInstallation, pWorkArea, pUnits); + } + } + } + else if (node.ToolTip == "单位") + { + var workAreas = (from x in pWorkArea + where x.InstallationId == node.ParentNode.NodeID && x.UnitId == node.NodeID.Split('|')[0] + select x); + workAreas = workAreas.OrderByDescending(x => x.WorkAreaCode); + foreach (var q in workAreas) + { + int a = (from x in BLL.Funs.DB.PW_IsoInfo where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == node.NodeID.Split('|')[0] && x.WorkAreaId == q.WorkAreaId select x).Count(); + TreeNode newNode = new TreeNode(); + newNode.Text = q.WorkAreaCode + "【" + a.ToString() + "】管线"; + newNode.NodeID = q.WorkAreaId; + newNode.EnableClickEvent = true; + newNode.ToolTip = "区域"; + node.Nodes.Add(newNode); + } + } + } + #endregion + + #region 点击TreeView + /// + /// 点击TreeView + /// + /// + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + this.unitId = e.Node.ParentNode.NodeID.Split('|')[0]; + + treeNodeId = e.NodeID; + this.BindGrid(e.NodeID); + } + #endregion + + #region 数据绑定 + /// + /// 数据绑定 + /// + private void BindGrid(string treeNodeId="") + { + string strSql = @"SELECT iso.ISO_ID, + iso.ProjectId, + iso.ISO_IsoNo, + iso.UnitId, + unit.UnitName, + iso.TestMediumId, + testMedium.MediumName, + iso.DetectionRateId, + detectionRate.DetectionRateValue, + iso.DetectionTypeId, + detectionType.DetectionTypeName, + iso.WorkAreaId, + workArea.WorkAreaCode, + iso.ISO_SysNo, + iso.ISO_SubSysNo, + iso.ISO_CwpNo, + iso.ISO_IsoNumber, + iso.ISO_Rev, + iso.ISO_Sheet, + iso.ISO_PipeQty, + iso.ISO_Paint, + iso.ISO_Insulator, + iso.MaterialId, + material.MaterialType, + iso.ISO_Executive, + iso.ISO_Modifier, + iso.ISO_ModifyDate, + iso.ISO_Creator, + iso.ISO_CreateDate, + iso.ISO_DesignPress, + iso.ISO_DesignTemperature, + iso.ISO_TestPress, + iso.ISO_TestTemperature, + iso.ISO_NDTClass, + iso.ISO_PTRate, + case when iso.Is_Standard=1 then '是'else '否' end as Is_Standard, + iso.PipingClassId, + pipingClass.PipingClassName, + iso.ISO_PTClass, + (CASE WHEN iso.ISO_IfPickling='True' THEN '是' ELSE '否' END) AS ISO_IfPickling, + (CASE WHEN iso.ISO_IfChasing='True' THEN '是' ELSE '否' END) AS ISO_IfChasing, + iso.ISO_Remark" + + @" FROM PW_IsoInfo AS iso" + + @" LEFT JOIN Base_Unit AS unit ON unit.UnitId = iso.UnitId" + + @" LEFT JOIN Base_TestMedium AS testMedium ON testMedium.TestMediumId = iso.TestMediumId" + + @" LEFT JOIN Base_DetectionRate AS detectionRate ON detectionRate.DetectionRateId = iso.DetectionRateId" + + @" LEFT JOIN Base_DetectionType AS detectionType ON detectionType.DetectionTypeId = iso.DetectionTypeId" + + @" LEFT JOIN ProjectData_WorkArea AS workArea ON workArea.WorkAreaId = iso.WorkAreaId" + + @" LEFT JOIN Base_Material AS material ON material.MaterialId = iso.MaterialId" + + @" LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId = iso.PipingClassId" + + @" WHERE iso.ProjectId=@ProjectId"; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + + if (!string.IsNullOrEmpty(treeNodeId)) + { + strSql += " AND workArea.WorkAreaId=@treeNodeId "; + listStr.Add(new SqlParameter("@treeNodeId", treeNodeId)); + } + + if (!string.IsNullOrEmpty(unitId)) + { + strSql += " AND iso.UnitId=@unitId "; + listStr.Add(new SqlParameter("@unitId", unitId)); + } + + if (!string.IsNullOrEmpty(this.drpIsStanded.SelectedValue)) + { + strSql += " AND iso.Is_Standard=@Is_Standard "; + listStr.Add(new SqlParameter("@Is_Standard", this.drpIsStanded.SelectedValue)); + } + if (!string.IsNullOrEmpty(this.txtIsoNo.Text.Trim())) + { + strSql += " AND iso.ISO_IsoNo LIKE @ISO_IsoNo"; + listStr.Add(new SqlParameter("@ISO_IsoNo", "%" + this.txtIsoNo.Text.Trim() + "%")); + } + if (!string.IsNullOrEmpty(this.drpSer.SelectedValue) && this.drpSer.SelectedValue != BLL.Const._Null) + { + strSql += " AND iso.TestMediumId = @TestMediumId"; + listStr.Add(new SqlParameter("@TestMediumId", this.drpSer.SelectedValue)); + } + if (!string.IsNullOrEmpty(this.drpNDT.SelectedValue) && this.drpNDT.SelectedValue != BLL.Const._Null) + { + strSql += " AND iso.DetectionTypeId = @DetectionTypeId"; + listStr.Add(new SqlParameter("@DetectionTypeId", this.drpNDT.SelectedValue)); + } + if (!string.IsNullOrEmpty(this.txtIso_IsoNumber.Text.Trim())) + { + strSql += " AND iso.ISO_IsoNumber LIKE @isoNumber"; + listStr.Add(new SqlParameter("@isoNumber", "%" + this.txtIso_IsoNumber.Text.Trim() + "%")); + } + if (!string.IsNullOrEmpty(this.drpSteId.SelectedValue) && this.drpSteId.SelectedValue != BLL.Const._Null) + { + strSql += " AND iso.MaterialId = @MaterialId"; + listStr.Add(new SqlParameter("@MaterialId", this.drpSteId.SelectedValue)); + } + if (!string.IsNullOrEmpty(this.txtISO_Specification.Text.Trim())) + { + strSql += " AND iso.ISO_Specification LIKE @ISO_Specification"; + listStr.Add(new SqlParameter("@ISO_Specification", "%" + this.txtISO_Specification.Text.Trim() + "%")); + } + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + // 2.获取当前分页数据 + //var table = this.GetPagedDataTable(Grid1, tb1); + Grid1.RecordCount = tb.Rows.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + //this.OutputSummaryData(tb); ///取合计值 + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 计算合计 + /// + /// 计算合计 + /// + //private void OutputSummaryData(DataTable tb) + //{ + // decimal count2 = 0;//总达因数 + // int count3 = 0;//总焊口数 + // for (int i = 0; i < tb.Rows.Count; i++) + // { + // count2 += Funs.GetNewDecimalOrZero(tb.Rows[i]["ISO_TotalDin"].ToString()); + // count3 += Funs.GetNewIntOrZero(tb.Rows[i]["ISO_JointQty"].ToString()); + // } + // JObject summary = new JObject(); + // summary.Add("ISO_IsoNo", "合计："); + // summary.Add("ISO_TotalDin", count2); + // summary.Add("ISO_JointQty", count3); + // Grid1.SummaryData = summary; + //} + #endregion + + #region 分页排序 + #region 页索引改变事件 + /// + /// 页索引改变事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(this.treeNodeId); + } + #endregion + + #region 排序 + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + #endregion + + #region 分页选择下拉改变事件 + /// + /// 分页选择下拉改变事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + #endregion + #endregion + + #region 管线信息 维护事件 + /// + /// Grid双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + if (GetButtonPower(Const.BtnModify)) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PipelineManageEdit.aspx?ISO_ID={0}", Grid1.SelectedRowID, "编辑 - "))); + } + else + { + ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + protected void btnSearch_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(treeNodeId)) + { + BindGrid(treeNodeId); + } + + } + /// + /// 增加管线信息 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + if (GetButtonPower(Const.BtnAdd)) + { + var workArea = BLL.WorkAreaService.getWorkAreaByWorkAreaId(tvControlItem.SelectedNodeID); + if (workArea != null) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PipelineManageEdit.aspx?workAreaId={0}", this.tvControlItem.SelectedNodeID, "新增 - "))); + } + else + { + ShowNotify("请先选择区域！", MessageBoxIcon.Warning); + } + } + else + { + ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + + /// + /// 管线信息编辑 + /// + /// + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + if (GetButtonPower(Const.BtnModify)) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PipelineManageEdit.aspx?ISO_ID={0}", Grid1.SelectedRowID, "维护 - "))); + } + else + { + ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + + /// + /// 删除按钮 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (GetButtonPower(Const.BtnDelete)) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + + bool isShow = true; + string isoRes = string.Empty; + if (Grid1.SelectedRowIndexArray.Length > 1) + { + isShow = false; + } + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + if (this.CurrUser.UserId == Const.sysglyId) + { + BLL.PW_IsoInfoService.DeleteIsoInfoALL(rowID); + } + else + { + if (judgementDelete(rowID, isShow)) + { + Model.PW_IsoInfo q = BLL.PW_IsoInfoService.GetIsoInfoByIsoInfoId(rowID); + if (q != null) + { + if (!BLL.PW_JointInfoService.IsExistJointInfoWeld(rowID)) + { + BLL.PW_JointInfoService.DeleteJointInfoByIsoId(rowID); + var tP_IsoList = (from x in BLL.Funs.DB.TP_IsoList where x.ISO_ID == q.ISO_ID select x).FirstOrDefault(); + if (tP_IsoList != null) + { + BLL.Funs.DB.TP_IsoList.DeleteOnSubmit(tP_IsoList); + BLL.Funs.DB.SubmitChanges(); + } + BLL.PW_IsoInfoService.DeleteIsoInfo(rowID); + BLL.LogService.AddSys_Log(this.CurrUser, null, rowID, BLL.Const.HJGL_PipelineMenuId, "删除管线信息"); + } + else + { + if (string.IsNullOrEmpty(isoRes)) + { + isoRes = q.ISO_IsoNo; + } + else + { + isoRes += "," + q.ISO_IsoNo; + } + } + } + } + } + } + if (!string.IsNullOrEmpty(isoRes)) + { + Alert.ShowInTop("管线" + isoRes + "存在焊口的焊接信息！", MessageBoxIcon.Warning); + } + else + { + // ShowNotify("删除成功！", MessageBoxIcon.Success); + } + if (!string.IsNullOrEmpty(treeNodeId)) + { + this.BindGrid(treeNodeId); + } + else + { + this.BindGrid(); + } + + + } + else + { + ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + #endregion + + #region 关闭弹出窗口及刷新页面 + /// + /// 关闭弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + this.BindGrid(); + } + + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + + /// + /// 查询 + /// + /// + /// + protected void Tree_TextChanged(object sender, EventArgs e) + { + this.InitTreeMenu(); + this.BindGrid(); + } + #endregion + + #region 判断是否可删除 + /// + /// 判断是否可以删除 + /// + /// + private bool judgementDelete(string id, bool isShow) + { + string content = string.Empty; + + string jotInfo = string.Empty; + var q = from x in Funs.DB.PW_JointInfo where x.ISO_ID == id && x.DReportID != null select x; + if (q.Count() > 0) + { + foreach (var item in q) + { + jotInfo += "焊口号：" + item.JOT_JointNo; + var dr = Funs.DB.BO_WeldReportMain.FirstOrDefault(x => x.DReportID == item.DReportID); + if (dr != null) + { + jotInfo += "；焊接日报号：" + dr.JOT_DailyReportNo; + } + } + + content = "该管线已焊焊口！" + jotInfo; + } + + if (BLL.AItemEndCheckService.IsExistAItemEndCheck(id)) + { + content = "A项尾工已经使用了该管线，不能删除！"; + } + if (BLL.BItemEndCheckService.IsExistBItemEndCheck(id)) + { + content = "B项尾工已经使用了该管线，不能删除！"; + } + if (string.IsNullOrEmpty(content)) + { + return true; + } + else + { + if (isShow) + { + Alert.ShowInTop(content, MessageBoxIcon.Error); + } + return false; + } + } + #endregion + + #region 选择要显示列 + /// + /// 选择显示列 + /// + /// + /// + protected void btnSelectColumn_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("PipelineShowColumn.aspx", "显示列 - "))); + } + + /// + /// 关闭显示列弹出窗口 + /// + /// + /// + protected void Window2_Close(object sender, WindowCloseEventArgs e) + { + this.BindGrid(); + //显示列 + Model.Sys_UserShowColumns c = BLL.UserShowColumnsService.GetColumnsByUserId(this.CurrUser.UserId, "Iso"); + if (c != null) + { + this.GetShowColumn(c.Columns); + } + } + #endregion + + #region 显示的列 + /// + /// 显示的列 + /// + /// + private void GetShowColumn(string column) + { + if (!string.IsNullOrEmpty(column)) + { + this.Grid1.Columns[1].Hidden = true; + this.Grid1.Columns[2].Hidden = true; + this.Grid1.Columns[3].Hidden = true; + this.Grid1.Columns[4].Hidden = true; + this.Grid1.Columns[5].Hidden = true; + this.Grid1.Columns[6].Hidden = true; + this.Grid1.Columns[7].Hidden = true; + this.Grid1.Columns[8].Hidden = true; + this.Grid1.Columns[9].Hidden = true; + this.Grid1.Columns[10].Hidden = true; + this.Grid1.Columns[11].Hidden = true; + this.Grid1.Columns[12].Hidden = true; + this.Grid1.Columns[13].Hidden = true; + this.Grid1.Columns[14].Hidden = true; + this.Grid1.Columns[15].Hidden = true; + this.Grid1.Columns[16].Hidden = true; + this.Grid1.Columns[17].Hidden = true; + this.Grid1.Columns[18].Hidden = true; + this.Grid1.Columns[19].Hidden = true; + this.Grid1.Columns[20].Hidden = true; + this.Grid1.Columns[21].Hidden = true; + this.Grid1.Columns[22].Hidden = true; + this.Grid1.Columns[23].Hidden = true; + this.Grid1.Columns[24].Hidden = true; + this.Grid1.Columns[25].Hidden = true; + this.Grid1.Columns[26].Hidden = true; + this.Grid1.Columns[27].Hidden = true; + this.Grid1.Columns[28].Hidden = true; + this.Grid1.Columns[29].Hidden = true; + this.Grid1.Columns[30].Hidden = true; + this.Grid1.Columns[31].Hidden = true; + this.Grid1.Columns[32].Hidden = true; + this.Grid1.Columns[33].Hidden = true; + this.Grid1.Columns[34].Hidden = true; + this.Grid1.Columns[35].Hidden = true; + this.Grid1.Columns[36].Hidden = true; + this.Grid1.Columns[37].Hidden = true; + this.Grid1.Columns[38].Hidden = true; + this.Grid1.Columns[39].Hidden = true; + this.Grid1.Columns[40].Hidden = true; + List columns = column.Split(',').ToList(); + foreach (var item in columns) + { + this.Grid1.Columns[Convert.ToInt32(item)].Hidden = false; + } + } + } + #endregion + + #region 格式化字符串 + /// + /// 获取总达因数 + /// + /// + /// + public static string ConvertTotalDin(object isoId) + { + if (isoId != null) + { + var sizeSum = (from x in Funs.DB.PW_JointInfo where x.ISO_ID == isoId.ToString() select x.JOT_Size).Sum(); + if (sizeSum != null) + { + return sizeSum.ToString(); + } + } + return null; + } + + /// + /// 获取总焊口数 + /// + /// + /// + public static string ConvertJointQty(object isoId) + { + if (isoId != null) + { + var jotCount = (from x in Funs.DB.PW_JointInfo where x.ISO_ID == isoId.ToString() select x).Count(); + if (jotCount != null) + { + return jotCount.ToString(); + } + } + return null; + } + + /// + /// 根据管线主键获取试压包编号 + /// + /// + /// + public static string ConvertTestPackageNo(object iso_id) + { + if (iso_id != null) + { + //var testPackage = (from x in Funs.DB.TP_TestPackage + // join y in Funs.DB.TP_IsoList on x.PTP_ID equals y.PTP_ID + // join z in Funs.DB.PW_IsoInfo on y.ISO_ID equals z.ISO_ID + // where z.ISO_ID == iso_id.ToString() + // select x.PTP_TestPackageCode).FirstOrDefault(); + //return testPackage; + return null; + } + return null; + } + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private bool GetButtonPower(string button) + { + return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_PipelineManageMenuId, button); + } + #endregion + + #region 批量生成二维码 + /// + /// 批量生成二维码 + /// + /// + /// + protected void btnQR_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + { + var getJointInfos = from x in Funs.DB.PW_JointInfo + join y in Funs.DB.PW_IsoInfo on x.ISO_ID equals y.ISO_ID + where x.ProjectId == this.CurrUser.LoginProjectId + && y.WorkAreaId == this.tvControlItem.SelectedNodeID + && x.QRCodeAttachUrl == null + select x; + int num = 0; + if (getJointInfos.Count() > 0) + { + foreach (var item in getJointInfos) + { + string url = CreateQRCodeService.CreateCode_Simple("WeldedJoint$" + item.JOT_ID); + if (!string.IsNullOrEmpty(url)) + { + item.QRCodeAttachUrl = url; + Funs.DB.SubmitChanges(); + num++; + } + } + } + ShowNotify("操作完成，新生成二维码" + num.ToString() + "条", MessageBoxIcon.Success); + } + else + { + Alert.ShowInTop("请选择区域！",MessageBoxIcon.Warning); + } + } + #endregion + + #region 导出焊口二维码 + /// + /// 导出焊口二维码 + /// + /// + /// + protected void btnPrint_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + string iso_Id = Grid1.SelectedRowID; + var getJots = Funs.DB.PW_JointInfo.Where(x => x.ISO_ID == iso_Id).Select(x => x.JOT_ID); + if (getJots.Count() > 0) + { + string pList = string.Empty; + foreach (var id in getJots) + { + if (string.IsNullOrEmpty(pList)) + { + pList = id; + } + else + { + pList += "," + id; + } + } + if (!string.IsNullOrEmpty(pList)) + { + PrinterDocService.PrinterDocMethod(BLL.Const.HJGL_PipelineMenuId, pList, "管线焊口二维码"); + } + else + { + Alert.ShowInParent("请选择要导出的管线！"); + return; + } + } + } + #endregion + } +} +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldReportEdit.aspx.cs" Inherits="FineUIPro.Web.HJGL.WeldingManage.WeldReportEdit" %> + + + + + + 焊接日报 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + --%> + + + <%----%> + + + <%-- + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using BLL; +using Newtonsoft.Json.Linq; + +namespace FineUIPro.Web.HJGL.WeldingManage +{ + public partial class WeldReportEdit : PageBase + { + #region 定义项 + /// + /// 焊接日报主键 + /// + public string DReportID + { + get + { + return (string)ViewState["DReportID"]; + } + set + { + ViewState["DReportID"] = value; + } + } + + #endregion + + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.DReportID = Request.Params["DReportID"]; + + ///焊接区域 + this.drpCodeName.DataTextField = "Text"; + this.drpCodeName.DataValueField = "Text"; + this.drpCodeName.DataSource = BLL.DropListService.HJGL_JointArea(); + this.drpCodeName.DataBind(); + ///焊口属性 + this.drpJointAttribute.DataTextField = "Text"; + this.drpJointAttribute.DataValueField = "Value"; + this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute(); + this.drpJointAttribute.DataBind(); + ///焊接位置 + this.drpLocation.DataTextField = "Text"; + this.drpLocation.DataValueField = "Value"; + this.drpLocation.DataSource = BLL.DropListService.HJGL_JOT_LocationItem(); + this.drpLocation.DataBind(); + + //this.SetDailyReportNo(null, null); + + List GetWeldReportItem = BLL.WeldReportService.GetDistinctWeldReportItem(this.DReportID); + this.BindGrid(GetWeldReportItem); // 初始化页面 + this.PageInfoLoad(); // 加载页面 + } + } + #endregion + + #region 加载页面输入提交信息 + /// + /// 加载页面输入提交信息 + /// + private void PageInfoLoad() + { + if (!string.IsNullOrEmpty(this.CurrUser.UnitId)) + { + this.hdUnitId.Text = this.CurrUser.UnitId; + //this.txtUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(this.CurrUser.UnitId); + } + if (!string.IsNullOrEmpty(this.CurrUser.UserId)) + { + this.hdUserId.Text = this.CurrUser.UserId; + this.txtUserName.Text = BLL.UserService.GetUserNameByUserId(this.CurrUser.UserId); + } + //BLL.Project_InstallationService.InitInstallationListDownList(this.drpInstallation, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true); + //this.drpInstallation.SelectedValue = BLL.Const._Null; + + this.drpUnit.Items.Clear(); + var pUnit = BLL.UnitService.GetUnitByProjectIdUnitTypeList(this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2); + if (pUnit != null) + { + this.drpUnit.DataTextField = "UnitName"; + this.drpUnit.DataValueField = "UnitId"; + this.drpUnit.DataSource = pUnit; + this.drpUnit.DataBind(); + this.drpUnit.SelectedValue = this.hdUnitId.Text; + + if (this.CurrUser.UnitId != Const.UnitId_TCC) + { + this.drpUnit.Enabled = false; + } + } + BLL.Project_InstallationService.InitInstallationListDownList(this.drpInstallation, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true); + this.drpInstallation.SelectedValue = BLL.Const._Null; + ///盖面焊工 + this.drpCellWelderCode.Items.Clear(); + ///打底焊工 + this.drpFloorWelderCode.Items.Clear(); + if (this.drpUnit.SelectedValue != BLL.Const._Null) + { + + drpCellWelderCode.DataTextField = "Text"; + drpCellWelderCode.DataValueField = "Value"; + drpCellWelderCode.DataSource = BLL.WelderService.GetWelderCodeListByProjectIdAndUnitId(this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue); + drpCellWelderCode.DataBind(); + + + drpFloorWelderCode.DataTextField = "Text"; + drpFloorWelderCode.DataValueField = "Value"; + drpFloorWelderCode.DataSource = BLL.WelderService.GetWelderCodeListByProjectIdAndUnitId(this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue); + drpFloorWelderCode.DataBind(); + } + var report = BLL.WeldReportService.GetWeldReportByDReportID(this.DReportID); + if (report != null) + { + //this.txtDailyReportNo.Text = report.JOT_DailyReportNo; + if (!string.IsNullOrEmpty(report.UnitId)) + { + + this.hdUnitId.Text = report.UnitId; + //this.txtUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(report.UnitId); + } + if (!string.IsNullOrEmpty(report.CHT_Tabler)) + { + this.hdUserId.Text = report.CHT_Tabler; + this.txtUserName.Text = BLL.UserService.GetUserNameByUserId(report.CHT_Tabler); + } + if (!string.IsNullOrEmpty(report.InstallationId)) + { + this.drpInstallation.SelectedValue = report.InstallationId; + } + this.hdDailyReportNo.Text = report.JOT_DailyReportNo; + this.txtJOT_WeldDate.Text = string.Format("{0:yyyy-MM-dd}", report.JOT_WeldDate); + this.txtCHT_TableDate.Text = string.Format("{0:yyyy-MM-dd}", report.CHT_TableDate); + this.txtJOT_Remark.Text = report.JOT_Remark; + } + else + { + this.SimpleForm1.Reset(); ///重置所有字段 + this.txtJOT_WeldDate.Text = string.Format("{0:yyyy-MM-dd}", System.DateTime.Now); + this.txtCHT_TableDate.Text = string.Format("{0:yyyy-MM-dd}", System.DateTime.Now); + } + + /////制单人 + //this.drpCHT_Tabler.DataTextField = "UserName"; + //this.drpCHT_Tabler.DataValueField = "UserId"; + //this.drpCHT_Tabler.DataSource = BLL.UserService.GetProjectUserListByProjectId(this.CurrUser.LoginProjectId); + //this.drpCHT_Tabler.DataBind(); + //Funs.FineUIPleaseSelect(this.drpCHT_Tabler); + //if (this.CurrUser.UserId != Const.sysglyId && this.CurrUser.UserId != BLL.Const.hfnbdId) + //{ + // this.drpCHT_Tabler.SelectedValue = this.CurrUser.UserId; + //} + + + + + + + //BLL.Project_InstallationService.InitInstallationsDropDownList(this.drpInstallation, this.CurrUser.LoginProjectId, true); + //if (report != null) + //{ + //if (!string.IsNullOrEmpty(report.CHT_Tabler)) + //{ + // var tabler = this.drpCHT_Tabler.Items.FirstOrDefault(x => x.Value == report.CHT_Tabler); + // if (tabler != null) + // { + // this.drpCHT_Tabler.SelectedValue = report.CHT_Tabler; + // } + //} + //this.drpUnit.SelectedValue = report.UnitId; + //if (!string.IsNullOrEmpty(report.UnitId)) + //{ + // drpCellWelderCode.DataTextField = "Text"; + // drpCellWelderCode.DataValueField = "Value"; + // drpCellWelderCode.DataSource = BLL.WelderService.GetWelderCodeListByProjectIdAndUnitId(this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue); + // drpCellWelderCode.DataBind(); + + + // drpFloorWelderCode.DataTextField = "Text"; + // drpFloorWelderCode.DataValueField = "Value"; + // drpFloorWelderCode.DataSource = BLL.WelderService.GetWelderCodeListByProjectIdAndUnitId(this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue); + // drpFloorWelderCode.DataBind(); + //} + //this.drpInstallation.SelectedValue = report.InstallationId; + //this.drpUnit.Enabled = false; + //} + } + #endregion + + #region 数据绑定 + /// + /// 数据绑定 + /// + private void BindGrid(List GetWeldReportItem) + { + DataTable tb = this.LINQToDataTable(GetWeldReportItem); + // 2.获取当前分页数据 + //var table = this.GetPagedDataTable(GridNewDynamic, tb1); + Grid1.RecordCount = tb.Rows.Count; + tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 排序 + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + List GetWeldReportItem = this.CollectGridJointInfo(); + this.BindGrid(GetWeldReportItem); + } + #endregion + + #region 焊接日报 提交事件 + /// + /// 编辑焊接日报 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_WeldReportMenuId, Const.BtnSave)) + { + //if (BLL.WeldReportService.IsExistDailyReportNO(this.txtDailyReportNo.Text, this.DReportID, this.CurrUser.LoginProjectId)) + //{ + // ShowNotify("日报编号已存在，请重新录入！", MessageBoxIcon.Warning); + // return; + //} + if (string.IsNullOrEmpty(this.txtJOT_WeldDate.Text) || this.drpInstallation.SelectedValue == BLL.Const._Null) + { + ShowNotify("装置、焊接日期不能为空！", MessageBoxIcon.Warning); + return; + } + List GetWeldReportItem = this.CollectGridJointInfo(); + + Model.BO_WeldReportMain newWeldReportMain = new Model.BO_WeldReportMain(); + newWeldReportMain.ProjectId = this.CurrUser.LoginProjectId; + //newWeldReportMain.JOT_DailyReportNo = this.txtDailyReportNo.Text.Trim(); + if (this.drpUnit.SelectedValue != BLL.Const._Null) + { + newWeldReportMain.UnitId = this.drpUnit.SelectedValue; + } + //if (!string.IsNullOrEmpty(this.CurrUser.UnitId)) + //{ + // newWeldReportMain.UnitId = this.CurrUser.UnitId; + //} + if (this.drpInstallation.SelectedValue != BLL.Const._Null&&!string.IsNullOrEmpty(this.drpInstallation.SelectedValue)) + { + newWeldReportMain.InstallationId = this.drpInstallation.SelectedValue; + } + DateTime? weldDate = Funs.GetNewDateTime(this.txtJOT_WeldDate.Text); + if (weldDate.HasValue) + { + newWeldReportMain.JOT_WeldDate = weldDate.Value; + } + else + { + newWeldReportMain.JOT_WeldDate = System.DateTime.Now; + } + //if (this.drpCHT_Tabler.SelectedValue != BLL.Const._Null) + //{ + // newWeldReportMain.CHT_Tabler = this.drpCHT_Tabler.SelectedValue; + //} + if (!string.IsNullOrEmpty(this.CurrUser.UserId)) + { + newWeldReportMain.CHT_Tabler = this.CurrUser.UserId; + } + newWeldReportMain.CHT_TableDate = Funs.GetNewDateTime(this.txtCHT_TableDate.Text); + newWeldReportMain.JOT_Remark = this.txtJOT_Remark.Text.Trim(); + + if (!string.IsNullOrEmpty(this.DReportID)) + { + newWeldReportMain.JOT_DailyReportNo = this.hdDailyReportNo.Text.Trim(); + newWeldReportMain.DReportID = this.DReportID; + BLL.WeldReportService.UpdateWeldReport(newWeldReportMain); + BLL.LogService.AddSys_Log(this.CurrUser, newWeldReportMain.JOT_DailyReportNo, this.DReportID, BLL.Const.HJGL_WeldReportMenuId, "修改焊接日报信息"); + } + else + { + #region 自动生成日报告号 + var workAreaCode = string.Empty; + var welderCode = string.Empty; + string jotId = GetWeldReportItem.FirstOrDefault().JOT_ID; + if (!string.IsNullOrEmpty(jotId)) + { + var jotInfo = BLL.PW_JointInfoService.GetJointInfoByJotID(jotId); + if (jotInfo != null) + { + if (!string.IsNullOrEmpty(jotInfo.ISO_ID)) + { + var isoInfo = BLL.PW_IsoInfoService.GetIsoInfoByIsoInfoId(jotInfo.ISO_ID); + if (isoInfo != null) + { + workAreaCode = BLL.WorkAreaService.GetWorkAreaCodeByWorkAreaId(isoInfo.WorkAreaId); + } + } + } + } + string welderId = GetWeldReportItem.FirstOrDefault().JOT_CellWelder; + if (!string.IsNullOrEmpty(welderId)) + { + welderCode = BLL.WelderService.GetWelderById(welderId).WED_Code; + } + string perfix = workAreaCode + "-" + welderCode + "-"; + newWeldReportMain.JOT_DailyReportNo = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.BO_WeldReportMain", "JOT_DailyReportNo", this.CurrUser.LoginProjectId, perfix); + #endregion + + this.DReportID = SQLHelper.GetNewID(typeof(Model.BO_WeldReportMain)); + newWeldReportMain.DReportID = this.DReportID; + BLL.WeldReportService.AddWeldReport(newWeldReportMain); + BLL.LogService.AddSys_Log(this.CurrUser, newWeldReportMain.JOT_DailyReportNo, this.DReportID, BLL.Const.HJGL_WeldReportMenuId, "添加焊接日报信息"); + } + + foreach (var item in GetWeldReportItem) + { + Model.PW_JointInfo jot = BLL.PW_JointInfoService.GetJointInfoByJotID(item.JOT_ID); + jot.DReportID = newWeldReportMain.DReportID; + jot.JOT_CellWelder = item.JOT_CellWelder; + jot.JOT_FloorWelder = item.JOT_FloorWelder; + jot.WLO_Code = item.WLO_Code == "安装" ? "F" : "S"; + jot.JOT_JointAttribute = item.JOT_JointAttribute; + jot.JOT_Location = item.JOT_Location; + jot.JOT_DoneDin = item.JOT_DoneDin; + jot.JOT_Electricity = item.JOT_Electricity; + jot.JOT_Voltage = item.JOT_Voltage; + jot.JOT_JointStatus = "100"; + jot.WeldingSpeed = item.WeldingSpeed; + jot.JOT_PrepareTemp = item.JOT_PrepareTemp; + jot.ActualPrepareTemp = item.ActualPrepareTemp; + jot.JOT_CellTemp = item.JOT_CellTemp; + jot.JOT_LastTemp = item.JOT_LastTemp; + BLL.PW_JointInfoService.UpdateJointInfoByDReport(jot); + //更新焊口号 修改固定焊口号后 +G + BLL.PW_JointInfoService.UpdateJointNoAddG(item.JOT_ID, item.JOT_JointAttribute, "Add"); + } + ShowNotify("提交成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + else + { + ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + return; + } + } + #endregion + + #region 收集Grid页面信息 + /// + /// 收集Grid页面信息 + /// + /// + private List CollectGridJointInfo() + { + List GetWeldReportItem = null; + List getNewWeldReportItem = new List(); + if (!string.IsNullOrEmpty(this.hdItemsString.Text)) + { + GetWeldReportItem = BLL.WeldReportService.GetWeldReportAddItem(this.hdItemsString.Text); + } + else if (string.IsNullOrEmpty(this.hdItemsString.Text) && this.DReportID != null) + { + GetWeldReportItem = BLL.WeldReportService.GetDistinctWeldReportItem(this.DReportID); + } + + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + + string rowID = values.Value("JOT_ID").ToString(); + var item = GetWeldReportItem.FirstOrDefault(x => x.JOT_ID == rowID); + if (item != null) + { + var cellWelderCode = (from x in Funs.DB.BS_Welder + where x.ProjectId == this.CurrUser.LoginProjectId && x.WED_Code == values.Value("WED_Code1") + select x).FirstOrDefault(); + if (cellWelderCode != null) + { + item.WED_Code1 = cellWelderCode.WED_Code; + item.JOT_CellWelder = cellWelderCode.WED_ID; + } + var floorWelderCode = (from x in Funs.DB.BS_Welder + where x.ProjectId == this.CurrUser.LoginProjectId && x.WED_Code == values.Value("WED_Code2") + select x).FirstOrDefault(); + if (floorWelderCode != null) + { + item.WED_Code2 = floorWelderCode.WED_Code; + item.JOT_FloorWelder = floorWelderCode.WED_ID; + } + + if (values.Value("WLO_Code").ToString() == "安装") + { + item.WLO_Code = "安装"; + } + else + { + item.WLO_Code = "预制"; + } + item.JOT_JointAttribute = values.Value("JOT_JointAttribute").ToString(); + item.JOT_Location = values.Value("JOT_Location").ToString(); + item.JOT_DoneDin = Funs.GetNewDecimalOrZero(values.Value("JOT_DoneDin").ToString()); + item.JOT_Electricity = values.Value("JOT_Electricity"); + item.JOT_Voltage = values.Value("JOT_Voltage"); + item.WeldingSpeed = values.Value("WeldingSpeed"); + item.JOT_PrepareTemp = Funs.GetNewDecimal(values.Value("JOT_PrepareTemp")); + item.ActualPrepareTemp = Funs.GetNewDecimal(values.Value("ActualPrepareTemp")); + item.JOT_CellTemp = Funs.GetNewDecimal(values.Value("JOT_CellTemp")); + item.JOT_LastTemp = Funs.GetNewDecimal(values.Value("JOT_LastTemp")); + getNewWeldReportItem.Add(item); + } + + } + return getNewWeldReportItem; + } + #endregion + + #region Grid 关闭弹出窗口事件 + /// + /// 关闭弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + List list = Funs.GetStrListByStr(hdItemsString.Text, '#'); + if (list.Count() == 2) + { + string welderLists = list[0]; + List welder = Funs.GetStrListByStr(welderLists, '|'); + + string jotLists = list[1]; + List jot = Funs.GetStrListByStr(jotLists, '|'); + //if (welder.Count() > 0 && jot.Count() > 0) + //{ + // this.SetDailyReportNo(jot[0], welder[0]); + //} + } + List GetWeldReportItem = BLL.WeldReportService.GetWeldReportAddItem(this.hdItemsString.Text); + this.BindGrid(GetWeldReportItem); + //SetDrpByDrpUnitChange(); + //this.hdItemsString.Text = string.Empty; + } + #endregion + + #region 右键删除事件 + /// + /// 右键删除事件 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + List GetWeldReportItem = this.CollectGridJointInfo(); + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + //var batchDetail = BLL.HJGL_BO_BatchDetailService.GetBatchDetailByJotId(rowID); + //if (batchDetail != null) + //{ + // var batch = BLL.HJGL_BO_BatchService.GetBatchById(batchDetail.BatchId); + // if (batch != null && (batch.BatchIsClosed == false || batch.BatchIsClosed == null)) + // { + // BLL.HJGL_BO_BatchDetailService.DeleteBatchDetail(rowID); + // } + //} + var item = GetWeldReportItem.FirstOrDefault(x => x.JOT_ID == rowID); + if (item != null) + { + GetWeldReportItem.Remove(item); + } + Model.PW_JointInfo jot = BLL.PW_JointInfoService.GetJointInfoByJotID(rowID); + if (!string.IsNullOrEmpty(jot.DReportID)) + { + jot.DReportID = null; + jot.JOT_CellWelder = null; + jot.JOT_FloorWelder = null; + jot.JOT_DoneDin = null; + jot.JOT_Electricity = null; + jot.JOT_Voltage = null; + jot.WeldingSpeed = null; + jot.JOT_PrepareTemp = null; + jot.ActualPrepareTemp = null; + jot.JOT_CellTemp = null; + jot.JOT_LastTemp = null; + BLL.PW_JointInfoService.UpdateJointInfoByDReport(jot); + } + } + + BindGrid(GetWeldReportItem); + ShowNotify("操作完成!", MessageBoxIcon.Success); + } + } + #endregion + + #region 查找 + /// + /// 查找未焊接焊口 + /// + /// + /// + protected void ckSelect_Click(object sender, EventArgs e) + { + string jotIds = string.Empty; + + for (int i = 0; i < Grid1.Rows.Count; i++) + { + string jotId = Grid1.DataKeys[i][0].ToString(); + jotIds = jotIds + jotId + "|"; + } + + if (jotIds != string.Empty) + { + jotIds = jotIds.Substring(0, jotIds.Length - 1); + } + + //if (!string.IsNullOrEmpty(this.drpUnit.SelectedValue) && this.drpUnit.SelectedValue != BLL.Const._Null) + if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && this.drpInstallation.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpInstallation.SelectedValue)) + { + string strList = this.CurrUser.LoginProjectId + "|" + this.drpUnit.SelectedValue + "|" + this.DReportID + "|" + this.drpInstallation.SelectedValue; + string window = String.Format("WeldReportItemEdit.aspx?strList={0}&jotIds={1}", strList, jotIds, "编辑 - "); + PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdItemsString.ClientID) + Window1.GetShowReference(window)); + } + else + { + Alert.ShowInTop("请选择装置！", MessageBoxIcon.Warning); + } + } + #endregion + + protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e) + { + BLL.Project_InstallationService.InitInstallationListDownList(this.drpInstallation, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true); + this.drpInstallation.SelectedValue = BLL.Const._Null; + ///盖面焊工 + this.drpCellWelderCode.Items.Clear(); + ///打底焊工 + this.drpFloorWelderCode.Items.Clear(); + if (this.drpUnit.SelectedValue != BLL.Const._Null) + { + + drpCellWelderCode.DataTextField = "Text"; + drpCellWelderCode.DataValueField = "Value"; + drpCellWelderCode.DataSource = BLL.WelderService.GetWelderCodeListByProjectIdAndUnitId(this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue); + drpCellWelderCode.DataBind(); + + + drpFloorWelderCode.DataTextField = "Text"; + drpFloorWelderCode.DataValueField = "Value"; + drpFloorWelderCode.DataSource = BLL.WelderService.GetWelderCodeListByProjectIdAndUnitId(this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue); + drpFloorWelderCode.DataBind(); + } + } + + } +} +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TestPackageManageEdit.aspx.cs" Inherits="FineUIPro.Web.HJGL.TestPackageManage.TestPackageManageEdit" %> + + + + + + + 试压包录入 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.IO; +using System.Linq; + +namespace FineUIPro.Web.HJGL.TestPackageManage +{ + public partial class TestPackageManageEdit : PageBase + { + #region 定义项 + /// + /// 试压包主键 + /// + public string PTP_ID + { + get + { + return (string)ViewState["PTP_ID"]; + } + set + { + ViewState["PTP_ID"] = value; + } + } + + /// + /// 管线集合 + /// + private static List isoInfos = new List(); + + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + var pUnit = BLL.UnitService.GetUnitByProjectIdUnitTypeList(this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2); + if (pUnit != null) + { + this.drpUnitId.DataTextField = "UnitName"; + this.drpUnitId.DataValueField = "UnitId"; + this.drpUnitId.DataSource = pUnit; + this.drpUnitId.DataBind(); + this.drpUnitId.SelectedValue = this.CurrUser.UnitId; + if (CurrUser.UnitId != Const.UnitId_TCC && CurrUser.UserId != Const.hfnbdId) + { + this.drpUnitId.Enabled = false; + } + BLL.Project_InstallationService.InitInstallationListDownList(this.drpInstallationId, this.CurrUser.LoginProjectId, this.drpUnitId.SelectedValue, true); + this.drpInstallationId.SelectedIndex = 0; + } + BLL.UserService.InitUserDropDownList(this.drpPTP_Modifier, this.CurrUser.LoginProjectId, true);//修改人 + BLL.Base_PressureService.InitPressureDropDownList(this.drpPTP_TestType, true);//试验类型 + BLL.UserService.InitUserDropDownList(this.drpPTP_Tabler, this.CurrUser.LoginProjectId, true);//建档人 + + this.txtReportDate.Text = string.Format("{0:yyyy-MM}", DateTime.Now); + this.txtPTP_TableDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + this.drpPTP_Tabler.SelectedValue = this.CurrUser.UserId; + + this.InitTreeMenu(); + } + } + #endregion + + #region 加载树装置-单位-工作区 + /// + /// 加载树 + /// + private void InitTreeMenu() + { + if (!string.IsNullOrEmpty(this.txtReportDate.Text.Trim())) + { + DateTime? startTime = Funs.GetNewDateTime(this.txtReportDate.Text.Trim()); + DateTime? endTime = startTime.HasValue ? startTime.Value.AddMonths(1) : System.DateTime.Now; + + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "单位-装置-月份"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + this.tvControlItem.Nodes.Add(rootNode); + + List units = null; + var unit = BLL.ProjectUnitService.GetProjectUnitById(this.CurrUser.UnitId); + if (unit == null || unit.UnitType == BLL.Const.ProjectUnitType_1 || unit.UnitType == BLL.Const.ProjectUnitType_3) + { + if (BLL.WorkAreaService.IsSupervisor(this.CurrUser.UnitId, this.CurrUser.LoginProjectId)) + { + units = (from x in Funs.DB.Base_Unit + join y in Funs.DB.ProjectData_WorkArea on x.UnitId equals y.UnitId + where (x.UnitId == this.CurrUser.UnitId || y.SupervisorUnitId == this.CurrUser.UnitId) && y.ProjectId == this.CurrUser.LoginProjectId + select x).Distinct().ToList(); + } + else + { + units = BLL.UnitService.GetUnitByProjectIdUnitTypeList(this.CurrUser.LoginProjectId, "2"); + } + } + else + { + units = (from x in Funs.DB.Base_Unit where x.UnitId == this.CurrUser.UnitId select x).ToList(); + } + List testPackageLists = new List(); ///试压包 + if (!this.txtReportDate.Hidden) + { + testPackageLists = (from x in Funs.DB.TP_TestPackage + where x.ProjectId == this.CurrUser.LoginProjectId && x.PTP_TableDate >= startTime && x.PTP_TableDate < endTime + select x).ToList(); + } + if (units != null) + { + foreach (var item in units) + { + TreeNode rootUnitNode = new TreeNode();//定义根节点 + rootUnitNode.Text = item.UnitName; + rootUnitNode.NodeID = item.UnitId; + rootUnitNode.Expanded = true; + rootUnitNode.ToolTip = "施工单位"; + rootNode.Nodes.Add(rootUnitNode); + var lists = testPackageLists.Where(x => x.BSU_ID == item.UnitId).ToList(); + this.BindNodes(rootUnitNode, lists); + } + } + else + { + Alert.ShowInTop("请先增加施工单位！", MessageBoxIcon.Warning); + return; + } + } + else + { + Alert.ShowInTop("请选择试压月份！", MessageBoxIcon.Warning); + return; + } + } + #endregion + + #region 绑定树节点 + /// + /// 绑定树节点 + /// + /// + private void BindNodes(TreeNode node, List testPackageLists) + { + if (node.ToolTip == "施工单位") + { + var installId = (from x in testPackageLists select x.InstallationId).Distinct(); + if (installId.Count() > 0) + { + var install = from x in Funs.DB.Project_Installation where installId.Contains(x.InstallationId) orderby x.InstallationCode select x; + foreach (var q in install) + { + TreeNode newNode = new TreeNode(); + newNode.Text = q.InstallationCode + q.InstallationName; + newNode.NodeID = q.InstallationId + "|" + node.NodeID; ; + newNode.ToolTip = "装置"; + newNode.Expanded = true; + node.Nodes.Add(newNode); + this.BindNodes(newNode, testPackageLists); + } + } + } + else if (node.ToolTip == "装置") + { + string installationId = Funs.GetStrListByStr(node.NodeID, '|')[0]; + var listMonth = (from x in testPackageLists + where x.InstallationId == installationId && x.BSU_ID == node.ParentNode.NodeID + select string.Format("{0:yyyy-MM}", x.PTP_TableDate)).Distinct(); + foreach (var item in listMonth) + { + TreeNode newNode = new TreeNode(); + newNode.Text = item; + newNode.NodeID = item + "|" + node.NodeID; ; + newNode.ToolTip = "月份"; + node.Nodes.Add(newNode); + this.BindNodes(newNode, testPackageLists); + } + } + else if (node.ToolTip == "月份") + { + string installationId = Funs.GetStrListByStr(node.ParentNode.NodeID, '|')[0]; + var days = (from x in testPackageLists + where x.InstallationId == installationId && x.BSU_ID == node.ParentNode.ParentNode.NodeID + orderby x.PTP_TableDate descending + select x.PTP_TableDate).Distinct(); + foreach (var item in days) + { + TreeNode newNode = new TreeNode(); + newNode.Text = string.Format("{0:yyyy-MM-dd}", item); + newNode.NodeID = item.ToString() + "|" + node.NodeID; ; + newNode.ToolTip = "日期"; + node.Nodes.Add(newNode); + this.BindNodes(newNode, testPackageLists); + } + } + else if (node.ToolTip == "日期") + { + string installationId = Funs.GetStrListByStr(node.ParentNode.ParentNode.NodeID, '|')[0]; + var dReports = from x in testPackageLists + where x.InstallationId == installationId && x.BSU_ID == node.ParentNode.ParentNode.ParentNode.NodeID + && x.PTP_TableDate == Funs.GetNewDateTime(node.Text) + orderby x.PTP_TestPackageNo descending + select x; + foreach (var item in dReports) + { + TreeNode newNode = new TreeNode(); + if (!string.IsNullOrEmpty(item.PTP_TestPackageNo)) + { + newNode.Text = item.PTP_TestPackageNo; + } + else + { + newNode.Text = "未知"; + } + if (!item.PTP_AduditDate.HasValue || string.IsNullOrEmpty(item.PTP_Auditer)) + { + newNode.Text = "" + newNode.Text + ""; + node.Text = "" + node.Text + ""; + node.ParentNode.Text = "" + node.ParentNode.Text + ""; + } + newNode.NodeID = item.PTP_ID; + newNode.EnableClickEvent = true; + node.Nodes.Add(newNode); + } + } + } + #endregion + + #region 查询Tree + protected void Tree_TextChanged(object sender, EventArgs e) + { + this.InitTreeMenu(); + } + #endregion + + #region 点击树节点 + /// + /// 点击树节点 + /// + /// + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + isoInfos = new List(); + this.PTP_ID = this.tvControlItem.SelectedNodeID; + if (!string.IsNullOrEmpty(this.PTP_ID)) + { + var testPackage = BLL.TestPackageManageEditService.GetTP_TestPackageByID(PTP_ID); + if (testPackage != null) + { + if (!string.IsNullOrEmpty(testPackage.BSU_ID)) + { + this.drpUnitId.SelectedValue = testPackage.BSU_ID; + } + if (!string.IsNullOrEmpty(testPackage.InstallationId)) + { + this.drpInstallationId.SelectedValue = testPackage.InstallationId; + } + this.txtPTP_TightnessTestTime.Text = testPackage.PTP_TightnessTestTime; + this.txtPTP_TestPackageNo.Text = testPackage.PTP_TestPackageNo; + if (!string.IsNullOrEmpty(testPackage.PTP_Modifier)) + { + this.drpPTP_Modifier.SelectedValue = testPackage.PTP_Modifier; + } + this.txtPTP_LeakageTestService.Text = testPackage.PTP_LeakageTestService; + this.txtPTP_TestPackageName.Text = testPackage.PTP_TestPackageName; + this.txtPTP_ModifyDate.Text = testPackage.PTP_ModifyDate.HasValue ? string.Format("{0:yyyy-MM-dd}", testPackage.PTP_ModifyDate) : ""; + this.txtPTP_LeakageTestPressure.Text = testPackage.PTP_LeakageTestPressure; + this.txtPTP_TestHeat.Text = testPackage.PTP_TestHeat; + this.txtPTP_TestPackageCode.Text = testPackage.PTP_TestPackageCode; + this.txtPTP_TightnessTestTemp.Text = testPackage.PTP_TightnessTestTemp; + this.txtPTP_TestService.Text = testPackage.PTP_TestService; + this.txtPTP_TestAmbientTemp.Text = testPackage.PTP_TestAmbientTemp; + this.txtPTP_VacuumTestService.Text = testPackage.PTP_VacuumTestService; + if (!string.IsNullOrEmpty(testPackage.PTP_TestType)) + { + this.drpPTP_TestType.SelectedValue = testPackage.PTP_TestType; + } + this.txtPTP_TestMediumTemp.Text = testPackage.PTP_TestMediumTemp; + this.txtPTP_VacuumTestPressure.Text = testPackage.PTP_VacuumTestPressure; + this.txtPTP_AllowSeepage.Text = testPackage.PTP_AllowSeepage; + this.txtPTP_TestPressure.Text = testPackage.PTP_TestPressure; + this.txtPTP_OperationMedium.Text = testPackage.PTP_OperationMedium; + this.txtPTP_FactSeepage.Text = testPackage.PTP_FactSeepage; + this.txtPTP_TestPressureTemp.Text = testPackage.PTP_TestPressureTemp; + this.txtPTP_PurgingMedium.Text = testPackage.PTP_PurgingMedium; + if (!string.IsNullOrEmpty(testPackage.PTP_Tabler)) + { + this.drpPTP_Tabler.SelectedValue = testPackage.PTP_Tabler; + } + this.txtPTP_TestPressureTime.Text = testPackage.PTP_TestPressureTime; + this.txtPTP_CleaningMedium.Text = testPackage.PTP_CleaningMedium; + this.txtPTP_TableDate.Text = testPackage.PTP_TableDate.HasValue ? string.Format("{0:yyyy-MM-dd}", testPackage.PTP_TableDate) : ""; + this.txtPTP_TightnessTest.Text = testPackage.PTP_TightnessTest; + this.txtPTP_Remark.Text = testPackage.PTP_Remark; + + isoInfos = BLL.TestPackageManageEditService.GetIsoInfosByPTP_ID(PTP_ID); + if (isoInfos.Count > 0) + { + this.Grid1.DataSource = isoInfos; + this.Grid1.DataBind(); + } + } + } + else + { + this.PTP_ID = string.Empty; + } + } + #endregion + + #region 增加 + /// + /// 增加按钮 + /// + /// + /// + protected void btnAdd_Click(object sender, EventArgs e) + { + if (this.GetButtonPower(BLL.Const.BtnAdd)) + { + TextEmpty(); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + private void TextEmpty() + { + this.PTP_ID = string.Empty; + this.drpInstallationId.SelectedIndex = 0; + this.txtPTP_TightnessTestTime.Text = string.Empty; + this.txtPTP_TestPackageNo.Text = string.Empty; + this.drpPTP_Modifier.SelectedIndex = 0; + this.txtPTP_LeakageTestService.Text = string.Empty; + this.txtPTP_TestPackageName.Text = string.Empty; + this.txtPTP_ModifyDate.Text = string.Empty; + this.txtPTP_LeakageTestPressure.Text = string.Empty; + this.txtPTP_TestHeat.Text = string.Empty; + this.txtPTP_TestPackageCode.Text = string.Empty; + this.txtPTP_TightnessTestTemp.Text = string.Empty; + this.txtPTP_TestService.Text = string.Empty; + this.txtPTP_TestAmbientTemp.Text = string.Empty; + this.txtPTP_VacuumTestService.Text = string.Empty; + this.drpPTP_TestType.SelectedIndex = 0; + this.txtPTP_TestMediumTemp.Text = string.Empty; + this.txtPTP_VacuumTestPressure.Text = string.Empty; + this.txtPTP_AllowSeepage.Text = string.Empty; + this.txtPTP_TestPressure.Text = string.Empty; + this.txtPTP_OperationMedium.Text = string.Empty; + this.txtPTP_FactSeepage.Text = string.Empty; + this.txtPTP_TestPressureTemp.Text = string.Empty; + this.txtPTP_PurgingMedium.Text = string.Empty; + this.drpPTP_Tabler.SelectedValue = this.CurrUser.UserId; + this.txtPTP_TestPressureTime.Text = string.Empty; + this.txtPTP_CleaningMedium.Text = string.Empty; + this.txtPTP_TableDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + this.txtPTP_TightnessTest.Text = string.Empty; + this.txtPTP_Remark.Text = string.Empty; + + isoInfos.Clear(); + isoInfos = new List(); + this.Grid1.DataSource = isoInfos; + this.Grid1.DataBind(); + } + #endregion + + #region 查找管线焊口 + /// + /// 查找按钮 + /// + /// + /// + protected void btnSearch_Click(object sender, EventArgs e) + { + if (GetButtonPower(BLL.Const.BtnSave)) + { + if (this.drpUnitId.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.drpUnitId.SelectedValue)) + { + Alert.ShowInTop("请选择单位！", MessageBoxIcon.Warning); + return; + } + else if (this.drpInstallationId.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.drpInstallationId.SelectedValue)) + { + Alert.ShowInTop("请选择装置名称！", MessageBoxIcon.Warning); + return; + } + else + { + string window = String.Format("ShowTestPackageSearch.aspx?unitId={0}&&installationId={1}", this.drpUnitId.SelectedValue, this.drpInstallationId.SelectedValue, "编辑 - "); + PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hdIso_Id.ClientID) + + Window1.GetShowReference(window)); + } + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + return; + } + } + #endregion + + #region 删除试压包 + /// + /// 删除按钮 + /// + /// + /// + protected void btnDelete_Click(object sender, EventArgs e) + { + if (this.GetButtonPower(BLL.Const.BtnDelete)) + { + this.PTP_ID = this.tvControlItem.SelectedNodeID; + if (!string.IsNullOrEmpty(this.PTP_ID)) + { + var test = BLL.TestPackageManageEditService.GetTP_TestPackageByID(PTP_ID); + if (test != null && !test.PTP_AduditDate.HasValue) + { + BLL.TestPackageManageEditService.DeleteTP_IsoListByPTP_ID(PTP_ID); + BLL.TestPackageManageEditService.DeleteTP_TestPackageByTP_TestPackageID(PTP_ID); + + ShowNotify("删除成功！", MessageBoxIcon.Success); + TextEmpty(); + InitTreeMenu(); + } + else + { + Alert.ShowInTop("此试压单已审核不能删除！", MessageBoxIcon.Warning); + } + } + else + { + Alert.ShowInTop("请选择要删除的试压记录！", MessageBoxIcon.Warning); + } + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + #endregion + + #region 保存 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (this.GetButtonPower(BLL.Const.BtnSave)) + { + foreach (var item in isoInfos) + { + if (item.ISO_IsoNo == null) + { + Alert.ShowInTop("管线号不能为空！", MessageBoxIcon.Warning); + return; + } + } + if (this.drpUnitId.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.drpUnitId.SelectedValue)) + { + Alert.ShowInTop("请选择单位！", MessageBoxIcon.Warning); + return; + } + if (this.drpInstallationId.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.drpInstallationId.SelectedValue)) + { + Alert.ShowInTop("请选择装置名称！", MessageBoxIcon.Warning); + return; + } + if (this.drpPTP_Tabler.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.drpPTP_Tabler.SelectedValue)) + { + Alert.ShowInTop("请选择建档人！", MessageBoxIcon.Warning); + return; + } + Model.TP_TestPackage testPackage = new Model.TP_TestPackage(); + testPackage.ProjectId = this.CurrUser.LoginProjectId; + testPackage.BSU_ID = this.drpUnitId.SelectedValue; + testPackage.InstallationId = this.drpInstallationId.SelectedValue; + testPackage.PTP_TestPackageNo = this.txtPTP_TestPackageNo.Text.Trim(); + testPackage.PTP_TestPackageName = this.txtPTP_TestPackageName.Text.Trim(); + testPackage.PTP_TestHeat = this.txtPTP_TestHeat.Text.Trim(); + testPackage.PTP_TestService = this.txtPTP_TestService.Text.Trim(); + if (this.drpPTP_TestType.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpPTP_TestType.SelectedValue)) + { + testPackage.PTP_TestType = this.drpPTP_TestType.SelectedValue; + } + testPackage.PTP_Tabler = this.drpPTP_Tabler.SelectedValue; + testPackage.PTP_TableDate = Funs.GetNewDateTime(this.txtPTP_TableDate.Text.Trim()); + if (this.drpPTP_Modifier.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpPTP_Modifier.SelectedValue)) + { + testPackage.PTP_Modifier = this.drpPTP_Modifier.SelectedValue; + } + testPackage.PTP_ModifyDate = Funs.GetNewDateTime(this.txtPTP_ModifyDate.Text.Trim()); + testPackage.PTP_Remark = this.txtPTP_Remark.Text.Trim(); + testPackage.PTP_TestPackageCode = this.txtPTP_TestPackageCode.Text.Trim(); + testPackage.PTP_TestAmbientTemp = this.txtPTP_TestAmbientTemp.Text.Trim(); + testPackage.PTP_TestMediumTemp = this.txtPTP_TestMediumTemp.Text.Trim(); + testPackage.PTP_TestPressure = this.txtPTP_TestPressure.Text.Trim(); + testPackage.PTP_TestPressureTemp = this.txtPTP_TestPressureTemp.Text.Trim(); + testPackage.PTP_TestPressureTime = this.txtPTP_TestPressureTime.Text.Trim(); + testPackage.PTP_TightnessTest = this.txtPTP_TightnessTest.Text.Trim(); + testPackage.PTP_TightnessTestTemp = this.txtPTP_TightnessTestTemp.Text.Trim(); + testPackage.PTP_TightnessTestTime = this.txtPTP_TightnessTestTime.Text.Trim(); + testPackage.PTP_LeakageTestService = this.txtPTP_LeakageTestService.Text.Trim(); + testPackage.PTP_LeakageTestPressure = this.txtPTP_LeakageTestPressure.Text.Trim(); + testPackage.PTP_VacuumTestService = this.txtPTP_VacuumTestService.Text.Trim(); + testPackage.PTP_VacuumTestPressure = this.txtPTP_VacuumTestPressure.Text.Trim(); + testPackage.PTP_OperationMedium = this.txtPTP_OperationMedium.Text.Trim(); + testPackage.PTP_PurgingMedium = this.txtPTP_PurgingMedium.Text.Trim(); + testPackage.PTP_CleaningMedium = this.txtPTP_CleaningMedium.Text.Trim(); + testPackage.PTP_AllowSeepage = this.txtPTP_AllowSeepage.Text.Trim(); + testPackage.PTP_FactSeepage = this.txtPTP_FactSeepage.Text.Trim(); + + if (!string.IsNullOrEmpty(this.PTP_ID)) + { + var updatetestPackage = BLL.TestPackageManageEditService.GetTP_TestPackageByID(this.PTP_ID); + if (updatetestPackage != null) + { + if (updatetestPackage.PTP_AduditDate.HasValue) + { + Alert.ShowInTop("此条试压单已审核不能修改！", MessageBoxIcon.Warning); + return; + } + else + { + testPackage.PTP_ID = PTP_ID; + BLL.TestPackageManageEditService.UpdateTP_TestPackage(testPackage); + BLL.TestPackageManageEditService.DeleteTP_IsoListByPTP_ID(PTP_ID); + } + } + } + else + { + testPackage.PTP_ID = SQLHelper.GetNewID(typeof(Model.TP_TestPackage)); + this.PTP_ID = testPackage.PTP_ID; + BLL.TestPackageManageEditService.AddTP_TestPackage(testPackage); + } + foreach (var item in isoInfos) + { + Model.TP_IsoList newitem = new Model.TP_IsoList(); + newitem.PTP_ID = this.PTP_ID; + newitem.ISO_ID = item.ISO_ID; + BLL.TestPackageManageEditService.AddTP_IsoList(newitem); + } + isoInfos.Clear(); + ShowNotify("保存成功！", MessageBoxIcon.Success); + InitTreeMenu(); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + #endregion + + #region 关闭弹出窗体 + /// + /// 关闭弹出窗体 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + isoInfos.Clear(); + List infos = Funs.GetStrListByStr(hdIso_Id.Text, ','); + + if (this.PTP_ID == null) + { + foreach (var item in infos) + { + Model.PW_IsoInfo info = BLL.PW_IsoInfoService.GetIsoInfoByIsoInfoId(item); + isoInfos.Add(info); + } + } + else + { + foreach (var iso in infos) + { + Model.PW_IsoInfo info = BLL.PW_IsoInfoService.GetIsoInfoByIsoInfoId(iso); + + if (isoInfos.Where(y => y.ISO_ID == iso).Count() == 0) + { + isoInfos.Add(info); + } + } + } + if (isoInfos.Count > 0) + { + this.Grid1.DataSource = isoInfos; + this.Grid1.DataBind(); + } + + changeTestPackageCode(sender, e); + } + #endregion + + #region 右键删除焊口 + /// + /// 右键删除焊口 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (this.GetButtonPower(BLL.Const.BtnDelete)) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + var testPackage = BLL.TestPackageManageEditService.GetTP_TestPackageByID(PTP_ID); + if (testPackage != null && testPackage.PTP_AduditDate.HasValue) + { + Alert.ShowInTop("此试压包已审核不能删除！", MessageBoxIcon.Warning); + return; + } + else + { + var item = isoInfos.FirstOrDefault(x => x.ISO_ID == rowID); + if (item != null) + { + isoInfos.RemoveAt(rowIndex); + } + } + } + Grid1.DataSource = isoInfos; + Grid1.DataBind(); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + #endregion + + #region DropDownList下拉选择事件 + /// + /// 委托单位下拉选择事件 + /// + /// + /// + protected void drpUnitId_SelectedIndexChanged(object sender, EventArgs e) + { + this.drpInstallationId.Items.Clear(); + if (!string.IsNullOrEmpty(this.drpUnitId.SelectedValue) && this.drpUnitId.SelectedValue != BLL.Const._Null) + { + BLL.Project_InstallationService.InitInstallationListDownList(this.drpInstallationId, this.CurrUser.LoginProjectId, this.drpUnitId.SelectedValue, true); + this.drpInstallationId.SelectedIndex = 0; + } + else + { + Funs.FineUIPleaseSelect(this.drpInstallationId); + } + changeTestPackageNo(sender, e); + } + #endregion + + #region 介质转换 + /// + /// 介质转换 + /// + /// + /// + protected string ConvertTestMedium(object SER_ID) + { + if (SER_ID != null) + { + return BLL.Base_TestMediumService.GetTestMediumById(SER_ID.ToString()).MediumName; + } + else + { + return ""; + } + } + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private bool GetButtonPower(string button) + { + return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_TestPackageManageMenuId, button); + } + + #endregion + + protected void drpInstallationId_OnSelectedIndexChanged(object sender, EventArgs e) + { + changeTestPackageNo(sender, e); + changeTestPackageCode(sender, e); + } + /// + /// 试压编号：施工单位+装置区号+SYB+流水号，自动生成。 + /// + protected void changeTestPackageNo(object sender, EventArgs e) + { + /// 施工单位 + 装置区号 + SYB + 流水号 + var unit = UnitService.GetUnitByUnitId(this.drpUnitId.SelectedValue); + var install = Project_InstallationService.GetInstallationByInstallationId(drpInstallationId.SelectedValue); + if (install != null && unit != null) + { + string code = unit.UnitCode + "-" + install.InstallationCode + "-SYB-"; + txtPTP_TestPackageNo.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.TP_TestPackage", "PTP_TestPackageNo", this.CurrUser.LoginProjectId, code); + } + } + + /// + /// 试压包号：装置区号+管道介质号+试压包流水号 + /// + protected void changeTestPackageCode(object sender, EventArgs e) + { + /// 装置区号+管道介质号+试压包流水号 + var install = Project_InstallationService.GetInstallationByInstallationId(drpInstallationId.SelectedValue); + if (install != null && isoInfos.Count > 0) + { + var isoInfo = isoInfos.Where(x => x.TestMediumId != null).FirstOrDefault(); + if (isoInfo != null) + { + var testMedium = Funs.DB.Base_TestMedium.Where(x => x.TestMediumId == isoInfo.TestMediumId).FirstOrDefault(); + + if (testMedium != null) + { + string code = install.InstallationCode + "-" + testMedium.MediumCode + "-"; + txtPTP_TestPackageCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.TP_TestPackage", "PTP_TestPackageCode", this.CurrUser.LoginProjectId, code); + } + } + } + } + + #region 打印 + protected void btnPrint_Click(object sender, EventArgs e) + { + exportWord(); + } + + protected Model.FastReportItem GetFastReportItem(Model.TP_TestPackage updateTestPackage, string printType) + { + string initTemplatePath = ""; + Model.FastReportItem fastReportItem = new Model.FastReportItem(); + switch (printType) + { + case "0"://报验申请表 + { + var iosList = BLL.TestPackageManageEditService.GetIsoInfosByPTP_ID(this.PTP_ID); + if (iosList.Count > 0) + { + var q = iosList[0]; + var isoIds = string.Join("','", iosList.Select(x => x.ISO_ID).ToArray()); + Dictionary keyValuePairs = new Dictionary(); + + var unit = BLL.ProjectUnitService.GetProjectUnitByProjectIdUnitType(this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_3); + var testPackage = BLL.TestPackageManageEditService.GetTP_TestPackageByID(this.PTP_ID); + var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + + keyValuePairs.Add("ProjectName", projectName); + keyValuePairs.Add("TestPackageNo", testPackage.PTP_TestPackageNo); + keyValuePairs.Add("UnitName", unit.UnitName); + BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); + + initTemplatePath = "File\\Fastreport\\JGZL\\1试压包报验申请表.frx"; + fastReportItem.ReportPath = initTemplatePath; + fastReportItem.ParameterValues = keyValuePairs; + } + } + break; + } + return fastReportItem; + } + #endregion + + protected void exportWord() + { + if (!string.IsNullOrEmpty(this.PTP_ID)) + { + var updateTestPackage = Funs.DB.TP_TestPackage.FirstOrDefault(x => x.PTP_ID == this.PTP_ID); + if (updateTestPackage != null) + { + string rootPath = Server.MapPath("~/"); + BLL.Common.FastReportService.ResetData(); + ListItem[] list = new ListItem[1]; + list[0] = new ListItem("0", "File\\Fastreport\\JGZL\\1试压包报验申请表.frx"); + + List FastReportItemList = new List(); + + foreach (var item in list) + { + FastReportItemList.Add(GetFastReportItem(updateTestPackage, item.Text)); + } + var Path = Funs.RootPath + "FileUpload/" + this.PTP_ID + ".docx"; + + BLL.Common.FastReportService.ExportMergeReport(FastReportItemList, Path); + FileInfo info = new FileInfo(Path); + long fileSize = info.Length; + + System.Web.HttpContext.Current.Response.Clear(); + System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed"; + System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode("交工资料.docx", System.Text.Encoding.UTF8)); + System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString()); + System.Web.HttpContext.Current.Response.TransmitFile(Path, 0, fileSize); + System.Web.HttpContext.Current.Response.Flush(); + System.Web.HttpContext.Current.Response.Close(); + File.Delete(Path); + } + } + else + { + Alert.ShowInTop("请选择要打印的单据!", MessageBoxIcon.Warning); + return; + } + } + } +} diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/LinkedTestRunReport/2024-04/638481924048752201_新建文档.docx b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/LinkedTestRunReport/2024-04/638481924048752201_新建文档.docx new file mode 100644 index 00000000..7a337fb6 --- /dev/null +++ b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/LinkedTestRunReport/2024-04/638481924048752201_新建文档.docx @@ -0,0 +1,3 @@ +1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。 +2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。 + diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/MonthReport/2024-04/638481898114730786_新建文档.docx b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/MonthReport/2024-04/638481898114730786_新建文档.docx new file mode 100644 index 00000000..7a337fb6 --- /dev/null +++ b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/MonthReport/2024-04/638481898114730786_新建文档.docx @@ -0,0 +1,3 @@ +1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。 +2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。 + diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/PropertyReport/2024-04/638481924592442911_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/PropertyReport/2024-04/638481924592442911_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx new file mode 100644 index 00000000..127dc425 Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/PropertyReport/2024-04/638481924592442911_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/CompleteSummary/2024-04/638481892601492878_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/CompleteSummary/2024-04/638481892601492878_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/CompleteSummary/2024-04/638481892601492878_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/CompleteSummary/2024-04/638483556968980495_新建文档.docx b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/CompleteSummary/2024-04/638483556968980495_新建文档.docx new file mode 100644 index 00000000..7a337fb6 --- /dev/null +++ b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/CompleteSummary/2024-04/638483556968980495_新建文档.docx @@ -0,0 +1,3 @@ +1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。 +2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。 + diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/CompleteSummary/2024-04/638483557080193582_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/CompleteSummary/2024-04/638483557080193582_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx new file mode 100644 index 00000000..127dc425 Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/CompleteSummary/2024-04/638483557080193582_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/PersonalSummary/2024-04/638481891153343957_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/PersonalSummary/2024-04/638481891153343957_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/PersonalSummary/2024-04/638481891153343957_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/PersonalSummary/2024-04/638483556360775372_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/PersonalSummary/2024-04/638483556360775372_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx new file mode 100644 index 00000000..127dc425 Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/PersonalSummary/2024-04/638483556360775372_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/PersonalSummary/2024-04/638483556427718917_新建文档.docx b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/PersonalSummary/2024-04/638483556427718917_新建文档.docx new file mode 100644 index 00000000..7a337fb6 --- /dev/null +++ b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/PersonalSummary/2024-04/638483556427718917_新建文档.docx @@ -0,0 +1,3 @@ +1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。 +2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。 + diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481052889287976_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481052889287976_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481052889287976_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481059847091091_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481059847091091_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481059847091091_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481832958461189_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481832958461189_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481832958461189_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481835179803534_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481835179803534_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481835179803534_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481838218637366_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481838218637366_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481838218637366_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481846156229151_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481846156229151_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481846156229151_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481848398820188_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481848398820188_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481848398820188_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481848546623224_ECEC.gif b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481848546623224_ECEC.gif new file mode 100644 index 00000000..e7d1dcad Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481848546623224_ECEC.gif differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481852763931257_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481852763931257_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481852763931257_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481852840480783_CNCEC16.gif b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481852840480783_CNCEC16.gif new file mode 100644 index 00000000..6de3c52f Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481852840480783_CNCEC16.gif differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481853058556238_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481853058556238_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481853058556238_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481853106339027_CWCEC.bmp b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481853106339027_CWCEC.bmp new file mode 100644 index 00000000..a296b06a Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481853106339027_CWCEC.bmp differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481853996017160_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481853996017160_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481853996017160_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481854110319045_SEDIN.jpg b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481854110319045_SEDIN.jpg new file mode 100644 index 00000000..793f58ef Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481854110319045_SEDIN.jpg differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481854928267621_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481854928267621_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481854928267621_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481854970577556_SEDIN.jpg b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481854970577556_SEDIN.jpg new file mode 100644 index 00000000..793f58ef Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481854970577556_SEDIN.jpg differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481855604666120_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481855604666120_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481855604666120_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481856291282187_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481856291282187_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481856291282187_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481856331636763_SEDIN.jpg b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481856331636763_SEDIN.jpg new file mode 100644 index 00000000..793f58ef Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481856331636763_SEDIN.jpg differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481857625821757_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481857625821757_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481857625821757_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481857658215188_SEDIN.jpg b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481857658215188_SEDIN.jpg new file mode 100644 index 00000000..793f58ef Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481857658215188_SEDIN.jpg differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481858751360999_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481858751360999_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481858751360999_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481858778371317_SEDIN.jpg b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481858778371317_SEDIN.jpg new file mode 100644 index 00000000..793f58ef Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481858778371317_SEDIN.jpg differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481860931981550_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481860931981550_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481860931981550_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481860994816928_SEDIN.jpg b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481860994816928_SEDIN.jpg new file mode 100644 index 00000000..793f58ef Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481860994816928_SEDIN.jpg differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481861631538461_CNCEC16.gif b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481861631538461_CNCEC16.gif new file mode 100644 index 00000000..6de3c52f Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481861631538461_CNCEC16.gif differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481863037465249_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481863037465249_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481863037465249_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481868679123777_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481868679123777_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481868679123777_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481868956217054_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481868956217054_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481868956217054_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481869993338935_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481869993338935_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481869993338935_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481876342611907_CNCEC.png b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481876342611907_CNCEC.png new file mode 100644 index 00000000..6fbda87d Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638481876342611907_CNCEC.png differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638483439074546063_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638483439074546063_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx new file mode 100644 index 00000000..127dc425 Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638483439074546063_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638483439152206907_新建文档.docx b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638483439152206907_新建文档.docx new file mode 100644 index 00000000..7a337fb6 --- /dev/null +++ b/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638483439152206907_新建文档.docx @@ -0,0 +1,3 @@ +1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。 +2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。 + diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482756497107801_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482756497107801_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx new file mode 100644 index 00000000..127dc425 Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482756497107801_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482757740206669_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482757740206669_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx new file mode 100644 index 00000000..127dc425 Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482757740206669_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482760172401743_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482760172401743_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx new file mode 100644 index 00000000..127dc425 Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482760172401743_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482762471567333_新建文档.docx b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482762471567333_新建文档.docx new file mode 100644 index 00000000..7a337fb6 --- /dev/null +++ b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482762471567333_新建文档.docx @@ -0,0 +1,3 @@ +1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。 +2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。 + diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482762530469969_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482762530469969_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx new file mode 100644 index 00000000..127dc425 Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482762530469969_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482764891720026_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482764891720026_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx new file mode 100644 index 00000000..127dc425 Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482764891720026_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482764980943824_新建文档.docx b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482764980943824_新建文档.docx new file mode 100644 index 00000000..7a337fb6 --- /dev/null +++ b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482764980943824_新建文档.docx @@ -0,0 +1,3 @@ +1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。 +2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。 + diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482767020668087_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482767020668087_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx new file mode 100644 index 00000000..127dc425 Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482767020668087_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482767086042191_新建文档.docx b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482767086042191_新建文档.docx new file mode 100644 index 00000000..7a337fb6 --- /dev/null +++ b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482767086042191_新建文档.docx @@ -0,0 +1,3 @@ +1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。 +2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。 + diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482767788570510_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482767788570510_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx new file mode 100644 index 00000000..127dc425 Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482767788570510_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482767851405460_新建文档.docx b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482767851405460_新建文档.docx new file mode 100644 index 00000000..7a337fb6 --- /dev/null +++ b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482767851405460_新建文档.docx @@ -0,0 +1,3 @@ +1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。 +2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。 + diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638483428933080406_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638483428933080406_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx new file mode 100644 index 00000000..127dc425 Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638483428933080406_EPC-PLA-HPL-A03-C_项目现场危险源清单20200427.xlsx differ diff --git a/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638483429006507650_新建文档.docx b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638483429006507650_新建文档.docx new file mode 100644 index 00000000..7a337fb6 --- /dev/null +++ b/SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638483429006507650_新建文档.docx @@ -0,0 +1,3 @@ +1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。 +2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。 + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index b8fdde4f..df7dd9f9 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1802,6 +1802,10 @@ + + + + @@ -1825,6 +1829,8 @@ + + @@ -16225,6 +16231,34 @@ MonthSummaryEdit.aspx + + PersonalSummary.aspx + ASPXCodeBehind + + + PersonalSummary.aspx + + + PersonalSummaryEdit.aspx + ASPXCodeBehind + + + PersonalSummaryEdit.aspx + + + SpecialSummary.aspx + ASPXCodeBehind + + + SpecialSummary.aspx + + + SpecialSummaryEdit.aspx + ASPXCodeBehind + + + SpecialSummaryEdit.aspx + FeedingTestRun.aspx ASPXCodeBehind @@ -16386,6 +16420,20 @@ MeetingSummary.aspx + + MeetingSummaryEdit.aspx + ASPXCodeBehind + + + MeetingSummaryEdit.aspx + + + MeetingSummaryView.aspx + ASPXCodeBehind + + + MeetingSummaryView.aspx + ScheduleMeeting.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx index 6a74db1b..f858e21a 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx @@ -9,9 +9,9 @@
- - + + + TextAlign="Center" ToolTip="附件查看" DataTextField="AttachUrl" ExpandUnusedSpace="true" /> diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.cs index 48ade239..c0230b96 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.cs @@ -37,10 +37,12 @@ namespace FineUIPro.Web.TestRun.DriverReport report.ReportType, report.Remark, unitWork.UnitWorkName, - u.UserName AS CompilePersonName" + u.UserName AS CompilePersonName, + RIGHT(att.AttachUrl,CHARINDEX('_',REVERSE(att.AttachUrl))-1) AS AttachUrl" + @" FROM Driver_DriverReport AS report " + @" LEFT JOIN WBS_UnitWork AS unitWork ON unitWork.UnitWorkId = report.UnitWorkId" + @" LEFT JOIN Sys_User AS u ON u.UserId = report.CompilePerson" + + @" LEFT JOIN AttachFile AS att ON att.ToKeyId=report.DriverReportId " + @" WHERE report.ProjectId=@projectId AND report.ReportType='6'"; List listStr = new List(); listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx index d0ba34b9..a8473f94 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx @@ -83,6 +83,8 @@ + + @@ -96,7 +98,7 @@ diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.cs index 4ec5d6eb..993c19e7 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.cs @@ -1,5 +1,6 @@ using BLL; using System; +using System.Collections.Generic; namespace FineUIPro.Web.TestRun.DriverReport { @@ -34,6 +35,7 @@ namespace FineUIPro.Web.TestRun.DriverReport this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : ""; //this.txtNumber.Text = data.Number; this.txtRemark.Text = data.Remark; + WindowAtt_Close(null, null); } } else @@ -59,6 +61,28 @@ namespace FineUIPro.Web.TestRun.DriverReport } PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverReport/DriverRunComplete&menuId={1}", this.hdId.Text, BLL.Const.DriverRunCompleteMenuId))); } + + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + this.lbtnAttach.Text = string.Empty; + string url = string.Empty; + var attLists = BLL.AttachFileService.Getfiles(this.hdId.Text, BLL.Const.DriverRunCompleteMenuId); + if (attLists != null) + { + List lists = Funs.GetStrListByStr(attLists.AttachUrl, ','); + if (lists.Count > 0) + { + foreach (var item in lists) + { + url += item.Substring(item.IndexOf('_') + 1) + "\r\n"; + } + } + if (!string.IsNullOrEmpty(url)) + { + this.lbtnAttach.Text = url; + } + } + } #endregion #region 保存 diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.designer.cs index e296de19..ceab6b8b 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.designer.cs @@ -174,6 +174,15 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.Button btnAttach; + /// + /// lbtnAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbtnAttach; + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx index e6e45728..1052bca8 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx @@ -9,9 +9,9 @@
- - + + + TextAlign="Center" ToolTip="附件查看" DataTextField="AttachUrl" ExpandUnusedSpace="true" /> diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.cs index e35bc09e..60c05ce8 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.cs @@ -37,10 +37,12 @@ namespace FineUIPro.Web.TestRun.DriverReport report.ReportType, report.Remark, unitWork.UnitWorkName, - u.UserName AS CompilePersonName" + u.UserName AS CompilePersonName, + RIGHT(att.AttachUrl,CHARINDEX('_',REVERSE(att.AttachUrl))-1) AS AttachUrl" + @" FROM Driver_DriverReport AS report " + @" LEFT JOIN WBS_UnitWork AS unitWork ON unitWork.UnitWorkId = report.UnitWorkId" + @" LEFT JOIN Sys_User AS u ON u.UserId = report.CompilePerson" + + @" LEFT JOIN AttachFile AS att ON att.ToKeyId=report.DriverReportId " + @" WHERE report.ProjectId=@projectId AND report.ReportType='4'"; List listStr = new List(); listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx index cd4c1143..a375df23 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx @@ -83,6 +83,8 @@ + + @@ -96,7 +98,7 @@ diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.cs index 7b21d546..7d6e4fb9 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.cs @@ -1,5 +1,6 @@ using BLL; using System; +using System.Collections.Generic; namespace FineUIPro.Web.TestRun.DriverReport { @@ -34,6 +35,7 @@ namespace FineUIPro.Web.TestRun.DriverReport this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : ""; //this.txtNumber.Text = data.Number; this.txtRemark.Text = data.Remark; + WindowAtt_Close(null, null); } } else @@ -59,6 +61,28 @@ namespace FineUIPro.Web.TestRun.DriverReport } PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverReport/FeedTestRunReport&menuId={1}", this.hdId.Text, BLL.Const.FeedTestRunReportMenuId))); } + + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + this.lbtnAttach.Text = string.Empty; + string url = string.Empty; + var attLists = BLL.AttachFileService.Getfiles(this.hdId.Text, BLL.Const.FeedTestRunReportMenuId); + if (attLists != null) + { + List lists = Funs.GetStrListByStr(attLists.AttachUrl, ','); + if (lists.Count > 0) + { + foreach (var item in lists) + { + url += item.Substring(item.IndexOf('_') + 1) + "\r\n"; + } + } + if (!string.IsNullOrEmpty(url)) + { + this.lbtnAttach.Text = url; + } + } + } #endregion #region 保存 diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.designer.cs index 634ab547..4e949877 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.designer.cs @@ -174,6 +174,15 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.Button btnAttach; + /// + /// lbtnAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbtnAttach; + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx index a918884d..f26de182 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx @@ -9,9 +9,9 @@
- - + + + TextAlign="Center" ToolTip="附件查看" DataTextField="AttachUrl" ExpandUnusedSpace="true" /> diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.cs index 367bc904..3b3d3a4a 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.cs @@ -37,10 +37,12 @@ namespace FineUIPro.Web.TestRun.DriverReport report.ReportType, report.Remark, unitWork.UnitWorkName, - u.UserName AS CompilePersonName" + u.UserName AS CompilePersonName, + RIGHT(att.AttachUrl,CHARINDEX('_',REVERSE(att.AttachUrl))-1) AS AttachUrl" + @" FROM Driver_DriverReport AS report " + @" LEFT JOIN WBS_UnitWork AS unitWork ON unitWork.UnitWorkId = report.UnitWorkId" + @" LEFT JOIN Sys_User AS u ON u.UserId = report.CompilePerson" + + @" LEFT JOIN AttachFile AS att ON att.ToKeyId=report.DriverReportId " + @" WHERE report.ProjectId=@projectId AND report.ReportType='3'"; List listStr = new List(); listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx index 6a835253..eb28efbf 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx @@ -83,6 +83,8 @@ + + @@ -96,7 +98,7 @@ diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.cs index c915e665..12a63403 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.cs @@ -1,5 +1,6 @@ using BLL; using System; +using System.Collections.Generic; namespace FineUIPro.Web.TestRun.DriverReport { @@ -34,6 +35,7 @@ namespace FineUIPro.Web.TestRun.DriverReport this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : ""; //this.txtNumber.Text = data.Number; this.txtRemark.Text = data.Remark; + WindowAtt_Close(null, null); } } else @@ -59,6 +61,28 @@ namespace FineUIPro.Web.TestRun.DriverReport } PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverReport/LinkedTestRunReport&menuId={1}", this.hdId.Text, BLL.Const.LinkedTestRunReportMenuId))); } + + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + this.lbtnAttach.Text = string.Empty; + string url = string.Empty; + var attLists = BLL.AttachFileService.Getfiles(this.hdId.Text, BLL.Const.LinkedTestRunReportMenuId); + if (attLists != null) + { + List lists = Funs.GetStrListByStr(attLists.AttachUrl, ','); + if (lists.Count > 0) + { + foreach (var item in lists) + { + url += item.Substring(item.IndexOf('_') + 1) + "\r\n"; + } + } + if (!string.IsNullOrEmpty(url)) + { + this.lbtnAttach.Text = url; + } + } + } #endregion #region 保存 diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.designer.cs index ad70ab29..34d17b48 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.designer.cs @@ -174,6 +174,15 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.Button btnAttach; + /// + /// lbtnAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbtnAttach; + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx index c7c3cad1..3c4c1710 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx @@ -9,9 +9,9 @@
- - + + - + diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs index 384ce137..30fcc86c 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs @@ -28,8 +28,10 @@ namespace FineUIPro.Web.TestRun.DriverReport string strSql = @"SELECT report.MonthReportId, report.ProjectId, report.MonthReportCode, - (CONVERT(varchar(10),DATEADD(DAY,1,DATEADD(MONTH,-1,report.MonthReportDate)),120)+'至'+CONVERT(varchar(10),report.MonthReportDate,120)) as MonthReportDate" + (CONVERT(varchar(10),DATEADD(DAY,1,DATEADD(MONTH,-1,report.MonthReportDate)),120)+'至'+CONVERT(varchar(10),report.MonthReportDate,120)) as MonthReportDate, + RIGHT(att.AttachUrl,CHARINDEX('_',REVERSE(att.AttachUrl))-1) AS AttachUrl" + @" FROM TestRun_MonthReport AS report " + + @" LEFT JOIN AttachFile AS att ON att.ToKeyId=report.MonthReportId " + @" WHERE report.ProjectId=@projectId "; List listStr = new List(); listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx index 96d4ec73..05cb98d7 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx @@ -618,6 +618,8 @@ + + @@ -630,7 +632,7 @@ diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs index 0b0ffb01..83dfdd03 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs @@ -80,6 +80,7 @@ namespace FineUIPro.Web.TestRun.DriverReport this.Grid3.DataSource = items3; this.Grid3.DataBind(); } + WindowAtt_Close(null, null); } else { @@ -147,6 +148,27 @@ namespace FineUIPro.Web.TestRun.DriverReport } PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverReport/MonthReport&menuId={1}", this.hdId.Text, BLL.Const.MonthReportMenuId))); } + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + this.lbtnAttach.Text = string.Empty; + string url = string.Empty; + var attLists = BLL.AttachFileService.Getfiles(this.hdId.Text, BLL.Const.MonthReportMenuId); + if (attLists != null) + { + List lists = Funs.GetStrListByStr(attLists.AttachUrl, ','); + if (lists.Count > 0) + { + foreach (var item in lists) + { + url += item.Substring(item.IndexOf('_') + 1) + "\r\n"; + } + } + if (!string.IsNullOrEmpty(url)) + { + this.lbtnAttach.Text = url; + } + } + } #endregion #region 保存 diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.designer.cs index 6c1c58da..fc759c4c 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.designer.cs @@ -1011,6 +1011,15 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.Button btnAttach; + /// + /// lbtnAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbtnAttach; + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx index 73316757..c860bd69 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx @@ -9,9 +9,9 @@
- - + + + TextAlign="Center" ToolTip="附件查看" DataTextField="AttachUrl" ExpandUnusedSpace="true" /> diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.cs index 7aab550c..2b3b8e5d 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.cs @@ -37,10 +37,12 @@ namespace FineUIPro.Web.TestRun.DriverReport report.ReportType, report.Remark, unitWork.UnitWorkName, - u.UserName AS CompilePersonName" + u.UserName AS CompilePersonName, + RIGHT(att.AttachUrl,CHARINDEX('_',REVERSE(att.AttachUrl))-1) AS AttachUrl" + @" FROM Driver_DriverReport AS report " + @" LEFT JOIN WBS_UnitWork AS unitWork ON unitWork.UnitWorkId = report.UnitWorkId" + @" LEFT JOIN Sys_User AS u ON u.UserId = report.CompilePerson" + + @" LEFT JOIN AttachFile AS att ON att.ToKeyId=report.DriverReportId " + @" WHERE report.ProjectId=@projectId AND report.ReportType='5'"; List listStr = new List(); listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx index 40d9a7e1..f2693ba2 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx @@ -83,6 +83,8 @@ + + @@ -96,7 +98,7 @@ diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.cs index f8682e46..58de3532 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.cs @@ -1,5 +1,6 @@ using BLL; using System; +using System.Collections.Generic; namespace FineUIPro.Web.TestRun.DriverReport { @@ -34,6 +35,7 @@ namespace FineUIPro.Web.TestRun.DriverReport this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : ""; //this.txtNumber.Text = data.Number; this.txtRemark.Text = data.Remark; + WindowAtt_Close(null, null); } } else @@ -59,6 +61,28 @@ namespace FineUIPro.Web.TestRun.DriverReport } PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverReport/PropertyReport&menuId={1}", this.hdId.Text, BLL.Const.PropertyReportMenuId))); } + + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + this.lbtnAttach.Text = string.Empty; + string url = string.Empty; + var attLists = BLL.AttachFileService.Getfiles(this.hdId.Text, BLL.Const.PropertyReportMenuId); + if (attLists != null) + { + List lists = Funs.GetStrListByStr(attLists.AttachUrl, ','); + if (lists.Count > 0) + { + foreach (var item in lists) + { + url += item.Substring(item.IndexOf('_') + 1) + "\r\n"; + } + } + if (!string.IsNullOrEmpty(url)) + { + this.lbtnAttach.Text = url; + } + } + } #endregion #region 保存 diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.designer.cs index 46c7a283..6c3d6436 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.designer.cs @@ -174,6 +174,15 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.Button btnAttach; + /// + /// lbtnAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbtnAttach; + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx index 0a5dc407..2db97975 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx @@ -5,28 +5,27 @@ - 项目完工总结 + 开车完工总结
- - + + - - <%----%> - + - @@ -38,26 +37,16 @@ - <%-- - --%> - - + FieldType="String" HeaderText="总结名称" HeaderTextAlign="Center" Width="400px"> + FieldType="String" HeaderText="总结人" HeaderTextAlign="Center" Width="200px"> - - - - - + + @@ -78,9 +67,9 @@ -