From aa6b32cb313c914e5f8eed0a347551f8fc65ffbd Mon Sep 17 00:00:00 2001
From: kingno <30263@KINGNO>
Date: 星期三, 27 八月 2025 16:51:18 +0800
Subject: [PATCH] 合并
---
src/Bro.M141.Process/M141Process.cs | 369 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 277 insertions(+), 92 deletions(-)
diff --git a/src/Bro.M141.Process/M141Process.cs b/src/Bro.M141.Process/M141Process.cs
index 37c90e0..1a63702 100644
--- a/src/Bro.M141.Process/M141Process.cs
+++ b/src/Bro.M141.Process/M141Process.cs
@@ -13,6 +13,7 @@
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;
@@ -22,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;
@@ -78,6 +83,8 @@
ThHeartPlc.IsBackground = true;
ThHeartPlc.Start();
}
+
+ printDocument1.PrintPage += new PrintPageEventHandler(printDocument_Print);
}
public override void ProcessRunStateChanged()
@@ -120,6 +127,8 @@
}
_errorSpec = M141Config.SpecCollection.FirstOrDefault(u => u.Code == M141Config.CheckErrorSpecCode) as Spec;
+
+
//InitialProductList();
NetWarmUp();
@@ -137,10 +146,10 @@
mqtt.Connect(M141Config.MESchannel);
}
- InitialContinuousNGAlarm();
+ InitialContinuousNGAlarm();
}
-
+
public override void Close()
{
devicestate = false;
@@ -188,6 +197,8 @@
Dictionary<string, List<int>> StateDIC = new Dictionary<string, List<int>>();
+ List<string> AlarmTypeList = new List<string>();
+
int numplc = 0;
while (true)
{
@@ -219,24 +230,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)
{
@@ -278,16 +295,15 @@
}
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();
@@ -297,39 +313,103 @@
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");
+
+ }
+
+ //if (!StateDIC.ContainsKey(plcdev.Name))
+ //{
+
+ // StateDIC[plcdev.Name] = new List<int>();
+ //}
+ }
+
+ Dictionary<string, AlarmTypeData> AlarmType = new Dictionary<string, AlarmTypeData>();
+
List<int> list = new List<int>();
+
foreach (var item in alrams)
{
- csvhead += $",{item.alarmname}";
- csvdata += $",{(item.value == 1 ? "1" : "")}";
- list.Add(item.value);
- }
+ if (!AlarmType.ContainsKey(item.alarmtype))
+ {
+ AlarmType.Add(item.alarmtype, new AlarmTypeData()
+ {
+ CSVhead = csvhead,
+ CSVdata = csvdata,
+ });
- if (!StateDIC[plcdev.Name].SequenceEqual(list))
+ }
+
+ if (AlarmType.ContainsKey(item.alarmtype))
+ {
+ AlarmType[item.alarmtype].CSVhead += $",{item.alarmname}";
+
+ AlarmType[item.alarmtype].CSVdata += $",{(item.value == 1 ? "1" : "")}";
+
+ AlarmType[item.alarmtype].AlarmTypeValue.Add(item.value);
+
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"鎶ヨ绫诲埆{item.alarmtype}锛涙暟鍊納item.value}鍔犲叆瀛楀吀锛欰larmType");
+ }
+
+ }
+ 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}鐨勪俊鍙峰彂鐢熷彉鍖�");
+
+ StateDIC[key].Clear();
+
+ StateDIC[key].AddRange(list);
+
+ CSVRecordAsync($"PLCstate_{key}.csv", AlarmType[item].CSVhead, AlarmType[item].CSVdata);
+
+ 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
{
@@ -343,8 +423,6 @@
{
}
-
-
try
{
@@ -368,6 +446,18 @@
Thread.Sleep(1000);
}
}
+
+ public class AlarmTypeData
+ {
+ public List <int> AlarmTypeValue;
+
+ public string CSVhead;
+
+ public string CSVdata;
+
+ }
+
+
/// <summary>
/// 缃戠粶棰勭儹
@@ -942,6 +1032,7 @@
#region plc
public ResponseMessage RunImageCheck_plc(IOperationConfig config)
{
+
ResponseMessage msg = new ResponseMessage();
msg.Result = 1;
List<MeasureBind> measureBinds = new List<MeasureBind>();
@@ -1014,7 +1105,10 @@
}
CheckPositionDoneAsync_plc(measureBinds[0].WorkPosition, inputSequence, config, cameraIds);
+
+
return msg;
+
}
@@ -1150,11 +1244,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);
@@ -1242,19 +1338,17 @@
mysqlhelper.UpdateProduct(p);
-
+
if (positionSet.IsLastPosition)
{
-
-
//鐝缁熻鏃堕棿鍒掑垎
if (M141Config.WorkShiftList.Count == 0)
{
//鐢熸垚涓�涓姤琛�
string name = $"ProductRecord_{DateTime.Now.ToString("yyyyMMdd")}.csv";
LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"鍒涘缓{name}鏁版嵁鎶ヨ〃");
- UpdateProductResultAsync(p, name);
+ UpdateProductResultAsync(p, name);
}
else
{
@@ -1274,7 +1368,7 @@
}
else
{
- if (now.TimeOfDay >= item.ShiftTime_Start.TimeOfDay )
+ if (now.TimeOfDay >= item.ShiftTime_Start.TimeOfDay)
{
//鐢熸垚涓�涓姤琛�
string name = $"ProductRecord_{DateTime.Now.ToString("yyyyMMdd")}_{item.ShiftName}.csv";
@@ -1291,16 +1385,12 @@
}
}
}
-
//UpdateProductResultAsync(p);
-
mysqlhelper.NewForAll(p, M141Config.StationCode, M141Config.defectname);
if (M141Config.IsfinDevice)
{
-
SummaryAllprodata(p);
-
}
}
});
@@ -1373,6 +1463,14 @@
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
{
@@ -1460,7 +1558,7 @@
newp.BasketCode = plist[0].BasketCode;
newp.Result = "NG";
newp.SN = plist[0].SN;
- if(M141Config.IsfinDevice)
+ if (M141Config.IsfinDevice)
{
SummaryAllprodata(newp);
LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{newp.PID}鎻愬墠NG鍔犲叆姹囨�绘暟鎹姤琛ㄧ粺璁�");
@@ -1557,7 +1655,7 @@
public void SummaryAllprodata(ProductModel p)
{
-
+
_taskFactory.StartNew(() =>
{
try
@@ -1572,7 +1670,7 @@
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)
{
@@ -1594,7 +1692,7 @@
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]);
@@ -1665,35 +1763,35 @@
LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"杩炵画NG鏁版嵁璁板綍");
DefectNGRecordList.ForEach(d =>
{
- string alarmMsg = "";
- int alarmTypeTemp = 0;
-
- if (product.Result == "OK")
+ string alarmMsg = "";
+ int alarmTypeTemp = 0;
+
+ if (product.Result == "OK")
+ {
+ if (d.CheckIsAlarmRaised(product.Result == "OK", out alarmMsg, out alarmTypeTemp))
{
- 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缁熻");
}
}
- 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)
@@ -1701,7 +1799,7 @@
LogAsync(DateTime.Now, EnumHelper.LogLevel.Warning, $"杩炵画NG鏁版嵁璁板綍澶辫触");
}
if (isAlarmRaised)
- {
+ {
LogAsync(DateTime.Now, EnumHelper.LogLevel.Warning, $"杩炵画NG鐩戞帶鎶ヨ锛寋allMsg}");
if (M141Config.IsOperatorReset)
{
@@ -1718,7 +1816,7 @@
{
Task.Delay(50).Wait();
ResetContinuousNGAlarm();
- }
+ }
}
});
}
@@ -1741,14 +1839,14 @@
_continuousNGAlarmFrm = new FrmContinuousNGAlarm();
_continuousNGAlarmFrm.TopMost = true;
-
+
_continuousNGAlarmFrm.FormClosed += _continuousNGAlarmFrm_FormClosed;
-
+
Task.Run(() =>
{
_continuousNGAlarmFrm.ShowDialog();
-
- });
+
+ });
}
}
}
@@ -1761,7 +1859,7 @@
{
_continuousNGAlarmFrm.Close();
}
-
+
}
});
@@ -1770,7 +1868,7 @@
private void _continuousNGAlarmFrm_FormClosed(object? sender, FormClosedEventArgs e)
{
ResetContinuousNGAlarm();
- LogAsync(DateTime.Now, EnumHelper.LogLevel.Action, $"杩炵画NG鎶ヨ宸插浣�");
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Action, $"杩炵画NG鎶ヨ宸插浣�");
_continuousNGAlarmFrm = null;
}
@@ -1785,7 +1883,7 @@
LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"杩炵画NG鐩戞帶閫氱煡PLC閲嶇疆鎶ヨ澶辫触锛寋error}");
}
}
-
+
}
[ProcessMethod("", "ContinuousNGAlarmTest", "杩炵画NG鎶ヨ娴嬭瘯", InvokeType.TestInvoke)]
@@ -1799,6 +1897,93 @@
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
@@ -1848,10 +2033,10 @@
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);
@@ -1882,9 +2067,9 @@
string msg = "";
lock (_lockObj)
{
- IsAlarmRaised = false;
+ IsAlarmRaised = false;
if (_isContinuousAlarm)
- {
+ {
_isContinuousAlarm = false;
ContinuousNGNum = 0;
msg += "杩炵画NG鎶ヨ ";
@@ -1892,7 +2077,7 @@
if (_timeAlarm)
{
-
+
_timeAlarm = false;
NGRecords.Clear();
msg += "鏃舵鍐匩G鎶ヨ ";
--
Gitblit v1.8.0