diff --git a/插件库/Lskj.PubBomImport/FrmProgress.cs b/插件库/Lskj.PubBomImport/FrmProgress.cs index 2457220..512c695 100644 --- a/插件库/Lskj.PubBomImport/FrmProgress.cs +++ b/插件库/Lskj.PubBomImport/FrmProgress.cs @@ -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(() => {