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

修改质量导入

Browse Source
This commit is contained in:
高飞
2023-06-28 09:42:41 +08:00
parent 291d71f92c
commit 2e4e6d7403
4 changed files with 21 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs
+8 -5
View File
@@ -228,11 +228,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
result += (i + 2).ToString() + "," + "标识编号" + "," + "此项为必填项！" + "|";
}
//}
//else
//{
// result += (i + 2).ToString() + "," + "报验编号" + "," + "该单位报验编号已存在！" + "|";
//}
else
{
var view = oldViewInfos.FirstOrDefault(x => x.RemarkCode == row12);
if (view != null)
{
result += (i + 2).ToString() + "," + "标识编号" + "," + "[" + row12 + "]已存在！" + "|";
}
}
}
else
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
+5 -5
View File
@@ -486,13 +486,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive
Ins.InspectionDate = Convert.ToDateTime(pds.Rows[i][9].ToString().Trim());
}
Ins.IsOnSite = pds.Rows[i][10].ToString().Trim() == "是" ? true : false;
if (!string.IsNullOrEmpty(pds.Rows[i][10].ToString().Trim()))
{
Ins.UnitsCount = Convert.ToInt32(pds.Rows[i][10].ToString().Trim());
}
if (!string.IsNullOrEmpty(pds.Rows[i][11].ToString().Trim()))
{
Ins.LeaveDate = Convert.ToDateTime(pds.Rows[i][11].ToString().Trim());
Ins.UnitsCount = Convert.ToInt32(pds.Rows[i][11].ToString().Trim());
}
if (!string.IsNullOrEmpty(pds.Rows[i][12].ToString().Trim()))
{
Ins.LeaveDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim());
}
Ins.InspectionMachineId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionMachine));
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs
+8 -8
View File
@@ -215,14 +215,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive
Alert.ShowInTop("请选择报验单位！", MessageBoxIcon.Warning);
return;
}
//if (this.drpPostId.SelectedText == "焊工")
//{
//if (string.IsNullOrEmpty(txtWelderCode.Text.Trim()))
//{
// Alert.ShowInTop("焊工编号必填！", MessageBoxIcon.Warning);
// return;
//}
//}
if (this.drpPostId.SelectedText == "焊工")
{
if (string.IsNullOrEmpty(txtWelderCode.Text.Trim()))
{
Alert.ShowInTop("焊工编号必填！", MessageBoxIcon.Warning);
return;
}
}
// 焊工部分
Model.BS_Welder welder = new Model.BS_Welder();
if (this.drpUnitId.SelectedValue != BLL.Const._Null)