cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r391

Browse Source 
SVN-Revision: r391
This commit is contained in:
wyf
2025-03-25 09:04:07 +00:00
parent 23828ad751
commit a54d2e5558
3 changed files with 16 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBomImport/FrmMain.cs
+3 -29
View File
@@ -63,7 +63,8 @@ namespace Lskj.PubBomImport
/// <param name="e"></param>
private void FrmMain_Load(object sender, EventArgs e)
{
bool showType = Model != null && Model.ShowType.Equals("1") && !ERPInfo.Instance.UserName.Equals("管理员");
int.TryParse(Model.ShowType, out int showTypeValue);
bool showType = Model != null && showTypeValue > 0 && !ERPInfo.Instance.UserName.Equals("管理员");
try
{
if (showType)
@@ -1626,31 +1627,4 @@ namespace Lskj.PubBomImport
{
case CellType.String:
cellValue = cell.StringCellValue;
break;
case CellType.Numeric:
cellValue = cell.NumericCellValue.ToString();
break;
case CellType.Boolean:
cellValue = cell.BooleanCellValue.ToString();
break;
case CellType.Blank:
break;
default:
cellValue.ToString();
break;
}
break;
default:
cellValue = cell.ToString();
break;
}
}
}
catch (Exception)
{
}
return cellValue;
}
#endregion
}
}
插件库/Lskj.PubBomImport/FrmProgress.cs
+4 -1
View File
@@ -172,7 +172,10 @@ namespace Lskj.PubBomImport
SqlHelper.ExecuteNonQuery(string.Format(updateChildVerSql, code, productId));
SetProcessBar(80, allCount);
//上传文件
isUpload = UploadFile(childInfo.FullName, idValue, out msg);
if (Model.ShowType.Equals("1"))
{
isUpload = UploadFile(childInfo.FullName, idValue, out msg);
}
SetProcessBar(100, finishCount);
SetProcessLabelAllMsg($"总进度：{nowCount + 1}/{parentTable.Rows.Count + 1}");
}
插件库/Lskj.PubBomImport/Lskj.PubBomImport.csproj
+9 -3
View File
@@ -64,15 +64,21 @@
</ItemGroup>
<ItemGroup>
<Compile Include="DllBaseClass.cs" />
<Compile Include="FrmBillInfo.cs" />
<Compile Include="FrmBillInfo.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="FrmBillInfo.Designer.cs">
<DependentUpon>FrmBillInfo.cs</DependentUpon>
</Compile>
<Compile Include="FrmMain.cs" />
<Compile Include="FrmMain.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmMain.Designer.cs">
<DependentUpon>FrmMain.cs</DependentUpon>
</Compile>
<Compile Include="FrmProgress.cs" />
<Compile Include="FrmProgress.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmProgress.Designer.cs">
<DependentUpon>FrmProgress.cs</DependentUpon>
</Compile>