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

2023-10-12

Browse Source
This commit is contained in:
李鹏飞
2023-10-12 19:33:22 +08:00
parent 7d87e48818
commit d1c7977da2
24 changed files with 688 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs
+35 -11
View File
@@ -228,14 +228,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
result += (i + 2).ToString() + "," + "标识编号" + "," + "此项为必填项！" + "|";
}
else
{
var view = oldViewInfos.FirstOrDefault(x => x.RemarkCode == row12);
if (view != null)
{
result += (i + 2).ToString() + "," + "标识编号" + "," + "[" + row12 + "]已存在！" + "|";
}
}
//else
//{
// var view = oldViewInfos.FirstOrDefault(x => x.RemarkCode == row12);
// if (view != null)
// {
// result += (i + 2).ToString() + "," + "标识编号" + "," + "[" + row12 + "]已存在！" + "|";
// }
//}
}
else
@@ -398,7 +398,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
oldViewInfo = oldViewInfos.Where(x => x.UnitId == unitInfo.UnitId
&& x.RemarkCode == pds.Rows[i][12].ToString().Trim()
).FirstOrDefault();
if (oldViewInfo == null)
if (oldViewInfo == null)//新增
{
Model.Comprehensive_InspectionEquipment Ins = new Model.Comprehensive_InspectionEquipment();
Ins.ProjectId = this.CurrUser.LoginProjectId;
@@ -428,9 +428,33 @@ namespace FineUIPro.Web.CQMS.Comprehensive
BLL.InspectionEquipmentService.AddInspectionEquipment(Ins);
}
else
else //修改
{
result += (i + 2).ToString() + "," + "报验编号" + "," + "该单位报验编号已存在！" + "|";
oldViewInfo.ProjectId = this.CurrUser.LoginProjectId;
oldViewInfo.UnitId = unitInfo.UnitId;
oldViewInfo.InspectionCode = pds.Rows[i][1].ToString().Trim();
if (!string.IsNullOrEmpty(pds.Rows[i][2].ToString().Trim()))
{
oldViewInfo.CNProfessionalId = Funs.DB.Base_CNProfessional.First(e => e.ProfessionalName == pds.Rows[i][2].ToString().Trim()).CNProfessionalId;
}
oldViewInfo.EquipmentNO = pds.Rows[i][3].ToString().Trim();
oldViewInfo.InspectionName = pds.Rows[i][4].ToString().Trim();
oldViewInfo.Specifications = pds.Rows[i][5].ToString().Trim();
oldViewInfo.Supplier = pds.Rows[i][6].ToString().Trim();
oldViewInfo.Counts = pds.Rows[i][7].ToString().Trim();
oldViewInfo.Unit = pds.Rows[i][8].ToString().Trim();
oldViewInfo.SamplingCount = pds.Rows[i][9].ToString().Trim();
oldViewInfo.SamplingResult = pds.Rows[i][10].ToString().Trim() == "合格" ? "1" : "2";
if (!string.IsNullOrEmpty(pds.Rows[i][11].ToString().Trim()))
{
oldViewInfo.InspectionDate = Convert.ToDateTime(pds.Rows[i][11].ToString().Trim());
}
oldViewInfo.RemarkCode = pds.Rows[i][12].ToString().Trim();
oldViewInfo.CompileMan = this.CurrUser.UserId;
oldViewInfo.CompileDate = DateTime.Now.Date;
BLL.InspectionEquipmentService.UpdateInspectionEquipment(oldViewInfo);
//result += (i + 2).ToString() + "," + "报验编号" + "," + "该单位报验编号已存在！" + "|";
}
}