lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-06-13

Browse Source
This commit is contained in:
李鹏飞
2023-06-13 15:51:41 +08:00
parent 549713aec6
commit 3c887b46d1
5 changed files with 214 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
+19 -15
View File
@@ -1007,10 +1007,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
pipeline.PipeMaterialCode = col17;
}
}
pipeline.Remark = Convert.ToString(pds[i].S);
pipeline.FlowingSection= Convert.ToString(pds[i].S);
pipeline.Remark = Convert.ToString(pds[i].T);
// 以下是焊口信息
string col19 = Convert.ToString(pds[i].T);
string col19 = Convert.ToString(pds[i].U);
if (string.IsNullOrEmpty(col19))
{
result.Add("第" + (i + 1).ToString() + "行," + "焊口号" + "," + "此项为必填项！" + "|");
@@ -1030,9 +1031,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
string col20 = "";
if (pds[i].U!=null)
if (pds[i].V!=null)
{
col20 = pds[i].U.ToString();
col20 = pds[i].V.ToString();
}
if (!string.IsNullOrEmpty(col20))
@@ -1055,9 +1056,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
string col21 = "";
if (pds[i].V!=null)
if (pds[i].W!=null)
{
col21 = pds[i].V.ToString();
col21 = pds[i].W.ToString();
}
if (!string.IsNullOrEmpty(col21))
@@ -1079,11 +1080,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
result.Add("第" + (i + 1).ToString() + "行," + "材质2" + "," + "此项为必填项！" + "|");
}
string col22 = Convert.ToString(pds[i].W);
string col22 = Convert.ToString(pds[i].X);
string col27 = "";
if (pds[i].AB!=null)
if (pds[i].AC!=null)
{
col27= pds[i].AB.ToString();
col27= pds[i].AC.ToString();
}
if (rbDiaType.SelectedValue == "1")
{
@@ -1125,7 +1126,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
var col23 = Convert.ToString(pds[i].X);
var col23 = Convert.ToString(pds[i].Y);
if (col23!=null)
{
try
@@ -1143,7 +1144,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
result.Add("第" + (i + 1).ToString() + "行," + "达因" + "," + "此项为必填项！" + "|");
}
var col24 = Convert.ToString(pds[i].Y);
var col24 = Convert.ToString(pds[i].Z);
if (col24!=null)
{
try
@@ -1180,7 +1181,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
string col25 = Convert.ToString(pds[i].Z);
string col25 = Convert.ToString(pds[i].AA);
if (!string.IsNullOrEmpty(col25))
{
var weldType = getWeldType.FirstOrDefault(x => x.WeldTypeCode == col25);
@@ -1238,7 +1239,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
result.Add("第" + (i + 1).ToString() + "行," + "焊缝类型" + "," + "此项为必填项！" + "|");
}
string col26 = Convert.ToString(pds[i].AA);
string col26 = Convert.ToString(pds[i].AB);
if (!string.IsNullOrEmpty(col26))
{
var JointAttribute = BLL.DropListService.HJGL_JointAttribute();
@@ -1557,7 +1558,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
VacuumPressure = x.VacuumPressure,
PCMedium = x.PCMedium,
MaterialId = x.MaterialId,
Remark = x.Remark
Remark = x.Remark,
FlowingSection=x.FlowingSection
}).DistinctBy(temp => new
{
temp.PipelineId,
@@ -1582,7 +1584,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
temp.VacuumPressure,
temp.PCMedium,
temp.MaterialId,
temp.Remark
temp.Remark,
temp.FlowingSection
}).ToList();
for (int i = 0; i < pipelines.Count(); i++)
{
@@ -1610,6 +1613,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
pipeline.PCMedium = pipelines[i].PCMedium;
pipeline.MaterialId = pipelines[i].MaterialId;
pipeline.Remark = pipelines[i].Remark;
pipeline.FlowingSection = pipelines[i].FlowingSection;
var isExistPipelineCode = PipelineService.GetPipelineByCode(pipeline.PipelineCode, pipeline.UnitWorkId);
if (isExistPipelineCode!=null) // 更新管线