From 86f899fa91e811415614dff1a699141144bfc802 Mon Sep 17 00:00:00 2001
From: quanzhou <quan.zhou@broconcentric.com>
Date: 星期五, 12 十二月 2025 13:25:37 +0800
Subject: [PATCH] S5上传mes逻辑修改及打印机逻辑修改和数据库存储数据增加
---
src/Bro.M141.Process/M141Process.cs | 281 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 218 insertions(+), 63 deletions(-)
diff --git a/src/Bro.M141.Process/M141Process.cs b/src/Bro.M141.Process/M141Process.cs
index be2c952..37671b9 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;
@@ -24,11 +25,14 @@
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;
@@ -79,6 +83,8 @@
ThHeartPlc.IsBackground = true;
ThHeartPlc.Start();
}
+
+ printDocument1.PrintPage += new PrintPageEventHandler(printDocument_Print);
}
public override void ProcessRunStateChanged()
@@ -97,6 +103,7 @@
public PLCBase Plc1;
bool devicestate = false;
PLCBase Plc2;
+ public PLCBase Plc3;
public Thread ThHeartPlc;
public RabbitMQHelper mqtt;
@@ -121,6 +128,8 @@
}
_errorSpec = M141Config.SpecCollection.FirstOrDefault(u => u.Code == M141Config.CheckErrorSpecCode) as Spec;
+
+
//InitialProductList();
NetWarmUp();
@@ -137,8 +146,12 @@
mqtt = new RabbitMQHelper(M141Config.zIP, M141Config.zport, M141Config.zuser, M141Config.zpassword);
mqtt.Connect(M141Config.MESchannel);
}
+ else
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Information, $"宸插叧闂笂浼爉es");
+ }
- InitialContinuousNGAlarm();
+ InitialContinuousNGAlarm();
}
@@ -189,6 +202,9 @@
Dictionary<string, List<int>> StateDIC = new Dictionary<string, List<int>>();
+ List<string> AlarmTypeList = new List<string>();
+
+
int numplc = 0;
while (true)
{
@@ -232,18 +248,18 @@
// 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();
- // }
- // }
- //}
+ // 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)
{
@@ -285,16 +301,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();
@@ -304,43 +317,98 @@
foreach (var item2 in item)
{
item2.value = Allbin[item2.address2];
+
+ if (!AlarmTypeList.Contains(item2.alarmtype))
+ {
+
+ AlarmTypeList.Add(item2.alarmtype);
+
+
+ }
}
}
+
+ string StateDICKey = "";
+
+ foreach (var item in AlarmTypeList)
+ {
+
+ StateDICKey = plcdev.Name +"_"+ item;
+
+ if (!StateDIC.ContainsKey(StateDICKey))
+ {
+
+ StateDIC[StateDICKey] = new List<int>();
+
+
+ }
+
+ }
+
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);
+
+ }
+
+ 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()}");
}
}
}
@@ -350,8 +418,6 @@
{
}
-
-
try
{
@@ -375,6 +441,18 @@
Thread.Sleep(1000);
}
}
+
+ public class AlarmTypeData
+ {
+ public List <int> AlarmTypeValue = new List<int>();
+
+ public string CSVhead;
+
+ public string CSVdata;
+
+ }
+
+
/// <summary>
/// 缃戠粶棰勭儹
@@ -564,6 +642,10 @@
if (measureBind.WorkPosition == "P1" && M141Config.StationCode == "S5" && detectResults.GetDefectDescList().Count == 0)
{
+ var defecttem1 = detectResults.SelectMany(u => u.AllNetResults).SelectMany(m => m.DetectDetails).Select(detail => detail.ClassName).ToList();
+
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"{products[0].SN} S3S5妫�娴� 缂洪櫡鍚嶇О闆嗗悎涓簕string.Join(",", defecttem1)}");
+
var defecttem = detectResults.SelectMany(u => u.AllNetResults.SelectMany(m => m.DetectDetails)).Where(u => u.ClassName == M141Config.defectname).ToList();
List<Netdefectdetail> Netdefectdetails = mysqlhelper.GetNetdefectdetails(products[0].SEQUENCE);
@@ -815,7 +897,6 @@
});
}
-
public async Task RunImageCheckAsync(List<ProductModel> products, string triggerText, string triggerSource, MeasureBind measureBind)
{
await Task.Run(() =>
@@ -894,7 +975,6 @@
});
}
-
private void RunCustomizedMethod(List<ProductModel> products, string triggerText, string triggerSource, IImageSet imgSet, string methodId, List<DetectResult> resultList)
{
try
@@ -941,10 +1021,6 @@
LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"鑷畾涔夋娴嬭繃绋嬪紓甯革紝{ex.GetExceptionMessage()}");
}
}
-
-
-
-
#region plc
public ResponseMessage RunImageCheck_plc(IOperationConfig config)
@@ -1023,7 +1099,6 @@
CheckPositionDoneAsync_plc(measureBinds[0].WorkPosition, inputSequence, config, cameraIds);
-
return msg;
}
@@ -1074,8 +1149,6 @@
LogAsync(DateTime.Now, EnumHelper.LogLevel.Action, $"鐩告満{camera.Name}妫�娴嬪墠娓呯悊缂撳瓨瀹屾垚");
}
});
-
-
inputSequence = triggerDatas[triggerDatas.Length - 1];
@@ -1161,13 +1234,12 @@
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);
@@ -1343,8 +1415,9 @@
if (pList[0].Result == "OK")
{
- M141Config.numpro++;
- Msgreceice = Task.Run(() => mqtt.MESForProduceAsync(pList[0], M141Config.mesnum2.ToString(), M141Config.numpro)).Result;
+ //M141Config.numpro++;
+ //Msgreceice = Task.Run(() => mqtt.MESForProduceAsync(pList[0], M141Config.mesnum2.ToString(), M141Config.numpro)).Result;
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"浜у搧{pList[0].PID}姹囨�籓K鏆傛椂涓嶄笂浼�");
}
else
{
@@ -1380,6 +1453,11 @@
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, "Honeywell PX240S(300 dpi)");
+ }
}
else
{
@@ -1391,8 +1469,6 @@
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}");
@@ -1482,9 +1558,6 @@
{
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
@@ -1533,7 +1606,10 @@
}
}
-
+ else
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Information, $"宸插叧闂璵es杩炴帴鎴栬�呮暟鎹笂浼犳帴鍙�");
+ }
}
//ReplyPlcData(positionName, config.TriggerValue);
@@ -1614,7 +1690,7 @@
data += "NA,";
}
}
- CSVRecordAsync($"AllDeviceProductRecord.csv", data, Head);
+ CSVRecordAsync($"AllDeviceProductRecord_{DateTime.Now.ToString("yyyyMMdd")}.csv", data, Head);
}
catch (Exception exx)
@@ -1806,6 +1882,85 @@
return new ResponseMessage();
}
+
+
+ #region 鎵撳嵃鏈虹浉鍏�
+ PrintDocument printDocument1 = new PrintDocument();
+ string Printmessage = "";
+
+ public void StartPrint(string str, string PrinterName)
+ {
+ try
+ {
+ int ttwith = 240;
+ int ttheigh = 80;
+ 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 = 60,
+ Height = 60,
+ Margin = 1//璁剧疆浜岀淮鐮佺殑杈硅窛,鍗曚綅涓嶆槸鍥哄畾鍍忕礌
+ };
+
+ writer.Options = options;
+ Bitmap map = writer.Write(Printmessage);
+ e.Graphics.DrawImage(map, new System.Drawing.Point(90, 4));
+
+ // 鍦ㄤ簩缁寸爜涓嬫柟鐢诲唴瀹规枃瀛�
+ 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 = 1 + 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
--
Gitblit v1.8.0