|
@@ -782,15 +782,19 @@ namespace Metis.AutoAnalysis
|
|
|
}
|
|
|
Console.WriteLine("Out of work runtime.");
|
|
|
|
|
|
- if(chkAutoUpload.Checked)
|
|
|
+ if(_isWorking)
|
|
|
{
|
|
|
- UploadData();
|
|
|
- }
|
|
|
+ //点停止按钮的时候不做这些处理
|
|
|
+ if (chkAutoUpload.Checked)
|
|
|
+ {
|
|
|
+ UploadData();
|
|
|
+ }
|
|
|
|
|
|
- this.Invoke(new Action(() =>
|
|
|
- {
|
|
|
- PrintReport(true);
|
|
|
- }));
|
|
|
+ this.Invoke(new Action(() =>
|
|
|
+ {
|
|
|
+ PrintReport(true);
|
|
|
+ }));
|
|
|
+ }
|
|
|
|
|
|
//当全部扫码完成退出循环,_isWorking依然为true,则认为完成
|
|
|
_workDone = _isWorking;
|
|
@@ -2361,8 +2365,11 @@ namespace Metis.AutoAnalysis
|
|
|
{
|
|
|
List<string> lstResult = new List<string>();
|
|
|
string filename = dir + "\\report.ai";
|
|
|
- if (Directory.Exists(filename) == false)
|
|
|
+ if (File.Exists(filename) == false)
|
|
|
+ {
|
|
|
+ LogHelper.log.Error("report.ai不存在 " + filename);
|
|
|
return lstResult;
|
|
|
+ }
|
|
|
|
|
|
var totalFiles = Directory.GetFiles(dir, "*.jpg");
|
|
|
int count = 1;//只取1张
|
|
@@ -2394,6 +2401,11 @@ namespace Metis.AutoAnalysis
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ if(lstResult.Count <= 0)
|
|
|
+ {
|
|
|
+ lstResult.Add(totalFiles[0]);
|
|
|
+ }
|
|
|
return lstResult;
|
|
|
}
|
|
|
|
|
@@ -2492,6 +2504,7 @@ namespace Metis.AutoAnalysis
|
|
|
|
|
|
foreach (var dir in m_lstWorkDir)
|
|
|
{
|
|
|
+ LogHelper.log.Debug("搜索图片文件夹:" + dir);
|
|
|
List<Bitmap> lstBitamp = new List<Bitmap>();
|
|
|
var randomFiles = GetOnlyFile(dir + "\\AI");
|
|
|
inclusionList.Clear();
|