From 11219b1b266c7b98dde39eb710faaa83b4a37924 Mon Sep 17 00:00:00 2001
From: kingno <30263@KINGNO>
Date: 星期二, 17 六月 2025 13:04:52 +0800
Subject: [PATCH] 双击圆点出图
---
src/Bro.M135.Common/ProductModel.cs | 50 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/src/Bro.M135.Common/ProductModel.cs b/src/Bro.M135.Common/ProductModel.cs
index ecca1b3..5017521 100644
--- a/src/Bro.M135.Common/ProductModel.cs
+++ b/src/Bro.M135.Common/ProductModel.cs
@@ -1,7 +1,9 @@
锘縰sing Bro.Common.Helper;
+using Bro.Common.Interface;
using Bro.Common.Model;
using Bro.M135.DBManager;
using Newtonsoft.Json;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.ListView;
namespace Bro.M135.Common
{
@@ -53,11 +55,11 @@
{
if (!string.IsNullOrWhiteSpace(d.FAIData))
{
- d.SpecList = JsonConvert.DeserializeObject<List<Spec>>(d.FAIData);
+ d.SpecList = JsonConvert.DeserializeObject<List<ISpec>>(d.FAIData);
}
else
{
- d.SpecList = new List<Spec>();
+ d.SpecList = new List<ISpec>();
}
if (!string.IsNullOrWhiteSpace(d.DefectDesc))
@@ -73,6 +75,8 @@
#endregion
public bool IsPreStationOK { get; set; } = false;
+
+ public List<string> ImagePaths { get; set; } = new List<string>();
public DateTime? EndTime { get; set; } = null;
@@ -193,10 +197,12 @@
});
});
+ allSpecs.RemoveAll(u => (u.Code.ToLower() == "ngspec" || u.Code == "妫�娴婽BD"));
+
head = $"鏃堕棿,PID,鏍忓叿鐮�,鐗╂枡鐮�,鏉＄爜,姹囨�绘娴嬬粨鏋�,";
positionList = new List<string>();
- Details = Details.OrderBy(u => u.PositionName).ToList();
+ Details = Details.OrderBy(u => u.STATION_CODE).ThenBy(u => u.PositionName).ToList();
foreach (var d in Details)
{
positionList.Add($"{d.STATION_CODE}_{d.PositionName}");
@@ -302,6 +308,8 @@
});
});
+ allSpecs.RemoveAll(u => u.Code.ToLower() == "ngspec" || u.Code == "妫�娴婽BD");
+
head = $"鏃堕棿,鏍忓叿鐮�,PID,搴忓彿,鏉＄爜,";
foreach (var d in positionDetail)
@@ -379,22 +387,22 @@
}
});
- positionDetail.ForEach(detail =>
- {
- if (detail.IsDone)
- {
+ //positionDetail.ForEach(detail =>
+ //{
+ // if (detail.IsDone)
+ // {
- var results = detail.ResultList;
+ // var results = detail.ResultList;
- var list = results.Where((DetectResult u) => u.ResultState != EnumHelper.ResultState.OK).SelectMany((DetectResult u) => u.NetResults.Where((NetResult m) => !m.IsAbandoned && m.CurResult != EnumHelper.ResultState.OK).SelectMany((NetResult m) => from n in m.DetectDetails where !n.IsAbandoned && n.FinalResult != EnumHelper.ResultState.OK select n)).ToList();
+ // var list = results.Where((DetectResult u) => u.ResultState != EnumHelper.ResultState.OK).SelectMany((DetectResult u) => u.NetResults.Where((NetResult m) => !m.IsAbandoned && m.CurResult != EnumHelper.ResultState.OK).SelectMany((NetResult m) => from n in m.DetectDetails where !n.IsAbandoned && n.FinalResult != EnumHelper.ResultState.OK select n)).ToList();
- list.ForEach(d =>
- {
- data += $"{(d.Rect.Height * d.PixelSize).ToString("f4")},";
- data += $"{(d.Rect.Width * d.PixelSize).ToString("f4")},";
- });
- }
- });
+ // list.ForEach(d =>
+ // {
+ // data += $"{(d.Rect.Height * d.PixelSize).ToString("f4")},";
+ // data += $"{(d.Rect.Width * d.PixelSize).ToString("f4")},";
+ // });
+ // }
+ //});
@@ -416,12 +424,20 @@
#endregion
#region PositionCheckTimes
- public void InitialPositionCheckList(string positionName, List<int> checkTimes)
+ public void InitialPositionCheckList(string positionName, List<int> checkTimes,string stationName)
{
lock (_checkResultLock)
{
PositionCheckList[positionName] = new List<int>(checkTimes);
Details.RemoveAll(u => u.PositionName == positionName);
+
+
+ P_PRODUCT_DETAIL detail = new P_PRODUCT_DETAIL();
+ detail.STATION_CODE = stationName;
+ detail.PositionName = positionName;
+ detail.PID = PID;
+ detail.IsDone = false;
+ Details.Add(detail);
}
}
--
Gitblit v1.8.0