diff --git a/DataBase/版本日志/SGGLDB_WH_2024-04-16-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-04-16-bwj.sql new file mode 100644 index 00000000..1ebd5691 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-04-16-bwj.sql @@ -0,0 +1,84 @@ + +CREATE TABLE [dbo].[Sys_DataInTemp]( + [TempId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [UserId] [nvarchar](50) NULL, + [Time] [datetime] NULL, + [RowNo] [int] NULL, + [Value1] [nvarchar](100) NULL, + [Value2] [nvarchar](100) NULL, + [Value3] [nvarchar](100) NULL, + [Value4] [nvarchar](100) NULL, + [Value5] [nvarchar](100) NULL, + [Value6] [nvarchar](100) NULL, + [Value7] [nvarchar](100) NULL, + [Value8] [nvarchar](100) NULL, + [Value9] [nvarchar](100) NULL, + [Value10] [nvarchar](100) NULL, + [Value11] [nvarchar](100) NULL, + [Value12] [nvarchar](100) NULL, + [Value13] [nvarchar](100) NULL, + [Value14] [nvarchar](100) NULL, + [Value15] [nvarchar](100) NULL, + [Value16] [nvarchar](100) NULL, + [Value17] [nvarchar](100) NULL, + [Value18] [nvarchar](100) NULL, + [Value19] [nvarchar](100) NULL, + [Value20] [nvarchar](100) NULL, + [Value21] [nvarchar](100) NULL, + [Value22] [nvarchar](100) NULL, + [Value23] [nvarchar](100) NULL, + [Value24] [nvarchar](100) NULL, + [Value25] [nvarchar](100) NULL, + [Value26] [nvarchar](100) NULL, + [Value27] [nvarchar](100) NULL, + [Value28] [nvarchar](100) NULL, + [Value29] [nvarchar](100) NULL, + [Value30] [nvarchar](100) NULL, + [Value31] [nvarchar](100) NULL, + [Value32] [nvarchar](100) NULL, + [Value33] [nvarchar](100) NULL, + [Value34] [nvarchar](100) NULL, + [Value35] [nvarchar](100) NULL, + [Value36] [nvarchar](100) NULL, + [Value37] [nvarchar](100) NULL, + [Value38] [nvarchar](100) NULL, + [Value39] [nvarchar](100) NULL, + [Value40] [nvarchar](100) NULL, + [Value41] [nvarchar](100) NULL, + [Value42] [nvarchar](100) NULL, + [Value43] [nvarchar](100) NULL, + [Value44] [nvarchar](100) NULL, + [Value45] [nvarchar](100) NULL, + [Value46] [nvarchar](100) NULL, + [Value47] [nvarchar](100) NULL, + [Value48] [nvarchar](100) NULL, + [Value49] [nvarchar](100) NULL, + [Value50] [nvarchar](100) NULL, + [ToopValue] [nvarchar](4000) NULL, + [Type] [nvarchar](50) NULL, + CONSTRAINT [PK_Sys_DataInTemp] PRIMARY KEY CLUSTERED +( + [TempId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[Sys_DataInTemp] WITH CHECK ADD CONSTRAINT [FK_Sys_DataInTemp_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[Sys_DataInTemp] CHECK CONSTRAINT [FK_Sys_DataInTemp_Base_Project] +GO + +ALTER TABLE [dbo].[Sys_DataInTemp] WITH CHECK ADD CONSTRAINT [FK_Sys_DataInTemp_Sys_User] FOREIGN KEY([UserId]) +REFERENCES [dbo].[Sys_User] ([UserId]) +GO + +ALTER TABLE [dbo].[Sys_DataInTemp] CHECK CONSTRAINT [FK_Sys_DataInTemp_Sys_User] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Sys_DataInTemp' +GO + + diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index ff413696..a2279f0b 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -181,6 +181,7 @@ + diff --git a/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs b/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs index 6068958e..9dac14b5 100644 --- a/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs @@ -21,6 +21,17 @@ namespace BLL return Funs.DB.Comprehensive_DataReceivingDoc.FirstOrDefault(e => e.DataReceivingDocId == dataReceivingDocId); } + /// + /// 根据编号和名称获取资料收发文登记记录 + /// + /// + /// + /// + public static Model.Comprehensive_DataReceivingDoc GetDataReceivingDocByCodeAndName(string fileCode, string fileName) + { + return Funs.DB.Comprehensive_DataReceivingDoc.FirstOrDefault(e => e.FileCode == fileCode && e.FileName == fileName); + } + /// /// 添加资料收发文登记记录 /// diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index c42c8498..6d133b12 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3240,6 +3240,11 @@ namespace BLL /// 新项目质量月报模板文件原始虚拟路径 /// public const string MonthReportNewTemplateUrl = "File\\Word\\CQMS\\项目质量月报.doc"; + + /// + /// 资料收发文登记记录导入模板原始虚拟路径 + /// + public const string CQMS_DataReceivingDocTempUrl = "File\\Excel\\DataIn\\资料收发文登记记录导入模板.xlsx"; #endregion #region 绩效考核模板文件路径 diff --git a/SGGL/BLL/Common/Sys_DataTempService.cs b/SGGL/BLL/Common/Sys_DataTempService.cs new file mode 100644 index 00000000..1b09aa07 --- /dev/null +++ b/SGGL/BLL/Common/Sys_DataTempService.cs @@ -0,0 +1,266 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 导入到临时表 + /// + public class Sys_DataTempService + { + /// + /// 根据主键获取导入临时表信息 + /// + /// Id + /// + public static Model.Sys_DataInTemp GetDataInTempByTempId(string tempId) + { + return Funs.DB.Sys_DataInTemp.FirstOrDefault(x => x.TempId == tempId); + } + + /// + /// 增加导入临时表记录 + /// + /// 委托实体 + public static void AddDataInTemp(Model.Sys_DataInTemp dataInTemp) + { + Model.SGGLDB db = Funs.DB; + Model.Sys_DataInTemp newDataInTemp = new Model.Sys_DataInTemp(); + newDataInTemp.TempId = dataInTemp.TempId; + newDataInTemp.ProjectId = dataInTemp.ProjectId; + newDataInTemp.UserId = dataInTemp.UserId; + newDataInTemp.Time = dataInTemp.Time; + newDataInTemp.RowNo = dataInTemp.RowNo; + newDataInTemp.Type = dataInTemp.Type; + newDataInTemp.Value1 = dataInTemp.Value1; + newDataInTemp.Value2 = dataInTemp.Value2; + newDataInTemp.Value3 = dataInTemp.Value3; + newDataInTemp.Value4 = dataInTemp.Value4; + newDataInTemp.Value5 = dataInTemp.Value5; + newDataInTemp.Value6 = dataInTemp.Value6; + newDataInTemp.Value7 = dataInTemp.Value7; + newDataInTemp.Value8 = dataInTemp.Value8; + newDataInTemp.Value9 = dataInTemp.Value9; + newDataInTemp.Value10 = dataInTemp.Value10; + newDataInTemp.Value11 = dataInTemp.Value11; + newDataInTemp.Value12 = dataInTemp.Value12; + newDataInTemp.Value13 = dataInTemp.Value13; + newDataInTemp.Value14 = dataInTemp.Value14; + newDataInTemp.Value15 = dataInTemp.Value15; + newDataInTemp.Value16 = dataInTemp.Value16; + newDataInTemp.Value17 = dataInTemp.Value17; + newDataInTemp.Value18 = dataInTemp.Value18; + newDataInTemp.Value19 = dataInTemp.Value19; + newDataInTemp.Value20 = dataInTemp.Value20; + newDataInTemp.Value21 = dataInTemp.Value21; + newDataInTemp.Value22 = dataInTemp.Value22; + newDataInTemp.Value23 = dataInTemp.Value23; + newDataInTemp.Value24 = dataInTemp.Value24; + newDataInTemp.Value25 = dataInTemp.Value25; + newDataInTemp.Value26 = dataInTemp.Value26; + newDataInTemp.Value27 = dataInTemp.Value27; + newDataInTemp.Value28 = dataInTemp.Value28; + newDataInTemp.Value29 = dataInTemp.Value29; + newDataInTemp.Value30 = dataInTemp.Value30; + newDataInTemp.Value31 = dataInTemp.Value31; + newDataInTemp.Value32 = dataInTemp.Value32; + newDataInTemp.Value33 = dataInTemp.Value33; + newDataInTemp.Value34 = dataInTemp.Value34; + newDataInTemp.Value35 = dataInTemp.Value35; + newDataInTemp.Value36 = dataInTemp.Value36; + newDataInTemp.Value37 = dataInTemp.Value37; + newDataInTemp.Value38 = dataInTemp.Value38; + newDataInTemp.Value39 = dataInTemp.Value39; + newDataInTemp.Value40 = dataInTemp.Value40; + newDataInTemp.Value41 = dataInTemp.Value41; + newDataInTemp.Value42 = dataInTemp.Value42; + newDataInTemp.Value43 = dataInTemp.Value43; + newDataInTemp.Value44 = dataInTemp.Value44; + newDataInTemp.Value45 = dataInTemp.Value45; + newDataInTemp.Value46 = dataInTemp.Value46; + newDataInTemp.Value47 = dataInTemp.Value47; + newDataInTemp.Value48 = dataInTemp.Value48; + newDataInTemp.Value49 = dataInTemp.Value49; + newDataInTemp.Value50 = dataInTemp.Value50; + + + newDataInTemp.ToopValue = dataInTemp.ToopValue; + db.Sys_DataInTemp.InsertOnSubmit(newDataInTemp); + db.SubmitChanges(); + } + + + public static void AddDataInTemp(List dataInTemps) + { + Model.SGGLDB db = Funs.DB; + foreach (var dataInTemp in dataInTemps) + { + Model.Sys_DataInTemp newDataInTemp = new Model.Sys_DataInTemp(); + newDataInTemp.TempId = dataInTemp.TempId; + newDataInTemp.ProjectId = dataInTemp.ProjectId; + newDataInTemp.UserId = dataInTemp.UserId; + newDataInTemp.Time = dataInTemp.Time; + newDataInTemp.RowNo = dataInTemp.RowNo; + newDataInTemp.Type = dataInTemp.Type; + newDataInTemp.Value1 = dataInTemp.Value1; + newDataInTemp.Value2 = dataInTemp.Value2; + newDataInTemp.Value3 = dataInTemp.Value3; + newDataInTemp.Value4 = dataInTemp.Value4; + newDataInTemp.Value5 = dataInTemp.Value5; + newDataInTemp.Value6 = dataInTemp.Value6; + newDataInTemp.Value7 = dataInTemp.Value7; + newDataInTemp.Value8 = dataInTemp.Value8; + newDataInTemp.Value9 = dataInTemp.Value9; + newDataInTemp.Value10 = dataInTemp.Value10; + newDataInTemp.Value11 = dataInTemp.Value11; + newDataInTemp.Value12 = dataInTemp.Value12; + newDataInTemp.Value13 = dataInTemp.Value13; + newDataInTemp.Value14 = dataInTemp.Value14; + newDataInTemp.Value15 = dataInTemp.Value15; + newDataInTemp.Value16 = dataInTemp.Value16; + newDataInTemp.Value17 = dataInTemp.Value17; + newDataInTemp.Value18 = dataInTemp.Value18; + newDataInTemp.Value19 = dataInTemp.Value19; + newDataInTemp.Value20 = dataInTemp.Value20; + newDataInTemp.Value21 = dataInTemp.Value21; + newDataInTemp.Value22 = dataInTemp.Value22; + newDataInTemp.Value23 = dataInTemp.Value23; + newDataInTemp.Value24 = dataInTemp.Value24; + newDataInTemp.Value25 = dataInTemp.Value25; + newDataInTemp.Value26 = dataInTemp.Value26; + newDataInTemp.Value27 = dataInTemp.Value27; + newDataInTemp.Value28 = dataInTemp.Value28; + newDataInTemp.Value29 = dataInTemp.Value29; + newDataInTemp.Value30 = dataInTemp.Value30; + newDataInTemp.Value31 = dataInTemp.Value31; + newDataInTemp.Value32 = dataInTemp.Value32; + newDataInTemp.Value33 = dataInTemp.Value33; + newDataInTemp.Value34 = dataInTemp.Value34; + newDataInTemp.Value35 = dataInTemp.Value35; + newDataInTemp.Value36 = dataInTemp.Value36; + newDataInTemp.Value37 = dataInTemp.Value37; + newDataInTemp.Value38 = dataInTemp.Value38; + newDataInTemp.Value39 = dataInTemp.Value39; + newDataInTemp.Value40 = dataInTemp.Value40; + newDataInTemp.Value41 = dataInTemp.Value41; + newDataInTemp.Value42 = dataInTemp.Value42; + newDataInTemp.Value43 = dataInTemp.Value43; + newDataInTemp.Value44 = dataInTemp.Value44; + newDataInTemp.Value45 = dataInTemp.Value45; + newDataInTemp.Value46 = dataInTemp.Value46; + newDataInTemp.Value47 = dataInTemp.Value47; + newDataInTemp.Value48 = dataInTemp.Value48; + newDataInTemp.Value49 = dataInTemp.Value49; + newDataInTemp.Value50 = dataInTemp.Value50; + + newDataInTemp.ToopValue = dataInTemp.ToopValue; + db.Sys_DataInTemp.InsertOnSubmit(newDataInTemp); + } + db.SubmitChanges(); + } + + + + /// + /// 修改导入临时表记录 + /// + /// 焊接实体 + public static void UpdateDataInTemp(Model.Sys_DataInTemp dataInTemp) + { + Model.SGGLDB db = Funs.DB; + Model.Sys_DataInTemp newDataInTemp = db.Sys_DataInTemp.FirstOrDefault(e => e.TempId == dataInTemp.TempId); + if (newDataInTemp != null) + { + newDataInTemp.UserId = dataInTemp.UserId; + newDataInTemp.Time = dataInTemp.Time; + newDataInTemp.Value1 = dataInTemp.Value1; + newDataInTemp.Value2 = dataInTemp.Value2; + newDataInTemp.Value3 = dataInTemp.Value3; + newDataInTemp.Value4 = dataInTemp.Value4; + newDataInTemp.Value5 = dataInTemp.Value5; + newDataInTemp.Value6 = dataInTemp.Value6; + newDataInTemp.Value7 = dataInTemp.Value7; + newDataInTemp.Value8 = dataInTemp.Value8; + newDataInTemp.Value9 = dataInTemp.Value9; + newDataInTemp.Value10 = dataInTemp.Value10; + newDataInTemp.Value11 = dataInTemp.Value11; + newDataInTemp.Value12 = dataInTemp.Value12; + newDataInTemp.Value13 = dataInTemp.Value13; + newDataInTemp.Value14 = dataInTemp.Value14; + newDataInTemp.Value15 = dataInTemp.Value15; + newDataInTemp.Value16 = dataInTemp.Value16; + newDataInTemp.Value17 = dataInTemp.Value17; + newDataInTemp.Value18 = dataInTemp.Value18; + newDataInTemp.Value19 = dataInTemp.Value19; + newDataInTemp.Value20 = dataInTemp.Value20; + newDataInTemp.Value21 = dataInTemp.Value21; + newDataInTemp.Value22 = dataInTemp.Value22; + newDataInTemp.Value23 = dataInTemp.Value23; + newDataInTemp.Value24 = dataInTemp.Value24; + newDataInTemp.Value25 = dataInTemp.Value25; + newDataInTemp.Value26 = dataInTemp.Value26; + newDataInTemp.Value27 = dataInTemp.Value27; + newDataInTemp.Value28 = dataInTemp.Value28; + newDataInTemp.Value29 = dataInTemp.Value29; + newDataInTemp.Value30 = dataInTemp.Value30; + newDataInTemp.Value31 = dataInTemp.Value31; + newDataInTemp.Value32 = dataInTemp.Value32; + newDataInTemp.Value33 = dataInTemp.Value33; + newDataInTemp.Value34 = dataInTemp.Value34; + newDataInTemp.Value35 = dataInTemp.Value35; + newDataInTemp.Value36 = dataInTemp.Value36; + newDataInTemp.Value37 = dataInTemp.Value37; + newDataInTemp.Value38 = dataInTemp.Value38; + newDataInTemp.Value39 = dataInTemp.Value39; + newDataInTemp.Value40 = dataInTemp.Value40; + newDataInTemp.Value41 = dataInTemp.Value41; + newDataInTemp.Value42 = dataInTemp.Value42; + newDataInTemp.Value43 = dataInTemp.Value43; + newDataInTemp.Value44 = dataInTemp.Value44; + newDataInTemp.Value45 = dataInTemp.Value45; + newDataInTemp.Value46 = dataInTemp.Value46; + newDataInTemp.Value47 = dataInTemp.Value47; + newDataInTemp.Value48 = dataInTemp.Value48; + newDataInTemp.Value49 = dataInTemp.Value49; + newDataInTemp.Value50 = dataInTemp.Value50; + newDataInTemp.ToopValue = dataInTemp.ToopValue; + newDataInTemp.Type = dataInTemp.Type; + db.SubmitChanges(); + } + } + + /// + /// 根据主键删除导入临时表记录 + /// + /// 委托主键 + public static void DeleteDataInTempByDataInTempID(string tempId) + { + Model.SGGLDB db = Funs.DB; + Model.Sys_DataInTemp dataInTemp = db.Sys_DataInTemp.FirstOrDefault(e => e.TempId == tempId); + if (dataInTemp != null) + { + db.Sys_DataInTemp.DeleteOnSubmit(dataInTemp); + db.SubmitChanges(); + } + } + + /// + /// 根据项目用户主键删除导入临时表记录 + /// + /// + /// + public static void DeleteDataInTempByProjectIdUserId(string projectId, string userId, string type) + { + Model.SGGLDB db = Funs.DB; + var dataInTemp = from x in db.Sys_DataInTemp where x.ProjectId == projectId && x.UserId == userId && x.Type == type select x; + if (dataInTemp.Count() > 0) + { + db.Sys_DataInTemp.DeleteAllOnSubmit(dataInTemp); + db.SubmitChanges(); + } + } + } +} diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx index 19171c07..02d5d8a7 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx @@ -32,8 +32,8 @@ - <%----%> + @@ -154,10 +154,10 @@ Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close" Width="1024px" Height="550px"> - <%----%> + Width="1024px" Height="560px"> + <%--