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

2022-11-21 001 焊接基础数据导入修改

This commit is contained in:
李鹏飞 2022-11-21 10:17:42 +08:00
parent 037798f67e
commit fe520d1201
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -105,8 +105,8 @@
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="MiniExcel, Version=1.26.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MiniExcel.1.26.5\lib\net45\MiniExcel.dll</HintPath>
<Reference Include="MiniExcel, Version=1.29.0.0, Culture=neutral, PublicKeyToken=e7310002a53eac39, processorArchitecture=MSIL">
<HintPath>..\packages\MiniExcel.1.29.0\lib\net45\MiniExcel.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>

4
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
View File

@ -1006,7 +1006,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
pipeline.WeldJointCode = col19;
}
string col20 = pds[i].U;
string col20 = pds[i].U.ToString();
if (!string.IsNullOrEmpty(col20))
{
var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col20);
@ -1025,7 +1025,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
result += "第" + (i + 1).ToString() + "行," + "材质1" + "," + "此项为必填项！" + "|";
}
string col21 = pds[i].V;
string col21 = pds[i].V.ToString();
if (!string.IsNullOrEmpty(col21))
{
var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col21);