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

20240429 修改综合管理导入导出

Browse Source
This commit is contained in:
毕文静
2024-04-29 19:13:54 +08:00
parent fc56b1f6c2
commit a3e123957d
48 changed files with 560 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs
+16 -5
View File
@@ -170,7 +170,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
where y.ProjectId == this.CurrUser.LoginProjectId
select x;
var cns = from x in Funs.DB.Base_CNProfessional select x;
var cns = from x in Funs.DB.Base_CNProfessional select x;
for (int i = 2; i < ir; i++)
{
@@ -276,7 +276,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
result += (i + 2).ToString() + "," + "上报日期" + "," + "格式错误！" + "|";
}
}
string row10 = pds.Rows[i][10].ToString().Trim();
if (!string.IsNullOrEmpty(row10))
{
@@ -355,7 +355,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
string row18 = pds.Rows[i][18].ToString().Trim();
if (!string.IsNullOrEmpty(row18))
{
{
if (row18 != "是" && row18 != "否")
{
result += (i + 2).ToString() + "," + "是否存档" + "," + "[" + row18 + "]错误！" + "|";
@@ -367,6 +367,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|";
}
else
{
try
{
int c = Convert.ToInt32(row19);
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row19 + "]错误！" + "|";
}
}
}
if (!string.IsNullOrEmpty(result))
{
@@ -517,7 +528,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var cn = cns.Where(y => y.ProfessionalName == pds.Rows[i][4].ToString().Trim()).FirstOrDefault();
var unit = units.Where(y => y.UnitName == pds.Rows[i][5].ToString().Trim()).FirstOrDefault();
oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][19].ToString().Trim()
oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == Funs.GetNewInt(pds.Rows[i][19].ToString().Trim())
).FirstOrDefault();
if (oldViewInfo == null)
{
@@ -569,7 +580,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
des.IsOnFile = false;
}
}
des.RemarkCode = pds.Rows[i][19].ToString().Trim();
des.RemarkCode = Funs.GetNewInt(pds.Rows[i][19].ToString().Trim());
des.CompileMan = this.CurrUser.UserId;
des.CompileDate = DateTime.Now;
BLL.DataReceivingDocService.AddDataReceivingDoc(des);