lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

施工交底补充交底人数

This commit is contained in:
夏菊 2025-06-14 01:42:47 +08:00
parent 0941b1f159
commit ee5bd9ef21
15 changed files with 132 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DataBase/版本日志/SGGLDB_WH_2025-06-14.sql Normal file
View File

@ -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

2
SGGL/BLL/CQMS/Comprehensive/ConTechnologyDisclosureService.cs
View File

@ -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();
}

3
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx
View File

@ -70,6 +70,9 @@
<asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField ColumnID="DisclosurePersonNum" DataField="DisclosurePersonNum" FieldType="String" HeaderText="交底人数" TextAlign="Center"
HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField ColumnID="AttendMan" DataField="AttendMan" FieldType="String" HeaderText="参加人员" TextAlign="Center"
HeaderTextAlign="Center" Width="130px">
</f:RenderField>

6
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs
View File

@ -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++;
}
// 第三步：写入文件流

3
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs
View File

@ -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);

5
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNew.aspx
View File

@ -101,7 +101,10 @@
<f:RenderField Width="100px" HeaderText="单位工程" ColumnID="Value7" DataField="Value7" SortField="Value7"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" HeaderText="参加人员" ColumnID="Value8" DataField="Value8" SortField="Value8"
<f:RenderField Width="100px" HeaderText="交底人数" ColumnID="Value10" DataField="Value10" SortField="Value10"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="220px" HeaderText="参加人员" ColumnID="Value8" DataField="Value8" SortField="Value8"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="180px" HeaderText="标志编号" ColumnID="Value9" DataField="Value9" SortField="Value9"

16
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNew.aspx.cs
View File

@ -238,6 +238,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
newDataInTemp.Value7 = ds.Tables[0].Rows[i][6].ToString();
newDataInTemp.Value8 = ds.Tables[0].Rows[i][7].ToString();
newDataInTemp.Value9 = ds.Tables[0].Rows[i][8].ToString();
newDataInTemp.Value10 = ds.Tables[0].Rows[i][9].ToString();
BLL.Sys_CQMS_DataInTempService.AddDataInTemp(newDataInTemp);
}
@ -444,6 +445,21 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
errInfo += "标志编号为必填项；";
}
if (!string.IsNullOrEmpty(tempData.Value10.Trim()))
{
try
{
Ins.DisclosurePersonNum = Convert.ToInt32(tempData.Value10.Trim());
if (Ins.DisclosurePersonNum == null)
{
errInfo += "交底人数[" + tempData.Value10.Trim() + "]格式错误；";
}
}
catch (Exception)
{
errInfo += "交底人数[" + tempData.Value10.Trim() + "]格式错误；";
}
}
Ins.CompileMan = this.CurrUser.UserId;
Ins.CompileDate = DateTime.Now.Date;
if (string.IsNullOrEmpty(errInfo)) ////所有信息正确的话 插入数据

8
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNewEdit.aspx
View File

@ -44,13 +44,15 @@
</f:TextBox>
<f:TextBox ID="txtValue7" Label="单位工程" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue8" Label="参与人员" runat="server" LabelWidth="120px">
<f:TextBox ID="txtValue9" Label="标志编号" runat="server" LabelWidth="120px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="25% 75%">
<f:FormRow ColumnWidths="25% 50% 25%">
<Items>
<f:TextBox ID="txtValue9" Label="标志编号" runat="server" LabelWidth="120px">
<f:TextBox ID="txtValue10" Label="交底人数" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue8" Label="参与人员" runat="server" LabelWidth="120px">
</f:TextBox>
<f:CheckBox ID="ckAll" runat="server" Checked="true" Text="是否批量修改"></f:CheckBox>
</Items>

14
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNewEdit.aspx.cs
View File

@ -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;

27
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNewEdit.aspx.designer.cs generated
View File

@ -131,15 +131,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// </remarks>
protected global::FineUIPro.TextBox txtValue7;
/// <summary>
/// txtValue8 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue8;
/// <summary>
/// txtValue9 控件。
/// </summary>
@ -149,6 +140,24 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// </remarks>
protected global::FineUIPro.TextBox txtValue9;
/// <summary>
/// txtValue10 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue10;
/// <summary>
/// txtValue8 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue8;
/// <summary>
/// ckAll 控件。
/// </summary>

1
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx
View File

@ -41,6 +41,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtDisclosurePersonNum" runat="server" Label="交底人数" LabelAlign="Right" LabelWidth="130px" MinValue="0" NoDecimal="true" NoNegative="true"></f:NumberBox>
<f:TextBox ID="txtAttendMan" runat="server" Label="参加人员" MaxLength="100" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
</Items>
</f:FormRow>

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.cs
View File

@ -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,6 +123,7 @@ 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))
{

15
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Comprehensive {
namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class ConTechnologyDisclosureEdit {
public partial class ConTechnologyDisclosureEdit
{
/// <summary>
/// form1 控件。
@ -111,6 +113,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks>
protected global::FineUIPro.NumberBox txtRemarkCode;
/// <summary>
/// txtDisclosurePersonNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtDisclosurePersonNum;
/// <summary>
/// txtAttendMan 控件。
/// </summary>

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/施工技术交底管理导入模板.xls
View File

Binary file not shown.

24
SGGL/Model/Model.cs
View File

@ -88641,6 +88641,8 @@ namespace Model
private System.Nullable<int> _RemarkCode;
private System.Nullable<int> _DisclosurePersonNum;
private EntityRef<Base_CNProfessional> _Base_CNProfessional;
private EntityRef<Base_Project> _Base_Project;
@ -88679,6 +88681,8 @@ namespace Model
partial void OnCompileDateChanged();
partial void OnRemarkCodeChanging(System.Nullable<int> value);
partial void OnRemarkCodeChanged();
partial void OnDisclosurePersonNumChanging(System.Nullable<int> 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<int> 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
{