焊接修改

This commit is contained in:
2025-09-24 17:31:28 +08:00
parent cb92dcb730
commit 0f70405339
64 changed files with 2492 additions and 2040 deletions
@@ -194,9 +194,9 @@ namespace FineUIPro.Web.HJGL.TestPackage
pipeline.UnitId = unitWork.UnitId;
}
if (pds[i].A != null)
if (pds[i].B != null)
{
string col0 = pds[i].A.ToString();
string col0 = pds[i].B.ToString();
if (string.IsNullOrEmpty(col0))
{
result.Add("第" + (i + 1).ToString() + "行," + "试压包编号" + "," + "此项为必填项!" + "|");
@@ -210,21 +210,21 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
result.Add("第" + (i + 1).ToString() + "行," + "试压包编号" + "," + "此项为必填项!" + "|");
}
if (pds[i].B != null)
{
pipeline.TestPackageName = pds[i].B.ToString();//系统名称
}
if (pds[i].C != null)
{
pipeline.AdjustTestPressure = pds[i].C.ToString();//调整试验压力
pipeline.TestPackageName = pds[i].C.ToString();//系统名称
}
if (pds[i].D != null)
{
pipeline.Remark = pds[i].D.ToString(); //备注
pipeline.AdjustTestPressure = pds[i].D.ToString();//调整试验压力
}
if (pds[i].E != null) //管线号
if (pds[i].E != null)
{
string col2 = pds[i].E.ToString();
pipeline.Remark = pds[i].E.ToString(); //备注
}
if (pds[i].F != null) //管线号
{
string col2 = pds[i].F.ToString();
if (string.IsNullOrEmpty(col2))
{
result.Add("第" + (i + 1).ToString() + "行," + "管线号" + "," + "此项为必填项!" + "|");
@@ -532,9 +532,24 @@ namespace FineUIPro.Web.HJGL.TestPackage
x.TestPressure
};
// materialize and add sequence number
var list = queryList.ToList();
var indexed = list.Select((x, idx) => new
{
No = idx + 1,
x.PipelineId,
x.PipelineCode,
x.PipingClassCode,
x.MediumName,
x.DesignPress,
x.DesignTemperature,
x.TestMediumCode,
x.TestPressure
}).ToList();
var value = new
{
model = queryList.ToList()
model = indexed
};
MiniExcel.SaveAsByTemplate(path, uploadfilepath, value);
}