diff --git a/CreateModel.bat b/CreateModel.bat new file mode 100644 index 0000000..2f27853 --- /dev/null +++ b/CreateModel.bat @@ -0,0 +1,33 @@ +@echo off +REM --------------- +REM 发布包生成工具 +REM 执行此文件前请先用Release生成WebOA项目 +REM -------------- + + + +REM -------------- +REM 环境变量设置 Project_Src为如WebOA这样的分支 +REM -------------- +set PROJECT_SRC=%CD% +cd.. + +REM 源代码Model项目文件夹 +set Model_ROOT=%PROJECT_SRC%\HJGL\Model + + +REM -------------- +REM 发布程序包文件夹相关 +REM -------------- + + + + +@echo 设置.net控制台环境 +@echo. +@call "%VS100COMNTOOLS%"vsvars32.bat + +SqlMetal /views /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model + +@ECHO 完成 +pause 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 index 8bec10e..f5e08d0 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo 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 @@ 锘縰sing 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 85a5f76..22590eb 100644 --- a/HJGL/Model/Model.cs +++ b/HJGL/Model/Model.cs @@ -21479,10 +21479,12 @@ namespace Model private int _Status; - private System.Nullable _CreatedTime; + private System.Nullable _CheckTime; private string _ReportNo; + private System.Nullable _ReportTime; + #region 鍙墿灞曟ф柟娉曞畾涔 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -21499,10 +21501,12 @@ namespace Model partial void OnAcceptanceChanged(); partial void OnStatusChanging(int value); partial void OnStatusChanged(); - partial void OnCreatedTimeChanging(System.Nullable value); - partial void OnCreatedTimeChanged(); + 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 public PMI_DelegationDetails() @@ -21630,22 +21634,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")] - public System.Nullable CreatedTime + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")] + public System.Nullable CheckTime { get { - return this._CreatedTime; + return this._CheckTime; } set { - if ((this._CreatedTime != value)) + if ((this._CheckTime != value)) { - this.OnCreatedTimeChanging(value); + this.OnCheckTimeChanging(value); this.SendPropertyChanging(); - this._CreatedTime = value; - this.SendPropertyChanged("CreatedTime"); - this.OnCreatedTimeChanged(); + this._CheckTime = value; + this.SendPropertyChanged("CheckTime"); + this.OnCheckTimeChanged(); } } } @@ -21670,6 +21674,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")] + public System.Nullable ReportTime + { + get + { + return this._ReportTime; + } + set + { + if ((this._ReportTime != value)) + { + this.OnReportTimeChanging(value); + this.SendPropertyChanging(); + this._ReportTime = value; + this.SendPropertyChanged("ReportTime"); + this.OnReportTimeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -40691,7 +40715,9 @@ namespace Model private string _Acceptance; - private System.Nullable _CreatedTime; + private System.Nullable _CheckTime; + + private System.Nullable _ReportTime; private string _WeldJointId; @@ -40755,18 +40781,34 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")] - public System.Nullable CreatedTime + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")] + public System.Nullable CheckTime { get { - return this._CreatedTime; + return this._CheckTime; } set { - if ((this._CreatedTime != value)) + if ((this._CheckTime != value)) { - this._CreatedTime = value; + this._CheckTime = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")] + public System.Nullable ReportTime + { + get + { + return this._ReportTime; + } + set + { + if ((this._ReportTime != value)) + { + this._ReportTime = value; } } } 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 index 983f586..f59c982 100644 --- a/HJGLPackFile/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql +++ b/HJGLPackFile/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql @@ -267,8 +267,12 @@ GO -alter table PMI_DelegationDetails add reportTime datetime +-- 增加报告编号 +ALTER TABLE dbo.PMI_DelegationDetails ADD reportNo NVARCHAR(50) +-- 增加报告日期 +ALTER TABLE dbo.PMI_DelegationDetails ADD reportTime datetime +GO ALTER VIEW [dbo].[View_PMI_DelegationDetails] @@ -286,6 +290,7 @@ TrustItem.PMIId, Trust.ProjectId, Trust.DelegationNo, Trust.DelegationDate, +ISNULL(TrustItem.reportNo,Trust.DelegationNo) as reportNo, WeldJoint.WeldJointCode, Pipeline.PipelineCode, WeldJoint.Specification, @@ -304,3 +309,4 @@ GO +