From 9fd7ab54075f5bc3646cb10e11c272fb6aaa05e9 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Thu, 17 Jul 2025 14:22:38 +0800 Subject: [PATCH] =?UTF-8?q?IDP=E8=B4=A8=E9=87=8F=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=9B=BE=E7=BA=B8=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...UBQHSE_V2025-07-16-xiaj（IDP设计图纸管理）.sql | 107 +++ SGGL/BLL/BLL.csproj | 2 + .../DesignDrawing/DesignDrawingService.cs | 90 ++ SGGL/BLL/Common/Const.cs | 8 + SGGL/BLL/Common/Funs.cs | 67 +- SGGL/BLL/Common/HttpHelper.cs | 72 ++ SGGL/BLL/IDP/IDPDataService.cs | 352 +++++++- SGGL/BLL/PMP/PMPDataService.cs | 2 +- .../CQMS/DesignDrawing/ArchivesLib.aspx | 170 ++++ .../CQMS/DesignDrawing/ArchivesLib.aspx.cs | 281 ++++++ .../ArchivesLib.aspx.designer.cs | 116 +++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 8 + SGGL/FineUIPro.Web/common/Menu_CQMS.xml | 2 + .../Model/IDP/IDPDesignDrawingResponseData.cs | 247 ++++++ SGGL/Model/IDP/OADesignDrawingData.cs | 88 ++ SGGL/Model/Model.cs | 821 +++++++++++++++++- SGGL/Model/Model.csproj | 2 + SGGL/WebAPI/.vs/WebAPI.csproj.dtbcache.json | 2 +- SGGL/WebAPI/Controllers/IDP/IDPController.cs | 49 ++ SGGL/WebAPI/ErrLog.txt | 21 +- SGGL/WebAPI/Filter/TestPermissionAttribute.cs | 1 + 21 files changed, 2457 insertions(+), 51 deletions(-) create mode 100644 DataBase/版本日志/SUBQHSE_V2025-07-16-xiaj（IDP设计图纸管理）.sql create mode 100644 SGGL/BLL/CQMS/DesignDrawing/DesignDrawingService.cs create mode 100644 SGGL/BLL/Common/HttpHelper.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx create mode 100644 SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.designer.cs create mode 100644 SGGL/Model/IDP/IDPDesignDrawingResponseData.cs create mode 100644 SGGL/Model/IDP/OADesignDrawingData.cs diff --git a/DataBase/版本日志/SUBQHSE_V2025-07-16-xiaj（IDP设计图纸管理）.sql b/DataBase/版本日志/SUBQHSE_V2025-07-16-xiaj（IDP设计图纸管理）.sql new file mode 100644 index 00000000..de96bc4a --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2025-07-16-xiaj（IDP设计图纸管理）.sql @@ -0,0 +1,107 @@ + + + +--ͼֽ +IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'A334796C-1D85-47F9-A9B2-E36BE49FADC2') +BEGIN +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('A334796C-1D85-47F9-A9B2-E36BE49FADC2','ͼֽ','',100,'0','Menu_CQMS',0,0,1) +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('13E3544E-AC56-48F9-9BC0-EB14EF4620FF','ļ','CQMS/DesignDrawing/ArchivesLib.aspx',10,'A334796C-1D85-47F9-A9B2-E36BE49FADC2','Menu_CQMS',0,1,1) +END +GO + + +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '13E3544E-AC56-48F9-9BC0-EB14EF4620FF') +BEGIN +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('54020202-29E6-4B9D-91A7-A2438DDCBD14','13E3544E-AC56-48F9-9BC0-EB14EF4620FF','',1) +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('F4F906B1-6DFD-440B-A515-0213BE7A3567','13E3544E-AC56-48F9-9BC0-EB14EF4620FF','޸',2) +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('5C5EE954-F1F6-4F56-B4B6-0C9AD5672A82','13E3544E-AC56-48F9-9BC0-EB14EF4620FF','ɾ',3) +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('6621B07E-F6FA-4C8C-BECD-E684FBFCB49D','13E3544E-AC56-48F9-9BC0-EB14EF4620FF','',4) +END +GO + + +--ͼֽ +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'IDP_DesignDrawing') AND type = N'U') +BEGIN +CREATE TABLE [dbo].[IDP_DesignDrawing]( + [Id] [nvarchar](50) NOT NULL, + [idpfileId] [nvarchar](50) NULL, + [stockId] [nvarchar](50) NULL, + [thirdId] [nvarchar](50) NULL, + [projectId] [nvarchar](50) NULL, + [projectCode] [nvarchar](50) NULL, + [displayProjectName] [nvarchar](500) NULL, + [projectDeviceProcedureSubjectCode] [nvarchar](50) NULL, + [wbsFullPath] [nvarchar](200) NULL, + [formatFileCode] [nvarchar](50) NULL, + [formatFileName] [nvarchar](200) NULL, + [fileVersion] [nvarchar](50) NULL, + [majorNo] [nvarchar](50) NULL, + [status] [nvarchar](50) NULL, + [designUserName] [nvarchar](50) NULL, + [jiaoheUserName] [nvarchar](50) NULL, + [shenheUserName] [nvarchar](50) NULL, + [shendingUserName] [nvarchar](50) NULL, + [majorResponsibleUserName] [nvarchar](50) NULL, + [classificationLevelInProject] [nvarchar](50) NULL, + [updateTime] [datetime] NULL, + [remark] [nvarchar](500) NULL, + [RdpId] [nvarchar](50) NULL, + [fileid] [nvarchar](50) NULL, + [upfileid] [nvarchar](50) NULL, + [maintitle] [nvarchar](200) NULL, + [doc_no] [nvarchar](50) NULL, + [bc] [nvarchar](50) NULL, + [archnumber] [nvarchar](50) NULL, + [sendtime] [datetime] NULL, + [printtime] [datetime] NULL, + [ifmail] [nvarchar](50) NULL, + CONSTRAINT [PK_IDP_DesignDrawing] PRIMARY KEY CLUSTERED +( + [id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'Id' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'idpļfileId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'idpfileId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'id(IDPId)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'stockId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ļid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'thirdId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'projectId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'projectCode' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿϢ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'displayProjectName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'װ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'projectDeviceProcedureSubjectCode' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'װ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'wbsFullPath' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ļ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'formatFileCode' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ļ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'formatFileName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'fileVersion' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'רҵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'majorNo' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'status' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'designUserName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'У' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'jiaoheUserName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'shenheUserName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'shendingUserName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'רҵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'majorResponsibleUserName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܵȼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'classificationLevelInProject' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'updateTime' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'remark' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ֵRdpId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'RdpId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ǰļid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'fileid' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ºļid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'upfileid' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ļ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'maintitle' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ļ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'doc_no' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'bc' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'⵵' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'archnumber' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'sendtime' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͼӡ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'printtime' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͼǷijǡ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'ifmail' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͼֽ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing' +END + +GO + + diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 0d63caf2..1741cc60 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -178,6 +178,7 @@ + @@ -292,6 +293,7 @@ + diff --git a/SGGL/BLL/CQMS/DesignDrawing/DesignDrawingService.cs b/SGGL/BLL/CQMS/DesignDrawing/DesignDrawingService.cs new file mode 100644 index 00000000..7a70b597 --- /dev/null +++ b/SGGL/BLL/CQMS/DesignDrawing/DesignDrawingService.cs @@ -0,0 +1,90 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Collections; +using System.Web.UI.WebControls; +using Model; + +namespace BLL +{ + public class DesignDrawingService + { + + /// + /// 获取IDP文件 + /// + /// + public static List GetIDPDesignDrawingFile() + { + return (from x in Funs.DB.IDP_DesignDrawing select x).ToList(); + } + /// + /// 获取IDP文件id + /// + /// + public static List GetIDPDesignDrawingFileId() + { + return (from x in Funs.DB.IDP_DesignDrawing select x.IdpfileId).ToList(); + } + + ///// + ///// 添加分项 + ///// + ///// + //public static void AddBreakdown(Model.WBS_Breakdown breakdown) + //{ + // Model.SGGLDB db = Funs.DB; + // Model.WBS_Breakdown newBreakdown = new Model.WBS_Breakdown(); + + // newBreakdown.BreakdownId = breakdown.BreakdownId; + // newBreakdown.BreakdownCode = breakdown.BreakdownCode; + // newBreakdown.BreakdownName = breakdown.BreakdownName; + // newBreakdown.DivisionId = breakdown.DivisionId; + // newBreakdown.Basis = breakdown.Basis; + // newBreakdown.CheckPoints = breakdown.CheckPoints; + // newBreakdown.RecordAndCode = breakdown.RecordAndCode; + // newBreakdown.Class = breakdown.Class; + // newBreakdown.SortIndex = breakdown.SortIndex; + // newBreakdown.Remark = breakdown.Remark; + // newBreakdown.ModelURL = breakdown.ModelURL; + // newBreakdown.IsAcceptance = breakdown.IsAcceptance; + // newBreakdown.FenBao = breakdown.FenBao; + // newBreakdown.WuHuan = breakdown.WuHuan; + // newBreakdown.JianLi = breakdown.JianLi; + // newBreakdown.YeZhu = breakdown.YeZhu; + // newBreakdown.CheckAcceptType = breakdown.CheckAcceptType; + + // db.WBS_Breakdown.InsertOnSubmit(newBreakdown); + // db.SubmitChanges(); + //} + + ///// + ///// 修改分项 + ///// + ///// + //public static void UpdateBreakdown(Model.WBS_Breakdown breakdown) + //{ + // Model.SGGLDB db = Funs.DB; + // Model.WBS_Breakdown newBreakdown = db.WBS_Breakdown.First(e => e.BreakdownId == breakdown.BreakdownId); + // newBreakdown.BreakdownCode = breakdown.BreakdownCode; + // newBreakdown.BreakdownName = breakdown.BreakdownName; + // newBreakdown.DivisionId = breakdown.DivisionId; + // newBreakdown.Basis = breakdown.Basis; + // newBreakdown.CheckPoints = breakdown.CheckPoints; + // newBreakdown.RecordAndCode = breakdown.RecordAndCode; + // newBreakdown.Class = breakdown.Class; + // newBreakdown.SortIndex = breakdown.SortIndex; + // newBreakdown.Remark = breakdown.Remark; + // newBreakdown.ModelURL = breakdown.ModelURL; + // newBreakdown.FenBao = breakdown.FenBao; + // newBreakdown.WuHuan = breakdown.WuHuan; + // newBreakdown.JianLi = breakdown.JianLi; + // newBreakdown.YeZhu = breakdown.YeZhu; + // newBreakdown.CheckAcceptType = breakdown.CheckAcceptType; + // db.SubmitChanges(); + //} + + + } +} diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index b30e620e..06a3ca78 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3925,6 +3925,14 @@ namespace BLL public const string CheckListMenuId = "B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306"; #endregion + + #region 质量设计图纸管理 + /// + /// 档案文件库 + /// + public const string ArchivesLibMenuId = "13E3544E-AC56-48F9-9BC0-EB14EF4620FF"; + #endregion + #region 质量共检 /// /// 质量共检 diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs index 1cfd69fd..b2715e7a 100644 --- a/SGGL/BLL/Common/Funs.cs +++ b/SGGL/BLL/Common/Funs.cs @@ -39,13 +39,13 @@ namespace BLL get; set; } - public static DictionaryWebEditList= new Dictionary(); + public static Dictionary WebEditList = new Dictionary(); /// /// ݿַ /// private static string connString; - + /// /// ݿַ /// @@ -294,7 +294,7 @@ namespace BLL DDL.Items.Insert(0, new FineUIPro.ListItem("- ѡ -", BLL.Const._Null)); return; } - + /// /// ΪĿѡ /// @@ -623,11 +623,64 @@ namespace BLL Random rm = new Random(System.Environment.TickCount); if (dateTime.HasValue) { - str= dateTime.Value.ToString("yyyyMMddhhmmss") + rm.Next(1000, 9999).ToString(); + str = dateTime.Value.ToString("yyyyMMddhhmmss") + rm.Next(1000, 9999).ToString(); } return str; } + + #region ʱ + + /// + /// ȡǰʱʱ + /// + /// ʱȣĬ10λ + /// + public static long GetNowTimeStamp(int size = 10) + { + long result = 0; + // ȡǰʱ + DateTimeOffset now = DateTimeOffset.Now; + // ȡUnixԪʱ䣨1970-01-01ڵʱ + TimeSpan timeSpan = now - new DateTimeOffset(1970, 1, 1, 0, 0, 0, TimeSpan.Zero); + if (size == 13) + { + // תΪ͵ĺ + result = (long)timeSpan.TotalMilliseconds; + } + else + { + result = (long)timeSpan.TotalSeconds; + } + return result; + } + + /// + /// ȡָʱʱ + /// + /// + /// + /// + public static long GetDateTimeStamp(DateTimeOffset dateOffset, int size = 10) + { + long result = 0; + DateTimeOffset epochStart = new DateTimeOffset(1970, 1, 1, 0, 0, 0, TimeSpan.Zero); + // ȡUnixԪʱ䣨1970-01-01ڵʱ + TimeSpan timeSpan = dateOffset - epochStart; + if (size == 13) + { + // תΪ͵ĺ + result = (long)timeSpan.TotalMilliseconds; + } + else + { + result = (long)timeSpan.TotalSeconds; + } + return result; + } + + #endregion + #region ʱת /// /// ıתʱ @@ -639,7 +692,7 @@ namespace BLL { if (!String.IsNullOrEmpty(time)) { - DateTime dateTime = DateTime.Parse(time); + DateTime dateTime = DateTime.Parse(time); if (dateTime.Year > 1753 && dateTime.Year < 9999) { return dateTime; @@ -950,7 +1003,7 @@ namespace BLL } #region ȡд¼ - public static string NumericCapitalization(decimal num) + public static string NumericCapitalization(decimal num) { string str1 = "Ҽ½ƾ"; //0-9Ӧĺ string str2 = "ǪʰǪʰǪʰԪǷ"; //λӦĺ @@ -1081,7 +1134,7 @@ namespace BLL return str.ToArray(); } - public static string GetStringByArray(string[] array) + public static string GetStringByArray(string[] array) { string str = string.Empty; foreach (var item in array) diff --git a/SGGL/BLL/Common/HttpHelper.cs b/SGGL/BLL/Common/HttpHelper.cs new file mode 100644 index 00000000..00c0401e --- /dev/null +++ b/SGGL/BLL/Common/HttpHelper.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Net; +using RestSharp; + +namespace BLL +{ + public static class HttpHelper + { + /// + /// GET请求 + /// + /// + /// + /// + + public static string Get(string url, Dictionary token) + { + ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12; + + var client = new RestClient(url); + client.Timeout = -1; + var request = new RestRequest(Method.GET); + if (token != null) + { + foreach (var item in token) + { + request.AddHeader(item.Key, item.Value); + } + } + request.AddHeader("ClientId", SysConstSetService.ClientId); + request.AddHeader("OperationCode", url.Substring(url.LastIndexOf("/", StringComparison.Ordinal) + 1)); + IRestResponse response = client.Execute(request); + return response.Content; + } + + + /// + /// POST请求 + /// + /// + /// + /// + /// + public static string Post(string url, Dictionary token, string jsonBody) + { + ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; + + var client = new RestClient(url); + client.Timeout = -1; + var request = new RestRequest(Method.POST); + if (token != null) + { + foreach (var item in token) + { + request.AddHeader(item.Key, item.Value); + } + } + request.AddHeader("ClientId", SysConstSetService.ClientId); + request.AddHeader("OperationCode", url.Substring(url.LastIndexOf("/", StringComparison.Ordinal) + 1)); + if (!string.IsNullOrEmpty(jsonBody)) + { + request.AddJsonBody(jsonBody); + } + + IRestResponse response = client.Execute(request); + return response.Content; + } + + + } +} \ No newline at end of file diff --git a/SGGL/BLL/IDP/IDPDataService.cs b/SGGL/BLL/IDP/IDPDataService.cs index 57b8f5eb..d37c5107 100644 --- a/SGGL/BLL/IDP/IDPDataService.cs +++ b/SGGL/BLL/IDP/IDPDataService.cs @@ -1,4 +1,5 @@ using Apache.NMS.ActiveMQ.Commands; +using Aspose.Words.Lists; using Microsoft.SqlServer.Dts.Runtime; using Model; using Newtonsoft.Json; @@ -8,20 +9,39 @@ using SgManager.AI; using System; using System.Collections; using System.Collections.Generic; +using System.Globalization; using System.IO; using System.Linq; using System.Net; using System.Security.Cryptography; +using System.Security.Policy; +using System.ServiceModel.Channels; using System.Text; namespace BLL { + /// + /// IDP平台接口服务 + /// public static class IDPDataService { + /// + /// 测试环境api地址 + /// + private static readonly string IDPApiUrl = "http://10.5.6.151:8100/"; + ///// + ///// 正式环境api地址 + ///// //private static readonly string IDPApiUrl = "https://idp.cwcec.com/"; - private static readonly string IDPApiUrl = SysConstSetService.WuHuanIDPPath; - ////private static readonly string publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQChnc2YD0YzJPx6QTh+/n7XzjR1ugFzrsmPolJhpCfWMKrSGbT7iX/Kgcm1AI+T95K4Jzv3KS42QTecZ1ziJ4Rr9Luzw+9ZCSjMZgrmAUbY5IeBaA6GzaSk8UWHZ4n5PL+GUGq+2f+COL7+KCS2AxEpaqDZVrJrIfg/UektdgNyzwIDAQAB"; + //private static readonly string IDPApiUrl = SysConstSetService.WuHuanIDPPath; + + #region 接口授权认证 + + /// + /// 加密公钥 + /// private static readonly string publicKey = "g1sk7Xtc1TJouHdY4+FAe5atGCu2n17NhoKVDV57pki1IL+9+S7BY4gxAjmMkUU2/cbCCdbPoUJLBrCBCjX7yI3UJW6FZwQWkn3kVoeulLEwdPCIq/GUjMXaWf3Iaaad5wBUFbfXAzv15VN6z48Nt1IY/O8YEzhIpuZdtEgDdos=AQAB"; + //private static readonly string publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQChnc2YD0YzJPx6QTh+/n7XzjR1ugFzrsmPolJhpCfWMKrSGbT7iX/Kgcm1AI+T95K4Jzv3KS42QTecZ1ziJ4Rr9Luzw+9ZCSjMZgrmAUbY5IeBaA6GzaSk8UWHZ4n5PL+GUGq+2f+COL7+KCS2AxEpaqDZVrJrIfg/UektdgNyzwIDAQAB"; /// /// 第三方加密认证接口 @@ -30,48 +50,60 @@ namespace BLL /// public static SessionItem GetAuthenticationSession() { - //// 创建RSA加密服务提供者 - ////using (RSA rsa = RSA.Create()) - //using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider()) - //{ - //// 获取公钥false表示只导出公钥 - //string publicKey = rsa.ToXmlString(false); - //// 获取私钥true表示导出公钥和私钥 - //string privateKey = rsa.ToXmlString(true); - SessionItem session = new SessionItem(); - - ////用户名加密 - //string encryptedUsername = EncryptData("dataviewer", publicKey); - ////密码加密 - //string encryptedPassword = EncryptData("a3365$!", publicKey); - - //用户名加密后的密文 - string encryptedUsername = "k0N0tx/hfRPY0v2lq1G8eH6hCO+UiMqlSZi1PD6bhGf4YpP/koJq5hfMsDSzdn3dZjzExrwyrjFWp/1jZLde0+gRbQ0D7tzm0R5D6AmriodD2cJvrEiwtDy7SeGNloSaNmpTEMuycpuueiOeGhMkKnTwWfRkEw73lxEpTmaahq4="; - //密码加密后的密文 - string encryptedPassword = "HLLroiNJJzyTWJt9td1xgChbVzyQkoxWCGGXqdwI2cvlUF/A30FAPaInszSwEhNRQlJZZ01EODElemkgv36DMF+XGwfDi0BfIq9jKG+/+wq0TVOHNhiu2NPzpn5Ji2X3yXIXpH1zv6XEtkvx/qiLToZYfRQCufsl5vH1cZxk2fQ="; - - string url = $"{IDPApiUrl}UAMS/authEncrypt"; - string contenttype = "application/json;charset=utf-8"; - var body = new + try { - encryptedUsername = encryptedUsername, - encryptedPassword = encryptedPassword - }; + //// 创建RSA加密服务提供者 + ////using (RSA rsa = RSA.Create()) + //using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider()) + //{ + //// 获取公钥false表示只导出公钥 + //string publicKey = rsa.ToXmlString(false); + //// 获取私钥true表示导出公钥和私钥 + //string privateKey = rsa.ToXmlString(true); - string pushContent = JsonConvert.SerializeObject(body); - //var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", null, null, pushContent); - string strJosn = APIGetHttpService.Http(url, "POST", contenttype, null, pushContent); - JObject obj = JObject.Parse(strJosn); - if (!string.IsNullOrEmpty(strJosn)) + + ////用户名加密 + //string encryptedUsername = EncryptData("dataviewer", publicKey); + ////密码加密 + //string encryptedPassword = EncryptData("a3365$!", publicKey); + + //用户名加密后的密文 + string encryptedUsername = "k0N0tx/hfRPY0v2lq1G8eH6hCO+UiMqlSZi1PD6bhGf4YpP/koJq5hfMsDSzdn3dZjzExrwyrjFWp/1jZLde0+gRbQ0D7tzm0R5D6AmriodD2cJvrEiwtDy7SeGNloSaNmpTEMuycpuueiOeGhMkKnTwWfRkEw73lxEpTmaahq4="; + //密码加密后的密文 + string encryptedPassword = "HLLroiNJJzyTWJt9td1xgChbVzyQkoxWCGGXqdwI2cvlUF/A30FAPaInszSwEhNRQlJZZ01EODElemkgv36DMF+XGwfDi0BfIq9jKG+/+wq0TVOHNhiu2NPzpn5Ji2X3yXIXpH1zv6XEtkvx/qiLToZYfRQCufsl5vH1cZxk2fQ="; + + string url = $"{IDPApiUrl}UAMS/authEncrypt"; + //string url = $"http://10.5.6.151:8100/UAMS/authEncrypt"; + string contenttype = "application/json;charset=utf-8"; + var body = new + { + encryptedUsername = encryptedUsername, + encryptedPassword = encryptedPassword + }; + + string pushContent = JsonConvert.SerializeObject(body); + string strJosn = APIGetHttpService.Http(url, "POST", contenttype, null, pushContent); + //string strJosn = HttpHelper.Post(url, null, pushContent); + JObject obj = JObject.Parse(strJosn); + if (!string.IsNullOrEmpty(strJosn)) + { + string value = obj["value"].ToString(); + string name = obj["name"].ToString(); + session.value = value; + session.name = name; + } + //} + } + catch (WebException ex) { - string value = obj["value"].ToString(); - string name = obj["name"].ToString(); - session.value = value; - session.name = name; + return null; + } + finally + { + } return session; - //} } /// @@ -100,6 +132,245 @@ namespace BLL } } + #endregion + + #region 质量管理设计图纸 + + #region IDP + + /// + /// 质量管理设计图纸 + /// + /// 项目Id + /// 获取指定日期之后到现在的异动数据 + public static void GetIDPProjectDesignDrawingData(string projectId = "", string startDate = "") + { + try + { + //五环主数据项目Code + string projectCode = string.Empty; + if (!string.IsNullOrWhiteSpace(projectId)) + {//根据施工平台项目Id获取主数据项目Code + var getPro = ProjectService.GetProjectByProjectId(projectId); + projectCode = getPro.ProjectCode; + } + + string timeStampStr = string.Empty; + if (!string.IsNullOrWhiteSpace(startDate)) + { + string format = "yyyy-MM-dd"; + DateTimeOffset dateTimeOffset = DateTimeOffset.ParseExact(startDate, format, CultureInfo.InvariantCulture); + long timeStamp = Funs.GetDateTimeStamp(dateTimeOffset, 13); + timeStampStr = timeStamp.ToString(); + } + + var session = GetAuthenticationSession(); + //ErrLogInfo.WriteLog($"【Session】name：{session.name}；value：{session.value}"); + Hashtable newToken = new Hashtable { { "Cookie", $"{session.name}={session.value}" } }; + + List listAdd = new List(); + List listModify = new List(); + + int pageSize = 1000;//一次性最多返回1000条数据 + int maxPageNum = 100; + List idpFileIds = DesignDrawingService.GetIDPDesignDrawingFileId(); + List idpFiles = DesignDrawingService.GetIDPDesignDrawingFile(); + for (int pageNum = 1; pageNum < 100000; pageNum++) + { + if (pageNum > maxPageNum) { break; } + string url = $"{IDPApiUrl}EDC/third/workitems?pageNum={pageNum}&pageSize={pageSize}"; + if (!string.IsNullOrWhiteSpace(timeStampStr)) { url = $"{url}&lastTimestamp={timeStampStr}"; } + if (!string.IsNullOrWhiteSpace(projectCode)) { url = $"{url}&projectCode={projectCode}"; } + + var returndata = BLL.APIGetHttpService.OutsideHttp(url, "GET", null, newToken, null); + if (!string.IsNullOrEmpty(returndata)) + { + IDPDesignDrawingResponseData responseData = IDPDesignDrawingResponseData.FromJson(returndata); + maxPageNum = responseData.page.pages; + foreach (var item in responseData.page.results) + { + IDP_DesignDrawing newItem = new IDP_DesignDrawing(); + if (!string.IsNullOrWhiteSpace(projectId)) + { + newItem.ProjectId = projectId; + } + else + { + if (string.IsNullOrWhiteSpace(item.projectCode)) + { + continue; + } + var getProject = ProjectService.GetProjectByProjectCode(item.projectCode); + if (getProject == null) + { + continue; + } + newItem.ProjectId = getProject.ProjectId; + } + newItem.IdpfileId = item.fileId; + newItem.StockId = item.stockId; + newItem.ThirdId = item.thirdId; + newItem.ProjectCode = item.projectCode; + newItem.DisplayProjectName = item.displayProjectName; + newItem.ProjectDeviceProcedureSubjectCode = item.projectDeviceProcedureSubjectCode; + newItem.WbsFullPath = item.wbsFullPath; + newItem.FormatFileName = item.formatFileName; + newItem.FileVersion = item.fileVersion; + newItem.MajorNo = item.majorNo; + newItem.Status = item.status; + newItem.DesignUserName = item.designUserName; + newItem.JiaoheUserName = item.jiaoheUserName; + newItem.ShenheUserName = item.shenheUserName; + newItem.ShendingUserName = item.shendingUserName; + newItem.MajorResponsibleUserName = item.majorResponsibleUserName; + newItem.ClassificationLevelInProject = item.classificationLevelInProject; + newItem.UpdateTime = item.updateTime; + newItem.Remark = item.remark; + + if (!string.IsNullOrWhiteSpace(item.fileId) && idpFileIds.Contains(item.fileId)) + {//编辑 + newItem.Id = idpFiles.Where(x => x.IdpfileId == item.fileId).FirstOrDefault().Id; + listModify.Add(newItem); + } + else + {//新增 + newItem.Id = SQLHelper.GetNewID(typeof(IDP_DesignDrawing)); + listAdd.Add(newItem); + } + } + } + else + { + break; + } + } + + + if (listAdd.Any()) + { + AddIDP_DesignDrawing(listAdd); + } + if (listModify.Any()) + { + ModifyIDP_DesignDrawing(listModify); + } + } + catch (WebException ex) + { + + } + finally + { + + } + } + + /// + /// 批量插入数据 + /// + /// + public static void AddIDP_DesignDrawing(List list) + { + Model.SGGLDB db = Funs.DB; + db.IDP_DesignDrawing.InsertAllOnSubmit(list); + db.SubmitChanges(); + } + + /// + /// 更新数据 + /// + /// + public static void ModifyIDP_DesignDrawing(List list) + { + Model.SGGLDB db = Funs.DB; + foreach (var obj in list) + { + IDP_DesignDrawing newItem = db.IDP_DesignDrawing.FirstOrDefault(x => x.Id == obj.Id); + if (newItem != null) + { + newItem.StockId = obj.StockId; + newItem.ThirdId = obj.ThirdId; + newItem.ProjectId = obj.ProjectId; + newItem.ProjectCode = obj.ProjectCode; + newItem.DisplayProjectName = obj.DisplayProjectName; + newItem.ProjectDeviceProcedureSubjectCode = obj.ProjectDeviceProcedureSubjectCode; + newItem.WbsFullPath = obj.WbsFullPath; + newItem.FormatFileName = obj.FormatFileName; + newItem.FileVersion = obj.FileVersion; + newItem.MajorNo = obj.MajorNo; + newItem.Status = obj.Status; + newItem.DesignUserName = obj.DesignUserName; + newItem.JiaoheUserName = obj.JiaoheUserName; + newItem.ShenheUserName = obj.ShenheUserName; + newItem.ShendingUserName = obj.ShendingUserName; + newItem.MajorResponsibleUserName = obj.MajorResponsibleUserName; + newItem.ClassificationLevelInProject = obj.ClassificationLevelInProject; + newItem.UpdateTime = obj.UpdateTime; + newItem.Remark = obj.Remark; + db.SubmitChanges(); + } + } + } + + #endregion + + #region 数字档案馆 + + /// + /// 接收保存数据 + /// + /// + public static string SaveDesignDrawingData(OADesignDrawingData newItems) + { + try + { + string message = string.Empty; + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + foreach (var item in newItems.DataItems) + { + if (!string.IsNullOrWhiteSpace(item.RdpId)) + { + IDP_DesignDrawing newItem = db.IDP_DesignDrawing.FirstOrDefault(x => x.StockId == item.RdpId); + if (newItem != null) + { + newItem.RdpId = item.RdpId; + newItem.Fileid = item.fileid; + newItem.Upfileid = item.upfileid; + newItem.Maintitle = item.maintitle; + newItem.Doc_no = item.doc_no; + newItem.Bc = item.bc; + newItem.Archnumber = item.archnumber; + newItem.Sendtime = item.sendtime; + newItem.Printtime = item.printtime; + newItem.Ifmail = item.ifmail; + db.SubmitChanges(); + } + } + else + { + + } + } + } + return message; + } + catch (WebException ex) + { + return ex.Message; + } + finally + { + + } + } + + + #endregion + + #endregion + + #region 试车工作包 /// /// 获取工作包结构化数据 @@ -114,6 +385,9 @@ namespace BLL //string url = $"{IDPApiUrl}/OSS/projects/{projectId}/wbs/{wbsCode}/workitems/{workitemCode}/objects/latest"; string url = $"{IDPApiUrl}/OSS/projects/9100168/wbs/000000/workitems/CP2100/objects/latest"; + + //测试环境接口地址 + var testApiUrl = "http://10.5.6.151:8100/OSS/projects/9100168/wbs/000000/workitems/CP2100/objects/latest"; try { var session = GetAuthenticationSession(); @@ -131,7 +405,6 @@ namespace BLL { } - } @@ -153,6 +426,7 @@ namespace BLL //} + #endregion } diff --git a/SGGL/BLL/PMP/PMPDataService.cs b/SGGL/BLL/PMP/PMPDataService.cs index f87b1968..40993ab5 100644 --- a/SGGL/BLL/PMP/PMPDataService.cs +++ b/SGGL/BLL/PMP/PMPDataService.cs @@ -85,7 +85,7 @@ namespace BLL string data = string.Empty; string rows = string.Empty; - List list = new List(); + List list = new List(); int pageSize = 1000;//一次性最多返回1000条数据 List searchCond = new List(); diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx new file mode 100644 index 00000000..4f785273 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx @@ -0,0 +1,170 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ArchivesLib.aspx.cs" Inherits="FineUIPro.Web.CQMS.DesignDrawing.ArchivesLib" %> + + + + + + + + + 档案文件库 + + + +
+ + + + + + + + <%-- + + + + + + + --%> + + + + <%-- + + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + --%> + + + + + + + + + + + + + + + + + + + + + <%-- + + + + + + + --%> + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.cs b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.cs new file mode 100644 index 00000000..8f160439 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.cs @@ -0,0 +1,281 @@ +using BLL; +using FineUIPro.Web.DataShow; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using NPOI.SS.UserModel; + +namespace FineUIPro.Web.CQMS.DesignDrawing +{ + public partial class ArchivesLib : PageBase + { + /// + /// 项目id + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ProjectId = this.CurrUser.LoginProjectId; + GetButtonPower(); + ////权限按钮方法 + //UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpSponsorUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true); + //UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true); + //CNProfessionalService.InitCNProfessionalDownList(drpCNProfessional, true); + //QualityQuestionTypeService.InitQualityQuestionTypeDownList(drpQuestionType, true); + //Funs.FineUIPleaseSelect(this.dpHandelStatus); + //btnNew.OnClientClick = Window1.GetShowReference("ChecklistEdit.aspx") + "return false;"; + ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + //if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.CurrUser.LoginProjectId, CurrUser.UnitId)) + //{ + // drpSponsorUnit.SelectedValue = CurrUser.UnitId; + // drpSponsorUnit.Readonly = true; + //} + // 绑定表格 + BindGrid(); + + } + + } + + #endregion + + + + protected DataTable ChecklistData() + { + string strSql = $@"SELECT * FROM IDP_DesignDrawing as lib + WHERE lib.ProjectId=@ProjectId + "; + //ORDER BY lib.updatetime DESC + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + //strSql += " AND (chec.CheckDate>=@startTime or @startTime='') and (chec.CheckDate<=@endTime or @endTime='') "; + //listStr.Add(new SqlParameter("@startTime", !string.IsNullOrEmpty(txtStartTime.Text.Trim()) ? txtStartTime.Text.Trim() + " 00:00:00" : "")); + //listStr.Add(new SqlParameter("@endTime", !string.IsNullOrEmpty(txtEndTime.Text.Trim()) ? txtEndTime.Text.Trim() + " 23:59:59" : "")); + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + return tb; + } + + //public string Convertstatus(Object code) + //{ + // Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(code.ToString()); + // if (checkControl.State.Equals("5") || checkControl.State.Equals("6")) + // { + // return "未确认"; + // } + // else if (checkControl.State == Const.CheckControl_Complete) + // { //闭环 + // return "已闭环"; + // } + // //else if( checkControl.LimitDate> ) + // else if (Convert.ToDateTime(checkControl.LimitDate).AddDays(1) < DateTime.Now) //延期未整改 + // { + // return "超期未整改"; + + // } + // else //期内未整改 + // { + // return "未整改"; + + // } + //} + + + /// + /// 绑定数据 + /// + + public void BindGrid() + { + DataTable tb = ChecklistData(); + + // 2.获取当前分页数据 + //var table = this.GetPagedDataTable(Grid1, tb1); + + Grid1.RecordCount = tb.Rows.Count; + tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + + Grid1.DataSource = table; + Grid1.DataBind(); + + //for (int i = 0; i < Grid1.Rows.Count; i++) + //{ + // string rowID = Grid1.Rows[i].DataKeys[0].ToString(); + // if (rowID.Count() > 0) + // { + // Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(rowID); + // if (checkControl.State.Equals("5") || checkControl.State.Equals("6")) + // { + // Grid1.Rows[i].CellCssClasses[11] = "LightGreen";//未确认 + // } + // else if (checkControl.State == Const.CheckControl_Complete) + // { //闭环 + // Grid1.Rows[i].CellCssClasses[11] = "Green"; + + // } + // else if (Convert.ToDateTime(checkControl.LimitDate).AddDays(1) < DateTime.Now) //延期未整改 + // { + // Grid1.Rows[i].CellCssClasses[11] = "Red"; + // } + // else //期内未整改 + // { + // Grid1.Rows[i].CellCssClasses[11] = " Yellow "; + // } + // } + //} + } + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ArchivesLibMenuId); + if (buttonList.Count() > 0) + { + //if (buttonList.Contains(BLL.Const.BtnAdd)) + //{ + // this.btnNew.Hidden = false; + + //} + //if (buttonList.Contains(BLL.Const.BtnModify)) + //{ + // this.btnMenuModify.Hidden = false; + //} + //if (buttonList.Contains(BLL.Const.BtnDelete)) + //{ + // this.btnMenuDel.Hidden = false; + //} + } + } + #endregion + + #region 查询 + + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 过滤表头、排序、分页、关闭窗口 + /// + /// 过滤表头 + /// + /// + /// + protected void Grid1_FilterChange(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + //Grid1.SortDirection = e.SortDirection; + //Grid1.SortField = e.SortField; + BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 关闭弹出窗 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region Grid双击事件 + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + //btnMenuModify_Click(null, null); + } + #endregion + + + #region 编辑 + + + #endregion + + + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.designer.cs new file mode 100644 index 00000000..f0614aeb --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.designer.cs @@ -0,0 +1,116 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.CQMS.DesignDrawing +{ + + + public partial class ArchivesLib + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// lblPageIndex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPageIndex; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + } +} diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index f841ead8..9e63843c 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -577,6 +577,7 @@ + @@ -8481,6 +8482,13 @@ WBSFileEdit.aspx + + ArchivesLib.aspx + ASPXCodeBehind + + + ArchivesLib.aspx + ControlPointCheck.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml index 641c523f..0909b3f1 100644 --- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml +++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml @@ -68,4 +68,6 @@ + + \ No newline at end of file diff --git a/SGGL/Model/IDP/IDPDesignDrawingResponseData.cs b/SGGL/Model/IDP/IDPDesignDrawingResponseData.cs new file mode 100644 index 00000000..adc10f9c --- /dev/null +++ b/SGGL/Model/IDP/IDPDesignDrawingResponseData.cs @@ -0,0 +1,247 @@ +// +// +// To parse this JSON data, add NuGet 'Newtonsoft.Json' then do: +// +// using Model; +// +// var response = Response.FromJson(jsonString); + + +namespace Model +{ + using System; + using Newtonsoft.Json; + + /// + /// IDP设计图纸接口返回参数 + /// + public partial class IDPDesignDrawingResponseData + { + ///// + ///// 返回状态 + ///// + //[JsonProperty("code")] + //public int code { get; set; } + ///// + ///// 返回消息 + ///// + //[JsonProperty("msg")] + //public string msg { get; set; } + + /// + /// 返回数据结果对象 + /// + [JsonProperty("page")] + public IDPDesignDrawingPageData page { get; set; } + } + + /// + /// 数据结果对象 + /// + public partial class IDPDesignDrawingPageData + { + /// + /// 当前查询页码 + /// + [JsonProperty("pageNum")] + public int pageNum { get; set; } + /// + /// 当前查询每页条数 + /// + [JsonProperty("pageSize")] + public int pageSize { get; set; } + /// + /// 本页查询获取数量 + /// + [JsonProperty("size")] + public int size { get; set; } + /// + /// 总数 + /// + [JsonProperty("total")] + public int total { get; set; } + /// + /// 总页码 + /// + [JsonProperty("pages")] + public int pages { get; set; } + + /// + /// 返回设计图纸数据结果对象 + /// + [JsonProperty("results")] + public System.Collections.Generic.List results { get; set; } + } + + + /// + /// IDP设计图纸 + /// + public partial class IDPDesignDrawing + { + /// + /// IDP文件ID + /// + [JsonProperty("fileId")] + public string fileId { get; set; } + /// + /// IDP主键推送批次id：stockId + /// + [JsonProperty("stockId")] + public string stockId { get; set; } + /// + /// 文件网盘id + /// + [JsonProperty("thirdId")] + public string thirdId { get; set; } + /// + /// 主项目编号 + /// + [JsonProperty("projectCode")] + public string projectCode { get; set; } + /// + /// 项目信息 + /// + [JsonProperty("displayProjectName")] + public string displayProjectName { get; set; } + /// + /// 装工主编码 + /// + [JsonProperty("projectDeviceProcedureSubjectCode")] + public string projectDeviceProcedureSubjectCode { get; set; } + /// + /// 装工主名称 + /// + [JsonProperty("wbsFullPath")] + public string wbsFullPath { get; set; } + /// + /// 文件编码 + /// + [JsonProperty("formatFileCode")] + public string formatFileCode { get; set; } + /// + /// 文件名称 + /// + [JsonProperty("formatFileName")] + public string formatFileName { get; set; } + /// + /// 版次 + /// + [JsonProperty("fileVersion")] + public string fileVersion { get; set; } + /// + /// 专业 + /// + [JsonProperty("majorNo")] + public string majorNo { get; set; } + /// + /// 发布状态 + /// + [JsonProperty("status")] + public string status { get; set; } + /// + /// 设计人 + /// + [JsonProperty("designUserName")] + public string designUserName { get; set; } + /// + /// 校核人 + /// + [JsonProperty("jiaoheUserName")] + public string jiaoheUserName { get; set; } + /// + /// 审核人 + /// + [JsonProperty("shenheUserName")] + public string shenheUserName { get; set; } + /// + /// 审定人 + /// + [JsonProperty("shendingUserName")] + public string shendingUserName { get; set; } + /// + /// 专业负责人 + /// + [JsonProperty("majorResponsibleUserName")] + public string majorResponsibleUserName { get; set; } + /// + /// 保密等级 + /// + [JsonProperty("classificationLevelInProject")] + public string classificationLevelInProject { get; set; } + /// + /// 入库日期 + /// + [JsonProperty("updateTime")] + public DateTime? updateTime { get; set; } + /// + /// 备注 + /// + [JsonProperty("remark")] + public string remark { get; set; } + + + ///// + ///// 数字档案馆RdpId + ///// + //[JsonProperty("RdpId")] + //public string RdpId { get; set; } + ///// + ///// 盖章前文件id + ///// + //[JsonProperty("fileid")] + //public string fileid { get; set; } + ///// + ///// 盖章后文件id + ///// + //[JsonProperty("upfileid")] + //public string upfileid { get; set; } + ///// + ///// 文件名称 + ///// + //[JsonProperty("maintitle")] + //public string maintitle { get; set; } + ///// + ///// 文件编号 + ///// + //[JsonProperty("doc_no")] + //public string doc_no { get; set; } + ///// + ///// 版次 + ///// + //[JsonProperty("bc")] + //public string bc { get; set; } + ///// + ///// 入库档案号 + ///// + //[JsonProperty("archnumber")] + //public string archnumber { get; set; } + ///// + ///// 档案室验收日期 + ///// + //[JsonProperty("sendtime")] + //public DateTime? sendtime { get; set; } + ///// + ///// 蓝图打印日期 + ///// + //[JsonProperty("printtime")] + //public DateTime? printtime { get; set; } + ///// + ///// 蓝图是否寄出（是、否） + ///// + //[JsonProperty("ifmail")] + //public string ifmail { get; set; } + + } + + + public partial class IDPDesignDrawingResponseData + { + public static IDPDesignDrawingResponseData FromJson(string json) + { + return JsonConvert.DeserializeObject(json, Model.Converter.Settings); + } + } + +} + diff --git a/SGGL/Model/IDP/OADesignDrawingData.cs b/SGGL/Model/IDP/OADesignDrawingData.cs new file mode 100644 index 00000000..4b0a8183 --- /dev/null +++ b/SGGL/Model/IDP/OADesignDrawingData.cs @@ -0,0 +1,88 @@ +// +// +// To parse this JSON data, add NuGet 'Newtonsoft.Json' then do: +// +// using Model; +// +// var response = Response.FromJson(jsonString); + + +namespace Model +{ + using System; + using System.Collections.Generic; + using Newtonsoft.Json; + + /// + /// OA设计图纸接收参数 + /// + public partial class OADesignDrawingData + { + /// + /// OA设计图纸数据项集合 + /// + public List DataItems + { + get; + set; + } + } + + /// + /// 数据结果对象 + /// + public partial class OADesignDrawingDataItem + { + /// + /// 数字档案馆RdpId + /// + [JsonProperty("RdpId")] + public string RdpId { get; set; } + /// + /// 盖章前文件id + /// + [JsonProperty("fileid")] + public string fileid { get; set; } + /// + /// 盖章后文件id + /// + [JsonProperty("upfileid")] + public string upfileid { get; set; } + /// + /// 文件名称 + /// + [JsonProperty("maintitle")] + public string maintitle { get; set; } + /// + /// 文件编号 + /// + [JsonProperty("doc_no")] + public string doc_no { get; set; } + /// + /// 版次 + /// + [JsonProperty("bc")] + public string bc { get; set; } + /// + /// 入库档案号 + /// + [JsonProperty("archnumber")] + public string archnumber { get; set; } + /// + /// 档案室验收日期 + /// + [JsonProperty("sendtime")] + public DateTime? sendtime { get; set; } + /// + /// 蓝图打印日期 + /// + [JsonProperty("printtime")] + public DateTime? printtime { get; set; } + /// + /// 蓝图是否寄出（是、否） + /// + [JsonProperty("ifmail")] + public string ifmail { get; set; } + } +} + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 57a56462..ae5b2097 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1184,6 +1184,9 @@ namespace Model partial void InsertHSSESystem_SafetyInstitution(HSSESystem_SafetyInstitution instance); partial void UpdateHSSESystem_SafetyInstitution(HSSESystem_SafetyInstitution instance); partial void DeleteHSSESystem_SafetyInstitution(HSSESystem_SafetyInstitution instance); + partial void InsertIDP_DesignDrawing(IDP_DesignDrawing instance); + partial void UpdateIDP_DesignDrawing(IDP_DesignDrawing instance); + partial void DeleteIDP_DesignDrawing(IDP_DesignDrawing instance); partial void InsertInApproveManager_EquipmentIn(InApproveManager_EquipmentIn instance); partial void UpdateInApproveManager_EquipmentIn(InApproveManager_EquipmentIn instance); partial void DeleteInApproveManager_EquipmentIn(InApproveManager_EquipmentIn instance); @@ -5921,6 +5924,14 @@ namespace Model } } + public System.Data.Linq.Table IDP_DesignDrawing + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table InApproveManager_EquipmentIn { get @@ -52273,7 +52284,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartName", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartName", DbType="NVarChar(200)")] public string DepartName { get @@ -52453,7 +52464,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(1000)")] public string Remark { get @@ -188144,6 +188155,812 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.IDP_DesignDrawing")] + public partial class IDP_DesignDrawing : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _IdpfileId; + + private string _StockId; + + private string _ThirdId; + + private string _ProjectId; + + private string _ProjectCode; + + private string _DisplayProjectName; + + private string _ProjectDeviceProcedureSubjectCode; + + private string _WbsFullPath; + + private string _FormatFileCode; + + private string _FormatFileName; + + private string _FileVersion; + + private string _MajorNo; + + private string _Status; + + private string _DesignUserName; + + private string _JiaoheUserName; + + private string _ShenheUserName; + + private string _ShendingUserName; + + private string _MajorResponsibleUserName; + + private string _ClassificationLevelInProject; + + private System.Nullable _UpdateTime; + + private string _Remark; + + private string _RdpId; + + private string _Fileid; + + private string _Upfileid; + + private string _Maintitle; + + private string _Doc_no; + + private string _Bc; + + private string _Archnumber; + + private System.Nullable _Sendtime; + + private System.Nullable _Printtime; + + private string _Ifmail; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnIdpfileIdChanging(string value); + partial void OnIdpfileIdChanged(); + partial void OnStockIdChanging(string value); + partial void OnStockIdChanged(); + partial void OnThirdIdChanging(string value); + partial void OnThirdIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnProjectCodeChanging(string value); + partial void OnProjectCodeChanged(); + partial void OnDisplayProjectNameChanging(string value); + partial void OnDisplayProjectNameChanged(); + partial void OnProjectDeviceProcedureSubjectCodeChanging(string value); + partial void OnProjectDeviceProcedureSubjectCodeChanged(); + partial void OnWbsFullPathChanging(string value); + partial void OnWbsFullPathChanged(); + partial void OnFormatFileCodeChanging(string value); + partial void OnFormatFileCodeChanged(); + partial void OnFormatFileNameChanging(string value); + partial void OnFormatFileNameChanged(); + partial void OnFileVersionChanging(string value); + partial void OnFileVersionChanged(); + partial void OnMajorNoChanging(string value); + partial void OnMajorNoChanged(); + partial void OnStatusChanging(string value); + partial void OnStatusChanged(); + partial void OnDesignUserNameChanging(string value); + partial void OnDesignUserNameChanged(); + partial void OnJiaoheUserNameChanging(string value); + partial void OnJiaoheUserNameChanged(); + partial void OnShenheUserNameChanging(string value); + partial void OnShenheUserNameChanged(); + partial void OnShendingUserNameChanging(string value); + partial void OnShendingUserNameChanged(); + partial void OnMajorResponsibleUserNameChanging(string value); + partial void OnMajorResponsibleUserNameChanged(); + partial void OnClassificationLevelInProjectChanging(string value); + partial void OnClassificationLevelInProjectChanged(); + partial void OnUpdateTimeChanging(System.Nullable value); + partial void OnUpdateTimeChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnRdpIdChanging(string value); + partial void OnRdpIdChanged(); + partial void OnFileidChanging(string value); + partial void OnFileidChanged(); + partial void OnUpfileidChanging(string value); + partial void OnUpfileidChanged(); + partial void OnMaintitleChanging(string value); + partial void OnMaintitleChanged(); + partial void OnDoc_noChanging(string value); + partial void OnDoc_noChanged(); + partial void OnBcChanging(string value); + partial void OnBcChanged(); + partial void OnArchnumberChanging(string value); + partial void OnArchnumberChanged(); + partial void OnSendtimeChanging(System.Nullable value); + partial void OnSendtimeChanged(); + partial void OnPrinttimeChanging(System.Nullable value); + partial void OnPrinttimeChanged(); + partial void OnIfmailChanging(string value); + partial void OnIfmailChanged(); + #endregion + + public IDP_DesignDrawing() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="id", Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="idpfileId", Storage="_IdpfileId", DbType="NVarChar(50)")] + public string IdpfileId + { + get + { + return this._IdpfileId; + } + set + { + if ((this._IdpfileId != value)) + { + this.OnIdpfileIdChanging(value); + this.SendPropertyChanging(); + this._IdpfileId = value; + this.SendPropertyChanged("IdpfileId"); + this.OnIdpfileIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="stockId", Storage="_StockId", DbType="NVarChar(50)")] + public string StockId + { + get + { + return this._StockId; + } + set + { + if ((this._StockId != value)) + { + this.OnStockIdChanging(value); + this.SendPropertyChanging(); + this._StockId = value; + this.SendPropertyChanged("StockId"); + this.OnStockIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="thirdId", Storage="_ThirdId", DbType="NVarChar(50)")] + public string ThirdId + { + get + { + return this._ThirdId; + } + set + { + if ((this._ThirdId != value)) + { + this.OnThirdIdChanging(value); + this.SendPropertyChanging(); + this._ThirdId = value; + this.SendPropertyChanged("ThirdId"); + this.OnThirdIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="projectId", Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="projectCode", Storage="_ProjectCode", DbType="NVarChar(50)")] + public string ProjectCode + { + get + { + return this._ProjectCode; + } + set + { + if ((this._ProjectCode != value)) + { + this.OnProjectCodeChanging(value); + this.SendPropertyChanging(); + this._ProjectCode = value; + this.SendPropertyChanged("ProjectCode"); + this.OnProjectCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="displayProjectName", Storage="_DisplayProjectName", DbType="NVarChar(500)")] + public string DisplayProjectName + { + get + { + return this._DisplayProjectName; + } + set + { + if ((this._DisplayProjectName != value)) + { + this.OnDisplayProjectNameChanging(value); + this.SendPropertyChanging(); + this._DisplayProjectName = value; + this.SendPropertyChanged("DisplayProjectName"); + this.OnDisplayProjectNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="projectDeviceProcedureSubjectCode", Storage="_ProjectDeviceProcedureSubjectCode", DbType="NVarChar(50)")] + public string ProjectDeviceProcedureSubjectCode + { + get + { + return this._ProjectDeviceProcedureSubjectCode; + } + set + { + if ((this._ProjectDeviceProcedureSubjectCode != value)) + { + this.OnProjectDeviceProcedureSubjectCodeChanging(value); + this.SendPropertyChanging(); + this._ProjectDeviceProcedureSubjectCode = value; + this.SendPropertyChanged("ProjectDeviceProcedureSubjectCode"); + this.OnProjectDeviceProcedureSubjectCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="wbsFullPath", Storage="_WbsFullPath", DbType="NVarChar(200)")] + public string WbsFullPath + { + get + { + return this._WbsFullPath; + } + set + { + if ((this._WbsFullPath != value)) + { + this.OnWbsFullPathChanging(value); + this.SendPropertyChanging(); + this._WbsFullPath = value; + this.SendPropertyChanged("WbsFullPath"); + this.OnWbsFullPathChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="formatFileCode", Storage="_FormatFileCode", DbType="NVarChar(50)")] + public string FormatFileCode + { + get + { + return this._FormatFileCode; + } + set + { + if ((this._FormatFileCode != value)) + { + this.OnFormatFileCodeChanging(value); + this.SendPropertyChanging(); + this._FormatFileCode = value; + this.SendPropertyChanged("FormatFileCode"); + this.OnFormatFileCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="formatFileName", Storage="_FormatFileName", DbType="NVarChar(200)")] + public string FormatFileName + { + get + { + return this._FormatFileName; + } + set + { + if ((this._FormatFileName != value)) + { + this.OnFormatFileNameChanging(value); + this.SendPropertyChanging(); + this._FormatFileName = value; + this.SendPropertyChanged("FormatFileName"); + this.OnFormatFileNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="fileVersion", Storage="_FileVersion", DbType="NVarChar(50)")] + public string FileVersion + { + get + { + return this._FileVersion; + } + set + { + if ((this._FileVersion != value)) + { + this.OnFileVersionChanging(value); + this.SendPropertyChanging(); + this._FileVersion = value; + this.SendPropertyChanged("FileVersion"); + this.OnFileVersionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="majorNo", Storage="_MajorNo", DbType="NVarChar(50)")] + public string MajorNo + { + get + { + return this._MajorNo; + } + set + { + if ((this._MajorNo != value)) + { + this.OnMajorNoChanging(value); + this.SendPropertyChanging(); + this._MajorNo = value; + this.SendPropertyChanged("MajorNo"); + this.OnMajorNoChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="NVarChar(50)")] + public string Status + { + get + { + return this._Status; + } + set + { + if ((this._Status != value)) + { + this.OnStatusChanging(value); + this.SendPropertyChanging(); + this._Status = value; + this.SendPropertyChanged("Status"); + this.OnStatusChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="designUserName", Storage="_DesignUserName", DbType="NVarChar(50)")] + public string DesignUserName + { + get + { + return this._DesignUserName; + } + set + { + if ((this._DesignUserName != value)) + { + this.OnDesignUserNameChanging(value); + this.SendPropertyChanging(); + this._DesignUserName = value; + this.SendPropertyChanged("DesignUserName"); + this.OnDesignUserNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="jiaoheUserName", Storage="_JiaoheUserName", DbType="NVarChar(50)")] + public string JiaoheUserName + { + get + { + return this._JiaoheUserName; + } + set + { + if ((this._JiaoheUserName != value)) + { + this.OnJiaoheUserNameChanging(value); + this.SendPropertyChanging(); + this._JiaoheUserName = value; + this.SendPropertyChanged("JiaoheUserName"); + this.OnJiaoheUserNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="shenheUserName", Storage="_ShenheUserName", DbType="NVarChar(50)")] + public string ShenheUserName + { + get + { + return this._ShenheUserName; + } + set + { + if ((this._ShenheUserName != value)) + { + this.OnShenheUserNameChanging(value); + this.SendPropertyChanging(); + this._ShenheUserName = value; + this.SendPropertyChanged("ShenheUserName"); + this.OnShenheUserNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="shendingUserName", Storage="_ShendingUserName", DbType="NVarChar(50)")] + public string ShendingUserName + { + get + { + return this._ShendingUserName; + } + set + { + if ((this._ShendingUserName != value)) + { + this.OnShendingUserNameChanging(value); + this.SendPropertyChanging(); + this._ShendingUserName = value; + this.SendPropertyChanged("ShendingUserName"); + this.OnShendingUserNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="majorResponsibleUserName", Storage="_MajorResponsibleUserName", DbType="NVarChar(50)")] + public string MajorResponsibleUserName + { + get + { + return this._MajorResponsibleUserName; + } + set + { + if ((this._MajorResponsibleUserName != value)) + { + this.OnMajorResponsibleUserNameChanging(value); + this.SendPropertyChanging(); + this._MajorResponsibleUserName = value; + this.SendPropertyChanged("MajorResponsibleUserName"); + this.OnMajorResponsibleUserNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="classificationLevelInProject", Storage="_ClassificationLevelInProject", DbType="NVarChar(50)")] + public string ClassificationLevelInProject + { + get + { + return this._ClassificationLevelInProject; + } + set + { + if ((this._ClassificationLevelInProject != value)) + { + this.OnClassificationLevelInProjectChanging(value); + this.SendPropertyChanging(); + this._ClassificationLevelInProject = value; + this.SendPropertyChanged("ClassificationLevelInProject"); + this.OnClassificationLevelInProjectChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="updateTime", Storage="_UpdateTime", DbType="DateTime")] + public System.Nullable UpdateTime + { + get + { + return this._UpdateTime; + } + set + { + if ((this._UpdateTime != value)) + { + this.OnUpdateTimeChanging(value); + this.SendPropertyChanging(); + this._UpdateTime = value; + this.SendPropertyChanged("UpdateTime"); + this.OnUpdateTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="remark", Storage="_Remark", DbType="NVarChar(500)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RdpId", DbType="NVarChar(50)")] + public string RdpId + { + get + { + return this._RdpId; + } + set + { + if ((this._RdpId != value)) + { + this.OnRdpIdChanging(value); + this.SendPropertyChanging(); + this._RdpId = value; + this.SendPropertyChanged("RdpId"); + this.OnRdpIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="fileid", Storage="_Fileid", DbType="NVarChar(50)")] + public string Fileid + { + get + { + return this._Fileid; + } + set + { + if ((this._Fileid != value)) + { + this.OnFileidChanging(value); + this.SendPropertyChanging(); + this._Fileid = value; + this.SendPropertyChanged("Fileid"); + this.OnFileidChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="upfileid", Storage="_Upfileid", DbType="NVarChar(50)")] + public string Upfileid + { + get + { + return this._Upfileid; + } + set + { + if ((this._Upfileid != value)) + { + this.OnUpfileidChanging(value); + this.SendPropertyChanging(); + this._Upfileid = value; + this.SendPropertyChanged("Upfileid"); + this.OnUpfileidChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="maintitle", Storage="_Maintitle", DbType="NVarChar(200)")] + public string Maintitle + { + get + { + return this._Maintitle; + } + set + { + if ((this._Maintitle != value)) + { + this.OnMaintitleChanging(value); + this.SendPropertyChanging(); + this._Maintitle = value; + this.SendPropertyChanged("Maintitle"); + this.OnMaintitleChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="doc_no", Storage="_Doc_no", DbType="NVarChar(50)")] + public string Doc_no + { + get + { + return this._Doc_no; + } + set + { + if ((this._Doc_no != value)) + { + this.OnDoc_noChanging(value); + this.SendPropertyChanging(); + this._Doc_no = value; + this.SendPropertyChanged("Doc_no"); + this.OnDoc_noChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="bc", Storage="_Bc", DbType="NVarChar(50)")] + public string Bc + { + get + { + return this._Bc; + } + set + { + if ((this._Bc != value)) + { + this.OnBcChanging(value); + this.SendPropertyChanging(); + this._Bc = value; + this.SendPropertyChanged("Bc"); + this.OnBcChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="archnumber", Storage="_Archnumber", DbType="NVarChar(50)")] + public string Archnumber + { + get + { + return this._Archnumber; + } + set + { + if ((this._Archnumber != value)) + { + this.OnArchnumberChanging(value); + this.SendPropertyChanging(); + this._Archnumber = value; + this.SendPropertyChanged("Archnumber"); + this.OnArchnumberChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="sendtime", Storage="_Sendtime", DbType="DateTime")] + public System.Nullable Sendtime + { + get + { + return this._Sendtime; + } + set + { + if ((this._Sendtime != value)) + { + this.OnSendtimeChanging(value); + this.SendPropertyChanging(); + this._Sendtime = value; + this.SendPropertyChanged("Sendtime"); + this.OnSendtimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="printtime", Storage="_Printtime", DbType="DateTime")] + public System.Nullable Printtime + { + get + { + return this._Printtime; + } + set + { + if ((this._Printtime != value)) + { + this.OnPrinttimeChanging(value); + this.SendPropertyChanging(); + this._Printtime = value; + this.SendPropertyChanged("Printtime"); + this.OnPrinttimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="ifmail", Storage="_Ifmail", DbType="NVarChar(50)")] + public string Ifmail + { + get + { + return this._Ifmail; + } + set + { + if ((this._Ifmail != value)) + { + this.OnIfmailChanging(value); + this.SendPropertyChanging(); + this._Ifmail = value; + this.SendPropertyChanged("Ifmail"); + this.OnIfmailChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.InApproveManager_EquipmentIn")] public partial class InApproveManager_EquipmentIn : INotifyPropertyChanging, INotifyPropertyChanged { diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj index 021a00d7..f4b2819c 100644 --- a/SGGL/Model/Model.csproj +++ b/SGGL/Model/Model.csproj @@ -236,6 +236,8 @@ + + diff --git a/SGGL/WebAPI/.vs/WebAPI.csproj.dtbcache.json b/SGGL/WebAPI/.vs/WebAPI.csproj.dtbcache.json index 502d6c76..b9ed685c 100644 --- a/SGGL/WebAPI/.vs/WebAPI.csproj.dtbcache.json +++ b/SGGL/WebAPI/.vs/WebAPI.csproj.dtbcache.json @@ -1 +1 @@ -{"RootPath":"E:\\五环\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\WebAPI","ProjectFileName":"WebAPI.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[],"References":[],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\五环\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\WebAPI\\bin\\WebAPI.dll","OutputItemRelativePath":"WebAPI.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]} \ No newline at end of file +{"RootPath":"G:\\公司项目\\五环\\SGGL\\WebAPI","ProjectFileName":"WebAPI.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"App_Start\\BundleConfig.cs"},{"SourceFile":"App_Start\\FilterConfig.cs"},{"SourceFile":"App_Start\\RouteConfig.cs"},{"SourceFile":"App_Start\\SwaggerConfig.cs"},{"SourceFile":"App_Start\\WebApiConfig.cs"},{"SourceFile":"Controllers\\AnBangToolController.cs"},{"SourceFile":"Controllers\\BaseInfoController.cs"},{"SourceFile":"Controllers\\CommonController.cs"},{"SourceFile":"Controllers\\CQMS\\InspectionManagementController.cs"},{"SourceFile":"Controllers\\CQMS\\PerformanceController.cs"},{"SourceFile":"Controllers\\CQMS\\QualityAssuranceController.cs"},{"SourceFile":"Controllers\\CQMS\\WBSController.cs"},{"SourceFile":"Controllers\\DataSync\\CNCECServerController.cs"},{"SourceFile":"Controllers\\DataSync\\EnvironmentalController.cs"},{"SourceFile":"Controllers\\DoorProject\\getController.cs"},{"SourceFile":"Controllers\\DoorProject\\uploadController.cs"},{"SourceFile":"Controllers\\FaceController.cs"},{"SourceFile":"Controllers\\DoorServerController.cs"},{"SourceFile":"Controllers\\HJGL\\GetHJDataController.cs"},{"SourceFile":"Controllers\\HSSE\\GeneralEquipmentQualityController.cs"},{"SourceFile":"Controllers\\HSSE\\HSSELogController.cs"},{"SourceFile":"Controllers\\HSSE\\TestingController.cs"},{"SourceFile":"Controllers\\HSSE\\TowerCraneController.cs"},{"SourceFile":"Controllers\\IDP\\IDPController.cs"},{"SourceFile":"Controllers\\JGZL\\JGZLController.cs"},{"SourceFile":"Controllers\\Person\\PersonCheckController.cs"},{"SourceFile":"Controllers\\CQMS\\CheckEquipmentController.cs"},{"SourceFile":"Controllers\\CQMS\\CheckListController.cs"},{"SourceFile":"Controllers\\CQMS\\CommenInfoController.cs"},{"SourceFile":"Controllers\\CQMS\\ContactController.cs"},{"SourceFile":"Controllers\\CQMS\\CQMSConstructSolutionController.cs"},{"SourceFile":"Controllers\\CQMS\\DesignController.cs"},{"SourceFile":"Controllers\\CQMS\\DrawController.cs"},{"SourceFile":"Controllers\\CQMS\\IndexController.cs"},{"SourceFile":"Controllers\\CQMS\\JointCheckController.cs"},{"SourceFile":"Controllers\\CQMS\\SpotCheckController.cs"},{"SourceFile":"Controllers\\CQMS\\TechnicalContactController.cs"},{"SourceFile":"Controllers\\HJGL\\HotProcessHardController.cs"},{"SourceFile":"Controllers\\HJGL\\NDETrustController.cs"},{"SourceFile":"Controllers\\HJGL\\PipeJointController.cs"},{"SourceFile":"Controllers\\HJGL\\PreWeldingDailyController.cs"},{"SourceFile":"Controllers\\HJGL\\ReportQueryController.cs"},{"SourceFile":"Controllers\\HJGL\\TestPackageController.cs"},{"SourceFile":"Controllers\\HSSE\\ChartAnalysisController.cs"},{"SourceFile":"Controllers\\HSSE\\CheckSpecialController.cs"},{"SourceFile":"Controllers\\HSSE\\ConstructSolutionController.cs"},{"SourceFile":"Controllers\\HSSE\\EmergencyController.cs"},{"SourceFile":"Controllers\\HSSE\\EquipmentQualityController.cs"},{"SourceFile":"Controllers\\HSSE\\HazardListController.cs"},{"SourceFile":"Controllers\\HSSE\\HazardRegisterController.cs"},{"SourceFile":"Controllers\\HSSE\\HSEDiaryController.cs"},{"SourceFile":"Controllers\\HSSE\\HSSEStandardsListController.cs"},{"SourceFile":"Controllers\\HSSE\\IncentiveNoticeController.cs"},{"SourceFile":"Controllers\\HSSE\\LawManageRuleController.cs"},{"SourceFile":"Controllers\\HSSE\\LawRegulationListController.cs"},{"SourceFile":"Controllers\\HSSE\\LawRulesRegulationsController.cs"},{"SourceFile":"Controllers\\HSSE\\LicenseController.cs"},{"SourceFile":"Controllers\\HSSE\\MeetingController.cs"},{"SourceFile":"Controllers\\HSSE\\PageDataController.cs"},{"SourceFile":"Controllers\\HSSE\\PauseNoticeController.cs"},{"SourceFile":"Controllers\\HSSE\\PersonQualityController.cs"},{"SourceFile":"Controllers\\HSSE\\PunishNoticeController.cs"},{"SourceFile":"Controllers\\HSSE\\ReceiveFileManagerController.cs"},{"SourceFile":"Controllers\\HSSE\\RectifyNoticesController.cs"},{"SourceFile":"Controllers\\HSSE\\ResourcesController.cs"},{"SourceFile":"Controllers\\HSSE\\SeDinMonthReportController.cs"},{"SourceFile":"Controllers\\HSSE\\ServerTestPlanController.cs"},{"SourceFile":"Controllers\\HSSE\\ServerTestRecordController.cs"},{"SourceFile":"Controllers\\HSSE\\TestPlanController.cs"},{"SourceFile":"Controllers\\HSSE\\TestRecordController.cs"},{"SourceFile":"Controllers\\HSSE\\TrainingPlanController.cs"},{"SourceFile":"Controllers\\HSSE\\TrainingTaskController.cs"},{"SourceFile":"Controllers\\HSSE\\TrainRecordController.cs"},{"SourceFile":"Controllers\\IDCardController.cs"},{"SourceFile":"Controllers\\FileUploadController.cs"},{"SourceFile":"Controllers\\HomeController.cs"},{"SourceFile":"Controllers\\PersonController.cs"},{"SourceFile":"Controllers\\PMP\\PMPController.cs"},{"SourceFile":"Controllers\\ProjectController.cs"},{"SourceFile":"Controllers\\PZHGL\\GJSXController.cs"},{"SourceFile":"Controllers\\TestRun\\DriverRunController.cs"},{"SourceFile":"Controllers\\ToDoItemController.cs"},{"SourceFile":"Controllers\\UnitController.cs"},{"SourceFile":"Controllers\\UserController.cs"},{"SourceFile":"Controllers\\VideoController.cs"},{"SourceFile":"Filter\\TestPermissionAttribute.cs"},{"SourceFile":"Global.asax.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.6.1.AssemblyAttributes.cs"}],"References":[{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Antlr.3.5.0.2\\lib\\Antlr3.Runtime.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Aspose.Words.24.12.0\\lib\\net461\\Aspose.Words.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\BLL\\bin\\Debug\\BLL.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\\lib\\net45\\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Microsoft.Web.Infrastructure.1.0.0.0\\lib\\net40\\Microsoft.Web.Infrastructure.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\Model\\bin\\Debug\\Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Newtonsoft.Json.13.0.1\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\SgManager.AI\\bin\\Debug\\SgManager.AI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Swashbuckle.Core.5.6.0\\lib\\net40\\Swashbuckle.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Microsoft.AspNet.WebApi.Client.5.2.7\\lib\\net45\\System.Net.Http.Formatting.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Net.Http.WebRequest.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.ApplicationServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Microsoft.AspNet.Cors.5.2.7\\lib\\net45\\System.Web.Cors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.DynamicData.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.Entity.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Microsoft.AspNet.WebPages.3.2.4\\lib\\net45\\System.Web.Helpers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Microsoft.AspNet.WebApi.Cors.5.2.7\\lib\\net45\\System.Web.Http.Cors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Microsoft.AspNet.WebApi.Core.5.2.7\\lib\\net45\\System.Web.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Microsoft.AspNet.WebApi.WebHost.5.2.4\\lib\\net45\\System.Web.Http.WebHost.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Microsoft.AspNet.Mvc.5.2.4\\lib\\net45\\System.Web.Mvc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Microsoft.AspNet.Web.Optimization.1.1.3\\lib\\net40\\System.Web.Optimization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Microsoft.AspNet.Razor.3.2.4\\lib\\net45\\System.Web.Razor.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.Routing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Microsoft.AspNet.WebPages.3.2.4\\lib\\net45\\System.Web.WebPages.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Microsoft.AspNet.WebPages.3.2.4\\lib\\net45\\System.Web.WebPages.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\Microsoft.AspNet.WebPages.3.2.4\\lib\\net45\\System.Web.WebPages.Razor.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\WebActivatorEx.2.0\\lib\\net40\\WebActivatorEx.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"G:\\公司项目\\五环\\SGGL\\packages\\WebGrease.1.6.0\\lib\\WebGrease.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"G:\\公司项目\\五环\\SGGL\\WebAPI\\bin\\WebAPI.dll","OutputItemRelativePath":"WebAPI.dll"},{"OutputItemFullPath":"G:\\公司项目\\五环\\SGGL\\WebAPI\\bin\\WebAPI.pdb","OutputItemRelativePath":"WebAPI.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/SGGL/WebAPI/Controllers/IDP/IDPController.cs b/SGGL/WebAPI/Controllers/IDP/IDPController.cs index aa1161c3..72693e87 100644 --- a/SGGL/WebAPI/Controllers/IDP/IDPController.cs +++ b/SGGL/WebAPI/Controllers/IDP/IDPController.cs @@ -9,6 +9,54 @@ namespace WebAPI.Controllers ///
public class IDPController : ApiController { + #region IDP系统项目设计图纸数据 + + /// + /// 每天夜间同步获取IDP系统项目设计图纸数据 + /// + /// + [HttpPost] + public Model.ResponeData SynIDPDesignDrawingData() + { + var responeData = new Model.ResponeData(); + try + { + IDPDataService.GetIDPProjectDesignDrawingData(); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.ToString(); + } + return responeData; + } + + + /// + /// 每天夜间接收OA系统项目设计图纸数据 + /// + /// + [HttpPost] + public Model.ResponeData SynOADesignDrawingData([FromBody] Model.OADesignDrawingData newItem) + { + var responeData = new Model.ResponeData(); + try + { + + responeData.message = IDPDataService.SaveDesignDrawingData(newItem); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.ToString(); + } + return responeData; + } + + #endregion + + #region IDP系统项目开车数据 + /// /// 每天夜间同步获取IDP系统项目开车数据 /// @@ -29,5 +77,6 @@ namespace WebAPI.Controllers return responeData; } + #endregion } } \ No newline at end of file diff --git a/SGGL/WebAPI/ErrLog.txt b/SGGL/WebAPI/ErrLog.txt index 5f282702..49c9e66c 100644 --- a/SGGL/WebAPI/ErrLog.txt +++ b/SGGL/WebAPI/ErrLog.txt @@ -1 +1,20 @@ - \ No newline at end of file +【Session】name：FULONGTECH_SESSION；value：54a7e2ee-bbeb-44ad-987c-5093d2fe5a9b +【Session】name：FULONGTECH_SESSION；value：c65e9e8d-b0d7-4501-a079-5af824c37964 +【Session】name：FULONGTECH_SESSION；value：a5c0d3ec-e766-4f21-944b-73d0c9fd8c47 +【Session】name：FULONGTECH_SESSION；value：cc2c5425-d08c-4d8c-9344-6b41cb3c8f70 +【Session】name：FULONGTECH_SESSION；value：03689099-8c4e-4d1b-9553-9c2a03082c54 +【Session】name：FULONGTECH_SESSION；value：b75cbb8f-6cdb-42ff-80ad-60bad9179843 +【Session】name：FULONGTECH_SESSION；value：15b8c128-1330-40ca-8608-2a9e2def308e +【Session】name：FULONGTECH_SESSION；value：d4adafad-f91b-49b9-9948-c58c94bfda37 +【Session】name：FULONGTECH_SESSION；value：a5e00438-bcab-4f8a-8202-e5ebd58e1470 +【Session】name：FULONGTECH_SESSION；value：8648b5fd-5c67-4f80-aafc-2539d265af3f +【Session】name：FULONGTECH_SESSION；value：7ff55d12-b241-42c2-b145-9cb8e967e022 +【Session】name：FULONGTECH_SESSION；value：ba9b1a4e-e289-426d-aacf-1defe1788925 +【Session】name：FULONGTECH_SESSION；value：678c5b99-5606-47c7-8613-08fb2ba86bf7 +【Session】name：FULONGTECH_SESSION；value：40799f96-ecd1-472a-a26e-b16679e23ee6 +【Session】name：FULONGTECH_SESSION；value：a46400ce-5e81-44bc-a281-b3e53b3df575 +【Session】name：FULONGTECH_SESSION；value：0641bce2-025b-4feb-9f01-3410d048c6fe +【Session】name：FULONGTECH_SESSION；value：15ffe888-6ccc-4d96-86fb-c9eed5d2c64f +【Session】name：FULONGTECH_SESSION；value：02f5ac63-9220-4f81-91cd-dc4dd2c98d10 +【Session】name：FULONGTECH_SESSION；value：ef252925-fece-4129-b084-30e58a6abfd7 +【Session】name：FULONGTECH_SESSION；value：58084872-8dad-44eb-ba52-6b42c291dc22 diff --git a/SGGL/WebAPI/Filter/TestPermissionAttribute.cs b/SGGL/WebAPI/Filter/TestPermissionAttribute.cs index 188718df..67608bfe 100644 --- a/SGGL/WebAPI/Filter/TestPermissionAttribute.cs +++ b/SGGL/WebAPI/Filter/TestPermissionAttribute.cs @@ -89,6 +89,7 @@ namespace WebAPI.Filter public static List lists = new List { "TowerCrane*saveTowerCraneRecord", "GJSX*OverdueWarningSendEmail", "User*postLoginOn", "get*token", "HazardRegister*getHazardRegisterTotalCount", "HazardRegister*getHazardRegisterByProjectIdStates", "PMP*SynPMPProjectData", + "IDP*SynIDPDesignDrawingData", "IDP*SynIDPPreRunData", "JGZL*getUserList", "JGZL*getProjedtList",