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

20250219 人员报验导入

This commit is contained in:
毕文静 2025-02-19 14:12:01 +08:00
parent b3128201d1
commit ccc49dc1c1
10 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
View File

@ -131,7 +131,7 @@
</f:Window> </f:Window>
<f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true" Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1000px" Height="560px"> Width="1200px" Height="600px">
</f:Window> </f:Window>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Parent" EnableResize="false" runat="server" EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNew.aspx
View File

@ -112,7 +112,7 @@
FieldType="String" HeaderTextAlign="Center" TextAlign="Right"> FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField> </f:RenderField>
<f:RenderField Width="110px" HeaderText="报验日期" ColumnID="Value12" DataField="Value12" SortField="Value12" <f:RenderField Width="110px" HeaderText="报验日期" ColumnID="Value12" DataField="Value12" SortField="Value12"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField> </f:RenderField>
<f:RenderField Width="80px" HeaderText="拟使用部位" ColumnID="Value13" DataField="Value13" SortField="Value13" <f:RenderField Width="80px" HeaderText="拟使用部位" ColumnID="Value13" DataField="Value13" SortField="Value13"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right"> FieldType="String" HeaderTextAlign="Center" TextAlign="Right">

8
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNew.aspx.cs
View File

@ -427,11 +427,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{ {
try try
{ {
Ins.InspectionDate = Convert.ToDateTime(tempData.Value12); Ins.InspectionDate = Funs.GetNewDateTime(tempData.Value12);
if (Ins.InspectionDate == null)
{
errInfo += "报验日期[" + tempData.Value12 + "]格式错误；";
}
} }
catch (Exception) catch (Exception)
{ {
errInfo += "报验日期[" + tempData.Value12+ "]格式错误；"; errInfo += "报验日期[" + tempData.Value12 + "]格式错误；";
} }
} }
if (!string.IsNullOrEmpty(tempData.Value13)) if (!string.IsNullOrEmpty(tempData.Value13))

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNewEdit.aspx
View File

@ -56,8 +56,8 @@
</f:TextBox> </f:TextBox>
<f:TextBox ID="txtValue11" Label="本次抽检结果" runat="server" LabelWidth="120px"> <f:TextBox ID="txtValue11" Label="本次抽检结果" runat="server" LabelWidth="120px">
</f:TextBox> </f:TextBox>
<f:DatePicker ID="txtValue12" Label="报验日期" runat="server" LabelWidth="120px"> <f:TextBox ID="txtValue12" Label="报验日期" runat="server" LabelWidth="120px">
</f:DatePicker> </f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow ColumnWidths="25% 25% 50%"> <f:FormRow ColumnWidths="25% 25% 50%">

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNewEdit.aspx.designer.cs generated
View File

@ -174,7 +174,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DatePicker txtValue12; protected global::FineUIPro.TextBox txtValue12;
/// <summary> /// <summary>
/// txtValue13 控件。 /// txtValue13 控件。

6
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx
View File

@ -30,8 +30,8 @@
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="人员报验" EnableCollapse="true" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="人员报验" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="InspectionPersonId" AllowCellEditing="true" EnableColumnLines="true" runat="server" BoxFlex="1" DataKeyNames="InspectionPersonId" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="InspectionPersonId" AllowSorting="true" SortField="ApprovalTime" ClicksToEdit="2" DataIDField="InspectionPersonId" AllowSorting="true" SortField="RemarkCode"
SortDirection="DESC" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand" SortDirection="ASC" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" OnRowDataBound="Grid1_RowDataBound" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" OnRowDataBound="Grid1_RowDataBound"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true" OnPreRowDataBound="Grid1_PreRowDataBound"> EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true" OnPreRowDataBound="Grid1_PreRowDataBound">
<Toolbars> <Toolbars>
@ -135,7 +135,7 @@
</f:Window> </f:Window>
<f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true" Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1000px" Height="600px"> Width="1200px" Height="600px">
</f:Window> </f:Window>
<f:Window ID="Window3" Title="编辑焊工资质信息" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window3" Title="编辑焊工资质信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Target="Parent" EnableResize="false" runat="server" IsModal="true"

6
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNew.aspx
View File

@ -104,10 +104,10 @@
FieldType="String" HeaderTextAlign="Center" TextAlign="Left"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" HeaderText="有效期" ColumnID="Value9" DataField="Value9" SortField="Value9" <f:RenderField Width="100px" HeaderText="有效期" ColumnID="Value9" DataField="Value9" SortField="Value9"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" HeaderText="批准时间" ColumnID="Value10" DataField="Value10" SortField="Value10" <f:RenderField Width="100px" HeaderText="批准时间" ColumnID="Value10" DataField="Value10" SortField="Value10"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField> </f:RenderField>
<f:RenderField Width="80px" HeaderText="是否在场" ColumnID="Value11" DataField="Value11" SortField="Value11" <f:RenderField Width="80px" HeaderText="是否在场" ColumnID="Value11" DataField="Value11" SortField="Value11"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right"> FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
@ -116,7 +116,7 @@
FieldType="String" HeaderTextAlign="Center" TextAlign="Left"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" HeaderText="离场时间" ColumnID="Value13" DataField="Value13" SortField="Value13" <f:RenderField Width="100px" HeaderText="离场时间" ColumnID="Value13" DataField="Value13" SortField="Value13"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Right"> FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField> </f:RenderField>
<f:RenderField Width="80px" HeaderText="备注" ColumnID="Value14" DataField="Value14" SortField="Value14" <f:RenderField Width="80px" HeaderText="备注" ColumnID="Value14" DataField="Value14" SortField="Value14"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right"> FieldType="String" HeaderTextAlign="Center" TextAlign="Right">

