From ab3d347fc586c682c154924ec9959cac3fb89754 Mon Sep 17 00:00:00 2001
From: Gokiburi <Gokiburi@DESKTOP-9ITC11L>
Date: 星期六, 21 六月 2025 15:13:10 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M200
---
src/Bro.M141_AOI1.Process/AOI1Process.cs | 58 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/src/Bro.M141_AOI1.Process/AOI1Process.cs b/src/Bro.M141_AOI1.Process/AOI1Process.cs
index 85fbd48..fe5e0fe 100644
--- a/src/Bro.M141_AOI1.Process/AOI1Process.cs
+++ b/src/Bro.M141_AOI1.Process/AOI1Process.cs
@@ -40,13 +40,14 @@
//using (StreamReader reader = new StreamReader(configPath, System.Text.Encoding.UTF8))
//{
// _configBackupStr = reader.ReadToEnd();
-
+
//}
//ProductModel p = JsonConvert.DeserializeObject<ProductModel>(_configBackupStr, new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.All });
base.Open();
}
+
[ProcessMethod("", "PositionCheck_P1", "宸ヤ綅1妫�娴�", InvokeType.TestInvoke)]
public ResponseMessage PositionCheck_P1(IOperationConfig config, IDevice invokeDevice, IDevice sourceDevice)
@@ -65,6 +66,7 @@
return msg;
}
+
[ProcessMethod("", "PositionCheck_P2", "宸ヤ綅2妫�娴�", InvokeType.TestInvoke)]
public ResponseMessage PositionCheck_P2(IOperationConfig config, IDevice invokeDevice, IDevice sourceDevice)
{
@@ -82,6 +84,7 @@
return msg;
}
+
[ProcessMethod("", "PositionCheck_P3", "宸ヤ綅3妫�娴�", InvokeType.TestInvoke)]
public ResponseMessage PositionCheck_P3(IOperationConfig config, IDevice invokeDevice, IDevice sourceDevice)
{
@@ -98,7 +101,6 @@
return msg;
}
-
[ProcessMethod("ImageCheck", "ReadBarcode", "璇荤爜", InvokeType.TestInvoke)]
@@ -128,14 +130,47 @@
}
else
{
- ret.Add(1);
+ if (barcode.Split('-').Length > 5)
+ {
+ int mh = Plc1.Read(4000, 1, out _)[0];
+ string codestr = barcode.Split('-')[4];
+ if (codestr == "L")
+ {
+ codestr = "10";
+ }
+
+ if (codestr.Equals(mh.ToString()))
+ {
+ ret.Add(1);
+ }
+ else
+ {
+ ret.Add(2);
+ Plc1.WriteSingleAddress(4010, 1, out _);//缁檖lc鎶ヨ
+ }
+ }
+ else
+ {
+ ret.Add(999);
+ }
}
FillSpecResults(results[0].PID, results[0].Specs, ret, opConfig.Products[0].SEQUENCE);
opConfig.Products[0].SN = barcode;
- opConfig.Products[0].Details.ForEach(u => u.SN = barcode);
+ opConfig.Products[0].PID = barcode + "_1";
+ opConfig.Products[0].Details.ForEach(u =>
+ {
+ u.SN = barcode;
+ u.PID = barcode + "_1";
+ u.ResultList.ForEach(x =>
+ {
+
+ x.PID = barcode + "_1";
+
+ });
+ });
LogAsync(DateTime.Now, EnumHelper.LogLevel.Action, $"浜у搧{opConfig.Products[0].PID}鏉＄爜鑾峰彇涓簕barcode}");
}
@@ -171,7 +206,6 @@
}
-
private string BarcodeScannerCommunicate(TcpClientWrapBase client)
{
string barcode = "";
@@ -202,6 +236,7 @@
return "NOREAD";
}
+
private bool CheckBarcodeValid(string barcode)
{
bool isBarcodeValid = true;
@@ -211,10 +246,6 @@
}
return isBarcodeValid;
}
-
-
-
-
[ProcessMethod("ImageCheck", "CheckLineProfile", "妫�娴嬩骇鍝佺嚎杞粨搴�", InvokeType.TestInvoke)]
@@ -358,15 +389,6 @@
return msg;
}
-
-
-
-
-
-
-
-
-
--
Gitblit v1.8.0