From 48961e94a37694f14bd0ac39e2ce91bfa49eddca Mon Sep 17 00:00:00 2001
From: peizhiyong <zhiyong.pei@broconcentric.com>
Date: 星期三, 06 八月 2025 18:40:52 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M200
---
src/Bro.M141.Process/M141Process.cs | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/src/Bro.M141.Process/M141Process.cs b/src/Bro.M141.Process/M141Process.cs
index 93b8fe0..3fbe71a 100644
--- a/src/Bro.M141.Process/M141Process.cs
+++ b/src/Bro.M141.Process/M141Process.cs
@@ -589,7 +589,8 @@
{
item1.IsAbandoned = false;
item1.FinalResult = ResultState.NG;
- LogAsync(DateTime.Now, EnumHelper.LogLevel.Action, $"浜у搧{products[0].PID}_{products[0].SEQUENCE}宸ヤ綅{measureBind.WorkPosition} S3S5缁勫悎妫�娴嬫鍑虹己闄�:{item1.NetName}");
+ //products[0].Result = M141Config.defectname;
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Action, $"浜у搧{products[0].PID}_{products[0].SEQUENCE}宸ヤ綅{measureBind.WorkPosition} S3S5缁勫悎妫�娴嬫鍑虹己闄�:{item1.NetName}锛屼骇鍝佺粨鏋滀负{products[0].Result}");
break;
}
}
@@ -695,10 +696,19 @@
}
string ngImageFile = Path.Combine(folder, $"{id}.{post}");
- var bitmap = imgSet.HImage.ConvertHImageToBitmap();
- bitmap.Save(ngImageFile, M141Config.ImageFormatNG);
- LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"{id}NG鍥剧墖宸蹭繚瀛�");
- bitmap.Dispose();
+ //var bitmap = imgSet.HImage.ConvertHImageToBitmap();
+ //bitmap.Save(ngImageFile, M141Config.ImageFormatNG);
+ //LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"{id}NG鍥剧墖宸蹭繚瀛�");
+ //bitmap.Dispose();
+ try
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"{id}NG鍥剧墖娴嬭瘯杞瓨{ngImageFile}");
+ imgSet.HImage.WriteImage(M141Config.ImageFormatOK.ToString().ToLower(), 0, ngImageFile);
+ }
+ catch (Exception)
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Error, $"{id}NG鍥剧墖淇濆瓨澶辫触");
+ }
}
}
}
@@ -731,11 +741,20 @@
post = M141Config.ImageFormatOK.ToString().ToLower();
}
- string ngImageFile = Path.Combine(folder, $"{id}.{post}");
- var bitmap = imgSet.HImage.ConvertHImageToBitmap();
- bitmap.Save(ngImageFile, M141Config.ImageFormatOK);
- LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"{id}OK鍥剧墖宸蹭繚瀛�");
- bitmap.Dispose();
+ string ngImageFile = Path.Combine(folder, $"{id}.{post}");
+ //var bitmap = imgSet.HImage.ConvertHImageToBitmap();
+ //bitmap.Save(ngImageFile, M141Config.ImageFormatOK);
+ //LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"{id}OK鍥剧墖宸蹭繚瀛�");
+ //bitmap.Dispose();
+ try
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"{id}OK鍥剧墖娴嬭瘯杞瓨{ngImageFile}");
+ imgSet.HImage.WriteImage(M141Config.ImageFormatOK.ToString().ToLower(), 0, ngImageFile);
+ }
+ catch (Exception)
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Error, $"{id}OK鍥剧墖淇濆瓨澶辫触");
+ }
}
}
}
--
Gitblit v1.8.0