From 1e4464ca5e8088b06c1fe6f18573047d7d00fc24 Mon Sep 17 00:00:00 2001 From: liyh Date: Wed, 24 Jul 2024 14:53:46 +0800 Subject: [PATCH 1/4] 1212 --- .../版本日志/SGGLDB_WH_V2024-07-24-li.sql | 68 ++++++ .../AttachFile/webuploader.aspx.cs | 7 + .../DataIn/PunchlistFrom导入模板(旧版).xls | Bin 0 -> 25088 bytes .../Excel/DataIn/PunchlistFrom导入模板.xls | Bin 25088 -> 24576 bytes .../FineUIPro.Web/Transfer/PunchlistFrom.aspx | 159 ++++++++++---- .../Transfer/PunchlistFrom.aspx.cs | 115 +++++++--- .../Transfer/PunchlistFrom.aspx.designer.cs | 157 +++++++++----- .../Transfer/PunchlistFromDataIn.aspx.cs | 201 +++++++++++++----- 8 files changed, 528 insertions(+), 179 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_V2024-07-24-li.sql create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/PunchlistFrom导入模板(旧版).xls diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-07-24-li.sql b/DataBase/版本日志/SGGLDB_WH_V2024-07-24-li.sql new file mode 100644 index 00000000..3237026d --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2024-07-24-li.sql @@ -0,0 +1,68 @@ +ALTER TABLE Transfer_PunchlistFrom ADD Num_NO BigInt NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD System_No NVARCHAR(50) NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD Sub_Sys_No NVARCHAR(50) NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD Cat NVARCHAR(50) NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD Raised_By NVARCHAR(50) NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD Date_Raised datetime NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD Disc NVARCHAR(50) NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD IsEng bit NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD IsMatI bit NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD Punch_Type NVARCHAR(50) NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD Required_Date datetime NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD PIC NVARCHAR(50) NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD PIC_WUH NVARCHAR(50) NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD Correction_Action NVARCHAR(500) NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD Actual_Date datetime NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD Cleared_By NVARCHAR(50) NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD Cleared_Date datetime NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD Confirmed_By NVARCHAR(50) NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD Confirmed_Date datetime NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD Verified_By NVARCHAR(50) NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD Verified_Date datetime NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD [Status] NVARCHAR(50) NULL +GO + +ALTER TABLE Transfer_PunchlistFrom ADD Remark NVARCHAR(500) NULL +GO diff --git a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs index 4880d08a..821158c6 100644 --- a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs +++ b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs @@ -778,6 +778,13 @@ namespace FineUIPro.Web.AttachFile } #endregion + #region PunchlistFrom附件保存成功后处理事件 + if (MenuId == BLL.Const.PunchlistFromMenuId) + { + PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + } + #endregion + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); } } diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/PunchlistFrom导入模板(旧版).xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/PunchlistFrom导入模板(旧版).xls new file mode 100644 index 0000000000000000000000000000000000000000..1c4a6ca51a5d96c1c5e6d2442701ba1667d7ba06 GIT binary patch literal 25088 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 T-6^HH2a>m4c8}M{Rax*q2GMn# literal 25088 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 I_rEdxKk#+aBme*a diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx index e534c8cc..9b734955 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx @@ -4,33 +4,33 @@ - +
- + - + EnableRowDoubleClickEvent="true" EnableTextSelection="true"> - - - - - + + + + + - + @@ -38,60 +38,57 @@ - <%-- - - - - + + + + + + + + + + + + - - + + <%-- - - - - - - - - + - - - - - - - + - - - <%-- + --%> + + <%-- @@ -110,6 +107,84 @@ --%> + + + + + + + + + + + + + + <%----%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%----%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -143,6 +218,10 @@ + + @@ -156,4 +235,4 @@ } - \ No newline at end of file + diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs index 131484b2..493ce1b1 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs @@ -30,57 +30,60 @@ namespace FineUIPro.Web.Transfer /// public void BindGrid() { - string strSql = @"select*from Transfer_PunchlistFrom + string strSql = @"select * + ,(CASE isnull(IsEng,0) WHEN 1 THEN 'Y' ELSE 'N' END) IsEngStr + ,(CASE isnull(IsMatI,0) WHEN 1 THEN 'Y' ELSE 'N' END) IsMatIStr + from Transfer_PunchlistFrom where ProjectId = @ProjectId"; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - if (!string.IsNullOrEmpty(this.txtPunch_No.Text.Trim())) + if (!string.IsNullOrEmpty(this.txtNum_NO.Text.Trim())) { - strSql += " AND Punch_No like @Punch_No"; - listStr.Add(new SqlParameter("@Punch_No", "%" + this.txtPunch_No.Text.Trim() + "%")); + strSql += " AND Num_NO like @Num_NO"; + listStr.Add(new SqlParameter("@Num_NO", "%" + this.txtNum_NO.Text.Trim() + "%")); } - if (!string.IsNullOrEmpty(this.txtSYSTEM.Text.Trim())) + if (!string.IsNullOrEmpty(this.txtSystem_No.Text.Trim())) { - strSql += " AND SystemName like @SystemName"; - listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSYSTEM.Text.Trim() + "%")); + strSql += " AND System_No like @System_No"; + listStr.Add(new SqlParameter("@System_No", "%" + this.txtSystem_No.Text.Trim() + "%")); } - if (!string.IsNullOrEmpty(this.txtSUBSYSTEM.Text.Trim())) + if (!string.IsNullOrEmpty(this.txtSub_Sys_No.Text.Trim())) { - strSql += " AND Subsystem like @Subsystem"; - listStr.Add(new SqlParameter("@Subsystem", "%" + this.txtSUBSYSTEM.Text.Trim() + "%")); + strSql += " AND Sub_Sys_No like @Sub_Sys_No"; + listStr.Add(new SqlParameter("@Sub_Sys_No", "%" + this.txtSub_Sys_No.Text.Trim() + "%")); } - if (!string.IsNullOrEmpty(txtStarTime.Text.Trim())) + if (!string.IsNullOrEmpty(txtStartDate_Raised.Text.Trim())) { - strSql += " AND PUNCH_ITEM_FINISH_DATE >= @InspectionDateA"; - listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim()))); + strSql += " AND Date_Raised >= @StartDate_Raised"; + listStr.Add(new SqlParameter("@StartDate_Raised", Funs.GetNewDateTime(txtStartDate_Raised.Text.Trim()))); } - if (!string.IsNullOrEmpty(txtEndTime.Text.Trim())) + if (!string.IsNullOrEmpty(txtEndDate_Raised.Text.Trim())) { - strSql += " AND PUNCH_ITEM_FINISH_DATE <= @InspectionDateZ"; - listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim()))); + strSql += " AND Date_Raised <= @EndDate_Raised"; + listStr.Add(new SqlParameter("@EndDate_Raised", Funs.GetNewDateTime(txtEndDate_Raised.Text.Trim()))); } - if (!string.IsNullOrEmpty(this.txtTestPackage.Text.Trim())) + if (!string.IsNullOrEmpty(txtStartRequired_Date.Text.Trim())) { - strSql += " AND Test_Package like @Test_Package"; - listStr.Add(new SqlParameter("@Test_Package", "%" + this.txtTestPackage.Text.Trim() + "%")); + strSql += " AND Required_Date >= @Required_Date"; + listStr.Add(new SqlParameter("@Required_Date", Funs.GetNewDateTime(txtStartRequired_Date.Text.Trim()))); } - if (!string.IsNullOrEmpty(this.txtDiscipline.Text.Trim())) + if (!string.IsNullOrEmpty(txtEndRequired_Date.Text.Trim())) { - strSql += " AND Discipline like @Discipline"; - listStr.Add(new SqlParameter("@Discipline", "%" + this.txtDiscipline.Text.Trim() + "%")); + strSql += " AND Required_Date <= @Required_Date"; + listStr.Add(new SqlParameter("@Required_Date", Funs.GetNewDateTime(txtEndRequired_Date.Text.Trim()))); } - if (!string.IsNullOrEmpty(this.txtIdentified.Text.Trim())) + if (!string.IsNullOrEmpty(txtStartActual_Date.Text.Trim())) { - strSql += " AND Identified like @Identified"; - listStr.Add(new SqlParameter("@Identified", "%" + this.txtIdentified.Text.Trim() + "%")); + strSql += " AND Actual_Date >= @Actual_Date"; + listStr.Add(new SqlParameter("@Actual_Date", Funs.GetNewDateTime(txtStartActual_Date.Text.Trim()))); } - if (!string.IsNullOrEmpty(this.txtCategory.Text.Trim())) + if (!string.IsNullOrEmpty(txtEndActual_Date.Text.Trim())) { - strSql += " AND Category like @Category"; - listStr.Add(new SqlParameter("@Category", "%" + this.txtCategory.Text.Trim() + "%")); + strSql += " AND Actual_Date <= @Actual_Date"; + listStr.Add(new SqlParameter("@Actual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim()))); } - strSql += " order by Punch_No "; + strSql += " order by Num_No "; SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); Grid1.RecordCount = tb.Rows.Count; @@ -175,6 +178,56 @@ namespace FineUIPro.Web.Transfer } #endregion + + #region Photoes附件 + /// + /// 右键附件上传功能 + /// + /// + /// + protected void btnMenuAttachA_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader.aspx?type=0&toKeyId={0}_A&path=FileUpload/Transfer/PunchlistFrom&menuId={1}", Grid1.SelectedRowID, BLL.Const.PunchlistFromMenuId))); + } + } + #endregion + + #region Corrected_Photos附件 + /// + /// 右键附件上传功能 + /// + /// + /// + protected void btnMenuAttachB_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader.aspx?type=0&toKeyId={0}_B&path=FileUpload/Transfer/PunchlistFrom&menuId={1}", Grid1.SelectedRowID, BLL.Const.PunchlistFromMenuId))); + } + } + #endregion + + /// + /// 获取附件(放于Img中) + /// + /// + /// + protected string ConvertImageUrlByImage(object Id_type) + { + string url = string.Empty; + if (Id_type != null) + { + var registration = BLL.AttachFileService.GetAttachFile(Id_type.ToString(), BLL.Const.PunchlistFromMenuId); + if (registration != null) + { + url = BLL.UploadAttachmentService.ShowImage("../../", registration.AttachUrl); + } + } + return url; + } + #region 导入 /// /// 导入按钮 @@ -205,11 +258,15 @@ namespace FineUIPro.Web.Transfer if (buttonList.Contains(BLL.Const.BtnAdd)) { //this.btnNew.Hidden = false; + btnMenuAttachA.Hidden=false; + btnMenuAttachB.Hidden = false; } if (buttonList.Contains(BLL.Const.BtnModify)) { //this.btnMenuModify.Hidden = false; this.Grid1.EnableRowDoubleClickEvent = true; + btnMenuAttachA.Hidden = false; + btnMenuAttachB.Hidden = false; } else { diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs index f91c4f96..ff67cd24 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.Transfer { - - - public partial class PunchlistFrom { - +namespace FineUIPro.Web.Transfer +{ + + + public partial class PunchlistFrom + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.Transfer { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.Transfer { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.Transfer { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.Transfer { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// ToolSearch 控件。 /// @@ -56,43 +58,43 @@ namespace FineUIPro.Web.Transfer { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar ToolSearch; - + /// - /// txtPunch_No 控件。 + /// txtNum_NO 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtPunch_No; - + protected global::FineUIPro.TextBox txtNum_NO; + /// - /// txtSYSTEM 控件。 + /// txtSystem_No 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtSYSTEM; - + protected global::FineUIPro.TextBox txtSystem_No; + /// - /// txtSUBSYSTEM 控件。 + /// txtSub_Sys_No 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtSUBSYSTEM; - + protected global::FineUIPro.TextBox txtSub_Sys_No; + /// - /// txtStarTime 控件。 + /// txtStartDate_Raised 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DatePicker txtStarTime; - + protected global::FineUIPro.DatePicker txtStartDate_Raised; + /// /// Label1 控件。 /// @@ -101,16 +103,16 @@ namespace FineUIPro.Web.Transfer { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// - /// txtEndTime 控件。 + /// txtEndDate_Raised 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DatePicker txtEndTime; - + protected global::FineUIPro.DatePicker txtEndDate_Raised; + /// /// btnSearch 控件。 /// @@ -119,16 +121,7 @@ namespace FineUIPro.Web.Transfer { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSearch; - - /// - /// btnAttach 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttach; - + /// /// btnImport 控件。 /// @@ -137,7 +130,7 @@ namespace FineUIPro.Web.Transfer { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnImport; - + /// /// Toolbar1 控件。 /// @@ -146,43 +139,79 @@ namespace FineUIPro.Web.Transfer { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// - /// txtTestPackage 控件。 + /// txtStartRequired_Date 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtTestPackage; - + protected global::FineUIPro.DatePicker txtStartRequired_Date; + /// - /// txtDiscipline 控件。 + /// Label2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtDiscipline; - + protected global::FineUIPro.Label Label2; + /// - /// txtIdentified 控件。 + /// txtEndRequired_Date 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtIdentified; - + protected global::FineUIPro.DatePicker txtEndRequired_Date; + /// - /// txtCategory 控件。 + /// txtStartActual_Date 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtCategory; - + protected global::FineUIPro.DatePicker txtStartActual_Date; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; + + /// + /// txtEndActual_Date 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndActual_Date; + + /// + /// lbPhotoesImageUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lbPhotoesImageUrl; + + /// + /// labCorrected_Photos 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labCorrected_Photos; + /// /// ToolbarText1 控件。 /// @@ -191,7 +220,7 @@ namespace FineUIPro.Web.Transfer { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -200,7 +229,7 @@ namespace FineUIPro.Web.Transfer { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// WindowAtt 控件。 /// @@ -209,7 +238,7 @@ namespace FineUIPro.Web.Transfer { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowAtt; - + /// /// Window2 控件。 /// @@ -218,7 +247,7 @@ namespace FineUIPro.Web.Transfer { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window2; - + /// /// Menu1 控件。 /// @@ -227,7 +256,7 @@ namespace FineUIPro.Web.Transfer { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuDel 控件。 /// @@ -236,5 +265,23 @@ namespace FineUIPro.Web.Transfer { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuDel; + + /// + /// btnMenuAttachA 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuAttachA; + + /// + /// btnMenuAttachB 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuAttachB; } } diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFromDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFromDataIn.aspx.cs index 39924624..3ef944e4 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFromDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFromDataIn.aspx.cs @@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 14); + AddDatasetToSQL(ds.Tables[0], 24); hdCheckResult.Text = "1"; } catch (Exception exc) @@ -168,18 +168,99 @@ namespace FineUIPro.Web.Transfer { for (int i = 1; i < ir; i++) { - string row4 = pds.Rows[i][9].ToString(); - if (!string.IsNullOrEmpty(row4)) + string allRowData = string.Empty; + for (int j = 0; j < 24; j++) + { + allRowData += pds.Rows[i][j].ToString(); + } + if (string.IsNullOrWhiteSpace(allRowData)) + continue; + + string row3 = pds.Rows[i][3].ToString(); + if (row3 != "" && row3 != "A" && row3 != "B" && row3 != "C" && row3 != "D") + { + result += (i + 2).ToString() + "," + " Cat. " + "," + "[" + row3 + "]错误！不是ABCD！" + "|"; + } + + string row5 = pds.Rows[i][5].ToString(); + if (!string.IsNullOrEmpty(row5)) { try { - DateTime date = Convert.ToDateTime(row4.Trim()); + DateTime date = Convert.ToDateTime(row5.Trim()); } catch (Exception) { - result += (i + 2).ToString() + "," + "PUNCH ITEM FINISH DATE" + "," + "[" + row4 + "]错误！不是日期格式！" + "|"; + result += (i + 2).ToString() + "," + " Date Raised " + "," + "[" + row5 + "]错误！不是日期格式！" + "|"; } } + + string row10 = pds.Rows[i][10].ToString(); + if (!string.IsNullOrEmpty(row10)) + { + try + { + DateTime date = Convert.ToDateTime(row10.Trim()); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + " Required Date " + "," + "[" + row10 + "]错误！不是日期格式！" + "|"; + } + } + + string row15 = pds.Rows[i][15].ToString(); + if (!string.IsNullOrEmpty(row15)) + { + try + { + DateTime date = Convert.ToDateTime(row15.Trim()); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + " Actual Date " + "," + "[" + row15 + "]错误！不是日期格式！" + "|"; + } + } + + string row17 = pds.Rows[i][17].ToString(); + if (!string.IsNullOrEmpty(row17)) + { + try + { + DateTime date = Convert.ToDateTime(row17.Trim()); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + " Cleared(PIC） Date " + "," + "[" + row17 + "]错误！不是日期格式！" + "|"; + } + } + + string row19 = pds.Rows[i][19].ToString(); + if (!string.IsNullOrEmpty(row19)) + { + try + { + DateTime date = Convert.ToDateTime(row19.Trim()); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + " Confirmed(WUH) Date " + "," + "[" + row19 + "]错误！不是日期格式！" + "|"; + } + } + + string row21 = pds.Rows[i][21].ToString(); + if (!string.IsNullOrEmpty(row21)) + { + try + { + DateTime date = Convert.ToDateTime(row21.Trim()); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + " Verified(BASF) Date " + "," + "[" + row21 + "]错误！不是日期格式！" + "|"; + } + } + + } if (!string.IsNullOrEmpty(result)) { @@ -286,7 +367,7 @@ namespace FineUIPro.Web.Transfer oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 14); + AddDatasetToSQL2(ds.Tables[0], 24); } catch (Exception ex) { @@ -312,6 +393,7 @@ namespace FineUIPro.Web.Transfer } string result = string.Empty; ir = pds.Rows.Count; + long? maxNumNO = -1; if (pds != null && ir > 0) { List list = new List(); @@ -320,57 +402,66 @@ namespace FineUIPro.Web.Transfer if (!string.IsNullOrEmpty(pds.Rows[i][1].ToString().Trim())) { //查询第一列，没查到的情况下作导入处理 - var modelOnly = Funs.DB.Transfer_PunchlistFrom.FirstOrDefault(x => x.Punch_No == pds.Rows[i][1].ToString().Trim() - && x.ProjectId == CurrUser.LoginProjectId); - if (modelOnly == null) - { - Model.Transfer_PunchlistFrom model = new Model.Transfer_PunchlistFrom(); - - model.Id = Guid.NewGuid().ToString(); - model.ProjectId = CurrUser.LoginProjectId; - - model.Item_No = pds.Rows[i][0].ToString().Trim(); - model.Punch_No = pds.Rows[i][1].ToString().Trim(); - model.SystemName = pds.Rows[i][2].ToString().Trim(); - model.Subsystem = pds.Rows[i][3].ToString().Trim(); - - model.Test_Package = pds.Rows[i][4].ToString().Trim(); - model.Discipline = pds.Rows[i][5].ToString().Trim(); - model.DESCRIPTION = pds.Rows[i][6].ToString().Trim(); - model.Identified = pds.Rows[i][7].ToString().Trim(); - model.Category = pds.Rows[i][8].ToString().Trim(); - DateTime t1; - if (DateTime.TryParse(pds.Rows[i][9].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][9].ToString())) - model.PUNCH_ITEM_FINISH_DATE = t1; - - - model.Action_By = pds.Rows[i][10].ToString().Trim(); - model.Required_By = pds.Rows[i][11].ToString().Trim(); - model.PUNCH_ITEM_STATUS = pds.Rows[i][12].ToString().Trim(); - model.Comments = pds.Rows[i][13].ToString().Trim(); - list.Add(model); + if (maxNumNO == -1) { + maxNumNO = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == CurrUser.LoginProjectId).Max(p => p.Num_NO); + if (maxNumNO == null) + maxNumNO = 1001; } + + + Model.Transfer_PunchlistFrom model = new Model.Transfer_PunchlistFrom(); + + model.Id = Guid.NewGuid().ToString(); + model.ProjectId = CurrUser.LoginProjectId; + + model.Num_NO = maxNumNO; + model.System_No = pds.Rows[i][0].ToString().Trim(); + model.Sub_Sys_No = pds.Rows[i][1].ToString().Trim(); + model.DESCRIPTION = pds.Rows[i][2].ToString().Trim(); + + model.Cat = pds.Rows[i][3].ToString().Trim(); + model.Raised_By = pds.Rows[i][4].ToString().Trim(); + DateTime t5; + if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t5) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) + model.Date_Raised = t5; + + model.Disc = pds.Rows[i][6].ToString().Trim(); + if (pds.Rows[i][7].ToString().Trim().Contains("Y")) + model.IsEng = true; else - { - //修改 - modelOnly.Item_No = pds.Rows[i][0].ToString().Trim(); - modelOnly.Punch_No = pds.Rows[i][1].ToString().Trim(); - modelOnly.SystemName = pds.Rows[i][2].ToString().Trim(); - modelOnly.Subsystem = pds.Rows[i][3].ToString().Trim(); - modelOnly.Test_Package = pds.Rows[i][4].ToString().Trim(); - modelOnly.Discipline = pds.Rows[i][5].ToString().Trim(); - modelOnly.DESCRIPTION = pds.Rows[i][6].ToString().Trim(); - modelOnly.Identified = pds.Rows[i][7].ToString().Trim(); - modelOnly.Category = pds.Rows[i][8].ToString().Trim(); - DateTime t1; - if (DateTime.TryParse(pds.Rows[i][9].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][9].ToString())) - modelOnly.PUNCH_ITEM_FINISH_DATE = t1; - modelOnly.Action_By = pds.Rows[i][10].ToString().Trim(); - modelOnly.Required_By = pds.Rows[i][11].ToString().Trim(); - modelOnly.PUNCH_ITEM_STATUS = pds.Rows[i][12].ToString().Trim(); - modelOnly.Comments = pds.Rows[i][13].ToString().Trim(); - Funs.DB.SubmitChanges(); - } + model.IsEng = false; + + if (pds.Rows[i][8].ToString().Trim().Contains("Y")) + model.IsMatI = true; + else + model.IsMatI = false; + model.Punch_Type = pds.Rows[i][9].ToString().Trim(); + DateTime t10; + if (DateTime.TryParse(pds.Rows[i][10].ToString(), out t10) && !string.IsNullOrEmpty(pds.Rows[i][10].ToString())) + model.Required_Date = t10; + model.Action_By = pds.Rows[i][11].ToString().Trim(); + model.PIC = pds.Rows[i][12].ToString().Trim(); + model.PIC_WUH = pds.Rows[i][13].ToString().Trim(); + model.Correction_Action = pds.Rows[i][14].ToString().Trim(); + DateTime t15; + if (DateTime.TryParse(pds.Rows[i][15].ToString(), out t15) && !string.IsNullOrEmpty(pds.Rows[i][15].ToString())) + model.PUNCH_ITEM_FINISH_DATE = t15; + model.Cleared_By = pds.Rows[i][16].ToString().Trim(); + DateTime t17; + if (DateTime.TryParse(pds.Rows[i][17].ToString(), out t17) && !string.IsNullOrEmpty(pds.Rows[i][17].ToString())) + model.Cleared_Date = t17; + model.Confirmed_By = pds.Rows[i][18].ToString().Trim(); + DateTime t19; + if (DateTime.TryParse(pds.Rows[i][19].ToString(), out t19) && !string.IsNullOrEmpty(pds.Rows[i][19].ToString())) + model.Confirmed_Date = t19; + model.Verified_By = pds.Rows[i][20].ToString().Trim(); + DateTime t21; + if (DateTime.TryParse(pds.Rows[i][21].ToString(), out t21) && !string.IsNullOrEmpty(pds.Rows[i][21].ToString())) + model.Verified_Date = t21; + model.Status = pds.Rows[i][22].ToString().Trim(); + model.Remark = pds.Rows[i][23].ToString().Trim(); + list.Add(model); + maxNumNO++; } } if (list.Count > 0) From a0aca61750a2b3d34134d81ffae4bd447dcf774b Mon Sep 17 00:00:00 2001 From: "754998852@qq.com" <754998852@qq.com> Date: Wed, 24 Jul 2024 14:54:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_WH_2024-7-23-phf.sql | 50 + SGGL/BLL/Common/Const.cs | 3 + .../DataIn/NonProcessSystemList导入模板.xls | Bin 0 -> 20480 bytes .../File/Excel/DataIn/Piping导入模板.xls | Bin 22016 -> 20480 bytes .../DataIn/ProcessSystemList导入模板.xls | Bin 0 -> 20992 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 16 + SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- .../FineUIPro.Web/Transfer/LHCSystemList.aspx | 145 +++ .../Transfer/LHCSystemList.aspx.cs | 258 +++++ .../Transfer/LHCSystemList.aspx.designer.cs | 161 +++ .../Transfer/LHCSystemListDataIn.aspx | 68 ++ .../Transfer/LHCSystemListDataIn.aspx.cs | 570 +++++++++++ .../LHCSystemListDataIn.aspx.designer.cs | 125 +++ SGGL/FineUIPro.Web/Web.config | 2 +- SGGL/Model/Model.cs | 958 ++++++++++++++++-- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 16 files changed, 2288 insertions(+), 72 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-7-23-phf.sql create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/NonProcessSystemList导入模板.xls create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/ProcessSystemList导入模板.xls create mode 100644 SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx create mode 100644 SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs create mode 100644 SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx create mode 100644 SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.cs create mode 100644 SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.designer.cs diff --git a/DataBase/版本日志/SGGLDB_WH_2024-7-23-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-7-23-phf.sql new file mode 100644 index 00000000..530ac66d --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-7-23-phf.sql @@ -0,0 +1,50 @@ +update SYS_MENU set IsUsed=0 where menuid='48545C6A-9D10-47F4-810F-DAB0CFCD5BF9'; + +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB','LHC System List(Process)','Transfer/LHCSystemList.aspx?Type=0',8,'0','Menu_Transfer',0,1,1) +go +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('8400F97B-5E26-4D22-BBED-1BBE533A4235','197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB','',1) +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('8EB4D935-3ECD-4E4C-AABC-1DA6432C9681','197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB','޸',2) +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('C201BD75-5928-4C97-BEB3-219A735A7CF3','197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB','ɾ',3) +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('F3E56E50-929D-4B4C-A3F7-87DA87787A8F','197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB','',4) +go + +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('022428DC-FC99-4916-B8AF-6A9DC885DFAF','LHC System List(Non-Process)','Transfer/LHCSystemList.aspx?Type=1',9,'0','Menu_Transfer',0,1,1) +go +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('489F3579-0ECA-4BC7-9BEA-E8D11B17816A','022428DC-FC99-4916-B8AF-6A9DC885DFAF','',1) +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('E6311F1E-1E1D-4CE8-BACB-3C51C1E94BA3','022428DC-FC99-4916-B8AF-6A9DC885DFAF','޸',2) +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('A90CE1C1-0776-4BDB-AF5D-B06D05342730','022428DC-FC99-4916-B8AF-6A9DC885DFAF','ɾ',3) +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('5EB9D01F-35C0-4463-A847-32ED48B9E29D','022428DC-FC99-4916-B8AF-6A9DC885DFAF','',4) +go + +CREATE TABLE [dbo].[Transfer_LHCSystemList]( + [Id] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [Type] [nvarchar](50) NULL, + [SN] [int] NULL, + [Commissioningsystemcode] [nvarchar](50) NULL, + [CommissioningCodeDescription] [nvarchar](50) NULL, + [SubCommissioningsystem] [nvarchar](50) NULL, + [Turnover_Code] [nvarchar](50) NULL, + [PlanStartofTestingDate] [datetime] NULL, + [PlanFinishofTestingDate] [datetime] NULL, + [Status] [nvarchar](50) NULL, + [ActualFinishedDate] [datetime] NULL, + [Describe] [nvarchar](200) NULL, + CONSTRAINT [PK_Transfer_LHCSystemList] PRIMARY KEY CLUSTERED +( + [Id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + + diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 8127544e..1a2af24d 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -4303,6 +4303,9 @@ namespace BLL public const string PlumbingMenuId = "95295BF7-FB51-480D-9902-6ADA4E8427FC"; public const string HVACMenuId = "05442049-1310-45B1-9D3D-CAAE759D8F3E"; public const string PunchlistFromMenuId = "016903B1-3B86-4CF5-AFF8-FF8BE389BEE5"; + + public const string Transfer_LHCSystemListMenuId0 = "197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB"; + public const string Transfer_LHCSystemListMenuId1 = "022428DC-FC99-4916-B8AF-6A9DC885DFAF"; #endregion #endregion diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/NonProcessSystemList导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/NonProcessSystemList导入模板.xls new file mode 100644 index 0000000000000000000000000000000000000000..9777cbda8ad3b6b34cad5f0e015f26a4d00ab880 GIT binary patch literal 20480 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 DYf}I! literal 0 HcmV?d00001 diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls index 26f8263cd3aeef16c15e11395d5dbac067b61c56..3297ee8a569e0d3f3cde48424fa5ed06a358e0c5 100644 GIT binary patch literal 20480 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 diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/ProcessSystemList导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/ProcessSystemList导入模板.xls new file mode 100644 index 0000000000000000000000000000000000000000..35340a31e5527d6d5c10d5d6a11b5f41cd416822 GIT binary patch literal 20992 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 + + @@ -17662,6 +17664,20 @@ InstrumentationDataIn.aspx + + LHCSystemList.aspx + ASPXCodeBehind + + + LHCSystemList.aspx + + + LHCSystemListDataIn.aspx + ASPXCodeBehind + + + LHCSystemListDataIn.aspx + Piping.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index cb873201..63722353 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true false diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx new file mode 100644 index 00000000..798f356c --- /dev/null +++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx @@ -0,0 +1,145 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LHCSystemList.aspx.cs" Inherits="FineUIPro.Web.Transfer.LHCSystemList" %> + + + + + + + Table 1：LHC System List + + +
+ + + + + + + + + + + + <%-- + + + + + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs new file mode 100644 index 00000000..ac2f6da7 --- /dev/null +++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs @@ -0,0 +1,258 @@ +using BLL; +using BLL.CQMS.Comprehensive; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; + +namespace FineUIPro.Web.Transfer +{ + public partial class LHCSystemList : PageBase + { + public string Type + { + get + { + return (string)ViewState["Type"]; + } + set + { + ViewState["Type"] = value; + } + } + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + Type= Request.Params["Type"]; + if (Type=="1") + { + var a = Grid1; + Grid1.Columns[3].Hidden = false; + } + GetButtonPower(); + BindGrid(); + } + } + + /// + /// 数据绑定 + /// + public void BindGrid() + { + string strSql = @"select * from Transfer_LHCSystemList + where ProjectId = @ProjectId and Type=@Type"; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@Type", Type)); + + if (!string.IsNullOrEmpty(this.txtCommissioningsystemcode.Text.Trim())) + { + strSql += " AND Commissioningsystemcode like @Commissioningsystemcode"; + listStr.Add(new SqlParameter("@Commissioningsystemcode", "%" + this.txtCommissioningsystemcode.Text.Trim() + "%")); + } + //if (!string.IsNullOrEmpty(txtStarTime.Text.Trim())) + //{ + // strSql += " AND TestPackageSTART >= @InspectionDateA"; + // listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim()))); + //} + //if (!string.IsNullOrEmpty(txtEndTime.Text.Trim())) + //{ + // strSql += " AND TestPackageSTART <= @InspectionDateZ"; + // listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim()))); + //} + if (!string.IsNullOrEmpty(this.txtCommissioningCodeDescription.Text.Trim())) + { + strSql += " AND CommissioningCodeDescription like @CommissioningCodeDescription"; + listStr.Add(new SqlParameter("@CommissioningCodeDescription", "%" + this.txtCommissioningCodeDescription.Text.Trim() + "%")); + } + 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(); + } + #endregion + + #region 分页、排序 + /// + /// 分页下拉 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 分页索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void btnSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + #region 关闭弹出窗口 + /// + /// 关闭弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region 增加 + /// + /// 新增按钮事件 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionEquipmentEdit.aspx", "编辑 - "))); + } + #endregion + + #region 编辑 + /// + /// 右键编辑 + /// + /// + /// + protected void btnMenuModify_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionEquipmentEdit.aspx?InspectionEquipmentId={0}", Grid1.SelectedRowID, "编辑 - "))); + } + + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.btnMenuModify_Click(sender, e); + } + #endregion + + #region 删除 + /// + /// 右键删除 + /// + /// + /// + protected void btnMenuDel_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + var model = Funs.DB.Transfer_LHCSystemList.FirstOrDefault(x => x.Id == rowID); + if (model != null) + { + Funs.DB.Transfer_LHCSystemList.DeleteOnSubmit(model); + Funs.DB.SubmitChanges(); + } + } + BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + #endregion + + #region 导入 + /// + /// 导入按钮 + /// + /// + /// + protected void btnImport_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("LHCSystemListDataIn.aspx?Type="+Type, "导入 - "))); + } + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + var menuId = ""; + if (Type == "0") + { + menuId = BLL.Const.Transfer_LHCSystemListMenuId0; + } + else { + menuId= BLL.Const.Transfer_LHCSystemListMenuId1; + } + + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, menuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + this.btnMenuDel.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnSave)) + { + this.btnImport.Hidden = false; + } + } + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.designer.cs new file mode 100644 index 00000000..2bb0bef2 --- /dev/null +++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.designer.cs @@ -0,0 +1,161 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.Transfer +{ + + + public partial class LHCSystemList + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// ToolSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar ToolSearch; + + /// + /// txtCommissioningsystemcode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCommissioningsystemcode; + + /// + /// txtCommissioningCodeDescription 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCommissioningCodeDescription; + + /// + /// btnSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSearch; + + /// + /// btnImport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnImport; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Window2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window2; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuDel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDel; + } +} diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx b/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx new file mode 100644 index 00000000..ce5e1050 --- /dev/null +++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx @@ -0,0 +1,68 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LHCSystemListDataIn.aspx.cs" Inherits="FineUIPro.Web.Transfer.LHCSystemListDataIn" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.cs new file mode 100644 index 00000000..955eea30 --- /dev/null +++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.cs @@ -0,0 +1,570 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.OleDb; +using System.IO; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + + +namespace FineUIPro.Web.Transfer +{ + public partial class LHCSystemListDataIn : PageBase + { + #region 定义变量 + /// + /// 上传预设的虚拟路径 + /// + private string initPath = Const.ExcelUrl; + + + /// + /// 错误集合 + /// + public static List errorInfos = new List(); + + public string Type + { + get + { + return (string)ViewState["Type"]; + } + set + { + ViewState["Type"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + Type = Request.Params["Type"]; + this.hdCheckResult.Text = string.Empty; + this.hdFileName.Text = string.Empty; + if (errorInfos != null) + { + errorInfos.Clear(); + } + } + } + #endregion + + #region 审核 + /// + /// 审核 + /// + /// + /// + protected void btnAudit_Click(object sender, EventArgs e) + { + try + { + if (this.fuAttachUrl.HasFile == false) + { + ShowNotify("请您选择Excel文件！", MessageBoxIcon.Warning); + return; + } + string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower(); + if (IsXls != ".xls") + { + ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning); + return; + } + if (errorInfos != null) + { + errorInfos.Clear(); + } + string rootPath = Server.MapPath("~/"); + string initFullPath = rootPath + initPath; + if (!Directory.Exists(initFullPath)) + { + Directory.CreateDirectory(initFullPath); + } + + this.hdFileName.Text = BLL.Funs.GetNewFileName() + IsXls; + string filePath = initFullPath + this.hdFileName.Text; + this.fuAttachUrl.PostedFile.SaveAs(filePath); + ImportXlsToData(rootPath + initPath + this.hdFileName.Text); + } + catch (Exception ex) + { + ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning); + } + } + + #region 读Excel提取数据 + /// + /// 从Excel提取数据--》Dataset + /// + /// Excel文件路径名 + private void ImportXlsToData(string fileName) + { + try + { + string oleDBConnString = String.Empty; + oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + oleDBConnString += "Data Source="; + oleDBConnString += fileName; + oleDBConnString += ";Extended Properties=Excel 8.0;"; + OleDbConnection oleDBConn = null; + OleDbDataAdapter oleAdMaster = null; + DataTable m_tableName = new DataTable(); + DataSet ds = new DataSet(); + + oleDBConn = new OleDbConnection(oleDBConnString); + oleDBConn.Open(); + m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + + if (m_tableName != null && m_tableName.Rows.Count > 0) + { + + m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + + } + string sqlMaster; + sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + oleAdMaster.Fill(ds, "m_tableName"); + oleAdMaster.Dispose(); + oleDBConn.Close(); + oleDBConn.Dispose(); + + if (Type == "0") + { + AddDatasetToSQL(ds.Tables[0], 8); + } + else + { + AddDatasetToSQL(ds.Tables[0], 9); + } + + hdCheckResult.Text = "1"; + } + catch (Exception exc) + { + Response.Write(exc); + //return null; + // return dt; + } + finally + { + } + } + #endregion + + #region 将Dataset的数据导入数据库 + /// + /// 将Dataset的数据导入数据库 + /// + /// 数据集 + /// 数据集行数 + /// + private bool AddDatasetToSQL(DataTable pds, int Cols) + { + string result = string.Empty; + int ic, ir; + ic = pds.Columns.Count; + if (ic < Cols) + { + ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning); + return false; + } + + ir = pds.Rows.Count; + if (pds != null && ir > 0) + { + for (int i = 1; i < ir; i++) + { + if (Type == "0") + { + string row4 = pds.Rows[i][4].ToString(); + if (!string.IsNullOrEmpty(row4)) + { + try + { + DateTime date = Convert.ToDateTime(row4.Trim()); + } + catch (Exception) + { + result += (i + 3).ToString() + "," + "Plan Start of Testing Date" + "," + "[" + row4 + "]错误！不是日期格式！" + "|"; + } + } + string row5 = pds.Rows[i][5].ToString(); + if (!string.IsNullOrEmpty(row4)) + { + try + { + DateTime date = Convert.ToDateTime(row5.Trim()); + } + catch (Exception) + { + result += (i + 3).ToString() + "," + "Plan Finish of Testing Date" + "," + "[" + row5 + "]错误！不是日期格式！" + "|"; + } + } + + string row8 = pds.Rows[i][7].ToString(); + if (!string.IsNullOrEmpty(row4)) + { + try + { + DateTime date = Convert.ToDateTime(row8.Trim()); + } + catch (Exception) + { + result += (i + 3).ToString() + "," + "Actual Finished Date" + "," + "[" + row8 + "]错误！不是日期格式！" + "|"; + } + } + } + else { + string row4 = pds.Rows[i][5].ToString(); + if (!string.IsNullOrEmpty(row4)) + { + try + { + DateTime date = Convert.ToDateTime(row4.Trim()); + } + catch (Exception) + { + result += (i + 3).ToString() + "," + "Plan Start of Testing Date" + "," + "[" + row4 + "]错误！不是日期格式！" + "|"; + } + } + string row5 = pds.Rows[i][6].ToString(); + if (!string.IsNullOrEmpty(row4)) + { + try + { + DateTime date = Convert.ToDateTime(row5.Trim()); + } + catch (Exception) + { + result += (i + 3).ToString() + "," + "Plan Finish of Testing Date" + "," + "[" + row5 + "]错误！不是日期格式！" + "|"; + } + } + + string row8 = pds.Rows[i][8].ToString(); + if (!string.IsNullOrEmpty(row4)) + { + try + { + DateTime date = Convert.ToDateTime(row8.Trim()); + } + catch (Exception) + { + result += (i + 3).ToString() + "," + "Actual Finished Date" + "," + "[" + row8 + "]错误！不是日期格式！" + "|"; + } + } + } + + } + if (!string.IsNullOrEmpty(result)) + { + result = result.Substring(0, result.LastIndexOf("|")); + } + errorInfos.Clear(); + if (!string.IsNullOrEmpty(result)) + { + string results = result; + List errorInfoList = results.Split('|').ToList(); + foreach (var item in errorInfoList) + { + string[] errors = item.Split(','); + Model.ErrorInfo errorInfo = new Model.ErrorInfo(); + errorInfo.Row = errors[0]; + errorInfo.Column = errors[1]; + errorInfo.Reason = errors[2]; + errorInfos.Add(errorInfo); + } + if (errorInfos.Count > 0) + { + this.gvErrorInfo.DataSource = errorInfos; + this.gvErrorInfo.DataBind(); + } + } + else + { + ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success); + } + } + + else + { + ShowNotify("导入数据为空！", MessageBoxIcon.Warning); + } + return true; + } + #endregion + #endregion + + #region 下载模板 + /// + /// 下载模板按钮 + /// + /// + /// + protected void btnDownLoad_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel"))); + } + + /// + /// 下载导入模板 + /// + /// + /// + protected void PageManager1_CustomEvent(object sender, CustomEventArgs e) + { + if (e.EventArgument == "Confirm_OK") + { + string rootPath = Server.MapPath("~/"); + string mbmc = ""; + if (Type == "0") + { + mbmc = "ProcessSystemList导入模板.xls"; + } + else + { + mbmc = "NonProcessSystemList导入模板.xls"; + } + + string uploadfilepath = rootPath + "File\\Excel\\DataIn\\" + mbmc; + string filePath = "File\\Excel\\DataIn\\" + mbmc; + 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 + + #region 导入 + /// + /// 导入 + /// + /// + /// + protected void btnImport_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(hdCheckResult.Text)) + { + if (errorInfos.Count <= 0) + { + string rootPath = Server.MapPath("~/"); + ImportXlsToData2(rootPath + initPath + this.hdFileName.Text); + hdCheckResult.Text = string.Empty; + ShowNotify("导入成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + else + { + ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning); + } + } + else + { + ShowNotify("请先审核要导入的文件！", MessageBoxIcon.Warning); + } + } + + #region Excel提取数据 + /// + /// 从Excel提取数据--》Dataset + /// + /// Excel文件路径名 + private void ImportXlsToData2(string fileName) + { + try + { + string oleDBConnString = String.Empty; + oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + oleDBConnString += "Data Source="; + oleDBConnString += fileName; + oleDBConnString += ";Extended Properties=Excel 8.0;"; + OleDbConnection oleDBConn = null; + OleDbDataAdapter oleAdMaster = null; + DataTable m_tableName = new DataTable(); + DataSet ds = new DataSet(); + + oleDBConn = new OleDbConnection(oleDBConnString); + oleDBConn.Open(); + m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + + if (m_tableName != null && m_tableName.Rows.Count > 0) + { + + m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + + } + string sqlMaster; + sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + oleAdMaster.Fill(ds, "m_tableName"); + oleAdMaster.Dispose(); + oleDBConn.Close(); + oleDBConn.Dispose(); + if (Type == "0") + { + AddDatasetToSQL2(ds.Tables[0], 8); + } + else + { + AddDatasetToSQL2(ds.Tables[0], 9); + } + + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 将Dataset的数据导入数据库 + /// + /// 将Dataset的数据导入数据库 + /// + /// 数据集 + /// 数据集列数 + /// + private bool AddDatasetToSQL2(DataTable pds, int Cols) + { + int ic, ir; + ic = pds.Columns.Count; + if (ic < Cols) + { + ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning); + } + string result = string.Empty; + ir = pds.Rows.Count; + int Sn = 0; + if (pds != null && ir > 0) + { + var list = new List(); + for (int i = 0; i < ir; i++) + { + ////查询第一列，没查到的情况下作导入处理 + //var modelOnly = Funs.DB.Transfer_LHCSystemList.FirstOrDefault(x => x.SN == Convert.ToInt32(pds.Rows[i][0].ToString().Trim()) + //&& x.ProjectId == CurrUser.LoginProjectId && x.Type==Type); + + //if (modelOnly == null) + //{ + Model.Transfer_LHCSystemList model = new Model.Transfer_LHCSystemList(); + model.Id = Guid.NewGuid().ToString(); + model.ProjectId = CurrUser.LoginProjectId; + model.Type = Type; + + //根据项目id查询sn + var snModel = Funs.DB.Transfer_LHCSystemList.Where(x => x.ProjectId == CurrUser.LoginProjectId + && x.Type == Type).OrderByDescending(x => x.SN).FirstOrDefault(); + if (snModel == null && Sn!=1001) + { + Sn = 1001; + model.SN = Sn; + } + else + { + if (snModel != null && Sn == 0) + { + Sn = Convert.ToInt32(snModel.SN + 1); + model.SN = Sn; + } + else { + Sn += 1; + model.SN = Sn; + } + + } + + model.Commissioningsystemcode= pds.Rows[i][0].ToString().Trim(); + model.CommissioningCodeDescription = pds.Rows[i][1].ToString().Trim(); + if (Type == "0") + { + model.SubCommissioningsystem = pds.Rows[i][2].ToString().Trim(); + model.Turnover_Code= pds.Rows[i][3].ToString().Trim(); + DateTime t1, t2,t3; + if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString())) + model.PlanStartofTestingDate = t1; + if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) + model.PlanFinishofTestingDate = t2; + model.Status= pds.Rows[i][6].ToString().Trim(); + if (DateTime.TryParse(pds.Rows[i][7].ToString(), out t3) && !string.IsNullOrEmpty(pds.Rows[i][7].ToString())) + model.ActualFinishedDate = t3; + + } + else { + model.Describe = pds.Rows[i][2].ToString().Trim(); + model.SubCommissioningsystem = pds.Rows[i][3].ToString().Trim(); + model.Turnover_Code = pds.Rows[i][4].ToString().Trim(); + DateTime t1, t2, t3; + if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString())) + model.PlanStartofTestingDate = t1; + if (DateTime.TryParse(pds.Rows[i][6].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) + model.PlanFinishofTestingDate = t2; + model.Status = pds.Rows[i][7].ToString().Trim(); + if (DateTime.TryParse(pds.Rows[i][8].ToString(), out t3) && !string.IsNullOrEmpty(pds.Rows[i][7].ToString())) + model.ActualFinishedDate = t3; + } + + + list.Add(model); + //} + //else + //{ + // //修改 + // modelOnly.PIPINGLINENUMBER = pds.Rows[i][0].ToString().Trim(); + // modelOnly.SYSTEM = pds.Rows[i][1].ToString().Trim(); + // modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim(); + // modelOnly.TestPackage = pds.Rows[i][3].ToString().Trim(); + // DateTime t1, t2; + // if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString())) + // modelOnly.TestPackageSTART = t1; + // if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) + // modelOnly.TestPackageFINISH = t2; + + // //更改前不是finished，更改后是finished的，才修改实际完成时间 + // if (modelOnly.FINALStatus.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished") + // { + // modelOnly.CompleteTime = DateTime.Now; + // } + // modelOnly.FINALStatus = pds.Rows[i][6].ToString().Trim(); + // //if (modelOnly.FINALStatus.ToLower() == "finished") + // //{ + // // modelOnly.CompleteTime = DateTime.Now; + // //} + // modelOnly.PreTestFINISHED = pds.Rows[i][7].ToString().Trim(); + // modelOnly.FinalTestFINISHED = pds.Rows[i][8].ToString().Trim(); + // Funs.DB.SubmitChanges(); + //} + } + if (list.Count > 0) + { + Funs.DB.Transfer_LHCSystemList.InsertAllOnSubmit(list); + Funs.DB.SubmitChanges(); + } + } + else + { + ShowNotify("导入数据为空！", MessageBoxIcon.Warning); + } + return true; + } + #endregion + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.designer.cs new file mode 100644 index 00000000..f76982a4 --- /dev/null +++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.designer.cs @@ -0,0 +1,125 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.Transfer +{ + + + public partial class LHCSystemListDataIn + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// hdFileName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdFileName; + + /// + /// btnAudit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAudit; + + /// + /// btnImport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnImport; + + /// + /// btnDownLoad 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnDownLoad; + + /// + /// hdCheckResult 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdCheckResult; + + /// + /// fuAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FileUpload fuAttachUrl; + + /// + /// gvErrorInfo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvErrorInfo; + + /// + /// lblPageIndex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPageIndex; + } +} diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 963148f2..f50b26d3 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -77,7 +77,7 @@ - + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index c864dcf1..d31b36ac 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -2516,6 +2516,9 @@ namespace Model partial void InsertTransfer_Instrumentation(Transfer_Instrumentation instance); partial void UpdateTransfer_Instrumentation(Transfer_Instrumentation instance); partial void DeleteTransfer_Instrumentation(Transfer_Instrumentation instance); + partial void InsertTransfer_LHCSystemList(Transfer_LHCSystemList instance); + partial void UpdateTransfer_LHCSystemList(Transfer_LHCSystemList instance); + partial void DeleteTransfer_LHCSystemList(Transfer_LHCSystemList instance); partial void InsertTransfer_Piping(Transfer_Piping instance); partial void UpdateTransfer_Piping(Transfer_Piping instance); partial void DeleteTransfer_Piping(Transfer_Piping instance); @@ -9370,6 +9373,14 @@ namespace Model } } + public System.Data.Linq.Table Transfer_LHCSystemList + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Transfer_Piping { get @@ -62016,8 +62027,6 @@ namespace Model private EntityRef _Base_Project; - private EntityRef _Technique_CheckItemSet; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -62069,7 +62078,6 @@ namespace Model public Check_CheckSpecial() { this._Base_Project = default(EntityRef); - this._Technique_CheckItemSet = default(EntityRef); OnCreated(); } @@ -62388,10 +62396,6 @@ namespace Model { if ((this._CheckItemSetId != value)) { - if (this._Technique_CheckItemSet.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnCheckItemSetIdChanging(value); this.SendPropertyChanging(); this._CheckItemSetId = value; @@ -62535,40 +62539,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Technique_CheckItemSet", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", IsForeignKey=true)] - public Technique_CheckItemSet Technique_CheckItemSet - { - get - { - return this._Technique_CheckItemSet.Entity; - } - set - { - Technique_CheckItemSet previousValue = this._Technique_CheckItemSet.Entity; - if (((previousValue != value) - || (this._Technique_CheckItemSet.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Technique_CheckItemSet.Entity = null; - previousValue.Check_CheckSpecial.Remove(this); - } - this._Technique_CheckItemSet.Entity = value; - if ((value != null)) - { - value.Check_CheckSpecial.Add(this); - this._CheckItemSetId = value.CheckItemSetId; - } - else - { - this._CheckItemSetId = default(string); - } - this.SendPropertyChanged("Technique_CheckItemSet"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -370529,8 +370499,6 @@ namespace Model private System.Nullable _IsBuiltIn; - private EntitySet _Check_CheckSpecial; - private EntitySet _Technique_CheckItemDetail; #region 可扩展性方法定义 @@ -370557,7 +370525,6 @@ namespace Model public Technique_CheckItemSet() { - this._Check_CheckSpecial = new EntitySet(new Action(this.attach_Check_CheckSpecial), new Action(this.detach_Check_CheckSpecial)); this._Technique_CheckItemDetail = new EntitySet(new Action(this.attach_Technique_CheckItemDetail), new Action(this.detach_Technique_CheckItemDetail)); OnCreated(); } @@ -370722,19 +370689,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Check_CheckSpecial", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")] - public EntitySet Check_CheckSpecial - { - get - { - return this._Check_CheckSpecial; - } - set - { - this._Check_CheckSpecial.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Technique_CheckItemDetail_Technique_CheckItemSet", Storage="_Technique_CheckItemDetail", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")] public EntitySet Technique_CheckItemDetail { @@ -370768,18 +370722,6 @@ namespace Model } } - private void attach_Check_CheckSpecial(Check_CheckSpecial entity) - { - this.SendPropertyChanging(); - entity.Technique_CheckItemSet = this; - } - - private void detach_Check_CheckSpecial(Check_CheckSpecial entity) - { - this.SendPropertyChanging(); - entity.Technique_CheckItemSet = null; - } - private void attach_Technique_CheckItemDetail(Technique_CheckItemDetail entity) { this.SendPropertyChanging(); @@ -392159,6 +392101,356 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Transfer_LHCSystemList")] + public partial class Transfer_LHCSystemList : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _ProjectId; + + private string _Type; + + private System.Nullable _SN; + + private string _Commissioningsystemcode; + + private string _CommissioningCodeDescription; + + private string _SubCommissioningsystem; + + private string _Turnover_Code; + + private System.Nullable _PlanStartofTestingDate; + + private System.Nullable _PlanFinishofTestingDate; + + private string _Status; + + private System.Nullable _ActualFinishedDate; + + private string _Describe; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnTypeChanging(string value); + partial void OnTypeChanged(); + partial void OnSNChanging(System.Nullable value); + partial void OnSNChanged(); + partial void OnCommissioningsystemcodeChanging(string value); + partial void OnCommissioningsystemcodeChanged(); + partial void OnCommissioningCodeDescriptionChanging(string value); + partial void OnCommissioningCodeDescriptionChanged(); + partial void OnSubCommissioningsystemChanging(string value); + partial void OnSubCommissioningsystemChanged(); + partial void OnTurnover_CodeChanging(string value); + partial void OnTurnover_CodeChanged(); + partial void OnPlanStartofTestingDateChanging(System.Nullable value); + partial void OnPlanStartofTestingDateChanged(); + partial void OnPlanFinishofTestingDateChanging(System.Nullable value); + partial void OnPlanFinishofTestingDateChanged(); + partial void OnStatusChanging(string value); + partial void OnStatusChanged(); + partial void OnActualFinishedDateChanging(System.Nullable value); + partial void OnActualFinishedDateChanged(); + partial void OnDescribeChanging(string value); + partial void OnDescribeChanged(); + #endregion + + public Transfer_LHCSystemList() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(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="_SN", DbType="Int")] + public System.Nullable SN + { + get + { + return this._SN; + } + set + { + if ((this._SN != value)) + { + this.OnSNChanging(value); + this.SendPropertyChanging(); + this._SN = value; + this.SendPropertyChanged("SN"); + this.OnSNChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Commissioningsystemcode", DbType="NVarChar(50)")] + public string Commissioningsystemcode + { + get + { + return this._Commissioningsystemcode; + } + set + { + if ((this._Commissioningsystemcode != value)) + { + this.OnCommissioningsystemcodeChanging(value); + this.SendPropertyChanging(); + this._Commissioningsystemcode = value; + this.SendPropertyChanged("Commissioningsystemcode"); + this.OnCommissioningsystemcodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CommissioningCodeDescription", DbType="NVarChar(50)")] + public string CommissioningCodeDescription + { + get + { + return this._CommissioningCodeDescription; + } + set + { + if ((this._CommissioningCodeDescription != value)) + { + this.OnCommissioningCodeDescriptionChanging(value); + this.SendPropertyChanging(); + this._CommissioningCodeDescription = value; + this.SendPropertyChanged("CommissioningCodeDescription"); + this.OnCommissioningCodeDescriptionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubCommissioningsystem", DbType="NVarChar(50)")] + public string SubCommissioningsystem + { + get + { + return this._SubCommissioningsystem; + } + set + { + if ((this._SubCommissioningsystem != value)) + { + this.OnSubCommissioningsystemChanging(value); + this.SendPropertyChanging(); + this._SubCommissioningsystem = value; + this.SendPropertyChanged("SubCommissioningsystem"); + this.OnSubCommissioningsystemChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Turnover_Code", DbType="NVarChar(50)")] + public string Turnover_Code + { + get + { + return this._Turnover_Code; + } + set + { + if ((this._Turnover_Code != value)) + { + this.OnTurnover_CodeChanging(value); + this.SendPropertyChanging(); + this._Turnover_Code = value; + this.SendPropertyChanged("Turnover_Code"); + this.OnTurnover_CodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanStartofTestingDate", DbType="DateTime")] + public System.Nullable PlanStartofTestingDate + { + get + { + return this._PlanStartofTestingDate; + } + set + { + if ((this._PlanStartofTestingDate != value)) + { + this.OnPlanStartofTestingDateChanging(value); + this.SendPropertyChanging(); + this._PlanStartofTestingDate = value; + this.SendPropertyChanged("PlanStartofTestingDate"); + this.OnPlanStartofTestingDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanFinishofTestingDate", DbType="DateTime")] + public System.Nullable PlanFinishofTestingDate + { + get + { + return this._PlanFinishofTestingDate; + } + set + { + if ((this._PlanFinishofTestingDate != value)) + { + this.OnPlanFinishofTestingDateChanging(value); + this.SendPropertyChanging(); + this._PlanFinishofTestingDate = value; + this.SendPropertyChanged("PlanFinishofTestingDate"); + this.OnPlanFinishofTestingDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="NVarChar(50)")] + public string Status + { + get + { + return this._Status; + } + set + { + if ((this._Status != value)) + { + this.OnStatusChanging(value); + this.SendPropertyChanging(); + this._Status = value; + this.SendPropertyChanged("Status"); + this.OnStatusChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualFinishedDate", DbType="DateTime")] + public System.Nullable ActualFinishedDate + { + get + { + return this._ActualFinishedDate; + } + set + { + if ((this._ActualFinishedDate != value)) + { + this.OnActualFinishedDateChanging(value); + this.SendPropertyChanging(); + this._ActualFinishedDate = value; + this.SendPropertyChanged("ActualFinishedDate"); + this.OnActualFinishedDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Describe", DbType="NVarChar(200)")] + public string Describe + { + get + { + return this._Describe; + } + set + { + if ((this._Describe != value)) + { + this.OnDescribeChanging(value); + this.SendPropertyChanging(); + this._Describe = value; + this.SendPropertyChanged("Describe"); + this.OnDescribeChanged(); + } + } + } + + 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.Transfer_Piping")] public partial class Transfer_Piping : INotifyPropertyChanging, INotifyPropertyChanged { @@ -393199,6 +393491,50 @@ namespace Model private string _Comments; + private string _System_No; + + private string _Cat; + + private string _Raised_By; + + private System.Nullable _Date_Raised; + + private string _Disc; + + private System.Nullable _IsEng; + + private System.Nullable _IsMatI; + + private string _Punch_Type; + + private System.Nullable _Required_Date; + + private string _PIC; + + private string _PIC_WUH; + + private string _Correction_Action; + + private System.Nullable _Actual_Date; + + private string _Cleared_By; + + private System.Nullable _Cleared_Date; + + private string _Confirmed_By; + + private System.Nullable _Confirmed_Date; + + private string _Verified_By; + + private System.Nullable _Verified_Date; + + private string _Status; + + private string _Remark; + + private string _Sub_Sys_No; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -393235,6 +393571,50 @@ namespace Model partial void OnPUNCH_ITEM_STATUSChanged(); partial void OnCommentsChanging(string value); partial void OnCommentsChanged(); + partial void OnSystem_NoChanging(string value); + partial void OnSystem_NoChanged(); + partial void OnCatChanging(string value); + partial void OnCatChanged(); + partial void OnRaised_ByChanging(string value); + partial void OnRaised_ByChanged(); + partial void OnDate_RaisedChanging(System.Nullable value); + partial void OnDate_RaisedChanged(); + partial void OnDiscChanging(string value); + partial void OnDiscChanged(); + partial void OnIsEngChanging(System.Nullable value); + partial void OnIsEngChanged(); + partial void OnIsMatIChanging(System.Nullable value); + partial void OnIsMatIChanged(); + partial void OnPunch_TypeChanging(string value); + partial void OnPunch_TypeChanged(); + partial void OnRequired_DateChanging(System.Nullable value); + partial void OnRequired_DateChanged(); + partial void OnPICChanging(string value); + partial void OnPICChanged(); + partial void OnPIC_WUHChanging(string value); + partial void OnPIC_WUHChanged(); + partial void OnCorrection_ActionChanging(string value); + partial void OnCorrection_ActionChanged(); + partial void OnActual_DateChanging(System.Nullable value); + partial void OnActual_DateChanged(); + partial void OnCleared_ByChanging(string value); + partial void OnCleared_ByChanged(); + partial void OnCleared_DateChanging(System.Nullable value); + partial void OnCleared_DateChanged(); + partial void OnConfirmed_ByChanging(string value); + partial void OnConfirmed_ByChanged(); + partial void OnConfirmed_DateChanging(System.Nullable value); + partial void OnConfirmed_DateChanged(); + partial void OnVerified_ByChanging(string value); + partial void OnVerified_ByChanged(); + partial void OnVerified_DateChanging(System.Nullable value); + partial void OnVerified_DateChanged(); + partial void OnStatusChanging(string value); + partial void OnStatusChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnSub_Sys_NoChanging(string value); + partial void OnSub_Sys_NoChanged(); #endregion public Transfer_PunchlistFrom() @@ -393562,6 +393942,446 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_System_No", DbType="NVarChar(50)")] + public string System_No + { + get + { + return this._System_No; + } + set + { + if ((this._System_No != value)) + { + this.OnSystem_NoChanging(value); + this.SendPropertyChanging(); + this._System_No = value; + this.SendPropertyChanged("System_No"); + this.OnSystem_NoChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Cat", DbType="NVarChar(50)")] + public string Cat + { + get + { + return this._Cat; + } + set + { + if ((this._Cat != value)) + { + this.OnCatChanging(value); + this.SendPropertyChanging(); + this._Cat = value; + this.SendPropertyChanged("Cat"); + this.OnCatChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Raised_By", DbType="NVarChar(50)")] + public string Raised_By + { + get + { + return this._Raised_By; + } + set + { + if ((this._Raised_By != value)) + { + this.OnRaised_ByChanging(value); + this.SendPropertyChanging(); + this._Raised_By = value; + this.SendPropertyChanged("Raised_By"); + this.OnRaised_ByChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Date_Raised", DbType="DateTime")] + public System.Nullable Date_Raised + { + get + { + return this._Date_Raised; + } + set + { + if ((this._Date_Raised != value)) + { + this.OnDate_RaisedChanging(value); + this.SendPropertyChanging(); + this._Date_Raised = value; + this.SendPropertyChanged("Date_Raised"); + this.OnDate_RaisedChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Disc", DbType="NVarChar(50)")] + public string Disc + { + get + { + return this._Disc; + } + set + { + if ((this._Disc != value)) + { + this.OnDiscChanging(value); + this.SendPropertyChanging(); + this._Disc = value; + this.SendPropertyChanged("Disc"); + this.OnDiscChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsEng", DbType="Bit")] + public System.Nullable IsEng + { + get + { + return this._IsEng; + } + set + { + if ((this._IsEng != value)) + { + this.OnIsEngChanging(value); + this.SendPropertyChanging(); + this._IsEng = value; + this.SendPropertyChanged("IsEng"); + this.OnIsEngChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsMatI", DbType="Bit")] + public System.Nullable IsMatI + { + get + { + return this._IsMatI; + } + set + { + if ((this._IsMatI != value)) + { + this.OnIsMatIChanging(value); + this.SendPropertyChanging(); + this._IsMatI = value; + this.SendPropertyChanged("IsMatI"); + this.OnIsMatIChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Punch_Type", DbType="NVarChar(50)")] + public string Punch_Type + { + get + { + return this._Punch_Type; + } + set + { + if ((this._Punch_Type != value)) + { + this.OnPunch_TypeChanging(value); + this.SendPropertyChanging(); + this._Punch_Type = value; + this.SendPropertyChanged("Punch_Type"); + this.OnPunch_TypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Required_Date", DbType="DateTime")] + public System.Nullable Required_Date + { + get + { + return this._Required_Date; + } + set + { + if ((this._Required_Date != value)) + { + this.OnRequired_DateChanging(value); + this.SendPropertyChanging(); + this._Required_Date = value; + this.SendPropertyChanged("Required_Date"); + this.OnRequired_DateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PIC", DbType="NVarChar(50)")] + public string PIC + { + get + { + return this._PIC; + } + set + { + if ((this._PIC != value)) + { + this.OnPICChanging(value); + this.SendPropertyChanging(); + this._PIC = value; + this.SendPropertyChanged("PIC"); + this.OnPICChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PIC_WUH", DbType="NVarChar(50)")] + public string PIC_WUH + { + get + { + return this._PIC_WUH; + } + set + { + if ((this._PIC_WUH != value)) + { + this.OnPIC_WUHChanging(value); + this.SendPropertyChanging(); + this._PIC_WUH = value; + this.SendPropertyChanged("PIC_WUH"); + this.OnPIC_WUHChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(50)")] + public string Correction_Action + { + get + { + return this._Correction_Action; + } + set + { + if ((this._Correction_Action != value)) + { + this.OnCorrection_ActionChanging(value); + this.SendPropertyChanging(); + this._Correction_Action = value; + this.SendPropertyChanged("Correction_Action"); + this.OnCorrection_ActionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Actual_Date", DbType="DateTime")] + public System.Nullable Actual_Date + { + get + { + return this._Actual_Date; + } + set + { + if ((this._Actual_Date != value)) + { + this.OnActual_DateChanging(value); + this.SendPropertyChanging(); + this._Actual_Date = value; + this.SendPropertyChanged("Actual_Date"); + this.OnActual_DateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Cleared_By", DbType="NVarChar(50)")] + public string Cleared_By + { + get + { + return this._Cleared_By; + } + set + { + if ((this._Cleared_By != value)) + { + this.OnCleared_ByChanging(value); + this.SendPropertyChanging(); + this._Cleared_By = value; + this.SendPropertyChanged("Cleared_By"); + this.OnCleared_ByChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Cleared_Date", DbType="DateTime")] + public System.Nullable Cleared_Date + { + get + { + return this._Cleared_Date; + } + set + { + if ((this._Cleared_Date != value)) + { + this.OnCleared_DateChanging(value); + this.SendPropertyChanging(); + this._Cleared_Date = value; + this.SendPropertyChanged("Cleared_Date"); + this.OnCleared_DateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Confirmed_By", DbType="NVarChar(50)")] + public string Confirmed_By + { + get + { + return this._Confirmed_By; + } + set + { + if ((this._Confirmed_By != value)) + { + this.OnConfirmed_ByChanging(value); + this.SendPropertyChanging(); + this._Confirmed_By = value; + this.SendPropertyChanged("Confirmed_By"); + this.OnConfirmed_ByChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Confirmed_Date", DbType="DateTime")] + public System.Nullable Confirmed_Date + { + get + { + return this._Confirmed_Date; + } + set + { + if ((this._Confirmed_Date != value)) + { + this.OnConfirmed_DateChanging(value); + this.SendPropertyChanging(); + this._Confirmed_Date = value; + this.SendPropertyChanged("Confirmed_Date"); + this.OnConfirmed_DateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Verified_By", DbType="NVarChar(50)")] + public string Verified_By + { + get + { + return this._Verified_By; + } + set + { + if ((this._Verified_By != value)) + { + this.OnVerified_ByChanging(value); + this.SendPropertyChanging(); + this._Verified_By = value; + this.SendPropertyChanged("Verified_By"); + this.OnVerified_ByChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Verified_Date", DbType="DateTime")] + public System.Nullable Verified_Date + { + get + { + return this._Verified_Date; + } + set + { + if ((this._Verified_Date != value)) + { + this.OnVerified_DateChanging(value); + this.SendPropertyChanging(); + this._Verified_Date = value; + this.SendPropertyChanged("Verified_Date"); + this.OnVerified_DateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="NVarChar(50)")] + public string Status + { + get + { + return this._Status; + } + set + { + if ((this._Status != value)) + { + this.OnStatusChanging(value); + this.SendPropertyChanging(); + this._Status = value; + this.SendPropertyChanged("Status"); + this.OnStatusChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")] + public string Sub_Sys_No + { + get + { + return this._Sub_Sys_No; + } + set + { + if ((this._Sub_Sys_No != value)) + { + this.OnSub_Sys_NoChanging(value); + this.SendPropertyChanging(); + this._Sub_Sys_No = value; + this.SendPropertyChanged("Sub_Sys_No"); + this.OnSub_Sys_NoChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index bd497c6b..5fe155da 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true From 4023edecf9903d3fee8fae538e72251fc9c0e2fa Mon Sep 17 00:00:00 2001 From: "754998852@qq.com" <754998852@qq.com> Date: Wed, 24 Jul 2024 14:58:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=A7=BB=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- SGGL/Model/Model.cs | 72 ++++++++++++++++--------- 2 files changed, 49 insertions(+), 25 deletions(-) diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 9793caa2..7591adf4 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -19072,7 +19072,7 @@ - +