From b570239439560cc684fa31e922f1420d7aa72f11 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Thu, 14 May 2026 16:26:33 +0800 Subject: [PATCH] =?UTF-8?q?20260514=20=E7=A1=AC=E5=BA=A6=E5=80=BC=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/HJGLDB_DS_2026-05-14_bwj.sql | 50 + HJGL_DS/BLL/BLL.csproj | 1 + HJGL_DS/BLL/Common/Const.cs | 5 + HJGL_DS/BLL/Common/NPOIHelper.cs | 8 +- HJGL_DS/BLL/Common/Sys_DataInTempService.cs | 175 +++ .../WeldingJointInspection.aspx | 3 +- .../WeldingJointInspection.aspx.cs | 22 +- .../WeldingJointInspection.aspx.designer.cs | 66 +- .../管道对接焊接接头报检检查记录.frx | 4 +- .../Fastreport/管道焊接接头报检检查记录.frx | 9 +- HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj | 18 + .../FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- .../HJGL/HotHardManage/HardReportSet.aspx | 7 + .../HJGL/HotHardManage/HardReportSet.aspx.cs | 19 +- .../HardReportSet.aspx.designer.cs | 74 +- .../HotHardManage/HardReportSetDataIn.aspx | 163 +++ .../HotHardManage/HardReportSetDataIn.aspx.cs | 536 +++++++ .../HardReportSetDataIn.aspx.designer.cs | 242 ++++ .../HardReportSetDataInEdit.aspx | 67 + .../HardReportSetDataInEdit.aspx.cs | 207 +++ .../HardReportSetDataInEdit.aspx.designer.cs | 152 ++ .../WeldInspectionCheckRecordItem.aspx.cs | 5 + .../JGZL/WeldInspectionCheckRecord.aspx.cs | 5 + HJGL_DS/FineUIPro.Web/Web.config | 2 +- HJGL_DS/FineUIPro.Web/res/DataInTable.js | 54 + HJGL_DS/Model/Model.cs | 1255 +++++++++++------ HJGL_DS/WebAPI/WebAPI.csproj.user | 2 +- 27 files changed, 2658 insertions(+), 495 deletions(-) create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-05-14_bwj.sql create mode 100644 HJGL_DS/BLL/Common/Sys_DataInTempService.cs create mode 100644 HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataIn.aspx create mode 100644 HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataIn.aspx.cs create mode 100644 HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataIn.aspx.designer.cs create mode 100644 HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataInEdit.aspx create mode 100644 HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataInEdit.aspx.cs create mode 100644 HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataInEdit.aspx.designer.cs create mode 100644 HJGL_DS/FineUIPro.Web/res/DataInTable.js diff --git a/DataBase/版本日志/HJGLDB_DS_2026-05-14_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-05-14_bwj.sql new file mode 100644 index 0000000..c3faeec --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-05-14_bwj.sql @@ -0,0 +1,50 @@ +CREATE TABLE [dbo].[Sys_DataInTemp]( + [TempId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [UserId] [nvarchar](50) NULL, + [Time] [datetime] NULL, + [RowNo] [int] NULL, + [ToopValue] [nvarchar](2000) NULL, + [Type] [nvarchar](50) 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, + 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, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) 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 + + diff --git a/HJGL_DS/BLL/BLL.csproj b/HJGL_DS/BLL/BLL.csproj index 029212b..994c2d6 100644 --- a/HJGL_DS/BLL/BLL.csproj +++ b/HJGL_DS/BLL/BLL.csproj @@ -166,6 +166,7 @@ + diff --git a/HJGL_DS/BLL/Common/Const.cs b/HJGL_DS/BLL/Common/Const.cs index 9dc044f..32c422b 100644 --- a/HJGL_DS/BLL/Common/Const.cs +++ b/HJGL_DS/BLL/Common/Const.cs @@ -633,6 +633,11 @@ namespace BLL /// public const string WeldingProcedureTemplateUrl = "File\\Excel\\HJGL_DataIn\\焊接工艺评定台账导入模板.xls"; + /// + /// 硬度值导入模板 + /// + public const string HardReportSetTemplateUrl = "File\\Excel\\HJGL_DataIn\\硬度值导入模板.xls"; + /// /// 通用附件上传路径 /// diff --git a/HJGL_DS/BLL/Common/NPOIHelper.cs b/HJGL_DS/BLL/Common/NPOIHelper.cs index 455fc95..0562b5e 100644 --- a/HJGL_DS/BLL/Common/NPOIHelper.cs +++ b/HJGL_DS/BLL/Common/NPOIHelper.cs @@ -101,8 +101,8 @@ namespace BLL.Common { // 2007版本 XSSFWorkbook workbook = new XSSFWorkbook(fs); - sheetNumber = workbook.NumberOfSheets; - for (int i = 0; i < sheetNumber; i++) + //sheetNumber = workbook.NumberOfSheets; + for (int i = 0; i < sheetNumber + 1; i++) { string sheetName = workbook.GetSheetName(i); sheet = workbook.GetSheet(sheetName); @@ -125,8 +125,8 @@ namespace BLL.Common { // 2003版本 HSSFWorkbook workbook = new HSSFWorkbook(fs); - sheetNumber = workbook.NumberOfSheets; - for (int i = 0; i < sheetNumber; i++) + //sheetNumber = workbook.NumberOfSheets; + for (int i = 0; i < sheetNumber + 1; i++) { string sheetName = workbook.GetSheetName(i); sheet = workbook.GetSheet(sheetName); diff --git a/HJGL_DS/BLL/Common/Sys_DataInTempService.cs b/HJGL_DS/BLL/Common/Sys_DataInTempService.cs new file mode 100644 index 0000000..6675e29 --- /dev/null +++ b/HJGL_DS/BLL/Common/Sys_DataInTempService.cs @@ -0,0 +1,175 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 导入临时表 + /// + public class Sys_DataInTempService + { + /// + /// 根据主键获取导入临时表信息 + /// + /// 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.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.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.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/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx index 65e8225..8d69a16 100644 --- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx +++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx @@ -79,7 +79,8 @@ - + <%----%> + diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs index 085f261..d94e778 100644 --- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs @@ -1,4 +1,7 @@ using BLL; +using FineUIPro.Web.common.BaseInfo; +using Model; +using NPOI.SS.Formula.Functions; using NPOI.SS.UserModel; using NPOI.SS.Util; using NPOI.XSSF.UserModel; @@ -96,10 +99,10 @@ namespace FineUIPro.Web.ContinuousPrint strSql += " AND isoInfo.ISO_ID=@isoId"; listStr.Add(new SqlParameter("@isoId", this.drpIsoId.SelectedValue)); } - if (!string.IsNullOrEmpty(this.txtWeldingDate.Text.Trim())) + if (!string.IsNullOrEmpty(this.drpWeldingDate.SelectedValue)) { strSql += " AND weldReport.JOT_WeldDate=@weldingDate"; - listStr.Add(new SqlParameter("@weldingDate", this.txtWeldingDate.Text.Trim())); + listStr.Add(new SqlParameter("@weldingDate", this.drpWeldingDate.SelectedValue)); } SqlParameter[] parameter = listStr.ToArray(); Grid2.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter); @@ -159,6 +162,19 @@ namespace FineUIPro.Web.ContinuousPrint this.drpIsoId.SelectedValue = BLL.Const._Null; BindGrid1(this.Grid1.SelectedRowID); + + //焊接日期 + this.drpWeldingDate.Items.Clear(); + this.drpWeldingDate.DataTextField = "Date"; + this.drpWeldingDate.DataValueField = "Date"; + List dateLists = (from x in Funs.DB.HJGL_BO_BatchDetail + join y in Funs.DB.HJGL_BO_Batch on x.BatchId equals y.BatchId + join z in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals z.JOT_ID + join w in Funs.DB.HJGL_BO_WeldReportMain on z.DReportID equals w.DReportID + where y.ProjectId== this.Grid1.SelectedRowID + select w.JOT_WeldDate.ToShortDateString()).Distinct().ToList(); + this.drpWeldingDate.DataSource = dateLists; + this.drpWeldingDate.DataBind(); } #endregion @@ -304,6 +320,8 @@ namespace FineUIPro.Web.ContinuousPrint { keyValuePairs.Add("NDTType", "PT"); } + string weldingDate = string.Format("{0:yyyy年MM月dd日}", Convert.ToDateTime(this.hidJOT_WeldDate.Value)); + keyValuePairs.Add("WeldingDate", weldingDate); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\管道焊接接头报检检查记录.frx"; diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.designer.cs index 3697665..7fa0f5b 100644 --- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.ContinuousPrint { - - - public partial class WeldingJointInspection { - +namespace FineUIPro.Web.ContinuousPrint +{ + + + public partial class WeldingJointInspection + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel2 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// panelTopRegion 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelTopRegion; - + /// /// Grid1 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar2 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// txtProjectCode 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectCode; - + /// /// btnSubmit 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSubmit; - + /// /// Label1 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label1; - + /// /// ToolbarSeparator1 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// panelBottomRegion 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelBottomRegion; - + /// /// Grid2 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid2; - + /// /// Toolbar3 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar3; - + /// /// btnWeldingRecord 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnWeldingRecord; - + /// /// drpIsoId 控件。 /// @@ -164,16 +166,16 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpIsoId; - + /// - /// txtWeldingDate 控件。 + /// drpWeldingDate 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DatePicker txtWeldingDate; - + protected global::FineUIPro.DropDownList drpWeldingDate; + /// /// labNumber 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label labNumber; - + /// /// hidProjectId 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.HiddenField hidProjectId; - + /// /// hidNDTR_ID 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.HiddenField hidNDTR_ID; - + /// /// hidJOTY_Group 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.HiddenField hidJOTY_Group; - + /// /// hidJOT_WeldDate 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.HiddenField hidJOT_WeldDate; - + /// /// hidProjectName 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.HiddenField hidProjectName; - + /// /// hidISO_ID 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.ContinuousPrint { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.HiddenField hidISO_ID; - + /// /// Window1 控件。 /// diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx index 37ebca6..2d55063 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx index c1835aa..1a8c850 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + @@ -63,6 +63,7 @@ namespace FastReport + @@ -269,8 +270,8 @@ namespace FastReport - - + + diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj index ae9a9fc..e9a67ef 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj @@ -46,6 +46,7 @@ 4 true false + AnyCPU pdbonly @@ -1139,6 +1140,8 @@ + + @@ -1383,6 +1386,7 @@ + @@ -5768,6 +5772,20 @@ HardReportSet.aspx + + HardReportSetDataIn.aspx + ASPXCodeBehind + + + HardReportSetDataIn.aspx + + + HardReportSetDataInEdit.aspx + ASPXCodeBehind + + + HardReportSetDataInEdit.aspx + HardTestReport.aspx ASPXCodeBehind diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index e3436b8..6e29203 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ true - Release|Any CPU + Debug|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSet.aspx b/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSet.aspx index e7a1631..5ec84c7 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSet.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSet.aspx @@ -60,6 +60,9 @@ + + @@ -186,6 +189,10 @@ + + + \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataIn.aspx.cs new file mode 100644 index 0000000..39fe9fb --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataIn.aspx.cs @@ -0,0 +1,536 @@ +using BLL; +using BLL.Common; +using Microsoft.JScript.Vsa; +using Model; +using Org.BouncyCastle.Ocsp; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.IO; +using System.Linq; +using System.Threading; + +namespace FineUIPro.Web.HJGL.HotHardManage +{ + public partial class HardReportSetDataIn : PageBase + { + #region 定义项 + /// + /// 项目id + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + + /// + /// 错误集合 + /// + public static string errorInfos = string.Empty; + #endregion + + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + if (percent == null) + { + percent = new Dictionary(); + } + this.ProjectId = Request.Params["projectId"]; + this.id.Text = this.CurrUser.UserId; + this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + // 绑定表格 + this.BindGrid(); + } + else if (GetRequestEventArgument() == "reloadGrid") + { + BindGrid(); + } + } + #endregion + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"SELECT TempId,ProjectId,UserId,Time,RowNo,ToopValue,Value1,Value2,Value3,Value4,Value5,Value6,Value7,Value8,Value9,Value10" + + @" ,Value11,Value12,Value13,Value14,Value15,Value16,Value17,Value18,Value19,Value20" + + @",ToopValue,Type" + + @" FROM Sys_DataInTemp " + + @" WHERE ProjectId=@ProjectId AND UserId=@UserId AND Type=@Type"; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.ProjectId)); + listStr.Add(new SqlParameter("@UserId", this.CurrUser.UserId)); + listStr.Add(new SqlParameter("@Type", "HardValue")); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + + var dataInTempAll = from x in Funs.DB.Sys_DataInTemp + where x.ProjectId == this.ProjectId && x.UserId == this.CurrUser.UserId && x.Type == "HardValue" + select x; + for (int i = 0; i < Grid1.Rows.Count; i++) + { + var dataInTemp = dataInTempAll.FirstOrDefault(x => x.TempId == Grid1.Rows[i].DataKeys[0].ToString()); + if (dataInTemp != null) + { + if (!string.IsNullOrEmpty(dataInTemp.ToopValue)) + { + Grid1.Rows[i].RowCssClass = "red"; + } + } + } + var errData = from x in dataInTempAll where x.ToopValue != null select x; + this.lbDataCout.Text = errData.Count().ToString(); + } + #endregion + + #region 双击事件 + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HardReportSetDataInEdit.aspx?TempId={0}&&projectId={1}", Grid1.SelectedRowID, this.ProjectId, "维护 - "))); + } + #endregion + + #region 导入信息 维护 + /// + /// 导入信息编辑 + /// + /// + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HardReportSetDataInEdit.aspx?TempId={0}&&projectId={1}", Grid1.SelectedRowID, this.ProjectId, "维护 - "))); + } + + /// + /// 删除按钮 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + BLL.Sys_DataInTempService.DeleteDataInTempByDataInTempID(rowID); + } + + ShowNotify("删除成功！", MessageBoxIcon.Success); + this.BindGrid(); + } + #endregion + + #region 分页 排序 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + BindGrid(); + } + #endregion + + #region 文件上传 + /// + /// 文件上传 + /// + /// + /// + protected void imgbtnImport_Click(object sender, EventArgs e) + { + try + { + if (this.FileExcel.HasFile == false) + { + ShowNotify("请选择Excel文件!", MessageBoxIcon.Warning); + return; + } + string IsXls = Path.GetExtension(this.FileExcel.FileName).ToString().Trim().ToLower(); + if (IsXls != ".xls" && IsXls != ".xlsx") + { + ShowNotify("只能选择Excel文件!", MessageBoxIcon.Warning); + return; + } + string rootPath = Server.MapPath("~/"); + string initFullPath = rootPath + Const.ExcelUrl; + if (!Directory.Exists(initFullPath)) + { + Directory.CreateDirectory(initFullPath); + } + //指定上传文件名称 + this.hdfileName.Text = BLL.Funs.GetNewFileName() + IsXls; + //上传文件路径 + string filePath = initFullPath + this.hdfileName.Text; + //文件上传服务器 + this.FileExcel.PostedFile.SaveAs(filePath); + //文件上传服务器后的名称 + string fileName = rootPath + Const.ExcelUrl + this.hdfileName.Text; + //读取Excel + DataSet ds = NPOIHelper.ExcelToDataSet(fileName, out errorInfos, true); + //验证Excel读取是否有误 + if (!string.IsNullOrEmpty(errorInfos)) + { + ShowNotify(errorInfos, MessageBoxIcon.Warning); + return; + } + if (ds.Tables[0].Rows.Count > 0) + { + for (int i = 0; i < ds.Tables[0].Rows.Count; i++) + { + Sys_DataInTemp newDataInTemp = new Sys_DataInTemp(); + newDataInTemp.TempId = SQLHelper.GetNewID(typeof(Model.Sys_DataInTemp)); + newDataInTemp.ProjectId = ProjectId; + newDataInTemp.UserId = this.CurrUser.UserId; + newDataInTemp.Time = DateTime.Now; + newDataInTemp.Type = "HardValue"; + newDataInTemp.RowNo = i + 1; + newDataInTemp.Value1 = ds.Tables[0].Rows[i][0].ToString(); + newDataInTemp.Value2 = ds.Tables[0].Rows[i][1].ToString(); + newDataInTemp.Value3 = ds.Tables[0].Rows[i][2].ToString(); + newDataInTemp.Value4 = ds.Tables[0].Rows[i][3].ToString(); + newDataInTemp.Value5 = ds.Tables[0].Rows[i][4].ToString(); + newDataInTemp.Value6 = ds.Tables[0].Rows[i][5].ToString(); + newDataInTemp.Value7 = ds.Tables[0].Rows[i][6].ToString(); + //newDataInTemp.Value8 = ds.Tables[0].Rows[i][7].ToString(); + //newDataInTemp.Value9 = ds.Tables[0].Rows[i][8].ToString(); + //newDataInTemp.Value10 = ds.Tables[0].Rows[i][9].ToString(); + //newDataInTemp.Value11 = ds.Tables[0].Rows[i][10].ToString(); + //newDataInTemp.Value12 = ds.Tables[0].Rows[i][11].ToString(); + //newDataInTemp.Value13 = ds.Tables[0].Rows[i][12].ToString(); + //newDataInTemp.Value14 = ds.Tables[0].Rows[i][13].ToString(); + //newDataInTemp.Value15 = ds.Tables[0].Rows[i][14].ToString(); + //newDataInTemp.Value16 = ds.Tables[0].Rows[i][15].ToString(); + //newDataInTemp.Value17 = ds.Tables[0].Rows[i][16].ToString(); + //newDataInTemp.Value18 = ds.Tables[0].Rows[i][17].ToString(); + //newDataInTemp.Value19 = ds.Tables[0].Rows[i][18].ToString(); + //newDataInTemp.Value20 = ds.Tables[0].Rows[i][19].ToString(); + + BLL.Sys_DataInTempService.AddDataInTemp(newDataInTemp); + } + this.BindGrid(); + ShowNotify("数据已导入临时表！", MessageBoxIcon.Success); + File.Delete(fileName);//删除上传的临时文件 + } + else + { + Alert.ShowInTop("导入数据为空！", MessageBoxIcon.Success); + return; + } + } + catch (Exception ex) + { + Alert.ShowInTop("'" + ex.Message + "'", MessageBoxIcon.Warning); + } + } + #endregion + + #region 保存审核事件 + /// + /// 保存审核事件 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + Thread t = new Thread(new ThreadStart(() => { btnSaveMethod(ProjectId, this.CurrUser.UserId, "HardValue"); })); + t.Start(); + if (percent.ContainsKey(this.CurrUser.UserId)) + { + percent[CurrUser.UserId] = 0; + } + else + { + percent.Add(CurrUser.UserId, 0); + + } + PageContext.RegisterStartupScript("printX()"); + } + protected void btnRefresh_Click(object sender, EventArgs e) + { + this.BindGrid(); + } + + protected void btnSaveMethod(string LoginProjectId, string UserId, string type) + { + Model.SGGLDB db = Funs.DB; + var isoInfos = from x in db.HJGL_PW_IsoInfo where x.ProjectId == LoginProjectId select x; + var jointInfos = from x in db.HJGL_PW_JointInfo where x.ProjectId == LoginProjectId select x; + var hardTestReportItemSetView = from x in db.HJGL_View_CH_HardTestReportItemSet where x.ProjectId == LoginProjectId && x.HardTestReportId == null select x; + + var dataInTemp = from x in Funs.DB.Sys_DataInTemp + where x.ProjectId == ProjectId && x.UserId == UserId && x.Type == type + select x; + int okCount = 0; + int i = 0; + int ir = dataInTemp.Count(); + string erreMessage = ""; + string isoId = string.Empty; + string jotId = string.Empty; + foreach (var tempData in dataInTemp) + { + if (tempData != null) + { + i++; + percent[UserId] = (int)(100 * i / ir); + string errInfo = string.Empty; + var isExitValue = hardTestReportItemSetView.FirstOrDefault(x => x.ISO_IsoNo == tempData.Value1.Trim() && x.JOT_JointNo == tempData.Value2.Trim() && x.TestPart == tempData.Value3.Trim()); + if (isExitValue != null) + { + if (!string.IsNullOrEmpty(tempData.Value1.Trim())) + { + var getIso = isoInfos.FirstOrDefault(x => x.ISO_IsoNo == tempData.Value1.Trim()); + if (getIso == null) + { + errInfo += "管线号[" + tempData.Value1.Trim() + "]不存在；"; + } + else + { + isoId = getIso.ISO_ID; + } + } + else + { + errInfo += "管线号为必填项；"; + } + if (!string.IsNullOrEmpty(tempData.Value2.Trim())) + { + var getJoint = jointInfos.FirstOrDefault(x => x.ISO_ID == isoId && x.JOT_JointNo == tempData.Value2.Trim()); + if (getJoint == null) + { + errInfo += "焊口号[" + tempData.Value2.Trim() + "]不存在；"; + } + else + { + jotId = getJoint.JOT_ID; + } + } + else + { + errInfo += "焊口号为必填项；"; + } + if (!string.IsNullOrEmpty(tempData.Value3.Trim())) + { + if (tempData.Value3.Trim() != "焊缝" && tempData.Value3.Trim() != "热影响区") + { + errInfo += "试验部位[" + tempData.Value3.Trim() + "]错误；"; + } + } + else + { + errInfo += "试验部位为必填项；"; + } + if (!string.IsNullOrEmpty(tempData.Value4.Trim())) + { + try + { + int hardNessValue1 = Convert.ToInt32(tempData.Value4.Trim()); + if (hardNessValue1 > 999) + { + errInfo += "硬度值1[" + tempData.Value4.Trim() + "]不能超过3位数；"; + } + } + catch (Exception) + { + + errInfo += "硬度值1[" + tempData.Value4.Trim() + "]格式错误；"; + } + } + else + { + errInfo += "硬度值1为必填项；"; + } + if (!string.IsNullOrEmpty(tempData.Value5.Trim())) + { + try + { + int hardNessValue2 = Convert.ToInt32(tempData.Value5.Trim()); + if (hardNessValue2 > 999) + { + errInfo += "硬度值1[" + tempData.Value5.Trim() + "]不能超过3位数；"; + } + } + catch (Exception) + { + + errInfo += "硬度值2[" + tempData.Value5.Trim() + "]格式错误；"; + } + } + else + { + errInfo += "硬度值2为必填项；"; + } + if (!string.IsNullOrEmpty(tempData.Value6.Trim())) + { + try + { + int hardNessValue3 = Convert.ToInt32(tempData.Value6.Trim()); + if (hardNessValue3 > 999) + { + errInfo += "硬度值3[" + tempData.Value6.Trim() + "]不能超过3位数；"; + } + } + catch (Exception) + { + + errInfo += "硬度值3[" + tempData.Value6.Trim() + "]格式错误；"; + } + } + else + { + errInfo += "硬度值3为必填项；"; + } + } + else + { + errInfo += "该记录不存在，请核对；"; + } + if (string.IsNullOrEmpty(errInfo)) ////所有信息正确的话 插入数据 + { + var item1 = (from x in db.HJGL_CH_HardTestReportItem where x.HardTestReportItemId == isExitValue.HardTestReportItemId select x).FirstOrDefault(); + if (item1 != null) + { + item1.HardNessValue = Funs.GetNewInt(tempData.Value4.Trim()); + item1.Remark = tempData.Value7.Trim(); + } + var item2 = (from x in db.HJGL_CH_HardTestReportItem where x.HardTestReportItemId == isExitValue.HardTestReportItemId2 select x).FirstOrDefault(); + if (item2 != null) + { + item2.HardNessValue = Funs.GetNewInt(tempData.Value5.Trim()); + item2.Remark = tempData.Value7.Trim(); + } + var item3 = (from x in db.HJGL_CH_HardTestReportItem where x.HardTestReportItemId == isExitValue.HardTestReportItemId3 select x).FirstOrDefault(); + if (item3 != null) + { + item3.HardNessValue = Funs.GetNewInt(tempData.Value6.Trim()); + item3.Remark = tempData.Value7.Trim(); + } + db.SubmitChanges(); + BLL.Sys_DataInTempService.DeleteDataInTempByDataInTempID(tempData.TempId); + okCount++; + } + if (!string.IsNullOrEmpty(errInfo)) + { + tempData.ToopValue = errInfo; + BLL.Sys_DataInTempService.UpdateDataInTemp(tempData); + erreMessage += errInfo + ";"; + } + } + } + } + #endregion + + #region 删除所有数据事件 + /// + /// 删除所有数据事件 + /// + /// + /// + protected void btnAllDelete_Click(object sender, EventArgs e) + { + //先删除临时表中 该人员以前导入的数据 + BLL.Sys_DataInTempService.DeleteDataInTempByProjectIdUserId(ProjectId, this.CurrUser.UserId, "HardValue"); + this.BindGrid(); + ShowNotify("删除成功！", MessageBoxIcon.Success); + this.lbDataCout.Text = string.Empty; + } + #endregion + + #region 下载模版 + /// + /// 下载模版 + /// + /// + /// + protected void imgbtnUpload_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string uploadfilepath = rootPath + Const.HardReportSetTemplateUrl; + string filePath = Const.HardReportSetTemplateUrl; + string fileName = Path.GetFileName(filePath); + FileInfo info = new FileInfo(uploadfilepath); + long fileSize = info.Length; + Response.ClearContent(); + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.ContentType = "excel/plain"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + Response.AddHeader("Content-Length", fileSize.ToString().Trim()); + Response.TransmitFile(uploadfilepath, 0, fileSize); + Response.End(); + } + #endregion + + public static Dictionary percent { get; set; } + public static Dictionary url { get; set; } + + [System.Web.Services.WebMethod] + public static int getPercent(string id) + { + return percent[id]; + } + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataIn.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataIn.aspx.designer.cs new file mode 100644 index 0000000..1bc3db1 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataIn.aspx.designer.cs @@ -0,0 +1,242 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HJGL.HotHardManage +{ + + + public partial class HardReportSetDataIn + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// id 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField id; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// hdfileName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdfileName; + + /// + /// FileExcel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FileUpload FileExcel; + + /// + /// imgbtnImport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgbtnImport; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnRefresh 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnRefresh; + + /// + /// btnAllDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAllDelete; + + /// + /// imgbtnUpload 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgbtnUpload; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// lbDataCout 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbDataCout; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Window2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window2; + + /// + /// ContentPanel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel3; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + + /// + /// ScriptManager2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.ScriptManager ScriptManager2; + } +} diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataInEdit.aspx b/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataInEdit.aspx new file mode 100644 index 0000000..e1c6671 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataInEdit.aspx @@ -0,0 +1,67 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HardReportSetDataInEdit.aspx.cs" Inherits="FineUIPro.Web.HJGL.HotHardManage.HardReportSetDataInEdit" %> + + + + + + + 修改错误信息 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataInEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataInEdit.aspx.cs new file mode 100644 index 0000000..4ce0dd1 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataInEdit.aspx.cs @@ -0,0 +1,207 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.HJGL.HotHardManage +{ + public partial class HardReportSetDataInEdit : PageBase + { + #region 定义项 + /// + /// 临时表主键 + /// + public string TempId + { + get + { + return (string)ViewState["TempId"]; + } + set + { + ViewState["TempId"] = value; + } + } + + /// + /// 项目id + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + #endregion + + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.TempId = Request.Params["TempId"]; + this.ProjectId = Request.Params["projectId"]; + this.txtValue1.Focus(); + var dataInTemp = BLL.Sys_DataInTempService.GetDataInTempByTempId(this.TempId); + if (dataInTemp != null) + { + this.txtValue1.Text = dataInTemp.Value1; + this.txtValue2.Text = dataInTemp.Value2; + this.txtValue3.Text = dataInTemp.Value3; + this.txtValue4.Text = dataInTemp.Value4; + this.txtValue5.Text = dataInTemp.Value5; + this.txtValue6.Text = dataInTemp.Value6; + this.txtValue7.Text = dataInTemp.Value7; + + this.lbErrCout.Text = dataInTemp.ToopValue; + } + } + } + #endregion + + #region 保存按钮 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + var dataInTemp = BLL.Sys_DataInTempService.GetDataInTempByTempId(this.TempId); + if (this.ckAll.Checked) + { + var allDataInTemp = from x in Funs.DB.Sys_DataInTemp where x.ProjectId == this.ProjectId && x.UserId == this.CurrUser.UserId && x.Type == "HardValue" select x; + if (dataInTemp.Value1 != this.txtValue1.Text.Trim()) + { + var tempValue1 = allDataInTemp.Where(x => x.Value1 == dataInTemp.Value1 || (x.Value1 == null && dataInTemp.Value1 == null)); + if (tempValue1 != null) + { + foreach (var item in tempValue1) + { + item.Value1 = this.txtValue1.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value2 != this.txtValue2.Text.Trim()) + { + var tempValue2 = allDataInTemp.Where(x => x.Value2 == dataInTemp.Value2 || (x.Value2 == null && dataInTemp.Value2 == null)); + if (tempValue2 != null) + { + foreach (var item in tempValue2) + { + item.Value2 = this.txtValue2.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value3 != this.txtValue3.Text.Trim()) + { + var tempValue3 = allDataInTemp.Where(x => x.Value3 == dataInTemp.Value3 || (x.Value3 == null && dataInTemp.Value3 == null)); + if (tempValue3 != null) + { + foreach (var item in tempValue3) + { + item.Value3 = this.txtValue3.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value4 != this.txtValue4.Text.Trim()) + { + var tempValue4 = allDataInTemp.Where(x => x.Value4 == dataInTemp.Value4 || (x.Value4 == null && dataInTemp.Value4 == null)); + if (tempValue4 != null) + { + foreach (var item in tempValue4) + { + item.Value4 = this.txtValue4.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value5 != this.txtValue5.Text.Trim()) + { + var tempValue5 = allDataInTemp.Where(x => x.Value5 == dataInTemp.Value5 || (x.Value5 == null && dataInTemp.Value5 == null)); + if (tempValue5 != null) + { + foreach (var item in tempValue5) + { + item.Value5 = this.txtValue5.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value6 != this.txtValue6.Text.Trim()) + { + var tempValue6 = allDataInTemp.Where(x => x.Value6 == dataInTemp.Value6 || (x.Value6 == null && dataInTemp.Value6 == null)); + if (tempValue6 != null) + { + foreach (var item in tempValue6) + { + item.Value6 = this.txtValue6.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value7 != this.txtValue7.Text.Trim()) + { + var tempValue7 = allDataInTemp.Where(x => x.Value7 == dataInTemp.Value7 || (x.Value7 == null && dataInTemp.Value7 == null)); + if (tempValue7 != null) + { + foreach (var item in tempValue7) + { + item.Value7 = this.txtValue7.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + var toopValue = allDataInTemp.Where(x => x.ToopValue == dataInTemp.ToopValue); + if (toopValue != null) + { + foreach (var item in toopValue) + { + item.ToopValue = null; + Funs.DB.SubmitChanges(); + } + } + } + else + { + Model.Sys_DataInTemp newDataInTemp = new Model.Sys_DataInTemp(); + newDataInTemp.ProjectId = ProjectId; + newDataInTemp.UserId = this.CurrUser.UserId; + newDataInTemp.Time = DateTime.Now; + newDataInTemp.Type = "HardValue"; + newDataInTemp.Value1 = this.txtValue1.Text.Trim(); + newDataInTemp.Value2 = this.txtValue2.Text.Trim(); + newDataInTemp.Value3 = this.txtValue3.Text.Trim(); + newDataInTemp.Value4 = this.txtValue4.Text.Trim(); + newDataInTemp.Value5 = this.txtValue5.Text.Trim(); + newDataInTemp.Value6 = this.txtValue6.Text.Trim(); + newDataInTemp.Value7 = this.txtValue7.Text.Trim(); + if (!string.IsNullOrEmpty(this.TempId)) + { + newDataInTemp.TempId = this.TempId; + newDataInTemp.ToopValue = null; + BLL.Sys_DataInTempService.UpdateDataInTemp(newDataInTemp); + } + } + ShowNotify("信息修改完成！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataInEdit.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataInEdit.aspx.designer.cs new file mode 100644 index 0000000..bbee077 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSetDataInEdit.aspx.designer.cs @@ -0,0 +1,152 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HJGL.HotHardManage +{ + + + public partial class HardReportSetDataInEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// txtValue1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue1; + + /// + /// txtValue2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue2; + + /// + /// txtValue3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue3; + + /// + /// txtValue4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue4; + + /// + /// txtValue5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue5; + + /// + /// txtValue6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue6; + + /// + /// txtValue7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue7; + + /// + /// ckAll 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox ckAll; + + /// + /// lbErrCout 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea lbErrCout; + } +} diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs index 2824200..b599fbb 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs @@ -576,6 +576,11 @@ namespace FineUIPro.Web.HJGL.WeldingReport { keyValuePairs.Add("NDTType", "PT"); } + if (this.drpWeldingDate.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpWeldingDate.SelectedValue)) + { + string weldingDate = string.Format("{0:yyyy年MM月dd日}", Convert.ToDateTime(this.drpWeldingDate.SelectedValue)); + keyValuePairs.Add("WeldingDate", weldingDate); + } BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\管道焊接接头报检检查记录.frx"; diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs index 9af1989..d86bcb3 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs @@ -346,6 +346,11 @@ namespace FineUIPro.Web.JGZL { keyValuePairs.Add("NDTType", "PT"); } + if (this.drpWeldingDate.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpWeldingDate.SelectedValue)) + { + string weldingDate = string.Format("{0:yyyy年MM月dd日}", Convert.ToDateTime(this.drpWeldingDate.SelectedValue)); + keyValuePairs.Add("WeldingDate", weldingDate); + } BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\JGZL\\管道焊接接头报检检查记录.frx"; diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 3c98f31..557f12f 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -67,7 +67,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/res/DataInTable.js b/HJGL_DS/FineUIPro.Web/res/DataInTable.js new file mode 100644 index 0000000..dbf9322 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/res/DataInTable.js @@ -0,0 +1,54 @@ +var menuID = 'Menu1'; +// 返回false，来阻止浏览器右键菜单 +function onRowContextMenu(event, rowId) { + F(menuID).show(); //showAt(event.pageX, event.pageY); + return false; +} +function reloadGrid() { + __doPostBack(null, 'reloadGrid'); +} + + +function parse(y) { + var box = document.getElementById("box"); + //获取进度条div的宽度 + var x = box.style.width; + x = parseInt(x) + 1; + y = y + 1; + //将y值加上百分号赋值给box的宽度。这样每次+1就可以实现进度条占父容器的100%; + box.style.width = y + "%"; + //将y值加上百分号并赋值给显示下载百分比的div上 + document.getElementById("box").innerHTML = y + "%"; + //判断当y已经100的时候，也就是进度条的宽度和父容器的宽度一致的时候停止。 + if (y >= 100) { + + document.getElementById("box").innerHTML = "100%"; + } +} + + + + + +function printX() { + var userid = document.getElementById('id-inputEl').value; + F.ui.Window2.show(); + parse(0); + var begin = setInterval(function () { + PageMethods.getPercent(userid,function (result) { + console.log(result); + parse(result); + if (result >= 100) { + F.ui.Window2.hide(); + document.getElementById('btnRefresh').click(); + clearInterval(begin); + } + }); + }, 1000); + + + y = 0; + + + +} diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index 7618bbc..e6a5fca 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -626,6 +626,9 @@ namespace Model partial void InsertSys_Const(Sys_Const instance); partial void UpdateSys_Const(Sys_Const instance); partial void DeleteSys_Const(Sys_Const instance); + partial void InsertSys_DataInTemp(Sys_DataInTemp instance); + partial void UpdateSys_DataInTemp(Sys_DataInTemp instance); + partial void DeleteSys_DataInTemp(Sys_DataInTemp instance); partial void InsertSys_ErrLogInfo(Sys_ErrLogInfo instance); partial void UpdateSys_ErrLogInfo(Sys_ErrLogInfo instance); partial void DeleteSys_ErrLogInfo(Sys_ErrLogInfo instance); @@ -2618,6 +2621,14 @@ namespace Model } } + public System.Data.Linq.Table Sys_DataInTemp + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Sys_ErrLogInfo { get @@ -4955,6 +4966,8 @@ namespace Model private EntitySet _SYBData_SpringSupportHangBracket; + private EntitySet _Sys_DataInTemp; + private EntitySet _Weld_ProjectPlan; private EntitySet _Weld_RecycleMat; @@ -5109,6 +5122,7 @@ namespace Model this._SYBData_PressureTestPackageList = new EntitySet(new Action(this.attach_SYBData_PressureTestPackageList), new Action(this.detach_SYBData_PressureTestPackageList)); this._SYBData_SlidingFixed = new EntitySet(new Action(this.attach_SYBData_SlidingFixed), new Action(this.detach_SYBData_SlidingFixed)); this._SYBData_SpringSupportHangBracket = new EntitySet(new Action(this.attach_SYBData_SpringSupportHangBracket), new Action(this.detach_SYBData_SpringSupportHangBracket)); + this._Sys_DataInTemp = new EntitySet(new Action(this.attach_Sys_DataInTemp), new Action(this.detach_Sys_DataInTemp)); this._Weld_ProjectPlan = new EntitySet(new Action(this.attach_Weld_ProjectPlan), new Action(this.detach_Weld_ProjectPlan)); this._Weld_RecycleMat = new EntitySet(new Action(this.attach_Weld_RecycleMat), new Action(this.detach_Weld_RecycleMat)); this._Weld_RecycleMatTop = new EntitySet(new Action(this.attach_Weld_RecycleMatTop), new Action(this.detach_Weld_RecycleMatTop)); @@ -6816,6 +6830,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Sys_DataInTemp_Base_Project", Storage="_Sys_DataInTemp", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet Sys_DataInTemp + { + get + { + return this._Sys_DataInTemp; + } + set + { + this._Sys_DataInTemp.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_ProjectPlan_Base_Project", Storage="_Weld_ProjectPlan", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet Weld_ProjectPlan { @@ -7944,6 +7971,18 @@ namespace Model entity.Base_Project = null; } + private void attach_Sys_DataInTemp(Sys_DataInTemp entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_Sys_DataInTemp(Sys_DataInTemp entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_Weld_ProjectPlan(Weld_ProjectPlan entity) { this.SendPropertyChanging(); @@ -51036,7 +51075,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="y2", Storage="_Y2", DbType="NVarChar(1)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="y2", Storage="_Y2", DbType="NVarChar(50)")] public string Y2 { get @@ -120070,6 +120109,774 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Sys_DataInTemp")] + public partial class Sys_DataInTemp : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _TempId; + + private string _ProjectId; + + private string _UserId; + + private System.Nullable _Time; + + private System.Nullable _RowNo; + + private string _ToopValue; + + private string _Type; + + private string _Value1; + + private string _Value2; + + private string _Value3; + + private string _Value4; + + private string _Value5; + + private string _Value6; + + private string _Value7; + + private string _Value8; + + private string _Value9; + + private string _Value10; + + private string _Value11; + + private string _Value12; + + private string _Value13; + + private string _Value14; + + private string _Value15; + + private string _Value16; + + private string _Value17; + + private string _Value18; + + private string _Value19; + + private string _Value20; + + private EntityRef _Base_Project; + + private EntityRef _Sys_User; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnTempIdChanging(string value); + partial void OnTempIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnUserIdChanging(string value); + partial void OnUserIdChanged(); + partial void OnTimeChanging(System.Nullable value); + partial void OnTimeChanged(); + partial void OnRowNoChanging(System.Nullable value); + partial void OnRowNoChanged(); + partial void OnToopValueChanging(string value); + partial void OnToopValueChanged(); + partial void OnTypeChanging(string value); + partial void OnTypeChanged(); + partial void OnValue1Changing(string value); + partial void OnValue1Changed(); + partial void OnValue2Changing(string value); + partial void OnValue2Changed(); + partial void OnValue3Changing(string value); + partial void OnValue3Changed(); + partial void OnValue4Changing(string value); + partial void OnValue4Changed(); + partial void OnValue5Changing(string value); + partial void OnValue5Changed(); + partial void OnValue6Changing(string value); + partial void OnValue6Changed(); + partial void OnValue7Changing(string value); + partial void OnValue7Changed(); + partial void OnValue8Changing(string value); + partial void OnValue8Changed(); + partial void OnValue9Changing(string value); + partial void OnValue9Changed(); + partial void OnValue10Changing(string value); + partial void OnValue10Changed(); + partial void OnValue11Changing(string value); + partial void OnValue11Changed(); + partial void OnValue12Changing(string value); + partial void OnValue12Changed(); + partial void OnValue13Changing(string value); + partial void OnValue13Changed(); + partial void OnValue14Changing(string value); + partial void OnValue14Changed(); + partial void OnValue15Changing(string value); + partial void OnValue15Changed(); + partial void OnValue16Changing(string value); + partial void OnValue16Changed(); + partial void OnValue17Changing(string value); + partial void OnValue17Changed(); + partial void OnValue18Changing(string value); + partial void OnValue18Changed(); + partial void OnValue19Changing(string value); + partial void OnValue19Changed(); + partial void OnValue20Changing(string value); + partial void OnValue20Changed(); + #endregion + + public Sys_DataInTemp() + { + this._Base_Project = default(EntityRef); + this._Sys_User = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TempId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string TempId + { + get + { + return this._TempId; + } + set + { + if ((this._TempId != value)) + { + this.OnTempIdChanging(value); + this.SendPropertyChanging(); + this._TempId = value; + this.SendPropertyChanged("TempId"); + this.OnTempIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserId", DbType="NVarChar(50)")] + public string UserId + { + get + { + return this._UserId; + } + set + { + if ((this._UserId != value)) + { + if (this._Sys_User.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnUserIdChanging(value); + this.SendPropertyChanging(); + this._UserId = value; + this.SendPropertyChanged("UserId"); + this.OnUserIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Time", DbType="DateTime")] + public System.Nullable Time + { + get + { + return this._Time; + } + set + { + if ((this._Time != value)) + { + this.OnTimeChanging(value); + this.SendPropertyChanging(); + this._Time = value; + this.SendPropertyChanged("Time"); + this.OnTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RowNo", DbType="Int")] + public System.Nullable RowNo + { + get + { + return this._RowNo; + } + set + { + if ((this._RowNo != value)) + { + this.OnRowNoChanging(value); + this.SendPropertyChanging(); + this._RowNo = value; + this.SendPropertyChanged("RowNo"); + this.OnRowNoChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ToopValue", DbType="NVarChar(2000)")] + public string ToopValue + { + get + { + return this._ToopValue; + } + set + { + if ((this._ToopValue != value)) + { + this.OnToopValueChanging(value); + this.SendPropertyChanging(); + this._ToopValue = value; + this.SendPropertyChanged("ToopValue"); + this.OnToopValueChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="NVarChar(50)")] + public string Type + { + get + { + return this._Type; + } + set + { + if ((this._Type != value)) + { + this.OnTypeChanging(value); + this.SendPropertyChanging(); + this._Type = value; + this.SendPropertyChanged("Type"); + this.OnTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value1", DbType="NVarChar(100)")] + public string Value1 + { + get + { + return this._Value1; + } + set + { + if ((this._Value1 != value)) + { + this.OnValue1Changing(value); + this.SendPropertyChanging(); + this._Value1 = value; + this.SendPropertyChanged("Value1"); + this.OnValue1Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value2", DbType="NVarChar(100)")] + public string Value2 + { + get + { + return this._Value2; + } + set + { + if ((this._Value2 != value)) + { + this.OnValue2Changing(value); + this.SendPropertyChanging(); + this._Value2 = value; + this.SendPropertyChanged("Value2"); + this.OnValue2Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value3", DbType="NVarChar(100)")] + public string Value3 + { + get + { + return this._Value3; + } + set + { + if ((this._Value3 != value)) + { + this.OnValue3Changing(value); + this.SendPropertyChanging(); + this._Value3 = value; + this.SendPropertyChanged("Value3"); + this.OnValue3Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value4", DbType="NVarChar(100)")] + public string Value4 + { + get + { + return this._Value4; + } + set + { + if ((this._Value4 != value)) + { + this.OnValue4Changing(value); + this.SendPropertyChanging(); + this._Value4 = value; + this.SendPropertyChanged("Value4"); + this.OnValue4Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value5", DbType="NVarChar(100)")] + public string Value5 + { + get + { + return this._Value5; + } + set + { + if ((this._Value5 != value)) + { + this.OnValue5Changing(value); + this.SendPropertyChanging(); + this._Value5 = value; + this.SendPropertyChanged("Value5"); + this.OnValue5Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value6", DbType="NVarChar(100)")] + public string Value6 + { + get + { + return this._Value6; + } + set + { + if ((this._Value6 != value)) + { + this.OnValue6Changing(value); + this.SendPropertyChanging(); + this._Value6 = value; + this.SendPropertyChanged("Value6"); + this.OnValue6Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value7", DbType="NVarChar(100)")] + public string Value7 + { + get + { + return this._Value7; + } + set + { + if ((this._Value7 != value)) + { + this.OnValue7Changing(value); + this.SendPropertyChanging(); + this._Value7 = value; + this.SendPropertyChanged("Value7"); + this.OnValue7Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value8", DbType="NVarChar(100)")] + public string Value8 + { + get + { + return this._Value8; + } + set + { + if ((this._Value8 != value)) + { + this.OnValue8Changing(value); + this.SendPropertyChanging(); + this._Value8 = value; + this.SendPropertyChanged("Value8"); + this.OnValue8Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value9", DbType="NVarChar(100)")] + public string Value9 + { + get + { + return this._Value9; + } + set + { + if ((this._Value9 != value)) + { + this.OnValue9Changing(value); + this.SendPropertyChanging(); + this._Value9 = value; + this.SendPropertyChanged("Value9"); + this.OnValue9Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value10", DbType="NVarChar(100)")] + public string Value10 + { + get + { + return this._Value10; + } + set + { + if ((this._Value10 != value)) + { + this.OnValue10Changing(value); + this.SendPropertyChanging(); + this._Value10 = value; + this.SendPropertyChanged("Value10"); + this.OnValue10Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value11", DbType="NVarChar(100)")] + public string Value11 + { + get + { + return this._Value11; + } + set + { + if ((this._Value11 != value)) + { + this.OnValue11Changing(value); + this.SendPropertyChanging(); + this._Value11 = value; + this.SendPropertyChanged("Value11"); + this.OnValue11Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value12", DbType="NVarChar(100)")] + public string Value12 + { + get + { + return this._Value12; + } + set + { + if ((this._Value12 != value)) + { + this.OnValue12Changing(value); + this.SendPropertyChanging(); + this._Value12 = value; + this.SendPropertyChanged("Value12"); + this.OnValue12Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value13", DbType="NVarChar(100)")] + public string Value13 + { + get + { + return this._Value13; + } + set + { + if ((this._Value13 != value)) + { + this.OnValue13Changing(value); + this.SendPropertyChanging(); + this._Value13 = value; + this.SendPropertyChanged("Value13"); + this.OnValue13Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value14", DbType="NVarChar(100)")] + public string Value14 + { + get + { + return this._Value14; + } + set + { + if ((this._Value14 != value)) + { + this.OnValue14Changing(value); + this.SendPropertyChanging(); + this._Value14 = value; + this.SendPropertyChanged("Value14"); + this.OnValue14Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value15", DbType="NVarChar(100)")] + public string Value15 + { + get + { + return this._Value15; + } + set + { + if ((this._Value15 != value)) + { + this.OnValue15Changing(value); + this.SendPropertyChanging(); + this._Value15 = value; + this.SendPropertyChanged("Value15"); + this.OnValue15Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value16", DbType="NVarChar(100)")] + public string Value16 + { + get + { + return this._Value16; + } + set + { + if ((this._Value16 != value)) + { + this.OnValue16Changing(value); + this.SendPropertyChanging(); + this._Value16 = value; + this.SendPropertyChanged("Value16"); + this.OnValue16Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value17", DbType="NVarChar(100)")] + public string Value17 + { + get + { + return this._Value17; + } + set + { + if ((this._Value17 != value)) + { + this.OnValue17Changing(value); + this.SendPropertyChanging(); + this._Value17 = value; + this.SendPropertyChanged("Value17"); + this.OnValue17Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value18", DbType="NVarChar(100)")] + public string Value18 + { + get + { + return this._Value18; + } + set + { + if ((this._Value18 != value)) + { + this.OnValue18Changing(value); + this.SendPropertyChanging(); + this._Value18 = value; + this.SendPropertyChanged("Value18"); + this.OnValue18Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value19", DbType="NVarChar(100)")] + public string Value19 + { + get + { + return this._Value19; + } + set + { + if ((this._Value19 != value)) + { + this.OnValue19Changing(value); + this.SendPropertyChanging(); + this._Value19 = value; + this.SendPropertyChanged("Value19"); + this.OnValue19Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value20", DbType="NVarChar(100)")] + public string Value20 + { + get + { + return this._Value20; + } + set + { + if ((this._Value20 != value)) + { + this.OnValue20Changing(value); + this.SendPropertyChanging(); + this._Value20 = value; + this.SendPropertyChanged("Value20"); + this.OnValue20Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Sys_DataInTemp_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.Sys_DataInTemp.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.Sys_DataInTemp.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Sys_DataInTemp_Sys_User", Storage="_Sys_User", ThisKey="UserId", OtherKey="UserId", IsForeignKey=true)] + public Sys_User Sys_User + { + get + { + return this._Sys_User.Entity; + } + set + { + Sys_User previousValue = this._Sys_User.Entity; + if (((previousValue != value) + || (this._Sys_User.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Sys_User.Entity = null; + previousValue.Sys_DataInTemp.Remove(this); + } + this._Sys_User.Entity = value; + if ((value != null)) + { + value.Sys_DataInTemp.Add(this); + this._UserId = value.UserId; + } + else + { + this._UserId = default(string); + } + this.SendPropertyChanged("Sys_User"); + } + } + } + + 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.Sys_ErrLogInfo")] public partial class Sys_ErrLogInfo : INotifyPropertyChanging, INotifyPropertyChanged { @@ -122193,6 +123000,8 @@ namespace Model private EntitySet _Project_UserPower; + private EntitySet _Sys_DataInTemp; + private EntitySet _Sys_Log; private EntityRef _Base_Depart; @@ -122302,6 +123111,7 @@ namespace Model this._Project_User = new EntitySet(new Action(this.attach_Project_User), new Action(this.detach_Project_User)); this._Project_UserButtonPower = new EntitySet(new Action(this.attach_Project_UserButtonPower), new Action(this.detach_Project_UserButtonPower)); this._Project_UserPower = new EntitySet(new Action(this.attach_Project_UserPower), new Action(this.detach_Project_UserPower)); + this._Sys_DataInTemp = new EntitySet(new Action(this.attach_Sys_DataInTemp), new Action(this.detach_Sys_DataInTemp)); this._Sys_Log = new EntitySet(new Action(this.attach_Sys_Log), new Action(this.detach_Sys_Log)); this._Base_Depart = default(EntityRef); this._Base_Unit = default(EntityRef); @@ -123379,6 +124189,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Sys_DataInTemp_Sys_User", Storage="_Sys_DataInTemp", ThisKey="UserId", OtherKey="UserId", DeleteRule="NO ACTION")] + public EntitySet Sys_DataInTemp + { + get + { + return this._Sys_DataInTemp; + } + set + { + this._Sys_DataInTemp.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Sys_Log_Sys_User_UserId", Storage="_Sys_Log", ThisKey="UserId", OtherKey="UserId", DeleteRule="NO ACTION")] public EntitySet Sys_Log { @@ -124115,6 +124938,18 @@ namespace Model entity.Sys_User = null; } + private void attach_Sys_DataInTemp(Sys_DataInTemp entity) + { + this.SendPropertyChanging(); + entity.Sys_User = this; + } + + private void detach_Sys_DataInTemp(Sys_DataInTemp entity) + { + this.SendPropertyChanging(); + entity.Sys_User = null; + } + private void attach_Sys_Log(Sys_Log entity) { this.SendPropertyChanging(); @@ -131917,8 +132752,6 @@ namespace Model private EntityRef _Base_Project; - private EntityRef _Weld_WeldInfo; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -131940,7 +132773,6 @@ namespace Model public Weld_ProjectPlan() { this._Base_Project = default(EntityRef); - this._Weld_WeldInfo = default(EntityRef); OnCreated(); } @@ -131999,10 +132831,6 @@ namespace Model { if ((this._WeldId != value)) { - if (this._Weld_WeldInfo.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnWeldIdChanging(value); this.SendPropertyChanging(); this._WeldId = value; @@ -132106,40 +132934,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_ProjectPlan_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)] - public Weld_WeldInfo Weld_WeldInfo - { - get - { - return this._Weld_WeldInfo.Entity; - } - set - { - Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity; - if (((previousValue != value) - || (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Weld_WeldInfo.Entity = null; - previousValue.Weld_ProjectPlan.Remove(this); - } - this._Weld_WeldInfo.Entity = value; - if ((value != null)) - { - value.Weld_ProjectPlan.Add(this); - this._WeldId = value.WeldId; - } - else - { - this._WeldId = default(string); - } - this.SendPropertyChanged("Weld_WeldInfo"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -132393,8 +133187,6 @@ namespace Model private EntityRef _Weld_UsingPlan; - private EntityRef _Weld_WeldInfo; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -132443,7 +133235,6 @@ namespace Model this._Weld_Storeman = default(EntityRef); this._Weld_UsingMat = default(EntityRef); this._Weld_UsingPlan = default(EntityRef); - this._Weld_WeldInfo = default(EntityRef); OnCreated(); } @@ -132522,10 +133313,6 @@ namespace Model { if ((this._WeldId != value)) { - if (this._Weld_WeldInfo.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnWeldIdChanging(value); this.SendPropertyChanging(); this._WeldId = value; @@ -132963,40 +133750,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_RecycleMat_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)] - public Weld_WeldInfo Weld_WeldInfo - { - get - { - return this._Weld_WeldInfo.Entity; - } - set - { - Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity; - if (((previousValue != value) - || (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Weld_WeldInfo.Entity = null; - previousValue.Weld_RecycleMat.Remove(this); - } - this._Weld_WeldInfo.Entity = value; - if ((value != null)) - { - value.Weld_RecycleMat.Add(this); - this._WeldId = value.WeldId; - } - else - { - this._WeldId = default(string); - } - this.SendPropertyChanged("Weld_WeldInfo"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -133060,8 +133813,6 @@ namespace Model private EntityRef _Weld_UsingPlan; - private EntityRef _Weld_WeldInfo; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -133102,7 +133853,6 @@ namespace Model this._Weld_Storeman = default(EntityRef); this._Weld_UsingMat = default(EntityRef); this._Weld_UsingPlan = default(EntityRef); - this._Weld_WeldInfo = default(EntityRef); OnCreated(); } @@ -133181,10 +133931,6 @@ namespace Model { if ((this._WeldId != value)) { - if (this._Weld_WeldInfo.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnWeldIdChanging(value); this.SendPropertyChanging(); this._WeldId = value; @@ -133542,40 +134288,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_RecycleMatTop_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)] - public Weld_WeldInfo Weld_WeldInfo - { - get - { - return this._Weld_WeldInfo.Entity; - } - set - { - Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity; - if (((previousValue != value) - || (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Weld_WeldInfo.Entity = null; - previousValue.Weld_RecycleMatTop.Remove(this); - } - this._Weld_WeldInfo.Entity = value; - if ((value != null)) - { - value.Weld_RecycleMatTop.Add(this); - this._WeldId = value.WeldId; - } - else - { - this._WeldId = default(string); - } - this.SendPropertyChanged("Weld_WeldInfo"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -134496,8 +135208,6 @@ namespace Model private System.Nullable _Weight; - private EntityRef _Weld_WeldInfo; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -134514,7 +135224,6 @@ namespace Model public Weld_StockInit() { - this._Weld_WeldInfo = default(EntityRef); OnCreated(); } @@ -134549,10 +135258,6 @@ namespace Model { if ((this._WeldId != value)) { - if (this._Weld_WeldInfo.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnWeldIdChanging(value); this.SendPropertyChanging(); this._WeldId = value; @@ -134602,40 +135307,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_StockInit_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)] - public Weld_WeldInfo Weld_WeldInfo - { - get - { - return this._Weld_WeldInfo.Entity; - } - set - { - Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity; - if (((previousValue != value) - || (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Weld_WeldInfo.Entity = null; - previousValue.Weld_StockInit.Remove(this); - } - this._Weld_WeldInfo.Entity = value; - if ((value != null)) - { - value.Weld_StockInit.Add(this); - this._WeldId = value.WeldId; - } - else - { - this._WeldId = default(string); - } - this.SendPropertyChanged("Weld_WeldInfo"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -135546,8 +136217,6 @@ namespace Model private EntityRef _Weld_UsingPlan; - private EntityRef _Weld_WeldInfo; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -135603,7 +136272,6 @@ namespace Model this._Base_Project = default(EntityRef); this._Weld_Storeman = default(EntityRef); this._Weld_UsingPlan = default(EntityRef); - this._Weld_WeldInfo = default(EntityRef); OnCreated(); } @@ -135682,10 +136350,6 @@ namespace Model { if ((this._WeldId != value)) { - if (this._Weld_WeldInfo.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnWeldIdChanging(value); this.SendPropertyChanging(); this._WeldId = value; @@ -136171,40 +136835,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_UsingMat_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)] - public Weld_WeldInfo Weld_WeldInfo - { - get - { - return this._Weld_WeldInfo.Entity; - } - set - { - Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity; - if (((previousValue != value) - || (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Weld_WeldInfo.Entity = null; - previousValue.Weld_UsingMat.Remove(this); - } - this._Weld_WeldInfo.Entity = value; - if ((value != null)) - { - value.Weld_UsingMat.Add(this); - this._WeldId = value.WeldId; - } - else - { - this._WeldId = default(string); - } - this.SendPropertyChanged("Weld_WeldInfo"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -136314,8 +136944,6 @@ namespace Model private EntitySet _Weld_UsingMat; - private EntityRef _Weld_WeldInfo; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -136379,7 +137007,6 @@ namespace Model this._Weld_RecycleMat = new EntitySet(new Action(this.attach_Weld_RecycleMat), new Action(this.detach_Weld_RecycleMat)); this._Weld_RecycleMatTop = new EntitySet(new Action(this.attach_Weld_RecycleMatTop), new Action(this.detach_Weld_RecycleMatTop)); this._Weld_UsingMat = new EntitySet(new Action(this.attach_Weld_UsingMat), new Action(this.detach_Weld_UsingMat)); - this._Weld_WeldInfo = default(EntityRef); OnCreated(); } @@ -136414,10 +137041,6 @@ namespace Model { if ((this._WeldId != value)) { - if (this._Weld_WeldInfo.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnWeldIdChanging(value); this.SendPropertyChanging(); this._WeldId = value; @@ -136946,40 +137569,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_UsingPlan_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)] - public Weld_WeldInfo Weld_WeldInfo - { - get - { - return this._Weld_WeldInfo.Entity; - } - set - { - Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity; - if (((previousValue != value) - || (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Weld_WeldInfo.Entity = null; - previousValue.Weld_UsingPlan.Remove(this); - } - this._Weld_WeldInfo.Entity = value; - if ((value != null)) - { - value.Weld_UsingPlan.Add(this); - this._WeldId = value.WeldId; - } - else - { - this._WeldId = default(string); - } - this.SendPropertyChanged("Weld_WeldInfo"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -137269,7 +137858,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteelType", DbType="NVarChar(10)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteelType", DbType="NVarChar(50)")] public string SteelType { get @@ -137650,18 +138239,6 @@ namespace Model private System.Nullable _IsLock; - private EntitySet _Weld_ProjectPlan; - - private EntitySet _Weld_RecycleMat; - - private EntitySet _Weld_RecycleMatTop; - - private EntitySet _Weld_StockInit; - - private EntitySet _Weld_UsingMat; - - private EntitySet _Weld_UsingPlan; - private EntityRef _Weld_WeldType; #region 可扩展性方法定义 @@ -137694,12 +138271,6 @@ namespace Model public Weld_WeldInfo() { - this._Weld_ProjectPlan = new EntitySet(new Action(this.attach_Weld_ProjectPlan), new Action(this.detach_Weld_ProjectPlan)); - this._Weld_RecycleMat = new EntitySet(new Action(this.attach_Weld_RecycleMat), new Action(this.detach_Weld_RecycleMat)); - this._Weld_RecycleMatTop = new EntitySet(new Action(this.attach_Weld_RecycleMatTop), new Action(this.detach_Weld_RecycleMatTop)); - this._Weld_StockInit = new EntitySet(new Action(this.attach_Weld_StockInit), new Action(this.detach_Weld_StockInit)); - this._Weld_UsingMat = new EntitySet(new Action(this.attach_Weld_UsingMat), new Action(this.detach_Weld_UsingMat)); - this._Weld_UsingPlan = new EntitySet(new Action(this.attach_Weld_UsingPlan), new Action(this.detach_Weld_UsingPlan)); this._Weld_WeldType = default(EntityRef); OnCreated(); } @@ -137848,7 +138419,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteelType", DbType="NVarChar(10)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteelType", DbType="NVarChar(50)")] public string SteelType { get @@ -137928,84 +138499,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_ProjectPlan_Weld_WeldInfo", Storage="_Weld_ProjectPlan", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")] - public EntitySet Weld_ProjectPlan - { - get - { - return this._Weld_ProjectPlan; - } - set - { - this._Weld_ProjectPlan.Assign(value); - } - } - - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_RecycleMat_Weld_WeldInfo", Storage="_Weld_RecycleMat", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")] - public EntitySet Weld_RecycleMat - { - get - { - return this._Weld_RecycleMat; - } - set - { - this._Weld_RecycleMat.Assign(value); - } - } - - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_RecycleMatTop_Weld_WeldInfo", Storage="_Weld_RecycleMatTop", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")] - public EntitySet Weld_RecycleMatTop - { - get - { - return this._Weld_RecycleMatTop; - } - set - { - this._Weld_RecycleMatTop.Assign(value); - } - } - - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_StockInit_Weld_WeldInfo", Storage="_Weld_StockInit", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")] - public EntitySet Weld_StockInit - { - get - { - return this._Weld_StockInit; - } - set - { - this._Weld_StockInit.Assign(value); - } - } - - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_UsingMat_Weld_WeldInfo", Storage="_Weld_UsingMat", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")] - public EntitySet Weld_UsingMat - { - get - { - return this._Weld_UsingMat; - } - set - { - this._Weld_UsingMat.Assign(value); - } - } - - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_UsingPlan_Weld_WeldInfo", Storage="_Weld_UsingPlan", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")] - public EntitySet Weld_UsingPlan - { - get - { - return this._Weld_UsingPlan; - } - set - { - this._Weld_UsingPlan.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_WeldInfo_Weld_WeldType", Storage="_Weld_WeldType", ThisKey="WeldTypeId", OtherKey="WeldTypeId", IsForeignKey=true)] public Weld_WeldType Weld_WeldType { @@ -138059,78 +138552,6 @@ namespace Model this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); } } - - private void attach_Weld_ProjectPlan(Weld_ProjectPlan entity) - { - this.SendPropertyChanging(); - entity.Weld_WeldInfo = this; - } - - private void detach_Weld_ProjectPlan(Weld_ProjectPlan entity) - { - this.SendPropertyChanging(); - entity.Weld_WeldInfo = null; - } - - private void attach_Weld_RecycleMat(Weld_RecycleMat entity) - { - this.SendPropertyChanging(); - entity.Weld_WeldInfo = this; - } - - private void detach_Weld_RecycleMat(Weld_RecycleMat entity) - { - this.SendPropertyChanging(); - entity.Weld_WeldInfo = null; - } - - private void attach_Weld_RecycleMatTop(Weld_RecycleMatTop entity) - { - this.SendPropertyChanging(); - entity.Weld_WeldInfo = this; - } - - private void detach_Weld_RecycleMatTop(Weld_RecycleMatTop entity) - { - this.SendPropertyChanging(); - entity.Weld_WeldInfo = null; - } - - private void attach_Weld_StockInit(Weld_StockInit entity) - { - this.SendPropertyChanging(); - entity.Weld_WeldInfo = this; - } - - private void detach_Weld_StockInit(Weld_StockInit entity) - { - this.SendPropertyChanging(); - entity.Weld_WeldInfo = null; - } - - private void attach_Weld_UsingMat(Weld_UsingMat entity) - { - this.SendPropertyChanging(); - entity.Weld_WeldInfo = this; - } - - private void detach_Weld_UsingMat(Weld_UsingMat entity) - { - this.SendPropertyChanging(); - entity.Weld_WeldInfo = null; - } - - private void attach_Weld_UsingPlan(Weld_UsingPlan entity) - { - this.SendPropertyChanging(); - entity.Weld_WeldInfo = this; - } - - private void detach_Weld_UsingPlan(Weld_UsingPlan entity) - { - this.SendPropertyChanging(); - entity.Weld_WeldInfo = null; - } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Weld_WeldType")] diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index 8cd7f1f..ef14066 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@ - Release|Any CPU + Debug|Any CPU FolderProfile true