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

SVN r904

Browse Source 
SVN-Revision: r904
This commit is contained in:
wyf
2025-08-05 09:20:56 +00:00
parent 02bf3984bf
commit 3a179d04b0
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBomImport/FrmProgress.cs
+18 -18
View File
@@ -2002,7 +2002,7 @@ namespace Lskj.PubBomImport
childInfo = new FileInfo(childDirPath);
}
}
if ((childInfo == null || filetable.Rows.Count > 0) && maxBcFileDic.ContainsKey(code) && maxBcFileDic[code] != null)
if ((childInfo == null || filetable.Rows.Count > 0) && !code.StartsWith("RJ") && maxBcFileDic.ContainsKey(code) && maxBcFileDic[code] != null)
{
using (WebClient webClient = new WebClient())
{
@@ -2113,7 +2113,7 @@ namespace Lskj.PubBomImport
}
else
{
if (filetable.Rows.Count == 0)
if (filetable.Rows.Count == 0 && !code.StartsWith("RJ"))
{
throw new Exception($"{code}的附件不存在，请检查文件");
}
@@ -2194,7 +2194,7 @@ namespace Lskj.PubBomImport
childInfo = new FileInfo(childDirPath);
}
}
if ((childInfo == null || filetable.Rows.Count > 0) && maxBcFileDic.ContainsKey(code) && maxBcFileDic[code] != null)
if ((childInfo == null || filetable.Rows.Count > 0) && !code.StartsWith("RJ") && maxBcFileDic.ContainsKey(code) && maxBcFileDic[code] != null)
{
using (WebClient webClient = new WebClient())
{
@@ -2217,7 +2217,7 @@ namespace Lskj.PubBomImport
}
}
}
if (childInfo == null)
if (childInfo == null && !code.StartsWith("RJ"))
{
throw new Exception($"MX明细中的{code}文件不存在");
}
@@ -2336,10 +2336,10 @@ namespace Lskj.PubBomImport
SetProcessLabelAllMsg($"总进度：{nowCount + 1}/{parentTable.Rows.Count + 1}");
}
}
else
{
throw new Exception($"目录中不包含文件{code}");
}
//else
//{
// throw new Exception($"目录中不包含文件{code}");
//}
}
else
{
@@ -2377,7 +2377,7 @@ namespace Lskj.PubBomImport
}
}
}
if (childInfo == null)
if (childInfo == null && !code.StartsWith("RJ"))
{
throw new Exception($"目录中不包含文件{code}");
}
@@ -2415,10 +2415,10 @@ namespace Lskj.PubBomImport
SetProcessBar(100, finishCount);
SetProcessLabelAllMsg($"总进度：{nowCount + 1}/{parentTable.Rows.Count + 1}");
}
else
{
throw new Exception($"目录中不包含文件{code}");
}
//else
//{
// throw new Exception($"目录中不包含文件{code}");
//}
}
}
this.Invoke(new Action(() =>
@@ -3086,7 +3086,7 @@ namespace Lskj.PubBomImport
}
}
}
if (childInfo == null)
if (childInfo == null && !code.StartsWith("RJ"))
{
throw new Exception($"目录中不包含文件{code}");
}
@@ -3124,10 +3124,10 @@ namespace Lskj.PubBomImport
SetProcessBar(100, finishCount);
SetProcessLabelAllMsg($"总进度：{nowCount + 1}/{parentTable.Rows.Count + 1}");
}
else
{
throw new Exception($"目录中不包含文件{code}");
}
//else
//{
// throw new Exception($"目录中不包含文件{code}");
//}
}
this.Invoke(new Action(() =>
{