diff --git a/DataBase/hjglDB_7_2024.03.18.rar b/DataBase/hjglDB_7_2024.03.18.rar deleted file mode 100644 index a1c11d6..0000000 Binary files a/DataBase/hjglDB_7_2024.03.18.rar and /dev/null differ diff --git a/DataBase/hjglDB_7_2024.03.19.bak b/DataBase/hjglDB_7_2024.03.19.bak deleted file mode 100644 index a8b800d..0000000 Binary files a/DataBase/hjglDB_7_2024.03.19.bak and /dev/null differ diff --git a/DataBase/hjglDB_7_2024.03.28(本机).bak b/DataBase/hjglDB_7_2024.03.28(本机).bak deleted file mode 100644 index 4d8e95a..0000000 Binary files a/DataBase/hjglDB_7_2024.03.28(本机).bak and /dev/null differ diff --git a/DataBase/hjglDB_7_2024.05.14.bak b/DataBase/hjglDB_7_2024.05.14.bak new file mode 100644 index 0000000..3ed61a8 Binary files /dev/null and b/DataBase/hjglDB_7_2024.05.14.bak differ diff --git a/DataBase/hjglDB_7_2024.05.14.rar b/DataBase/hjglDB_7_2024.05.14.rar new file mode 100644 index 0000000..c1a5efc Binary files /dev/null and b/DataBase/hjglDB_7_2024.05.14.rar differ diff --git a/DataBase/版本日志/HJGLDB_2024.01.30.sql b/DataBase/版本日志/已完成/HJGLDB_2024.01.30.sql similarity index 100% rename from DataBase/版本日志/HJGLDB_2024.01.30.sql rename to DataBase/版本日志/已完成/HJGLDB_2024.01.30.sql diff --git a/DataBase/版本日志/HJGLDB_2024.02.04.sql b/DataBase/版本日志/已完成/HJGLDB_2024.02.04.sql similarity index 100% rename from DataBase/版本日志/HJGLDB_2024.02.04.sql rename to DataBase/版本日志/已完成/HJGLDB_2024.02.04.sql diff --git a/DataBase/版本日志/HJGLDB_2024.03.07.sql b/DataBase/版本日志/已完成/HJGLDB_2024.03.07.sql similarity index 100% rename from DataBase/版本日志/HJGLDB_2024.03.07.sql rename to DataBase/版本日志/已完成/HJGLDB_2024.03.07.sql diff --git a/DataBase/版本日志/HJGLDB_2024.03.19.sql b/DataBase/版本日志/已完成/HJGLDB_2024.03.19.sql similarity index 100% rename from DataBase/版本日志/HJGLDB_2024.03.19.sql rename to DataBase/版本日志/已完成/HJGLDB_2024.03.19.sql diff --git a/DataBase/版本日志/HJGLDB_2024.04.08.sql b/DataBase/版本日志/已完成/HJGLDB_2024.04.08.sql similarity index 100% rename from DataBase/版本日志/HJGLDB_2024.04.08.sql rename to DataBase/版本日志/已完成/HJGLDB_2024.04.08.sql diff --git a/DataBase/版本日志/HJGLDB_2024.04.12.sql b/DataBase/版本日志/已完成/HJGLDB_2024.04.12.sql similarity index 100% rename from DataBase/版本日志/HJGLDB_2024.04.12.sql rename to DataBase/版本日志/已完成/HJGLDB_2024.04.12.sql diff --git a/DataBase/版本日志/HJGLDB_2024.04.13.sql b/DataBase/版本日志/已完成/HJGLDB_2024.04.13.sql similarity index 100% rename from DataBase/版本日志/HJGLDB_2024.04.13.sql rename to DataBase/版本日志/已完成/HJGLDB_2024.04.13.sql diff --git a/DataBase/版本日志/HJGLDB_2024.04.17.sql b/DataBase/版本日志/已完成/HJGLDB_2024.04.17.sql similarity index 100% rename from DataBase/版本日志/HJGLDB_2024.04.17.sql rename to DataBase/版本日志/已完成/HJGLDB_2024.04.17.sql diff --git a/DataBase/版本日志/HJGLDB_2024.04.18.sql b/DataBase/版本日志/已完成/HJGLDB_2024.04.18.sql similarity index 100% rename from DataBase/版本日志/HJGLDB_2024.04.18.sql rename to DataBase/版本日志/已完成/HJGLDB_2024.04.18.sql diff --git a/DataBase/版本日志/HJGLDB_2024.05.02.sql b/DataBase/版本日志/已完成/HJGLDB_2024.05.02.sql similarity index 100% rename from DataBase/版本日志/HJGLDB_2024.05.02.sql rename to DataBase/版本日志/已完成/HJGLDB_2024.05.02.sql diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo new file mode 100644 index 0000000..f5e08d0 Binary files /dev/null and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/BLL/Common/ProjectSet/Welder_TeamGroupService.cs b/HJGL/BLL/Common/ProjectSet/Welder_TeamGroupService.cs index f3782bd..7c0425d 100644 --- a/HJGL/BLL/Common/ProjectSet/Welder_TeamGroupService.cs +++ b/HJGL/BLL/Common/ProjectSet/Welder_TeamGroupService.cs @@ -108,7 +108,12 @@ namespace BLL /// public static ListItem[] GetAllTeamGroupList(string projectId, string unitId) { - var q = (from x in Funs.DB.Welder_TeamGroup where x.ProjectId==projectId && x.UnitId == unitId orderby x.TeamGroupName select x).ToList(); + var q = (from x in Funs.DB.Welder_TeamGroup where x.ProjectId==projectId orderby x.TeamGroupName select x).ToList(); + if (!string.IsNullOrEmpty(unitId)) + { + q = q.Where(x => x.UnitId == unitId).ToList(); + } + ListItem[] lis = new ListItem[q.Count()]; for (int i = 0; i < q.Count(); i++) diff --git a/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs b/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs index 9c2ad63..2d9a6d1 100644 --- a/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs +++ b/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs @@ -98,6 +98,7 @@ namespace BLL SystemNumber = weldJoint.SystemNumber, Remark = weldJoint.Remark, IsGoldJoint = weldJoint.IsGoldJoint, + IsPMI=weldJoint.IsPMI, WPQId = weldJoint.WPQId, DetectionType = weldJoint.DetectionType, PageNum = weldJoint.PageNum, diff --git a/HJGL/FineUIPro.Web/File/Excel/HJGL_DataIn/焊接数据导入模版.xlsx b/HJGL/FineUIPro.Web/File/Excel/HJGL_DataIn/焊接数据导入模版.xlsx index 081de7f..16dcba4 100644 Binary files a/HJGL/FineUIPro.Web/File/Excel/HJGL_DataIn/焊接数据导入模版.xlsx and b/HJGL/FineUIPro.Web/File/Excel/HJGL_DataIn/焊接数据导入模版.xlsx differ diff --git a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs index e9fee46..9c6e84b 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs @@ -354,7 +354,8 @@ namespace FineUIPro.Web.WeldingProcess.DataIn newDataInTemp.Value35 = ds.Tables[0].Rows[i][34].ToString().Trim(); newDataInTemp.Value36 = ds.Tables[0].Rows[i][35].ToString().Trim(); newDataInTemp.Value37 = ds.Tables[0].Rows[i][36].ToString().Trim(); - + newDataInTemp.Value38 = ds.Tables[0].Rows[i][37].ToString().Trim(); + BLL.DataInTempService.AddDataInTemp(newDataInTemp); } } @@ -1542,10 +1543,24 @@ namespace FineUIPro.Web.WeldingProcess.DataIn } } - //if (!string.IsNullOrEmpty(tempData.Value22) && !string.IsNullOrEmpty(tempData.Value23)) - //{ - // weldJoint.Specification = "Φ" + tempData.Value22 + "*" + tempData.Value23; - //} + if (!string.IsNullOrEmpty(tempData.Value38)) + { + if (tempData.Value38 == "是") + { + weldJoint.IsPMI = true; + } + else if (tempData.Value38 == "否") + { + weldJoint.IsPMI = false; + } + } + else + { + if (jot != null && jot.IsPMI != null) + { + weldJoint.IsPMI = jot.IsPMI; + } + } if (string.IsNullOrEmpty(errInfo)) // 所有信息正确的话 这插入管线焊口 { diff --git a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx index eb0debf..514af20 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx @@ -155,6 +155,8 @@ + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx.cs index eb2041f..7ed6425 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx.cs @@ -74,7 +74,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn this.txtValue35.Text = dataInTemp.Value35; this.txtValue36.Text = dataInTemp.Value36; this.txtValue37.Text = dataInTemp.Value37; - //this.txtValue38.Text = dataInTemp.Value38; + this.txtValue38.Text = dataInTemp.Value38; this.lbErrCout.Text = dataInTemp.ToopValue; } } @@ -541,19 +541,18 @@ namespace FineUIPro.Web.WeldingProcess.DataIn } } - - //if (dataInTemp.Value38 != this.txtValue38.Text.Trim()) - //{ - // var tempValue38 = allDataInTemp.Where(x => x.Value38 == dataInTemp.Value38 || (x.Value38 == null && dataInTemp.Value38 == null)); - // if (tempValue38 != null) - // { - // foreach (var item in tempValue38) - // { - // item.Value38 = this.txtValue38.Text.Trim(); - // Funs.DB.SubmitChanges(); - // } - // } - //} + if (dataInTemp.Value38 != this.txtValue38.Text.Trim()) + { + var tempValue38 = allDataInTemp.Where(x => x.Value38 == dataInTemp.Value38 || (x.Value38 == null && dataInTemp.Value38 == null)); + if (tempValue38 != null) + { + foreach (var item in tempValue38) + { + item.Value38 = this.txtValue38.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } } else { @@ -597,8 +596,8 @@ namespace FineUIPro.Web.WeldingProcess.DataIn newDataInTemp.Value34 = this.txtValue34.Text.Trim(); newDataInTemp.Value35 = this.txtValue35.Text.Trim(); newDataInTemp.Value36 = this.txtValue36.Text.Trim(); - //newDataInTemp.Value37 = this.txtValue37.Text.Trim(); - //newDataInTemp.Value38 = this.txtValue38.Text.Trim(); + newDataInTemp.Value37 = this.txtValue37.Text.Trim(); + newDataInTemp.Value38 = this.txtValue38.Text.Trim(); if (!string.IsNullOrEmpty(this.TempId)) { diff --git a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx.designer.cs index 9526fee..fb9dde2 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.WeldingProcess.DataIn { - - - public partial class DataInEdit { - +namespace FineUIPro.Web.WeldingProcess.DataIn +{ + + + public partial class DataInEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// Toolbar1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// ToolbarFill1 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// ckAll 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckAll; - + /// /// btnSave 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// lbErrCout 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea lbErrCout; - + /// /// txtValue1 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue1; - + /// /// txtValue2 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue2; - + /// /// txtValue3 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue3; - + /// /// txtValue4 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue4; - + /// /// txtValue5 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue5; - + /// /// txtValue6 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue6; - + /// /// txtValue7 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue7; - + /// /// txtValue8 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue8; - + /// /// txtValue9 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue9; - + /// /// txtValue10 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue10; - + /// /// txtValue11 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue11; - + /// /// txtValue12 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue12; - + /// /// txtValue13 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue13; - + /// /// txtValue14 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue14; - + /// /// txtValue15 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue15; - + /// /// txtValue16 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue16; - + /// /// txtValue17 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue17; - + /// /// txtValue18 控件。 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue18; - + /// /// txtValue19 控件。 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue19; - + /// /// txtValue20 控件。 /// @@ -263,7 +265,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue20; - + /// /// txtValue21 控件。 /// @@ -272,7 +274,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue21; - + /// /// txtValue22 控件。 /// @@ -281,7 +283,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtValue22; - + /// /// txtValue23 控件。 /// @@ -290,7 +292,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue23; - + /// /// txtValue24 控件。 /// @@ -299,7 +301,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue24; - + /// /// txtValue25 控件。 /// @@ -308,7 +310,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue25; - + /// /// txtValue26 控件。 /// @@ -317,7 +319,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue26; - + /// /// txtValue27 控件。 /// @@ -326,7 +328,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue27; - + /// /// txtValue28 控件。 /// @@ -335,7 +337,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue28; - + /// /// txtValue29 控件。 /// @@ -344,7 +346,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue29; - + /// /// txtValue30 控件。 /// @@ -353,7 +355,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue30; - + /// /// txtValue31 控件。 /// @@ -362,7 +364,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue31; - + /// /// txtValue32 控件。 /// @@ -371,7 +373,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue32; - + /// /// txtValue33 控件。 /// @@ -380,7 +382,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue33; - + /// /// txtValue34 控件。 /// @@ -389,7 +391,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue34; - + /// /// txtValue36 控件。 /// @@ -398,7 +400,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue36; - + /// /// txtValue37 控件。 /// @@ -407,7 +409,16 @@ namespace FineUIPro.Web.WeldingProcess.DataIn { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtValue37; - + + /// + /// txtValue38 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue38; + /// /// txtValue35 控件。 /// diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/GetWdldingDailyItem.ashx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/GetWdldingDailyItem.ashx.cs index d7a151f..3159229 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/GetWdldingDailyItem.ashx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/GetWdldingDailyItem.ashx.cs @@ -30,7 +30,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage viewWeldlines[i].WeldTypeCode, viewWeldlines[i].JointAttribute, viewWeldlines[i].WeldingLocationCode, - viewWeldlines[i].DoneDin, + viewWeldlines[i].Size, viewWeldlines[i].Dia, viewWeldlines[i].Thickness, viewWeldlines[i].WeldingMethodCode, diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx index 40f72f6..b636c86 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx @@ -163,7 +163,7 @@ columnMenu: false, columnResizing: false, cls: 'gridinrowexpander', - fields: ['Num', 'PipelineCode', 'WeldJointCode', 'BackingWelderCode', 'CoverWelderCode', 'WeldTypeCode', 'JointAttribute', 'WeldingLocationCode', 'DoneDin', 'Dia', 'Thickness', 'WeldingMethodCode', 'Material1Code', 'Material2Code', 'ComponentsCode1', 'ComponentsCode2', 'HeartNo1', 'HeartNo2', 'WeldSilkCode', 'WeldMatCode', 'PipeSegment', 'WPQCode'], + fields: ['Num', 'PipelineCode', 'WeldJointCode', 'BackingWelderCode', 'CoverWelderCode', 'WeldTypeCode', 'JointAttribute', 'WeldingLocationCode', 'Size', 'Dia', 'Thickness', 'WeldingMethodCode', 'Material1Code', 'Material2Code', 'ComponentsCode1', 'ComponentsCode2', 'HeartNo1', 'HeartNo2', 'WeldSilkCode', 'WeldMatCode', 'PipeSegment', 'WPQCode'], columns: [{ text: '序号', field: 'Num', width: 50 }, { @@ -181,7 +181,7 @@ }, { text: '焊接位置', field: 'WeldingLocationCode', width: 80 }, { - text: '管径', field: 'DoneDin', width: 65 + text: '管径', field: 'Size', width: 65 }, { text: '外径', field: 'Dia', width: 65 }, { diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs index 6972e98..f833f0e 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs @@ -1019,15 +1019,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage } else { - d.Material1Id = steel.MaterialId; - //if (!string.IsNullOrEmpty(d.Material1Id) && d.Material1Id != steel.MaterialId) - //{ - // errorInfos += (i + 2) + "行,材质1[" + ds.Tables[0].Rows[i]["材质1"].ToString() + "]验证不一至；"; - //} - //else - //{ - // d.Material1Id = steel.MaterialId; - //} + if ((!string.IsNullOrEmpty(d.Material1Id) && steel.MaterialId != d.Material1Id) + || (!string.IsNullOrEmpty(d.Material2Id) && steel.MaterialId != d.Material2Id)) + { + errorInfos += (i + 2) + "行,材质1[" + ds.Tables[0].Rows[i]["材质1"].ToString() + "]验证不一至；"; + } + else + { + d.Material1Id = steel.MaterialId; + } } } @@ -1040,18 +1040,19 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage } else { - d.Material2Id = steel.MaterialId; - //if (!string.IsNullOrEmpty(d.Material2Id) && d.Material2Id != steel.MaterialId) - //{ - // errorInfos += (i + 2) + "行,材质2[" + ds.Tables[0].Rows[i]["材质2"].ToString() + "]验证不一至；"; - //} - //else - //{ - // d.Material2Id = steel.MaterialId; - //} + if ((!string.IsNullOrEmpty(d.Material2Id) && steel.MaterialId!=d.Material2Id) + || (!string.IsNullOrEmpty(d.Material1Id) && steel.MaterialId != d.Material1Id)) + { + errorInfos += (i + 2) + "行,材质2[" + ds.Tables[0].Rows[i]["材质2"].ToString() + "]验证不一至；"; + } + else + { + d.Material2Id = steel.MaterialId; + } } } + if (ds.Tables[0].Rows[i]["组件1"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["组件1"].ToString())) { var com = componentss.FirstOrDefault(x => x.ComponentsCode == ds.Tables[0].Rows[i]["组件1"].ToString()); @@ -1061,7 +1062,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage } else { - if (!string.IsNullOrEmpty(d.PipeAssembly1Id) && d.PipeAssembly1Id != com.ComponentsId) + if ((!string.IsNullOrEmpty(d.PipeAssembly1Id) && com.ComponentsId != d.PipeAssembly1Id) + || (!string.IsNullOrEmpty(d.PipeAssembly2Id) && com.ComponentsId != d.PipeAssembly2Id)) + { errorInfos += (i + 2) + "行,组件1[" + ds.Tables[0].Rows[i]["组件1"].ToString() + "]验证不一至；"; } @@ -1081,7 +1084,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage } else { - if (!string.IsNullOrEmpty(d.PipeAssembly2Id) && d.PipeAssembly2Id != com.ComponentsId) + if ((!string.IsNullOrEmpty(d.PipeAssembly1Id) && com.ComponentsId != d.PipeAssembly1Id) + || (!string.IsNullOrEmpty(d.PipeAssembly2Id) && com.ComponentsId != d.PipeAssembly2Id)) { errorInfos += (i + 2) + "行,组件2[" + ds.Tables[0].Rows[i]["组件2"].ToString() + "]验证不一至；"; } @@ -1094,27 +1098,28 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage if (ds.Tables[0].Rows[i]["炉批号1"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["炉批号1"].ToString())) { - d.HeartNo1 = ds.Tables[0].Rows[i]["炉批号1"].ToString(); - //if (!string.IsNullOrEmpty(d.HeartNo1) && d.HeartNo1 != ds.Tables[0].Rows[i]["炉批号1"].ToString()) - //{ - // errorInfos += (i + 2) + "行,炉批号1[" + ds.Tables[0].Rows[i]["炉批号1"].ToString() + "]验证不一至；"; - //} - //else - //{ - // d.HeartNo1 = ds.Tables[0].Rows[i]["炉批号1"].ToString(); - //} + if ((!string.IsNullOrEmpty(d.HeartNo1) && ds.Tables[0].Rows[i]["炉批号1"].ToString() != d.HeartNo1) + || (!string.IsNullOrEmpty(d.HeartNo2) && ds.Tables[0].Rows[i]["炉批号1"].ToString() != d.HeartNo2)) + { + errorInfos += (i + 2) + "行,炉批号1[" + ds.Tables[0].Rows[i]["炉批号1"].ToString() + "]验证不一至；"; + } + else + { + d.HeartNo1 = ds.Tables[0].Rows[i]["炉批号1"].ToString(); + } } + if (ds.Tables[0].Rows[i]["炉批号2"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["炉批号2"].ToString())) { - d.HeartNo2 = ds.Tables[0].Rows[i]["炉批号2"].ToString(); - //if (!string.IsNullOrEmpty(d.HeartNo2) && d.HeartNo2 != ds.Tables[0].Rows[i]["炉批号2"].ToString()) - //{ - // errorInfos += (i + 2) + "行,炉批号2[" + ds.Tables[0].Rows[i]["炉批号2"].ToString() + "]验证不一至；"; - //} - //else - //{ - // d.HeartNo2 = ds.Tables[0].Rows[i]["炉批号2"].ToString(); - //} + if ((!string.IsNullOrEmpty(d.HeartNo1) && ds.Tables[0].Rows[i]["炉批号2"].ToString() != d.HeartNo1) + || (!string.IsNullOrEmpty(d.HeartNo2) && ds.Tables[0].Rows[i]["炉批号2"].ToString() != d.HeartNo2)) + { + errorInfos += (i + 2) + "行,炉批号2[" + ds.Tables[0].Rows[i]["炉批号2"].ToString() + "]验证不一至；"; + } + else + { + d.HeartNo2 = ds.Tables[0].Rows[i]["炉批号2"].ToString(); + } } //if (ds.Tables[0].Rows[i]["焊丝"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["焊丝"].ToString())) diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx index d2443ed..fbbc75f 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx @@ -28,17 +28,20 @@ + LabelAlign="Right" Width="180px" LabelWidth="80px" OnSelectedIndexChanged="drpInstallation_OnSelectedIndexChanged"> + LabelAlign="Right" Width="180px" LabelWidth="80px" > - + + + LabelWidth="90px" Width="210px"> diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs index 7811dd7..2dd3c21 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs @@ -1,7 +1,6 @@ using BLL; using NPOI.XSSF.UserModel; using NPOI.SS.UserModel; -using NPOI.HSSF.Util; using System; using System.Collections.Generic; @@ -10,13 +9,9 @@ using System.Data.SqlClient; using System.IO; using System.Linq; using Newtonsoft.Json.Linq; -using NPOI.HSSF.UserModel; -using NPOI.SS.Util; -using NPOI.SS.Formula.Functions; -using NPOI.OpenXmlFormats.Wordprocessing; -using System.Web.UI.WebControls; using BorderStyle = NPOI.SS.UserModel.BorderStyle; -using System.Data.Linq; + + namespace FineUIPro.Web.WeldingProcess.WeldingReport { @@ -36,6 +31,12 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport BLL.Project_InstallationService.InitInstallationDropDownList(drpInstallation, true, CurrUser.LoginProjectId, Resources.Lan.PleaseSelect); BLL.Base_UnitService.InitProjectUnitDropDownList(this.drpUnit, true, CurrUser.LoginProjectId, Const.UnitType_5, Resources.Lan.PleaseSelect); Funs.FineUIPleaseSelect(drpWorkAreaId, Resources.Lan.PleaseSelect); + var teamGroup = BLL.Welder_TeamGroupService.GetAllTeamGroupList(CurrUser.LoginProjectId, ""); + drpTeamGroup.DataValueField = "Value"; + drpTeamGroup.DataTextField = "Text"; + drpTeamGroup.DataSource = teamGroup; + drpTeamGroup.DataBind(); + Funs.FineUIPleaseSelect(drpTeamGroup, ""); } } @@ -70,7 +71,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport left join Welder_Welder AS fw on weldJoint.BackingWelderId = fw.WelderId left join Welder_Welder AS cw on weldJoint.CoverWelderId = cw.WelderId LEFT JOIN dbo.Base_DetectionRate rate ON rate.DetectionRateId = pipeline.DetectionRateId - WHERE weldJoint.WeldingDailyId IS NOT NULL AND weldJoint.ProjectId=@projectId"; + LEFT JOIN dbo.Welder_ProjectWelder pcw ON pcw.WelderId = weldJoint.CoverWelderId AND pcw.ProjectId=weldJoint.ProjectId + LEFT JOIN dbo.Welder_ProjectWelder pfw ON pfw.WelderId = weldJoint.BackingWelderId AND pfw.ProjectId=weldJoint.ProjectId + WHERE weldJoint.WeldingDailyId IS NOT NULL AND weldJoint.ProjectId=@projectId"; List listStr = new List(); listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); @@ -97,11 +100,13 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport strSql += " AND pipeline.UnitId = @UnitId"; listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue)); } - //if (this.drpWelder.SelectedValue!=Const._Null) - //{ - // strSql += " AND (weldJoint.CoverWelderId=@WelderId OR weldJoint.BackingWelderId=@WelderId)"; - // listStr.Add(new SqlParameter("@WelderId", drpWelder.SelectedValue)); - //} + if (this.drpTeamGroup.SelectedValueArray.Length>0) + { + string[] teamGroupList = drpTeamGroup.SelectedValueArray; + string teamGroups = string.Join(",", teamGroupList); + strSql += " AND (CHARINDEX(pcw.TeamGroupId,@TeamGroupId)>0 OR CHARINDEX(pfw.TeamGroupId,@TeamGroupId)>0) "; + listStr.Add(new SqlParameter("@TeamGroupId", teamGroups)); + } if (txtStarTime.Text != "") { strSql += " AND weldingDaily.WeldingDate> = @WeldingStartDate"; diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.designer.cs index 35f2540..230d180 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.WeldingProcess.WeldingReport { - - - public partial class WeldDailyExport { - +namespace FineUIPro.Web.WeldingProcess.WeldingReport +{ + + + public partial class WeldDailyExport + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar1 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// drpInstallation 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpInstallation; - + /// /// drpWorkAreaId 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpWorkAreaId; - + /// /// drpUnit 控件。 /// @@ -83,7 +85,16 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnit; - + + /// + /// drpTeamGroup 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpTeamGroup; + /// /// txtStarTime 控件。 /// @@ -92,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtStarTime; - + /// /// Label1 控件。 /// @@ -101,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// txtEndTime 控件。 /// @@ -110,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtEndTime; - + /// /// ToolbarFill1 控件。 /// @@ -119,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// BtnAnalyse 控件。 /// @@ -128,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button BtnAnalyse; - + /// /// btnOut 控件。 /// @@ -137,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOut; - + /// /// labNumber 控件。 /// @@ -146,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label labNumber; - + /// /// Label3 控件。 /// @@ -155,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label3; - + /// /// ToolbarSeparator1 控件。 /// @@ -164,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -173,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs index 9050676..22590eb 100644 --- a/HJGL/Model/Model.cs +++ b/HJGL/Model/Model.cs @@ -21300,7 +21300,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] public string ProjectId { get @@ -21479,10 +21479,10 @@ namespace Model private int _Status; - private string _ReportNo; - private System.Nullable _CheckTime; + private string _ReportNo; + private System.Nullable _ReportTime; #region 可扩展性方法定义 @@ -21501,10 +21501,10 @@ namespace Model partial void OnAcceptanceChanged(); partial void OnStatusChanging(int value); partial void OnStatusChanged(); - partial void OnReportNoChanging(string value); - partial void OnReportNoChanged(); partial void OnCheckTimeChanging(System.Nullable value); partial void OnCheckTimeChanged(); + partial void OnReportNoChanging(string value); + partial void OnReportNoChanged(); partial void OnReportTimeChanging(System.Nullable value); partial void OnReportTimeChanged(); #endregion @@ -21614,7 +21614,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int NOT NULL")] public int Status { get @@ -21634,26 +21634,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")] - public string ReportNo - { - get - { - return this._ReportNo; - } - set - { - if ((this._ReportNo != value)) - { - this.OnReportNoChanging(value); - this.SendPropertyChanging(); - this._ReportNo = value; - this.SendPropertyChanged("ReportNo"); - this.OnReportNoChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")] public System.Nullable CheckTime { @@ -21674,6 +21654,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")] + public string ReportNo + { + get + { + return this._ReportNo; + } + set + { + if ((this._ReportNo != value)) + { + this.OnReportNoChanging(value); + this.SendPropertyChanging(); + this._ReportNo = value; + this.SendPropertyChanged("ReportNo"); + this.OnReportNoChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")] public System.Nullable ReportTime { @@ -37314,8 +37314,6 @@ namespace Model private string _ProjectId; - private System.Nullable _IsPMI; - private string _PipelineCode; private string _PipelineId; @@ -37446,22 +37444,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="isPMI", Storage="_IsPMI", DbType="Bit")] - public System.Nullable IsPMI - { - get - { - return this._IsPMI; - } - set - { - if ((this._IsPMI != value)) - { - this._IsPMI = value; - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")] public string PipelineCode { @@ -39470,6 +39452,8 @@ namespace Model private string _PipingClassCode; + private string _PIPClassCode; + private string _WeldingDate; private System.Nullable _IsCancel; @@ -40578,6 +40562,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PIPClassCode", DbType="NVarChar(50)")] + public string PIPClassCode + { + get + { + return this._PIPClassCode; + } + set + { + if ((this._PIPClassCode != value)) + { + this._PIPClassCode = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingDate", DbType="VarChar(100)")] public string WeldingDate { diff --git a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache index 0f8d702..37461cc 100644 Binary files a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache and b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache differ diff --git a/HJGLPackFile/版本日志/HJGLDB_2024.05.12.sql b/HJGLPackFile/版本日志/HJGLDB_2024.05.12.sql new file mode 100644 index 0000000..f59c982 --- /dev/null +++ b/HJGLPackFile/版本日志/HJGLDB_2024.05.12.sql @@ -0,0 +1,312 @@ +-- ߺ Ƿ PMI +alter table Pipeline_WeldJoint add isPMI bit NULL +GO +update Pipeline_WeldJoint set isPMI=0 +GO + +ALTER VIEW [dbo].[View_Pipeline_WeldJoint] +AS +/************Ϣͼ*****************/ +SELECT WeldJoint.WeldJointId, +WeldJoint.ProjectId, +WeldJoint.PipelineId, +WeldJoint.WeldJointCode, +dbo.Fun_GetParseInt(WeldJoint.WeldJointCode) AS ConvertWeldJoint, +WeldJoint.WeldTypeId, +WeldJoint.Material1Id, +WeldJoint.Material2Id, +WeldJoint.ANSISCH, +WeldJoint.Thickness, +WeldJoint.Dia, +WeldJoint.Size, +WeldJoint.JointAttribute, +WeldJoint.JointArea, +WeldJoint.WeldingMethodId, +WeldJoint.IsHotProess, +WeldJoint.WeldingLocationId, +WeldJoint.WeldMatId, +WeldJoint.WeldSilkId, +WeldJoint.GrooveTypeId, +WeldJoint.PipeSegment, +WeldJoint.PipeAssembly1Id, +WeldJoint.PipeAssembly2Id, +WeldJoint.PipeAssemblyCount, +WeldJoint.HeartNo1, +WeldJoint.HeartNo2, +WeldJoint.LastTemp, +WeldJoint.CellTemp, +WeldJoint.PrepareTemp, +WeldJoint.Electricity, +WeldJoint.SystemNumber, +WeldJoint.Remark, +WeldJoint.DoneDin, +WeldJoint.Voltage, +WeldJoint.TestPackageNo, +WeldJoint.WeldingDailyCode, +WeldJoint.WeldingDailyId, +WeldJoint.BackingWelderId, +WeldJoint.CoverWelderId, +WeldJoint.PipingClassId, +WeldJoint.Specification, +WeldJoint.CancelResult, +Project.ProjectCode, +Project.ProjectName, +Pipeline.PipelineCode, +Pipeline.InstallationId, +Pipeline.UnitId, +Pipeline.SingleNumber, +Pipeline.WorkAreaId, +WeldType.WeldTypeCode, +Material1.MaterialCode AS Material1Code, +Material2.MaterialCode AS Material2Code, +WeldingMethod.WeldingMethodCode, +WeldingLocation.WeldingLocationCode, +WeldMat.ConsumablesCode AS WeldMatCode, +--WeldSilk.ConsumablesCode AS WeldSilkCode, +'' AS WeldSilkCode, +GrooveType.GrooveTypeCode, +CASE WHEN WeldJoint.WeldingDailyId IS NULL THEN '' ELSE '' END AS Is_hjName, +CASE WHEN WeldJoint.IsHotProess=1 THEN '' ELSE '' END AS IsHotProessStr, +Components1.ComponentsCode AS ComponentsCode1, +Components2.ComponentsCode AS ComponentsCode2, +BackingWelder.WelderCode AS BackingWelderCode, +BackingWelder.WelderName AS BackingWelderName, +CoverWelder.WelderCode AS CoverWelderCode, +CoverWelder.WelderName AS CoverWelderName, +(CASE WHEN CoverWelder.WelderCode IS NOT NULL AND BackingWelder.WelderCode IS NOT NULL + THEN CoverWelder.WelderCode + '/' + BackingWelder.WelderCode + ELSE (ISNULL(CoverWelder.WelderCode,'') + ISNULL(BackingWelder.WelderCode,'')) END) AS WelderCode, -- + (CASE WHEN Material1.MaterialCode IS NOT NULL AND Material2.MaterialCode IS NOT NULL + THEN Material1.MaterialCode + '/' + Material2.MaterialCode + ELSE (ISNULL(Material1.MaterialCode,'') + ISNULL(Material2.MaterialCode,'')) END) AS MaterialCode, -- +pipingClass.PipingClassCode,pip.PIPClassCode, +CONVERT(VARCHAR(100), WeldingDaily.WeldingDate, 23) AS WeldingDate, +WeldJoint.IsCancel, +WeldJoint.IsPMI, +WeldJoint.IsGoldJoint, +WeldJoint.WPQId,wps.WPQCode, +WeldJoint.DetectionType, +WeldJoint.PageNum +FROM Pipeline_WeldJoint AS WeldJoint +LEFT JOIN Base_Project AS Project ON Project.ProjectId=WeldJoint.ProjectId +LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId = WeldJoint.PipelineId +LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=WeldJoint.WeldTypeId +LEFT JOIN Base_Material AS Material1 ON Material1.MaterialId = WeldJoint.Material1Id +LEFT JOIN Base_Material AS Material2 ON Material2.MaterialId = WeldJoint.Material2Id +LEFT JOIN Base_WeldingMethod AS WeldingMethod ON WeldingMethod.WeldingMethodId=WeldJoint.WeldingMethodId +LEFT JOIN Base_WeldingLocation AS WeldingLocation ON WeldingLocation.WeldingLocationId=WeldJoint.WeldingLocationId +LEFT JOIN Base_Consumables AS WeldMat ON WeldMat.ConsumablesId=WeldJoint.WeldMatId +--LEFT JOIN Base_Consumables AS WeldSilk ON WeldSilk.ConsumablesId=WeldJoint.WeldSilkId +LEFT JOIN Base_GrooveType AS GrooveType ON GrooveType.GrooveTypeId=WeldJoint.GrooveTypeId +LEFT JOIN Base_Components AS Components1 ON Components1.ComponentsId = WeldJoint.PipeAssembly1Id +LEFT JOIN Base_Components AS Components2 ON Components2.ComponentsId = WeldJoint.PipeAssembly2Id +LEFT JOIN Welder_Welder AS BackingWelder ON BackingWelder.WelderId=WeldJoint.BackingWelderId +LEFT JOIN Welder_Welder AS CoverWelder ON CoverWelder.WelderId=WeldJoint.CoverWelderId +LEFT JOIN Pipeline_WeldingDaily AS WeldingDaily ON WeldingDaily.WeldingDailyId=WeldJoint.WeldingDailyId +LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId=WeldJoint.PipingClassId +LEFT JOIN dbo.Base_PIPClass pip ON pip.PIPClassId = Pipeline.PIPClassId +LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId=WeldJoint.WPQId + + + +GO + + + + +ALTER PROC [dbo].[sp_rpt_JointComprehensive] + @projectId NVARCHAR(50), + @workAreaId NVARCHAR(50)=NULL, + @pipelineIds NVARCHAR(MAX) = NULL + +AS +/**********ۺϢ**********/ +SELECT + weldJoint.WeldJointId, + weldJoint.ProjectId, + WorkArea.WorkAreaId, + WorkArea.WorkAreaCode, + weldJoint.SystemNumber, + weldJoint.TestPackageNo, + pipeline.SingleNumber, + pipeline.PipelineCode, + pipeline.DrawingsNum, + pipingClass.PipingClassCode,pip.PIPClassCode, + weldJoint.PageNum, + weldJoint.PipeSegment,--ܶ + weldJoint.WeldJointCode, + weldType.WeldTypeCode, + weldJoint.JointAttribute, + wl.WeldingLocationCode, + weldJoint.Dia, + weldJoint.Thickness,--ں + weldJoint.HeartNo1, + weldJoint.HeartNo2, + com1.ComponentsName AS PipeAssembly1, + com2.ComponentsName AS PipeAssembly2, + --material.MaterialCode, + mat1.MaterialCode AS MaterialCode1, + mat2.MaterialCode AS MaterialCode2, + cw.WelderCode AS CoverWelderCode, + fw.WelderCode AS BackingWelderCode, + WeldMethod.WeldingMethodName, + medium.MediumName, + weldingDaily.WeldingDate, + weldingDaily.WeldingDailyCode, + trust.TrustBatchCode, + --TrustBatchCode.DetectionRateCode, + --TrustBatchCode.AcceptLevel, + (CASE WHEN weldJoint.IsHotProess=1 THEN '' ELSE '' END) AS IsHotProess, + null as TrustBatchCode, + null as DetectionRateCode, + null as AcceptLevel, + nde.NDEDate AS CHT_CHECKDATE, + ndeItem.NDEReportNo, + CAST(CAST(ISNULL(weldJoint.Size,0) AS REAL) AS NVARCHAR(8)) AS JOT_Size, + WeldMaterialMat.ConsumablesCode AS WMT_MatCode, + WeldMaterialMat.ConsumablesName AS WMT_Matname, + weldJoint.WeldSilkId, + --WeldMaterialSilk.ConsumablesCode AS hsCode, + --WeldMaterialSilk.ConsumablesName AS hsname, + --WeldMaterialSilk.UserFlux, + weldJoint.Specification, + wps.WPQCode,ndttype.DetectionTypeCode,NULL AS HotReportCode, + (CASE WHEN (PointBatchItem.PointState='1' OR PointBatchItem.PointState='2') + THEN (CASE WHEN PointBatchItem.IsWelderFirst=1 THEN '' ELSE '' END) ELSE '' END) AS if_dk +FROM Pipeline_WeldJoint AS weldJoint + LEFT JOIN Pipeline_Pipeline AS pipeline ON pipeline.PipelineId = weldJoint.PipelineId + LEFT JOIN Project_WorkArea AS WorkArea ON WorkArea.WorkAreaId = pipeline.WorkAreaId + LEFT JOIN Base_Material AS mat1 ON mat1.MaterialId = weldJoint.Material1Id + LEFT JOIN Base_Material AS mat2 ON mat2.MaterialId = weldJoint.Material2Id + LEFT JOIN Base_WeldingMethod AS WeldMethod ON WeldMethod.WeldingMethodId = weldJoint.WeldingMethodId + LEFT JOIN dbo.Base_WeldType weldType ON weldType.WeldTypeId = weldJoint.WeldTypeId + LEFT JOIN dbo.Base_WeldingLocation wl ON wl.WeldingLocationId = weldJoint.WeldingLocationId + LEFT JOIN Base_Medium AS medium ON medium.MediumId = pipeline.MediumId + LEFT JOIN Base_Components com1 ON com1.ComponentsId=weldJoint.PipeAssembly1Id + LEFT JOIN Base_Components com2 ON com2.ComponentsId=weldJoint.PipeAssembly2Id + LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId=WeldJoint.PipingClassId + LEFT JOIN dbo.Base_PIPClass pip ON pip.PIPClassId = Pipeline.PIPClassId + LEFT JOIN Pipeline_WeldingDaily AS weldingDaily ON weldingDaily.WeldingDailyId = weldJoint.WeldingDailyId + LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId = weldJoint.WPQId + left join Welder_Welder AS fw on weldJoint.BackingWelderId = fw.WelderId + left join Welder_Welder AS cw on weldJoint.CoverWelderId = cw.WelderId + LEFT JOIN Base_Consumables AS WeldMaterialMat ON WeldMaterialMat.ConsumablesId =weldJoint.WeldMatId + --LEFT JOIN Base_Consumables AS WeldMaterialSilk ON WeldMaterialSilk.ConsumablesId =weldJoint.WeldSilkId + LEFT JOIN Batch_PointBatchItem AS PointBatchItem ON PointBatchItem.WeldJointId =weldJoint.WeldJointId + LEFT JOIN dbo.Batch_PointBatch point ON point.PointBatchId = PointBatchItem.PointBatchId + LEFT JOIN dbo.Base_DetectionType ndttype ON ndttype.DetectionTypeId = point.DetectionTypeId + LEFT JOIN dbo.Batch_BatchTrustItem trustItem ON trustItem.PointBatchItemId = PointBatchItem.PointBatchItemId + LEFT JOIN dbo.Batch_BatchTrust trust ON trust.TrustBatchId = trustItem.TrustBatchId + LEFT JOIN dbo.Batch_NDEItem ndeItem ON ndeItem.TrustBatchItemId = trustItem.TrustBatchItemId + LEFT JOIN dbo.Batch_NDE nde ON nde.NDEID = ndeItem.NDEID + + WHERE weldJoint.ProjectId=@projectId + AND(pipeline.WorkAreaId=@workAreaId OR @workAreaId IS NULL) + AND (CHARINDEX(weldJoint.PipelineId,@pipelineIds)>0 or @pipelineIds IS NULl) + --AND(pipeline.PipelineCode=@pipelineCode OR @pipelineCode IS NULl) + + GO + +UPDATE dbo.Template_Files SET title=REPLACE(title,cast(sortindex as nvarchar(50))+'-','') +GO + +UPDATE dbo.Template_Files SET SortIndex=SortIndex+1 where SortIndex>24 +GO + +INSERT INTO [dbo].[Template_Files]([id],[title],[filePath],[SortIndex]) +VALUES('95125974-3DD4-4E16-B4F0-A9D9C9A1406D','ܵӽͷPMIȷϱ','',25) +GO + +-- PMIί +create table PMI_Delegation +( + Id nvarchar(50) not null primary key, + DelegationNo nvarchar(50) not null, + DelegationDate datetime, + ProjectId nvarchar(50) not null, + InstallationId nvarchar(50), + UnitId nvarchar(50), + DetectionStandard nvarchar(50), + Tabler nvarchar(50), + Remark nvarchar(255), + CreatedTime datetime default getdate() +) +go +---- PMIί ϸ +create table PMI_DelegationDetails +( + Id nvarchar(50) not null primary key, + PMIId nvarchar(50) not null, + JointId nvarchar(50) not null, + QualityNo nvarchar(255), + Acceptance nvarchar(255), + Status int not null, + CreatedTime datetime default getdate() +) +go + + +-- PMIίв˵ +insert into Sys_Menu values('A6FB44C3-0920-4F77-862F-D814FD5E5D23','PMI','PMI detection management','',21,0,3,NUll,1) +insert into Sys_Menu values(NEWID(),'PMIί','PMI delegation','/WeldingProcess/PMI/PMIDelegation.aspx',1,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) +insert into Sys_Menu values(NEWID(),'PMI¼','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',2,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) +GO + + +/*******PMIίϸͼ***********/ + +USE [HJGLDB_ZJBSF] +GO + +/****** Object: View [dbo].[View_PMI_DelegationDetails] Script Date: 2024-5-13 9:06:44 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + + + + +-- ӱ +ALTER TABLE dbo.PMI_DelegationDetails ADD reportNo NVARCHAR(50) +-- ӱ +ALTER TABLE dbo.PMI_DelegationDetails ADD reportTime datetime +GO + + +ALTER VIEW [dbo].[View_PMI_DelegationDetails] +AS +/********PMIϸ********/ +SELECT +TrustItem.Id, +TrustItem.Acceptance, +TrustItem.checkTime, +TrustItem.reportTime, +TrustItem.JointId as WeldJointId, +TrustItem.status, +TrustItem.QualityNo, +TrustItem.PMIId, +Trust.ProjectId, +Trust.DelegationNo, +Trust.DelegationDate, +ISNULL(TrustItem.reportNo,Trust.DelegationNo) as reportNo, +WeldJoint.WeldJointCode, +Pipeline.PipelineCode, +WeldJoint.Specification, +Material.MaterialCode, +Pipeline.WorkAreaId +FROM PMI_DelegationDetails AS TrustItem +LEFT JOIN PMI_Delegation AS Trust ON Trust.Id=TrustItem.PMIId +LEFT JOIN Pipeline_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=TrustItem.JointId +LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId +LEFT JOIN Base_Material AS Material ON Material.MaterialId=WeldJoint.Material1Id +GO + + + + + + + +