From bd125c728f48a21729fbc12122b5c340059a9d13 Mon Sep 17 00:00:00 2001
From: quanzhou <quan.zhou@broconcentric.com>
Date: 星期五, 29 八月 2025 15:45:22 +0800
Subject: [PATCH] PLC报警添加种类分别存储功能完善
---
src/Bro.M141.Process/M141Process.cs | 905 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 827 insertions(+), 78 deletions(-)
diff --git a/src/Bro.M141.Process/M141Process.cs b/src/Bro.M141.Process/M141Process.cs
index 21f4dc8..9067fd5 100644
--- a/src/Bro.M141.Process/M141Process.cs
+++ b/src/Bro.M141.Process/M141Process.cs
@@ -5,12 +5,15 @@
using Bro.Device.InsCamera;
using Bro.M135.Common;
using Bro.M135.DBManager;
+using Bro.M141.Process.UI;
using Bro.Process;
using Bro.Process.DataBase.Models;
using Bro.UI.Model.Winform;
using HalconDotNet;
+using MySql.Data.MySqlClient;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using NPOI.SS.Formula.Function;
using NPOI.SS.Formula.Functions;
using Org.BouncyCastle.Asn1.X509;
using Org.BouncyCastle.Ocsp;
@@ -20,12 +23,16 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Drawing.Imaging;
+using System.Drawing.Printing;
using System.IO;
using System.Linq;
using System.Text;
using Windows.ApplicationModel.Appointments;
+using Windows.Devices.PointOfService;
using ZXing;
+using ZXing.QrCode;
using static Bro.Common.Helper.EnumHelper;
using static Bro.Process.ProcessControl;
using static Org.BouncyCastle.Math.EC.ECCurve;
@@ -57,6 +64,8 @@
public event Action RerefreshBasketcodeUI;
+ public Action<bool, string> OnContinuousNGAlarmRaised;
+
public void RerefreshBasketcode()
{
RerefreshBasketcodeUI?.Invoke();
@@ -74,6 +83,8 @@
ThHeartPlc.IsBackground = true;
ThHeartPlc.Start();
}
+
+ printDocument1.PrintPage += new PrintPageEventHandler(printDocument_Print);
}
public override void ProcessRunStateChanged()
@@ -98,9 +109,6 @@
-
-
-
public override void Open()
{
base.Open();
@@ -119,6 +127,8 @@
}
_errorSpec = M141Config.SpecCollection.FirstOrDefault(u => u.Code == M141Config.CheckErrorSpecCode) as Spec;
+
+
//InitialProductList();
NetWarmUp();
@@ -136,7 +146,7 @@
mqtt.Connect(M141Config.MESchannel);
}
-
+ InitialContinuousNGAlarm();
}
@@ -187,6 +197,9 @@
Dictionary<string, List<int>> StateDIC = new Dictionary<string, List<int>>();
+ List<string> AlarmTypeList = new List<string>();
+
+
int numplc = 0;
while (true)
{
@@ -218,24 +231,30 @@
}
}
}
-
- lock (StatisticRecordsFull)
+ if (numsum > 20)
{
- if (numsum > 20)
- {
- numsum = 0;
- using (FileStream fileStream = new FileStream(_statisticFilePath, FileMode.OpenOrCreate, FileAccess.Write))
- {
- fileStream.Seek(0L, SeekOrigin.Begin);
- string s = JsonConvert.SerializeObject(StatisticRecordsFull);
- byte[] bytes = Encoding.UTF8.GetBytes(s);
- fileStream.Write(bytes, 0, bytes.Length);
- fileStream.SetLength(bytes.Length);
- fileStream.Flush();
- fileStream.Close();
- }
- }
+ numsum = 0;
+ StatisticRecordsFull.SaveSummaryRecord();
}
+ //lock (StatisticRecordsFull)
+ //{
+ // if (numsum > 20)
+ // {
+ // numsum = 0;
+
+
+ // using (FileStream fileStream = new FileStream(_statisticFilePath, FileMode.OpenOrCreate, FileAccess.Write))
+ // {
+ // fileStream.Seek(0L, SeekOrigin.Begin);
+ // string s = JsonConvert.SerializeObject(StatisticRecordsFull);
+ // byte[] bytes = Encoding.UTF8.GetBytes(s);
+ // fileStream.Write(bytes, 0, bytes.Length);
+ // fileStream.SetLength(bytes.Length);
+ // fileStream.Flush();
+ // fileStream.Close();
+ // }
+ // }
+ //}
}
catch (Exception ex)
{
@@ -277,16 +296,13 @@
}
var alrams = item1.AlarmDetails;
+
var plcdev = DeviceCollection.FirstOrDefault(u => u.Id == item1.plcname) as PLCBase;
-
- if (!StateDIC.ContainsKey(plcdev.Name))
- {
- StateDIC[plcdev.Name] = new List<int>();
- }
-
+
foreach (var item in alrams.GroupBy(u => u.address))
{
int add = item.Key;
+
var readres = plcdev.Read(add, 1, out _)[0];
var Allbin = Convert.ToString(readres, 2).PadLeft(16, '0').Select(c => c - '0').ToArray();
@@ -296,43 +312,99 @@
foreach (var item2 in item)
{
item2.value = Allbin[item2.address2];
+
+ if (!AlarmTypeList.Contains(item2.alarmtype))
+ {
+
+ AlarmTypeList.Add(item2.alarmtype);
+
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"鎶ヨ绫诲埆{item2.alarmtype}鍔犲叆闃熷垪,闃熷垪涓暟涓簕AlarmTypeList.Count}");
+ }
}
}
+
+ string StateDICKey = "";
+
+ foreach (var item in AlarmTypeList)
+ {
+
+ StateDICKey = plcdev.Name +"_"+ item;
+
+ if (!StateDIC.ContainsKey(StateDICKey))
+ {
+
+ StateDIC[StateDICKey] = new List<int>();
+
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"鎶ヨ绫诲埆{StateDICKey}鍔犲叆瀛楀吀锛歋tateDIC");
+
+ }
+
+ }
+
List<int> list = new List<int>();
+
+ Dictionary<string, AlarmTypeData> AlarmType = new Dictionary<string, AlarmTypeData>();
+
foreach (var item in alrams)
{
- csvhead += $",{item.alarmname}";
- csvdata += $",{(item.value == 1 ? "1" : "")}";
- list.Add(item.value);
- }
+ string key = item.alarmtype;
- if (!StateDIC[plcdev.Name].SequenceEqual(list))
+ if (!AlarmType.TryGetValue(key, out var alarmData))
+ {
+ // 涓嶅瓨鍦紝鍒涘缓鏂扮殑
+ alarmData = new AlarmTypeData()
+ {
+ CSVhead = csvhead,
+ CSVdata = csvdata,
+ };
+ AlarmType.Add(item.alarmtype, alarmData);
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"鎶ヨ{item.alarmname}绫诲埆{key}浣滀负key鍔犲叆AlarmType瀛楀吀");
+ }
+
+ alarmData.CSVhead += $",{item.alarmname}";
+ alarmData.CSVdata += $",{(item.value == 1 ? "1" : "")}";
+ alarmData.AlarmTypeValue.Add(item.value);
+
+ }
+ foreach(var item in AlarmType.Keys)
{
- StateDIC[plcdev.Name].Clear();
- StateDIC[plcdev.Name].AddRange(list);
- CSVRecordAsync($"PLCstate_{plcdev.Name}.csv", csvdata, csvhead);
+ list = AlarmType[item].AlarmTypeValue;
- var showdata = alrams.Where(u => u.value == 1).Select(u => u.alarmname).ToList();
+ string key = plcdev.Name+"_"+item;
- if (showdata == null)
+ if (!StateDIC[key].SequenceEqual(list))
{
- showdata = new List<string>();
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"{plcdev.Name}鎶ヨ绫诲瀷锛歿item}鐨勪俊鍙峰彂鐢熷彉鍖�,淇濆瓨鐨勬暟鎹负{AlarmType[item].CSVdata}");
+
+ StateDIC[key].Clear();
+
+ StateDIC[key].AddRange(list);
+
+ CSVRecordAsync($"PLCstate_{DateTime.Now.ToString("yyyyMMdd")}_{key}.csv", AlarmType[item].CSVdata, AlarmType[item].CSVhead);
+
+ var showdata = alrams.Where(u => u.value == 1).Select(u => u.alarmname).ToList();
+
+ if (showdata == null)
+ {
+ showdata = new List<string>();
+ }
+
+ if (showdata.Count > 0)
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"{plcdev.Name}鎶ヨ 涓暟:{showdata.Count} {string.Join(',', showdata)}");
+ }
+ else
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"{plcdev.Name}鎶ヨ 涓暟:0");
+ }
}
- if (showdata.Count > 0)
- {
- LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"{plcdev.Name}鎶ヨ 涓暟:{showdata.Count} {string.Join(',', showdata)}");
- }
- else
- {
- LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"{plcdev.Name}鎶ヨ 涓暟:0");
- }
- }
+ }
}
- catch
+ catch(Exception EXC)
{
-
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Error, $"PLC鎶ヨ瀛樺偍璁板綍鍙戠敓寮傚父 {EXC.ToString()}");
}
}
}
@@ -342,8 +414,6 @@
{
}
-
-
try
{
@@ -367,6 +437,18 @@
Thread.Sleep(1000);
}
}
+
+ public class AlarmTypeData
+ {
+ public List <int> AlarmTypeValue = new List<int>();
+
+ public string CSVhead;
+
+ public string CSVdata;
+
+ }
+
+
/// <summary>
/// 缃戠粶棰勭儹
@@ -574,11 +656,8 @@
double y1 = item1.Rect.Point_LU.Y + item1.Rect.Height / 2.0;
num++;
- //HOperatorSet.AffineTransPoint2d(new HTuple(products[0].Centermatrix.ToArray()), x1, y1, out HTuple qx, out HTuple qy);
- //HOperatorSet.ProjectiveTransPixel(new HTuple(products[0].Centermatrix.ToArray()), x1, y1, out HTuple qx, out HTuple qy);
-
LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"{products[0].SN} S3S5妫�娴� 鍘熷潗鏍噞num} {x1},{y1}");
- HOperatorSet.ProjectiveTransPixel(new HTuple(products[0].Centermatrix.ToArray()), x1, y1, out HTuple qx, out HTuple qy);
+ HOperatorSet.ProjectiveTransPixel(new HTuple(products[0].Centermatrix.ToArray()), y1, x1, out HTuple qx, out HTuple qy);
LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"{products[0].SN} S3S5妫�娴� 鏂板潗鏍噞num} {qx},{qy}");
@@ -592,7 +671,9 @@
{
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;
}
}
@@ -698,10 +779,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鍥剧墖淇濆瓨澶辫触");
+ }
}
}
}
@@ -735,10 +825,19 @@
}
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();
+ //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鍥剧墖淇濆瓨澶辫触");
+ }
}
}
}
@@ -924,6 +1023,7 @@
#region plc
public ResponseMessage RunImageCheck_plc(IOperationConfig config)
{
+
ResponseMessage msg = new ResponseMessage();
msg.Result = 1;
List<MeasureBind> measureBinds = new List<MeasureBind>();
@@ -996,7 +1096,10 @@
}
CheckPositionDoneAsync_plc(measureBinds[0].WorkPosition, inputSequence, config, cameraIds);
+
+
return msg;
+
}
@@ -1064,10 +1167,12 @@
if (M141Config.Isreadbasketcode)
{
p.BasketCode = M141Config.basketcode;
+ p.Zword = M141Config.zwoid;
}
else
{
- p.BasketCode = mysqlhelper.Getbasketcode(p.SEQUENCE, out string sntem);
+ p.BasketCode = mysqlhelper.Getbasketcode(p.SEQUENCE, out string sntem, out string zword);
+ p.Zword = zword;
p.SN = sntem;
p.PID = $"{sntem}_{i}";
if ("NoRead".Equals(p.BasketCode))
@@ -1130,11 +1235,13 @@
public async Task<List<ProductModel>> CheckPositionDoneAsync_plc(string positionName, string inputSequence, IOperationConfig config, List<string> cameraIds)
{
+
string triggerSource = config.TriggerSource;
return await _taskFactory.StartNew(() =>
{
try
{
+
string index = config.TriggerStr.Split(',')[1];
var positionSet = M141Config.WorkPositionCollection.FirstOrDefault(u => u.PositionName == positionName);
@@ -1221,27 +1328,64 @@
mysqlhelper.UpdateProduct(p);
+
+
+
if (positionSet.IsLastPosition)
{
- UpdateProductResultAsync(p);
+ //鐝缁熻鏃堕棿鍒掑垎
+ if (M141Config.WorkShiftList.Count == 0)
+ {
+ //鐢熸垚涓�涓姤琛�
+ string name = $"ProductRecord_{DateTime.Now.ToString("yyyyMMdd")}.csv";
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"鍒涘缓{name}鏁版嵁鎶ヨ〃");
+ UpdateProductResultAsync(p, name);
+ }
+ else
+ {
+ foreach (var item in M141Config.WorkShiftList)
+ {
+ DateTime now = DateTime.Now;
+
+ if (item.ShiftTime_Start < item.ShiftTime_End)
+ {
+ if (now.TimeOfDay >= item.ShiftTime_Start.TimeOfDay && now.TimeOfDay < item.ShiftTime_End.TimeOfDay)
+ {
+ //鐢熸垚涓�涓姤琛�
+ string name = $"ProductRecord_{DateTime.Now.ToString("yyyyMMdd")}_{item.ShiftName}.csv";
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"鍒涘缓{name}鏁版嵁鎶ヨ〃");
+ UpdateProductResultAsync(p, name);
+ }
+ }
+ else
+ {
+ if (now.TimeOfDay >= item.ShiftTime_Start.TimeOfDay)
+ {
+ //鐢熸垚涓�涓姤琛�
+ string name = $"ProductRecord_{DateTime.Now.ToString("yyyyMMdd")}_{item.ShiftName}.csv";
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"鍒涘缓{name}鏁版嵁鎶ヨ〃");
+ UpdateProductResultAsync(p, name);
+ }
+ if (now.TimeOfDay < item.ShiftTime_End.TimeOfDay)
+ {
+ // 鐢熸垚涓�涓姤琛�
+ string name = $"ProductRecord_{DateTime.Now.AddDays(-1).ToString("yyyyMMdd")}_{item.ShiftName}.csv";
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"鍒涘缓{name}鏁版嵁鎶ヨ〃");
+ UpdateProductResultAsync(p, name);
+ }
+ }
+ }
+ }
+ //UpdateProductResultAsync(p);
mysqlhelper.NewForAll(p, M141Config.StationCode, M141Config.defectname);
+
if (M141Config.IsfinDevice)
{
SummaryAllprodata(p);
}
}
});
- //ReplyPlcData(positionSet, plcresult);
- if (positionSet.IsLastPosition)
- {
- if (_ct != null)
- {
- UpdateCT(null, (float)((DateTime.Now - _ct.Value).TotalSeconds));
- }
- _ct = DateTime.Now;
- }
- //ReplyPlcData(positionName, config.TriggerValue);
cameraIds.ForEach(c =>
{
@@ -1252,6 +1396,229 @@
LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"鐩告満{camera.Name}娓呯悊缂撳瓨");
}
});
+
+ //ReplyPlcData(positionSet, plcresult);
+ if (positionSet.IsLastPosition)
+ {
+ if (_ct != null)
+ {
+ UpdateCT(null, (float)((DateTime.Now - _ct.Value).TotalSeconds));
+ }
+ _ct = DateTime.Now;
+
+ if (M141Config.ISupMES && (M141Config.MESchannel == -1 || M141Config.MESchannel == 1))
+ {
+ if (M141Config.numpro >= 50)
+ {
+ M141Config.numpro = 0;
+ }
+
+ string Msgreceice = null;
+
+ if (pList[0].Result == "OK")
+ {
+ M141Config.numpro++;
+ Msgreceice = Task.Run(() => mqtt.MESForProduceAsync(pList[0], M141Config.mesnum2.ToString(), M141Config.numpro)).Result;
+ }
+ else
+ {
+ if (M141Config.ISupNG)
+ {
+ Msgreceice = Task.Run(() => mqtt.MESForProduceAsync(pList[0], M141Config.mesnum2.ToString(), M141Config.numpro)).Result;
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{pList[0].PID}鍚姩NG涓婁紶");
+
+ }
+ else
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{pList[0].PID}鍏抽棴NG涓婁紶");
+ }
+ }
+ M141Config.mesnum2++;
+ if (Msgreceice == null && !M141Config.ISupNG)
+ {
+ if (!M141Config.ISupNG)
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{pList[0].PID}鏁版嵁NG锛屽紑鍚叧闂璑G涓婁紶MES");
+ }
+ else
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"浜у搧{pList[0].PID}鏁版嵁涓婁紶MES寮傚父 杩斿洖鏁版嵁涓簄ull");
+ }
+ }
+ else
+ {
+ try
+ {
+ var obj = JsonConvert.DeserializeObject<AutoLineMacBarcodeQueueBak>(Msgreceice);
+
+ if (obj.zstatus == "200")
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{pList[0].PID}鏁版嵁涓婁紶MES鎴愬姛 {Msgreceice}");
+
+ if (M141Config.Isprint && !string.IsNullOrEmpty(obj.tary_label))
+ {
+ StartPrint(obj.tary_label);
+ }
+
+
+
+ }
+ else
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"浜у搧{pList[0].PID}鏁版嵁涓婁紶MES澶辫触 {Msgreceice}");
+ }
+ }
+ catch
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"浜у搧{pList[0].PID}鏁版嵁涓婁紶MES寮傚父 {Msgreceice}");
+ }
+ }
+
+
+
+ int numplca = Convert.ToInt32(pList[0].SEQUENCE.Split('_')[0]);
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"plc缁欏嚭鐨勪骇鍝佸簭鍙蜂负{numplca}");
+
+ lock (plcnumlock)//1-29999
+ {
+
+ if (PlcNumForAll == -1)
+ {
+ PlcNumForAll = numplca;
+ }
+
+ int differ = numplca - PlcNumForAll;
+
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"涓や釜浜у搧涓棿鐨勫樊鍊糳iffer涓簕differ}");
+
+ if (differ > 1)
+ {
+ for (int i = PlcNumForAll + 1; i < numplca; i++)
+ {
+ try
+ {
+ var plist = mysqlhelper.GetProductList(i + "_1");
+ ProductModel newp = new ProductModel();
+ newp.SEQUENCE = plist[0].SEQUENCE;
+ newp.PID = plist[0].PID;
+ newp.BasketCode = plist[0].BasketCode;
+ newp.Zword = plist[0].Zword;
+ newp.Result = "NG";
+ newp.SN = plist[0].SN;
+
+ if (M141Config.IsfinDevice)
+ {
+ SummaryAllprodata(newp);
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{newp.PID}鎻愬墠NG鍔犲叆姹囨�绘暟鎹姤琛ㄧ粺璁�");
+ }
+ if (M141Config.ISupNG)
+ {
+ var tems = Task.Run(() => mqtt.MESForProduceAsync(newp, M141Config.mesnum2.ToString(), M141Config.numpro)).Result;
+ M141Config.mesnum2++;
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{newp.PID}鍚姩NG涓婁紶");
+ }
+ else
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{newp.PID}鍏抽棴NG涓婁紶");
+ }
+
+ }
+ catch
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{i + "_1"}涓婁紶澶辫触");
+ }
+ }
+ }
+ else if (differ == -29998 && differ == 1 && differ == 0)
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"鐢熶骇杩囩▼涓湭澶卞幓浜у搧");
+ }
+ else if (differ < 0 && differ > -29998)
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"PlcNumForAll涓簕PlcNumForAll}锛宯umplca涓簕numplca}");
+ //浜у搧浠庢柊璁℃暟鏃�
+ for (int i = PlcNumForAll + 1; i <= 29999; i++)
+ {
+ try
+ {
+ var plist = mysqlhelper.GetProductList(i + "_1");
+ ProductModel newp = new ProductModel();
+ newp.SEQUENCE = plist[0].SEQUENCE;
+ newp.PID = plist[0].PID;
+ newp.Zword = plist[0].Zword;
+ newp.BasketCode = plist[0].BasketCode;
+ newp.Result = "NG";
+ newp.SN = plist[0].SN;
+ if (M141Config.IsfinDevice)
+ {
+ SummaryAllprodata(newp);
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{newp.PID}鎻愬墠NG鍔犲叆姹囨�绘暟鎹姤琛ㄧ粺璁�");
+ }
+ if (M141Config.ISupNG)
+ {
+ var tems = Task.Run(() => mqtt.MESForProduceAsync(newp, M141Config.mesnum2.ToString(), M141Config.numpro)).Result;
+ M141Config.mesnum2++;
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{newp.PID}鍚姩NG涓婁紶");
+ }
+ else
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{newp.PID}鍏抽棴NG涓婁紶");
+ }
+ //var tems = Task.Run(() => mqtt.MESForProduceAsync(newp, M141Config.mesnum2.ToString(), M141Config.numpro)).Result;
+ //M141Config.mesnum2++;
+ //LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"PlcNumForAll锛屽墠绔橬G鎺掓枡涓攑lc瑙﹀彂娓呴浂浜у搧{newp.PID}鏁版嵁涓婁紶,缁撴灉涓簕newp.Result}");
+
+ }
+ catch
+ {
+
+ }
+ }
+ for (int i = 1; i < numplca; i++)
+ {
+ try
+ {
+ var plist = mysqlhelper.GetProductList(i + "_1");
+ ProductModel newp = new ProductModel();
+ newp.SEQUENCE = plist[0].SEQUENCE;
+ newp.PID = plist[0].PID;
+ newp.BasketCode = plist[0].BasketCode;
+ newp.Zword = plist[0].Zword;
+ newp.Result = "NG";
+ newp.SN = plist[0].SN;
+ if (M141Config.IsfinDevice)
+ {
+ SummaryAllprodata(newp);
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{newp.PID}鎻愬墠NG鍔犲叆姹囨�绘暟鎹姤琛ㄧ粺璁�");
+ }
+ if (M141Config.ISupNG)
+ {
+ var tems = Task.Run(() => mqtt.MESForProduceAsync(newp, M141Config.mesnum2.ToString(), M141Config.numpro)).Result;
+ M141Config.mesnum2++;
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{newp.PID}鍚姩NG涓婁紶");
+ }
+ else
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{newp.PID}鍏抽棴NG涓婁紶");
+ }
+
+ //var tems = Task.Run(() => mqtt.MESForProduceAsync(newp, M141Config.mesnum2.ToString(), M141Config.numpro)).Result;
+ //M141Config.mesnum2++;
+ //LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"numplca锛屽墠绔橬G鎺掓枡涓攑lc瑙﹀彂娓呴浂浜у搧{newp.PID}鏁版嵁涓婁紶,缁撴灉涓簕newp.Result}");
+ }
+ catch
+ {
+ }
+ }
+ }
+ PlcNumForAll = numplca;
+ }
+
+ }
+
+ }
+
+ //ReplyPlcData(positionName, config.TriggerValue);
return pList;
@@ -1279,6 +1646,7 @@
public void SummaryAllprodata(ProductModel p)
{
+
_taskFactory.StartNew(() =>
{
try
@@ -1287,13 +1655,14 @@
newp.SEQUENCE = p.SEQUENCE;
newp.PID = p.PID;
newp.BasketCode = p.BasketCode;
+ newp.Zword = p.Zword;
newp.Result = p.Result;
newp.SN = p.SN;
Thread.Sleep(500);
var plist = mysqlhelper.GetProductList(p.SEQUENCE);
-
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"浜у搧{p.PID}妫�娴嬬粨鏋滀负{p.Result}浠庢暟鎹簱涓幏鍙栫殑鏁版嵁涓轰骇鍝亄plist[0].PID}妫�娴嬬粨鏋滀负{plist[0].Result}");
if (plist != null)
{
foreach (var item in plist)
@@ -1301,6 +1670,7 @@
newp.Details.AddRange(item.Details);
}
}
+
//LogAsync(DateTime.Now, EnumHelper.LogLevel.Error, $"AllDeviceProductRecord浠庢暟鎹簱鑾峰彇鍒版暟鎹畕p.SEQUENCE} plist鏁伴噺{plist.Count} Details鏁伴噺{newp.Details.Count}");
//newp.Details.AddRange(p.Details);
@@ -1308,7 +1678,25 @@
List<string> specHeadListforall = new List<string>();
List<string> positionListforall = new List<string>();
string csvHeadforall = newp.GetCSVHead(ref specHeadListforall, ref positionListforall);
- CSVRecordAsync($"AllDeviceProductRecord.csv", newp.GetCSVData(specHeadListforall, positionListforall), csvHeadforall);
+ string csvDataforall = newp.GetCSVData(specHeadListforall, positionListforall);
+
+ string data = "";
+
+ string Head = "鏃堕棿,PID,鏍忓叿鐮�,鐗╂枡鐮�,鏉＄爜,姹囨�绘娴嬬粨鏋�,S2_P1妫�娴嬫槑缁�,S2_P2妫�娴嬫槑缁�,S2_P3妫�娴嬫槑缁�,S3_P1妫�娴嬫槑缁�,S3_P2妫�娴嬫槑缁�,S4_P1妫�娴嬫槑缁�,S4_P2妫�娴嬫槑缁�,S5_P1妫�娴嬫槑缁�,S5_P2妫�娴嬫槑缁�,S5_P3妫�娴嬫槑缁�,Barcode,SPC_A,SPC_BF_A1,SPC_BF_A2,SPC_BF_A3,SPC_BF_A4,SPC_BF_A5,SPC_BF_A6,SPC_BF_A7,SPC_BF_A8,SPC_BF_A9,SPC_BS_A1,SPC_BS_A2,SPC_BS_A3,SPC_BS_A4,SPC_BS_A5,SPC_BS_A6,SPC_BS_A7,SPC_BS_A8,SPC_BS_A9,SPC_BT_A100RES,SPC_BT_A101RES,SPC_BT_A102RES,SPC_BT_A103RES,SPC_BT_A104RES,SPC_BT_A105RES,SPC_BT_A106RES,SPC_BT_A107RES,SPC_BT_A108RES,SPC_BT_A109RES,SPC_BT_A10RES,SPC_BT_A110RES,SPC_BT_A111RES,SPC_BT_A112RES,SPC_BT_A113RES,SPC_BT_A11RES,SPC_BT_A12RES,SPC_BT_A13RES,SPC_BT_A14RES,SPC_BT_A15RES,SPC_BT_A16RES,SPC_BT_A17RES,SPC_BT_A18RES,SPC_BT_A19RES,SPC_BT_A1RES,SPC_BT_A20RES,SPC_BT_A21RES,SPC_BT_A22RES,SPC_BT_A23RES,SPC_BT_A24RES,SPC_BT_A25RES,SPC_BT_A26RES,SPC_BT_A27RES,SPC_BT_A28RES,SPC_BT_A29RES,SPC_BT_A2RES,SPC_BT_A30RES,SPC_BT_A31RES,SPC_BT_A32RES,SPC_BT_A33RES,SPC_BT_A34RES,SPC_BT_A35RES,SPC_BT_A36RES,SPC_BT_A37RES,SPC_BT_A38RES,SPC_BT_A39RES,SPC_BT_A3RES,SPC_BT_A40RES,SPC_BT_A41RES,SPC_BT_A42RES,SPC_BT_A43RES,SPC_BT_A44RES,SPC_BT_A45RES,SPC_BT_A46RES,SPC_BT_A47RES,SPC_BT_A48RES,SPC_BT_A49RES,SPC_BT_A4RES,SPC_BT_A50RES,SPC_BT_A51RES,SPC_BT_A52RES,SPC_BT_A53RES,SPC_BT_A54RES,SPC_BT_A55RES,SPC_BT_A56RES,SPC_BT_A57RES,SPC_BT_A58RES,SPC_BT_A59RES,SPC_BT_A5RES,SPC_BT_A60RES,SPC_BT_A61RES,SPC_BT_A62RES,SPC_BT_A63RES,SPC_BT_A64RES,SPC_BT_A65RES,SPC_BT_A66RES,SPC_BT_A67RES,SPC_BT_A68RES,SPC_BT_A69RES,SPC_BT_A6RES,SPC_BT_A70RES,SPC_BT_A71RES,SPC_BT_A72RES,SPC_BT_A73RES,SPC_BT_A74RES,SPC_BT_A75RES,SPC_BT_A76RES,SPC_BT_A77RES,SPC_BT_A78RES,SPC_BT_A79RES,SPC_BT_A7RES,SPC_BT_A80RES,SPC_BT_A81RES,SPC_BT_A82RES,SPC_BT_A83RES,SPC_BT_A84RES,SPC_BT_A85RES,SPC_BT_A86RES,SPC_BT_A87RES,SPC_BT_A88RES,SPC_BT_A89RES,SPC_BT_A8RES,SPC_BT_A90RES,SPC_BT_A91RES,SPC_BT_A92RES,SPC_BT_A93RES,SPC_BT_A94RES,SPC_BT_A95RES,SPC_BT_A96RES,SPC_BT_A97RES,SPC_BT_A98RES,SPC_BT_A99RES,SPC_BT_A9RES,SPC_C";
+
+ for (int i = 0; i < Head.Split(",").ToList().Count(); i++)
+ {
+ int index = csvHeadforall.Split(",").ToList().IndexOf(Head.Split(",").ToList()[i]);
+ if (index != -1)
+ {
+ data += $"{string.Join(" ", csvDataforall.Split(",").ToList()[index])},";
+ }
+ else
+ {
+ data += "NA,";
+ }
+ }
+ CSVRecordAsync($"AllDeviceProductRecord.csv", data, Head);
}
catch (Exception exx)
@@ -1323,10 +1711,371 @@
#endregion
+
+ List<DefectNGRecord> DefectNGRecordList = new List<DefectNGRecord>();
+
+ public void InitialContinuousNGAlarm()
+ {
+ DefectNGRecordList = M141Config.ContinuousNGAlarmColletion.Where(u => u.IsEnabled).Select(u =>
+ {
+ DefectNGRecord record = new DefectNGRecord();
+ record.DefectName = u.DefectType;
+ record.AlarmSetting = u;
+ return record;
+ }).ToList();
+ OnContinuousNGAlarmRaised = NGAlarmRaised;
+ if (M141Config.ContinuousNGAlarmAddress > 0 && Plc1 != null)
+ {
+ if (!Plc1.WriteSingleAddress(M141Config.ContinuousNGAlarmAddress, 0, out string error))
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"杩炵画NG鐩戞帶閫氱煡PLC閲嶇疆鎶ヨ澶辫触锛寋error}");
+ }
+ }
+ }
+ public async void CheckContinuousNGAlarmAsync(ProductModel product)
+ {
+ await Task.Run(() =>
+ {
+ if (!M141Config.IsEnableContinuousNGAlarm)
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"杩炵画NG鎶ヨ鎬诲紑鍏冲凡鍏抽棴");
+ return;
+ }
+
+ if (DefectNGRecordList.Count == 0)
+ return;
+
+ string allMsg = "";
+ bool isAlarmRaised = false;
+ int alarmType = 0;
+ string ngItem = "";
+ try
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"杩炵画NG鏁版嵁璁板綍");
+ DefectNGRecordList.ForEach(d =>
+ {
+ string alarmMsg = "";
+ int alarmTypeTemp = 0;
+
+ if (product.Result == "OK")
+ {
+ if (d.CheckIsAlarmRaised(product.Result == "OK", out alarmMsg, out alarmTypeTemp))
+ {
+ allMsg += $"{alarmMsg}\r\n";
+
+ isAlarmRaised = true;
+ ngItem = "浜у搧缁撴灉";
+ alarmType = alarmTypeTemp;
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"{product.PID}鏁版嵁缁撴灉涓簕product.Result}鍙備笌杩炵画NG缁熻");
+ }
+ }
+ else
+ {
+ if (product.Result.Contains(d.DefectName))
+ {
+ if (d.CheckIsAlarmRaised(!product.Result.Contains(d.DefectName), out alarmMsg, out alarmTypeTemp))
+ {
+ allMsg += $"{alarmMsg}\r\n";
+ isAlarmRaised = true;
+ ngItem = "浜у搧缁撴灉";
+ alarmType = alarmTypeTemp;
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"{product.PID}鏁版嵁缁撴灉涓簕product.Result}鍙備笌杩炵画NG缁熻");
+ }
+ }
+ }
+ });
+ }
+ catch (Exception ex)
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Warning, $"杩炵画NG鏁版嵁璁板綍澶辫触");
+ }
+ if (isAlarmRaised)
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Warning, $"杩炵画NG鐩戞帶鎶ヨ锛寋allMsg}");
+ if (M141Config.IsOperatorReset)
+ {
+ if (M141Config.ContinuousNGAlarmAddress > 0 && Plc1 != null)
+ {
+ if (!Plc1.WriteSingleAddress(M141Config.ContinuousNGAlarmAddress, 1, out string error))
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"杩炵画NG鐩戞帶閫氱煡PLC閲嶇疆鎶ヨ澶辫触锛寋error}");
+ }
+ }
+ OnContinuousNGAlarmRaised?.Invoke(true, allMsg);
+ }
+ else
+ {
+ Task.Delay(50).Wait();
+ ResetContinuousNGAlarm();
+ }
+ }
+ });
+ }
+
+ object _continuousNGAlarmLock = new object();
+
+ FrmContinuousNGAlarm _continuousNGAlarmFrm = null;
+ private async void NGAlarmRaised(bool isRaiseAlarm, string alarmMsg)
+ {
+ await Task.Run(() =>
+ {
+ if (isRaiseAlarm)
+ {
+ if (_continuousNGAlarmFrm == null)
+ {
+ lock (_continuousNGAlarmLock)
+ {
+ if (_continuousNGAlarmFrm == null)
+ {
+ _continuousNGAlarmFrm = new FrmContinuousNGAlarm();
+
+ _continuousNGAlarmFrm.TopMost = true;
+
+ _continuousNGAlarmFrm.FormClosed += _continuousNGAlarmFrm_FormClosed;
+
+ Task.Run(() =>
+ {
+ _continuousNGAlarmFrm.ShowDialog();
+
+ });
+ }
+ }
+ }
+ Task.Delay(100).Wait();
+ _continuousNGAlarmFrm.ShowAlarmMsg(alarmMsg);
+ }
+ else
+ {
+ if (_continuousNGAlarmFrm != null)
+ {
+ _continuousNGAlarmFrm.Close();
+ }
+
+ }
+ });
+
+ }
+
+ private void _continuousNGAlarmFrm_FormClosed(object? sender, FormClosedEventArgs e)
+ {
+ ResetContinuousNGAlarm();
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Action, $"杩炵画NG鎶ヨ宸插浣�");
+ _continuousNGAlarmFrm = null;
+ }
+
+ public void ResetContinuousNGAlarm()
+ {
+ //杩炵画NG澶嶄綅
+ DefectNGRecordList.Where(u => u.IsAlarmRaised).ToList().ForEach(u => u.ResetAlarm());
+ if (M141Config.ContinuousNGAlarmAddress > 0 && Plc1 != null)
+ {
+ if (!Plc1.WriteSingleAddress(M141Config.ContinuousNGAlarmAddress, 0, out string error))
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"杩炵画NG鐩戞帶閫氱煡PLC閲嶇疆鎶ヨ澶辫触锛寋error}");
+ }
+ }
+
+ }
+
+ [ProcessMethod("", "ContinuousNGAlarmTest", "杩炵画NG鎶ヨ娴嬭瘯", InvokeType.TestInvoke)]
+ public ResponseMessage ContinuousNGAlarmTest(IOperationConfig config, IDevice invokeDevice, IDevice sourceDevice)
+ {
+ ProductModel p = new ProductModel();
+
+ p.Result = config.TriggerStr;
+
+ CheckContinuousNGAlarmAsync(p);
+
+ return new ResponseMessage();
+ }
+
+
+
+
+
+
+ #region 鎵撳嵃鏈虹浉鍏�
+ PrintDocument printDocument1 = new PrintDocument();
+ string Printmessage = "";
+
+ public void StartPrint(string str)
+ {
+ try
+ {
+ int ttwith = 320;
+ int ttheigh = 160;
+ Printmessage = str;
+
+ this.printDocument1.DefaultPageSettings.PrinterSettings.PrinterName = "Honeywell PX240S (300 dpi)";
+ this.printDocument1.DefaultPageSettings.PaperSize = new PaperSize("Custum", ttwith, ttheigh);
+
+ this.printDocument1.PrintController = new System.Drawing.Printing.StandardPrintController();
+ this.printDocument1.Print();
+
+ }
+ catch
+ {
+
+ }
+
+ }
+
+
+ //C229M2508250500002
+ private void printDocument_Print(object sender, PrintPageEventArgs e)
+ {
+ Font fntTxt = new Font("榛戜綋", 15, System.Drawing.FontStyle.Bold);//姝ｆ枃鏂囧瓧
+ System.Drawing.Brush brush = new SolidBrush(System.Drawing.Color.Black);//鐢诲埛
+ try
+ {
+ var g = e.Graphics;
+ g.Clear(Color.White);
+ BarcodeWriter writer = new BarcodeWriter();
+ writer.Format = BarcodeFormat.QR_CODE;
+ QrCodeEncodingOptions options = new QrCodeEncodingOptions()
+ {
+ DisableECI = true,//璁剧疆鍐呭缂栫爜
+ CharacterSet = "UTF-8", //璁剧疆浜岀淮鐮佺殑瀹藉害鍜岄珮搴�
+ Width = 123,
+ Height = 123,
+ Margin = 1//璁剧疆浜岀淮鐮佺殑杈硅窛,鍗曚綅涓嶆槸鍥哄畾鍍忕礌
+ };
+
+ writer.Options = options;
+ Bitmap map = writer.Write(Printmessage);
+ e.Graphics.DrawImage(map, new System.Drawing.Point(90, 10));
+
+ // 鍦ㄤ簩缁寸爜涓嬫柟鐢诲唴瀹规枃瀛�
+ using (Font font = new Font("Arial", 10))
+ using (Brush brush3 = new SolidBrush(Color.Black))
+ {
+ // 璁╂枃瀛楀眳涓埌浜岀淮鐮佷笅鏂�
+ SizeF textSize = e.Graphics.MeasureString(Printmessage, font);
+ float textX = 90 + (map.Width - textSize.Width) / 2;
+ float textY = 10 + map.Height;
+
+ e.Graphics.DrawString(Printmessage, font, brush3, textX, textY);
+ }
+
+ }
+ catch (Exception ee)
+ {
+
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, ee.ToString());
+ }
+ }
+
+
+
+
+ #endregion
+
+
+
+
+
+
}
+ public class DefectNGRecord
+ {
+ public string DefectName { get; set; }
+ public List<DateTime> NGRecords { get; set; } = new List<DateTime>();
+ public int ContinuousNGNum { get; set; } = 0;
+ public ContinuousNGAlarm AlarmSetting { get; set; }
+ private object _lockObj = new object();
+ public bool IsAlarmRaised = false;
+ bool _isContinuousAlarm = false;
-}
+ bool _timeAlarm = false;
+
+ public bool CheckIsAlarmRaised(bool isOK, out string alarmMsg, out int alarmType)
+ {
+ alarmType = 0;
+ alarmMsg = "";
+ bool isAlarmRasied = false;
+
+ if (IsAlarmRaised)
+ return false;
+
+ lock (_lockObj)
+ {
+ if (IsAlarmRaised)
+ return false;
+
+ if (isOK)
+ {
+ ContinuousNGNum = 0;
+ }
+ else
+ {
+ //杩炵画NG鏁伴噺闃堝��
+ if (AlarmSetting.ContinuousNumThreshold > 0)
+ {
+ ContinuousNGNum++;
+ CommonLogger.LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"{DefectName}杩炵画NG鏁伴噺涓猴細{ContinuousNGNum}涓�");
+ }
+ //鏃堕棿鍐匩G鏁伴噺闃堝��
+ if (AlarmSetting.TimePeriodNumThresold > 0)
+ {
+ NGRecords.Add(DateTime.Now);
+ }
+ }
+
+ if (NGRecords.Count >= AlarmSetting.TimePeriodNumThresold && NGRecords.Count > 0)
+ {
+
+ NGRecords = NGRecords.Skip(NGRecords.Count - AlarmSetting.TimePeriodNumThresold).OrderBy(u => u).ToList();
+
+ int timeInMinute = (int)Math.Ceiling((NGRecords[NGRecords.Count - 1] - NGRecords[0]).TotalMinutes);
+ //鐩戞帶鏃堕棿娈�
+ if (timeInMinute <= AlarmSetting.TimePeriod)
+ {
+ isAlarmRasied = true;
+ alarmMsg += $"{DefectName}{timeInMinute}鍒嗛挓鍐匩G{NGRecords.Count}涓� ";
+ alarmType = AlarmSetting.TimePeriodAlarmType;
+ _timeAlarm = true;
+ }
+ }
+
+ if (ContinuousNGNum >= AlarmSetting.ContinuousNumThreshold)
+ {
+ isAlarmRasied = true;
+ alarmMsg += $"{DefectName}杩炵画NG{ContinuousNGNum}涓� ";
+ alarmType = AlarmSetting.ContinuousAlarmType;
+ _isContinuousAlarm = true;
+ }
+ IsAlarmRaised = isAlarmRasied;
+ return isAlarmRasied;
+ }
+ }
+
+ public void ResetAlarm()
+ {
+ string msg = "";
+ lock (_lockObj)
+ {
+ IsAlarmRaised = false;
+ if (_isContinuousAlarm)
+ {
+ _isContinuousAlarm = false;
+ ContinuousNGNum = 0;
+ msg += "杩炵画NG鎶ヨ ";
+ }
+
+ if (_timeAlarm)
+ {
+
+ _timeAlarm = false;
+ NGRecords.Clear();
+ msg += "鏃舵鍐匩G鎶ヨ ";
+ }
+ }
+ CommonLogger.LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"{DefectName}{msg}宸查噸缃�");
+ }
+
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0