From ee5bd9ef2174d1605c52b16b54ae76a035a1a66a Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Sat, 14 Jun 2025 01:42:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=BD=E5=B7=A5=E4=BA=A4=E5=BA=95=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E4=BA=A4=E5=BA=95=E4=BA=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_WH_2025-06-14.sql | 6 +++ .../ConTechnologyDisclosureService.cs | 2 + .../ConTechnologyDisclosure.aspx | 3 ++ .../ConTechnologyDisclosure.aspx.cs | 6 ++- .../ConTechnologyDisclosureDataIn.aspx.cs | 3 +- .../ConTechnologyDisclosureDataInNew.aspx | 5 +- .../ConTechnologyDisclosureDataInNew.aspx.cs | 16 ++++++ .../ConTechnologyDisclosureDataInNewEdit.aspx | 8 +-- ...nTechnologyDisclosureDataInNewEdit.aspx.cs | 14 ++++++ ...gyDisclosureDataInNewEdit.aspx.designer.cs | 27 ++++++---- .../ConTechnologyDisclosureEdit.aspx | 1 + .../ConTechnologyDisclosureEdit.aspx.cs | 4 +- ...nTechnologyDisclosureEdit.aspx.designer.cs | 47 +++++++++++------- .../Excel/DataIn/施工技术交底管理导入模板.xls | Bin 14848 -> 14848 bytes SGGL/Model/Model.cs | 24 +++++++++ 15 files changed, 132 insertions(+), 34 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2025-06-14.sql diff --git a/DataBase/版本日志/SGGLDB_WH_2025-06-14.sql b/DataBase/版本日志/SGGLDB_WH_2025-06-14.sql new file mode 100644 index 00000000..34e54d4a --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2025-06-14.sql @@ -0,0 +1,6 @@ +alter table dbo.Comprehensive_ConTechnologyDisclosure add DisclosurePersonNum int +go + +exec sp_addextendedproperty 'MS_Description', N'', 'SCHEMA', 'dbo', 'TABLE', 'Comprehensive_ConTechnologyDisclosure', + 'COLUMN', 'DisclosurePersonNum' +go \ No newline at end of file diff --git a/SGGL/BLL/CQMS/Comprehensive/ConTechnologyDisclosureService.cs b/SGGL/BLL/CQMS/Comprehensive/ConTechnologyDisclosureService.cs index 9a5326dc..81660522 100644 --- a/SGGL/BLL/CQMS/Comprehensive/ConTechnologyDisclosureService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/ConTechnologyDisclosureService.cs @@ -39,6 +39,7 @@ namespace BLL DisclosureDate = con.DisclosureDate, UnitWorkId = con.UnitWorkId, AttendMan = con.AttendMan, + DisclosurePersonNum = con.DisclosurePersonNum, CompileMan = con.CompileMan, CompileDate = con.CompileDate, RemarkCode = con.RemarkCode @@ -64,6 +65,7 @@ namespace BLL newCon.DisclosureDate = con.DisclosureDate; newCon.UnitWorkId = con.UnitWorkId; newCon.AttendMan = con.AttendMan; + newCon.DisclosurePersonNum = con.DisclosurePersonNum; newCon.RemarkCode = con.RemarkCode; Funs.DB.SubmitChanges(); } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx index e4852e21..c492cb0b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx @@ -70,6 +70,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs index 7643e0b7..f1f29421 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs @@ -32,7 +32,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive public void BindGrid() { string strSql = @"select C.ConTechnologyDisclosureId, C.ProjectId, C.CNProfessionalId, C.DisclosureCode, C.DisclosureName,C.UnitId,C.DisclosureMan,C.DisclosureDate, C.UnitWorkId,C.AttendMan, - C.CompileMan, C.CompileDate, C.RemarkCode,CN.ProfessionalName,u.UnitName,C.RemarkCode + C.CompileMan, C.CompileDate, C.RemarkCode,CN.ProfessionalName,u.UnitName,C.RemarkCode,C.DisclosurePersonNum from Comprehensive_ConTechnologyDisclosure C left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId left join Base_Unit u on u.UnitId = C.UnitId @@ -349,6 +349,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive cell = row.CreateCell(8); cell.CellStyle = cellStyle; cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 + + cell = row.CreateCell(9); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.DisclosurePersonNum.HasValue ? item.DisclosurePersonNum.ToString() : "");//交底人数 i++; } // 第三步：写入文件流 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs index 882753da..3b2df607 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs @@ -430,7 +430,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][6].ToString().Trim()); } des.AttendMan = pds.Rows[i][7].ToString().Trim(); - des.RemarkCode =Funs.GetNewInt( pds.Rows[i][8].ToString().Trim()); + des.RemarkCode = Funs.GetNewInt(pds.Rows[i][8].ToString().Trim()); + des.DisclosurePersonNum = Funs.GetNewInt(pds.Rows[i][9].ToString().Trim()); des.CompileMan = this.CurrUser.UserId; des.CompileDate = DateTime.Now; BLL.ConTechnologyDisclosureService.AddConTechnologyDisclosure(des); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNew.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNew.aspx index 8c79ebbd..ae364039 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNew.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNew.aspx @@ -101,7 +101,10 @@ - + + - + - + - + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNewEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNewEdit.aspx.cs index 5c98e87e..24ef7bd9 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNewEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNewEdit.aspx.cs @@ -51,6 +51,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtValue7.Text = dataInTemp.Value7; this.txtValue8.Text = dataInTemp.Value8; this.txtValue9.Text = dataInTemp.Value9; + this.txtValue10.Text = dataInTemp.Value10; this.lbErrCout.Text = dataInTemp.ToopValue; } @@ -166,6 +167,18 @@ namespace FineUIPro.Web.CQMS.Comprehensive } } } + if (dataInTemp.Value10 != this.txtValue10.Text.Trim()) + { + var tempValue10 = allDataInTemp.Where(x => x.Value10 == dataInTemp.Value10 || (x.Value10 == null && dataInTemp.Value10 == null)); + if (tempValue10 != null) + { + foreach (var item in tempValue10) + { + item.Value10 = this.txtValue10.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } var toopValue = allDataInTemp.Where(x => x.ToopValue == dataInTemp.ToopValue); if (toopValue != null) { @@ -192,6 +205,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive newDataInTemp.Value7 = this.txtValue7.Text.Trim(); newDataInTemp.Value8 = this.txtValue8.Text.Trim(); newDataInTemp.Value9 = this.txtValue9.Text.Trim(); + newDataInTemp.Value10 = this.txtValue10.Text.Trim(); if (!string.IsNullOrEmpty(this.TempId)) { newDataInTemp.TempId = this.TempId; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNewEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNewEdit.aspx.designer.cs index f2a59982..7c407b98 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNewEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNewEdit.aspx.designer.cs @@ -131,15 +131,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// protected global::FineUIPro.TextBox txtValue7; - /// - /// txtValue8 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue8; - /// /// txtValue9 控件。 /// @@ -149,6 +140,24 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// protected global::FineUIPro.TextBox txtValue9; + /// + /// txtValue10 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue10; + + /// + /// txtValue8 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue8; + /// /// ckAll 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx index e81ced90..201d0e78 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx @@ -41,6 +41,7 @@ + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.cs index 30e346f3..e0038e7e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.cs @@ -65,6 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive } this.txtAttendMan.Text = con.AttendMan; this.txtRemarkCode.Text = con.RemarkCode.HasValue ? con.RemarkCode.ToString() : ""; + this.txtDisclosurePersonNum.Text = con.DisclosurePersonNum.HasValue ? con.DisclosurePersonNum.ToString() : ""; } else { @@ -122,7 +123,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive newCon.UnitWorkId = ids; newCon.AttendMan = this.txtAttendMan.Text.Trim(); newCon.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); - + newCon.DisclosurePersonNum = Funs.GetNewInt(this.txtDisclosurePersonNum.Text.Trim()); + if (string.IsNullOrEmpty(this.ConTechnologyDisclosureId)) { newCon.ConTechnologyDisclosureId = SQLHelper.GetNewID(typeof(Model.Comprehensive_ConTechnologyDisclosure)); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.designer.cs index dd2561ad..5675225b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive { - - - public partial class ConTechnologyDisclosureEdit { - +namespace FineUIPro.Web.CQMS.Comprehensive +{ + + + public partial class ConTechnologyDisclosureEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpCNProfessionalId 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessionalId; - + /// /// txtDisclosureCode 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtDisclosureCode; - + /// /// txtDisclosureName 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtDisclosureName; - + /// /// drpUnitId 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitId; - + /// /// txtDisclosureMan 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtDisclosureMan; - + /// /// txtDisclosureDate 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtDisclosureDate; - + /// /// drpUnitWorkIds 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWorkIds; - + /// /// txtRemarkCode 控件。 /// @@ -110,7 +112,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtRemarkCode; - + + /// + /// txtDisclosurePersonNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtDisclosurePersonNum; + /// /// txtAttendMan 控件。 /// @@ -119,7 +130,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtAttendMan; - + /// /// Toolbar1 控件。 /// @@ -128,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// btnSave 控件。 /// diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/施工技术交底管理导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/施工技术交底管理导入模板.xls index d21489f3260a327ea1e15438fec318e9e7fe3034..0adc3b5326d5880a240404aceb9171fbb46a0505 100644 GIT binary patch delta 804 zcmZ`%O=uHA6#izj+0CCM+r*@awb@v0k_L(m3C3Hhtx^mN(z~>WfQQl+45D~wL3&b8 zkJ3s(dno8d6ju;Mp@QB#2}Q(G1SyCJ#@=cx@y%|kB6Nl~^S<~0-pp)cw()2})t8@q zIeC5kBVAJG#5irMEoB$<)7u}`ASO`9B&KkgiOy?hX-rGeqBiImYv$~AZ89_?j4G-o zuxfrn3|;^N9Y6&J{*h~rJOx}ajH+2x_w4n3Jqk$skxYjl5HixsXykVgEOa_M5%*iVPaDh;mM4J+nQKR;} zdBdx(A;`iYWqaQwREQO8{=#!>y52&76-5&Wfy_b|#j+jBgC43CwkVamlL@esPvOwK z0+{y5yDGwtOlAqthuoo=PUZv#|J%dx;}?5LyHn2TBEd*j=^_QEA;Y@J!#df8i&P9b zZ{s2_BRMb^Y3wK8fl-Zv>kQ@iU8N6aIQbs(vrabho-H=`j-e0Vu!S&`=2ylM_?psJ z78R$5`Ew#pJNYF(7y7ItK_{-@F)`=6Ev@{U?Y7u~^H91!ZTA+Qs*jI%D(bb*@%wgH z(W3;GWVNfU-K0jDQnzwgr;*Y<@s@s+3dx(SI>5BZ#2*hUOi`xS^sWoXC6b#cdypo35UNm<$V5ya^8MXE_wV#4DddI0eicmi{F6ykdpua delta 755 zcmZ`%OKTHR6#nj=M`l98Bxy|TgLb5~dD+;OL?eh!w6%(*2wnIG6kJFRm_@s4H{G}r z4~Q?+o$joim4eWXATG3YQxFjsx=;$n?kZ?{?o54DD3|Y^^PTsdGxLr4#^Pl?QvWiz z*nj68UDX%FG1}By5`umhB`wbKT&0t0<`msBYufmyF8{qb9h*xgJ=b%AW%nb}FaZd3 z0yD|PzxK#3c54^=-*~a3juFJCfGYRZx$mC;8&|op?tf@=V)B6#{tfr05qXU$8=`b@;AO1EdK3j$ z#namZ-IUFy _RemarkCode; + private System.Nullable _DisclosurePersonNum; + private EntityRef _Base_CNProfessional; private EntityRef _Base_Project; @@ -88679,6 +88681,8 @@ namespace Model partial void OnCompileDateChanged(); partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); + partial void OnDisclosurePersonNumChanging(System.Nullable value); + partial void OnDisclosurePersonNumChanged(); #endregion public Comprehensive_ConTechnologyDisclosure() @@ -88966,6 +88970,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DisclosurePersonNum", DbType="Int")] + public System.Nullable DisclosurePersonNum + { + get + { + return this._DisclosurePersonNum; + } + set + { + if ((this._DisclosurePersonNum != value)) + { + this.OnDisclosurePersonNumChanging(value); + this.SendPropertyChanging(); + this._DisclosurePersonNum = value; + this.SendPropertyChanged("DisclosurePersonNum"); + this.OnDisclosurePersonNumChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_ConTechnologyDisclosure_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)] public Base_CNProfessional Base_CNProfessional {