25
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNew.aspx.cs
View File

@ -312,12 +312,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
protected void btnSaveMethod(string LoginProjectId, string UserId, string IsPDMS) protected void btnSaveMethod(string LoginProjectId, string UserId, string IsPDMS)
{ {
var oldViewInfos = from x in Funs.DB.Comprehensive_InspectionPerson var oldViewInfos = from x in Funs.DB.Comprehensive_InspectionPerson
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == LoginProjectId
select x; select x;
var units = from x in Funs.DB.Base_Unit var units = from x in Funs.DB.Base_Unit
join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId
where y.ProjectId == this.CurrUser.LoginProjectId where y.ProjectId == LoginProjectId
select x; select x;
var cns = from x in Funs.DB.Base_CNProfessional select x; var cns = from x in Funs.DB.Base_CNProfessional select x;
@ -437,7 +437,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{ {
try try
{ {
Ins.ValidityDate = Convert.ToDateTime(tempData.Value9.Trim()); Ins.ValidityDate = Funs.GetNewDateTime(tempData.Value9.Trim());
if (Ins.ValidityDate == null)
{
errInfo += "有效期[" + tempData.Value9.Trim() + "]错误；";
}
} }
catch (Exception) catch (Exception)
{ {
@ -448,7 +452,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{ {
try try
{ {
Ins.ApprovalTime = Convert.ToDateTime(tempData.Value10.Trim()); Ins.ApprovalTime = Funs.GetNewDateTime(tempData.Value10.Trim());
if (Ins.ApprovalTime == null)
{
errInfo += "批准时间[" + tempData.Value10.Trim() + "]错误；";
}
} }
catch (Exception) catch (Exception)
{ {
@ -481,7 +489,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{ {
try try
{ {
Ins.DepartureTime = Convert.ToDateTime(tempData.Value13.Trim()); Ins.DepartureTime = Funs.GetNewDateTime(tempData.Value13.Trim());
if (Ins.DepartureTime == null)
{
errInfo += "离场时间[" + tempData.Value13.Trim() + "]错误；";
}
} }
catch (Exception) catch (Exception)
{ {
@ -514,7 +526,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{ {
Ins.ProjectId = LoginProjectId; Ins.ProjectId = LoginProjectId;
var isExitISOValue = oldViewInfos.FirstOrDefault(x => x.UnitId == Ins.UnitId var isExitISOValue = oldViewInfos.FirstOrDefault(x => x.UnitId == Ins.UnitId
&& x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value14)); && x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value15));
if (isExitISOValue != null) ///已存在 if (isExitISOValue != null) ///已存在
{ {
Ins.InspectionPersonId = isExitISOValue.InspectionPersonId; Ins.InspectionPersonId = isExitISOValue.InspectionPersonId;
@ -591,7 +603,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
tempData.ToopValue = errInfo; tempData.ToopValue = errInfo;
BLL.Sys_CQMS_DataInTempService.UpdateDataInTemp(tempData); BLL.Sys_CQMS_DataInTempService.UpdateDataInTemp(tempData);
erreMessage += errInfo + ";"; erreMessage += errInfo + ";";
} }
} }
} }

14
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNewEdit.aspx
View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server"> <head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title> <title></title>
</head> </head>
<body> <body>
@ -50,10 +50,10 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DatePicker ID="txtValue9" Label="有效期" runat="server" LabelWidth="120px"> <f:TextBox ID="txtValue9" Label="有效期" runat="server" LabelWidth="120px">
</f:DatePicker> </f:TextBox>
<f:DatePicker ID="txtValue10" Label="批准时间" runat="server" LabelWidth="120px"> <f:TextBox ID="txtValue10" Label="批准时间" runat="server" LabelWidth="120px">
</f:DatePicker> </f:TextBox>
<f:TextBox ID="txtValue11" Label="是否在场" runat="server" LabelWidth="120px"> <f:TextBox ID="txtValue11" Label="是否在场" runat="server" LabelWidth="120px">
</f:TextBox> </f:TextBox>
<f:TextBox ID="txtValue12" Label="培训" runat="server" LabelWidth="120px"> <f:TextBox ID="txtValue12" Label="培训" runat="server" LabelWidth="120px">
@ -62,8 +62,8 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DatePicker ID="txtValue13" Label="离场时间" runat="server" LabelWidth="120px"> <f:TextBox ID="txtValue13" Label="离场时间" runat="server" LabelWidth="120px">
</f:DatePicker> </f:TextBox>
<f:TextBox ID="txtValue14" Label="备注" runat="server" LabelWidth="120px"> <f:TextBox ID="txtValue14" Label="备注" runat="server" LabelWidth="120px">
</f:TextBox> </f:TextBox>
<f:TextBox ID="txtValue15" Label="标志编号" runat="server" LabelWidth="120px" Required="true" ShowRedStar="true"> <f:TextBox ID="txtValue15" Label="标志编号" runat="server" LabelWidth="120px" Required="true" ShowRedStar="true">

6
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNewEdit.aspx.designer.cs generated
View File

@ -147,7 +147,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DatePicker txtValue9; protected global::FineUIPro.TextBox txtValue9;
/// <summary> /// <summary>
/// txtValue10 控件。 /// txtValue10 控件。
@ -156,7 +156,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DatePicker txtValue10; protected global::FineUIPro.TextBox txtValue10;
/// <summary> /// <summary>
/// txtValue11 控件。 /// txtValue11 控件。
@ -183,7 +183,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DatePicker txtValue13; protected global::FineUIPro.TextBox txtValue13;
/// <summary> /// <summary>
/// txtValue14 控件。 /// txtValue14 控件。