From f857f8d850d20f7899a781b1080823cf109c0800 Mon Sep 17 00:00:00 2001
From: CPL <1179393954@qq.com>
Date: Mon, 26 Aug 2024 08:41:58 +0800
Subject: [PATCH] =?UTF-8?q?v2.0.7=20=E9=80=9A=E5=A8=81=E6=8A=A5=E8=A1=A8?=
=?UTF-8?q?=E4=B8=8A=E4=B8=8B=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BanBoShi/SysCtrl/SysMgr.cs | 211 +++++++++++++++++-
.../SysUI/DefectPicShow/DataQueryFrm.cs | 8 +-
halftoneproject-master/Models/Order.cs | 6 +
3 files changed, 210 insertions(+), 15 deletions(-)
diff --git a/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs b/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs
index b2a2e0d3..3aa25ebd 100644
--- a/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs
+++ b/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs
@@ -4529,7 +4529,10 @@ namespace MaiMuAOI.SysCtrl
StepName = processName,
ModifyUserCode = SysMgr.Instance.UserMgr.LoginUser.Code,
CreateUserCode = SysMgr.Instance.UserMgr.LoginUser.Code,
- isAverage = false
+ isAverage = false,
+ StandardValues = TensionParam.OpenUseLimit? TensionParam.StandardValues: CurrProductModel.TensionBaseValue,
+ MaxLimit = TensionParam.OpenUseLimit ? TensionParam.MaxLimit : CurrProductModel.TensionUpFloatValue,
+ MinLimit = TensionParam.OpenUseLimit ? TensionParam.MinLimit : CurrProductModel.TensionDownFloatValue,
});
ioCardDev.WriteBitState(GetIOPortIndex((int)DOName.触发张力按钮灯), GetIOBitIndex((int)DOName.触发张力按钮灯), false);
@@ -4746,7 +4749,10 @@ namespace MaiMuAOI.SysCtrl
StepName = processName,
ModifyUserCode = SysMgr.Instance.UserMgr.LoginUser.Code,
CreateUserCode = SysMgr.Instance.UserMgr.LoginUser.Code,
- isAverage = false
+ isAverage = false,
+ StandardValues = ThicknessParam.OpenUseLimit ? ThicknessParam.StandardValues : CurrProductModel.HeightBaseValue,
+ MaxLimit = ThicknessParam.OpenUseLimit ? ThicknessParam.MaxLimit : CurrProductModel.HeightUpFloatValue,
+ MinLimit = ThicknessParam.OpenUseLimit ? ThicknessParam.MinLimit : CurrProductModel.HeightDownFloatValue,
});
//显示数据
if ((TestCnt - 1) == this.CurrPoinntCount) //显示最终结果
@@ -7510,7 +7516,7 @@ namespace MaiMuAOI.SysCtrl
///
///
private void GetLimitInfo(int index, double data, double aveData, Product model, PointTestProp testParam,
- out double Max, out double Min, out string TestName )
+ out double Max, out double Min, out string TestName, out double stVal, out double MaxVal, out double MinVal)
{
double PtUpper = 0;
double PtLower = 0;
@@ -7523,11 +7529,17 @@ namespace MaiMuAOI.SysCtrl
Log($"线宽值", $"线宽{lstTestData.Count}:{data}");
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.LineWidthBaseValue;
+ MaxVal = model.LineWidthUpFloatValue;
+ MinVal = model.LineWidthDownFloatValue;
PtUpper = model.LineWidthBaseValue + model.LineWidthUpFloatValue;
PtLower = model.LineWidthBaseValue - model.LineWidthDownFloatValue;
}
@@ -7539,11 +7551,17 @@ namespace MaiMuAOI.SysCtrl
Log($"反面检测值", $"反面检测{lstTestData.Count}:{data}");
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.FLineWidthBaseValue;
+ MaxVal = model.FLineWidthUpFloatValue;
+ MinVal = model.FLineWidthDownFloatValue;
PtUpper = model.FLineWidthBaseValue + model.FLineWidthUpFloatValue;
PtLower = model.FLineWidthBaseValue - model.FLineWidthDownFloatValue;
}
@@ -7555,11 +7573,17 @@ namespace MaiMuAOI.SysCtrl
Log($"背极宽度值", $"背极宽度{lstTestData.Count}:{data}");
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.BackPoleWidthBaseValue;
+ MaxVal = model.BackPoleWidthUpFloatValue;
+ MinVal = model.BackPoleWidthDownFloatValue;
PtUpper = model.BackPoleWidthBaseValue + model.BackPoleWidthUpFloatValue;
PtLower = model.BackPoleWidthBaseValue - model.BackPoleWidthDownFloatValue;
}
@@ -7571,11 +7595,17 @@ namespace MaiMuAOI.SysCtrl
Log($"鱼叉口宽值", $"鱼叉口宽{lstTestData.Count}:{data}");
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.ForkWidthBaseValue;
+ MaxVal = model.ForkWidthUpFloatValue;
+ MinVal = model.ForkWidthDownFloatValue;
PtUpper = model.ForkWidthBaseValue + model.ForkWidthUpFloatValue;
PtLower = model.ForkWidthBaseValue - model.ForkWidthDownFloatValue;
}
@@ -7587,11 +7617,17 @@ namespace MaiMuAOI.SysCtrl
Log($"蜈蚣角宽值", $"蜈蚣角宽{lstTestData.Count}:{data}");
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.ChilopodWidthBaseValue;
+ MaxVal = model.ChilopodWidthUpFloatValue;
+ MinVal = model.ChilopodWidthDownFloatValue;
PtUpper = model.ChilopodWidthBaseValue + model.ChilopodWidthUpFloatValue;
PtLower = model.ChilopodWidthBaseValue - model.ChilopodWidthDownFloatValue;
}
@@ -7603,11 +7639,17 @@ namespace MaiMuAOI.SysCtrl
Log($"主栅宽度检测值", $"主栅宽度检测{lstTestData.Count}:{data}");
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.MGridWidthBaseValue;
+ MaxVal = model.MGridWidthUpFloatValue;
+ MinVal = model.MGridWidthDownFloatValue;
PtUpper = model.MGridWidthBaseValue + model.MGridWidthUpFloatValue;
PtLower = model.MGridWidthBaseValue - model.MGridWidthDownFloatValue;
}
@@ -7619,11 +7661,17 @@ namespace MaiMuAOI.SysCtrl
Log($"3道鱼叉宽检测值", $"3道鱼叉宽检测{lstTestData.Count}:{data}");
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = 0;
+ MaxVal = 0;
+ MinVal = 0;
PtUpper = 0;
PtLower = 0;
}
@@ -7637,11 +7685,17 @@ namespace MaiMuAOI.SysCtrl
order.PTValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.PTBaseValue;
+ MaxVal = model.PTUpFloatValue;
+ MinVal = model.PTDownFloatValue;
PtUpper = model.PTBaseValue + model.PTUpFloatValue;
PtLower = model.PTBaseValue - model.PTDownFloatValue;
}
@@ -7653,11 +7707,17 @@ namespace MaiMuAOI.SysCtrl
order.XPTValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.PTXBaseValue;
+ MaxVal = model.PTXUpFloatValue;
+ MinVal = model.PTXDownFloatValue;
PtUpper = model.PTXBaseValue + model.PTXUpFloatValue;
PtLower = model.PTXBaseValue - model.PTXDownFloatValue;
}
@@ -7669,11 +7729,17 @@ namespace MaiMuAOI.SysCtrl
order.MGridIntervalValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.MGridIntervalBaseValue;
+ MaxVal = model.MGridIntervalUpFloatValue;
+ MinVal = model.MGridIntervalDownFloatValue;
PtUpper = model.MGridIntervalBaseValue + model.MGridIntervalUpFloatValue;
PtLower = model.MGridIntervalBaseValue - model.MGridIntervalDownFloatValue;
}
@@ -7685,11 +7751,17 @@ namespace MaiMuAOI.SysCtrl
order.MGridWidthValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.MGridWidthBaseValue;
+ MaxVal = model.MGridWidthUpFloatValue;
+ MinVal = model.MGridWidthDownFloatValue;
PtUpper = model.MGridWidthBaseValue + model.MGridWidthUpFloatValue;
PtLower = model.MGridWidthBaseValue - model.MGridWidthDownFloatValue;
}
@@ -7701,11 +7773,17 @@ namespace MaiMuAOI.SysCtrl
order.MGridSpreadValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.MGridSpreadBaseValue;
+ MaxVal = model.MGridSpreadUpFloatValue;
+ MinVal = model.MGridSpreadDownFloatValue;
PtUpper = model.MGridSpreadBaseValue + model.MGridSpreadUpFloatValue;
PtLower = model.MGridSpreadBaseValue - model.MGridSpreadDownFloatValue;
}
@@ -7717,11 +7795,17 @@ namespace MaiMuAOI.SysCtrl
order.FGridSpreadValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.FGridSpreadBaseValue;
+ MaxVal = model.FGridSpreadUpFloatValue;
+ MinVal = model.FGridSpreadDownFloatValue;
PtUpper = model.FGridSpreadBaseValue + model.FGridSpreadUpFloatValue;
PtLower = model.FGridSpreadBaseValue - model.FGridSpreadDownFloatValue;
}
@@ -7733,11 +7817,17 @@ namespace MaiMuAOI.SysCtrl
order.MGridLengthValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.MGridLengthBaseValue;
+ MaxVal = model.MGridLengthUpFloatValue;
+ MinVal = model.MGridLengthDownFloatValue;
PtUpper = model.MGridLengthBaseValue + model.MGridLengthUpFloatValue;
PtLower = model.MGridLengthBaseValue - model.MGridLengthDownFloatValue;
}
@@ -7749,11 +7839,17 @@ namespace MaiMuAOI.SysCtrl
order.MarkXDisValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.MarkXDisBaseValue;
+ MaxVal = model.MarkXDisUpFloatValue;
+ MinVal = model.MarkXDisDownFloatValue;
PtUpper = model.MarkXDisBaseValue + model.MarkXDisUpFloatValue;
PtLower = model.MarkXDisBaseValue - model.MarkXDisDownFloatValue;
}
@@ -7765,11 +7861,17 @@ namespace MaiMuAOI.SysCtrl
order.MarkYDisValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.MarkYDisBaseValue;
+ MaxVal = model.MarkYDisUpFloatValue;
+ MinVal = model.MarkYDisDownFloatValue;
PtUpper = model.MarkYDisBaseValue + model.MarkYDisUpFloatValue;
PtLower = model.MarkYDisBaseValue - model.MarkYDisDownFloatValue;
}
@@ -7781,11 +7883,17 @@ namespace MaiMuAOI.SysCtrl
order.ForkLengthValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.ForkLengthBaseValue;
+ MaxVal = model.ForkLengthUpFloatValue;
+ MinVal = model.ForkLengthDownFloatValue;
PtUpper = model.ForkLengthBaseValue + model.ForkLengthUpFloatValue;
PtLower = model.ForkLengthBaseValue - model.ForkLengthDownFloatValue;
}
@@ -7797,11 +7905,17 @@ namespace MaiMuAOI.SysCtrl
order.ForkDisValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.ForkDisBaseValue;
+ MaxVal = model.ForkDisUpFloatValue;
+ MinVal = model.ForkDisDownFloatValue;
PtUpper = model.ForkDisBaseValue + model.ForkDisUpFloatValue;
PtLower = model.ForkDisBaseValue - model.ForkDisDownFloatValue;
}
@@ -7813,11 +7927,17 @@ namespace MaiMuAOI.SysCtrl
order.ChilopodLengthValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.ChilopodLengthBaseValue;
+ MaxVal = model.ChilopodLengthUpFloatValue;
+ MinVal = model.ChilopodLengthDownFloatValue;
PtUpper = model.ChilopodLengthBaseValue + model.ChilopodLengthUpFloatValue;
PtLower = model.ChilopodLengthBaseValue - model.ChilopodLengthDownFloatValue;
}
@@ -7829,11 +7949,17 @@ namespace MaiMuAOI.SysCtrl
order.ShardingDisValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.ShardingDisBaseValue;
+ MaxVal = model.ShardingDisUpFloatValue;
+ MinVal = model.ShardingDisDownFloatValue;
PtUpper = model.ShardingDisBaseValue + model.ShardingDisUpFloatValue;
PtLower = model.ShardingDisBaseValue - model.ShardingDisDownFloatValue;
}
@@ -7845,11 +7971,17 @@ namespace MaiMuAOI.SysCtrl
order.WeldingSpotLengthValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.WeldingSpotLengthBaseValue;
+ MaxVal = model.WeldingSpotLengthUpFloatValue;
+ MinVal = model.WeldingSpotLengthDownFloatValue;
PtUpper = model.WeldingSpotLengthBaseValue + model.WeldingSpotLengthUpFloatValue;
PtLower = model.WeldingSpotLengthBaseValue - model.WeldingSpotLengthDownFloatValue;
}
@@ -7861,11 +7993,17 @@ namespace MaiMuAOI.SysCtrl
order.WeldingSpotWidthValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.WeldingSpotWidthBaseValue;
+ MaxVal = model.WeldingSpotWidthUpFloatValue;
+ MinVal = model.WeldingSpotWidthDownFloatValue;
PtUpper = model.WeldingSpotWidthBaseValue + model.WeldingSpotWidthUpFloatValue;
PtLower = model.WeldingSpotWidthBaseValue - model.WeldingSpotWidthDownFloatValue;
}
@@ -7877,11 +8015,17 @@ namespace MaiMuAOI.SysCtrl
order.WeldingSpotDisValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = model.WeldingSpotDisBaseValue;
+ MaxVal = model.WeldingSpotDisUpFloatValue;
+ MinVal = model.WeldingSpotDisDownFloatValue;
PtUpper = model.WeldingSpotDisBaseValue + model.WeldingSpotDisUpFloatValue;
PtLower = model.WeldingSpotDisBaseValue - model.WeldingSpotDisDownFloatValue;
}
@@ -7893,11 +8037,17 @@ namespace MaiMuAOI.SysCtrl
// order.WeldingSpotDisValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = 0;
+ MaxVal = 0;
+ MinVal = 0;
PtUpper = 0;
PtLower = 0;
}
@@ -7909,11 +8059,17 @@ namespace MaiMuAOI.SysCtrl
// order.WeldingSpotDisValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = 0;
+ MaxVal = 0;
+ MinVal = 0;
PtUpper = 0;
PtLower = 0;
}
@@ -7925,11 +8081,17 @@ namespace MaiMuAOI.SysCtrl
// order.WeldingSpotDisValue = aveData;
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = 0;
+ MaxVal = 0;
+ MinVal = 0;
PtUpper = 0;
PtLower = 0;
}
@@ -7939,11 +8101,17 @@ namespace MaiMuAOI.SysCtrl
default:
if (testParam.OpenUseLimit)
{
+ stVal = testParam.StandardValues;
+ MaxVal = testParam.MaxLimit;
+ MinVal = testParam.MinLimit;
PtUpper = testParam.StandardValues + testParam.MaxLimit;
PtLower = testParam.StandardValues - testParam.MinLimit;
}
else
{
+ stVal = 0;
+ MaxVal = 0;
+ MinVal = 0;
PtUpper = 0;
PtLower = 0;
}
@@ -8251,8 +8419,11 @@ namespace MaiMuAOI.SysCtrl
double PtUpper = 0;
double PtLower = 0;
string testName = "";
+ double stVal,maxVal,minVal;
+
//上下限设置
- GetLimitInfo(res.index, res.PT1, PtValue, model, testParam, out PtUpper, out PtLower, out testName);
+ GetLimitInfo(res.index, res.PT1, PtValue, model, testParam, out PtUpper, out PtLower, out testName,
+ out stVal, out maxVal, out minVal);
//OnAutoRuning(new RunEventArgs(22, lstTestData, model.PTBaseValue + model.PTUpFloatValue, model.PTBaseValue - model.PTDownFloatValue));
//数据判定
@@ -8296,7 +8467,10 @@ namespace MaiMuAOI.SysCtrl
StepName = processName,
ModifyUserCode = SysMgr.Instance.UserMgr.LoginUser.Code,
CreateUserCode = SysMgr.Instance.UserMgr.LoginUser.Code,
- isAverage = false
+ isAverage = false,
+ StandardValues = stVal,
+ MaxLimit = maxVal,
+ MinLimit = minVal,
});
if ((this.CurrPoinntCount + 1) < testParam.PointCnt)
@@ -8346,8 +8520,10 @@ namespace MaiMuAOI.SysCtrl
double LwUpper = 0;
double LwLower = 0;
string testName = "";
+ double stVal, maxVal, minVal;
//上下限设置
- GetLimitInfo(res.index, lineWidthValue, LwValue, model, testParam, out LwUpper, out LwLower, out testName);
+ GetLimitInfo(res.index, lineWidthValue, LwValue, model, testParam, out LwUpper, out LwLower, out testName,
+ out stVal, out maxVal, out minVal);
//OnAutoRuning(new RunEventArgs(23, lstTestData, model.LineWidthBaseValue + model.LineWidthUpFloatValue, model.LineWidthBaseValue - model.LineWidthDownFloatValue));
//数据判定
@@ -8390,7 +8566,10 @@ namespace MaiMuAOI.SysCtrl
StepName = processName,
ModifyUserCode = SysMgr.Instance.UserMgr.LoginUser.Code,
CreateUserCode = SysMgr.Instance.UserMgr.LoginUser.Code,
- isAverage = false
+ isAverage = false,
+ StandardValues = stVal,
+ MaxLimit = maxVal,
+ MinLimit = minVal,
});
if ((this.CurrPoinntCount + 1) < testParam.PointCnt)
OnAutoRuning(new RunEventArgs(stepIndex, processName, new List(lstTestData.ToArray()), Math.Round(lstTestData.Average(), 2),
@@ -8447,7 +8626,9 @@ namespace MaiMuAOI.SysCtrl
string testName = "";
double PtUpper = 0;
double PtLower = 0;
- GetLimitInfo(res.index, 0, PtValue, model, testParam, out PtUpper, out PtLower, out testName);
+ double stVal, maxVal, minVal;
+ GetLimitInfo(res.index, 0, PtValue, model, testParam, out PtUpper, out PtLower, out testName,
+ out stVal, out maxVal, out minVal);
//OnAutoRuning(new RunEventArgs(stepIndex, processName, lstPT, Math.Round(lstPT.Average(), 4),
// Math.Round(lstPT.Max(), 4), Math.Round(lstPT.Min(), 4), 3, false));
@@ -8468,7 +8649,10 @@ namespace MaiMuAOI.SysCtrl
StepName = processName,
ModifyUserCode = SysMgr.Instance.UserMgr.LoginUser.Code,
CreateUserCode = SysMgr.Instance.UserMgr.LoginUser.Code,
- isAverage = false
+ isAverage = false,
+ StandardValues = stVal,
+ MaxLimit = maxVal,
+ MinLimit = minVal,
});
if ((this.CurrPoinntCount + 1) < testParam.PointCnt)
@@ -8507,7 +8691,9 @@ namespace MaiMuAOI.SysCtrl
string testName = "";
double LwUpper = 0;
double LwLower = 0;
- GetLimitInfo(res.index, 0, LwValue, model, testParam, out LwUpper, out LwLower, out testName);
+ double stVal, maxVal, minVal;
+ GetLimitInfo(res.index, 0, LwValue, model, testParam, out LwUpper, out LwLower, out testName,
+ out stVal, out maxVal, out minVal);
order.Qualified = false;
CurrStepResult = 2;
@@ -8526,7 +8712,10 @@ namespace MaiMuAOI.SysCtrl
StepName = processName,
ModifyUserCode = SysMgr.Instance.UserMgr.LoginUser.Code,
CreateUserCode = SysMgr.Instance.UserMgr.LoginUser.Code,
- isAverage = false
+ isAverage = false,
+ StandardValues = stVal,
+ MaxLimit = maxVal,
+ MinLimit = minVal,
});
if ((this.CurrPoinntCount + 1) < testParam.PointCnt)
OnAutoRuning(new RunEventArgs(stepIndex, processName + ":检测失败", lstTestData, Math.Round(lstTestData.Average(), 2),
diff --git a/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs b/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs
index 4fb7ff6b..247cea19 100644
--- a/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs
+++ b/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs
@@ -652,11 +652,11 @@ namespace MaiMuAOI.SysUI.DefectPicShow
var tempstep = md.StepInfo.ProcessList.Where(q => q.ProcessName == tdata.Key).FirstOrDefault();
var tempstep22 = item.StepInfo.ProcessList.Where(q => q.ProcessName == tdata.Key).FirstOrDefault();
- if (tempstep != null)
+ if (tempstep != null && tempd.Count > 0)
{
JObject processParam = JObject.Parse(tempstep.ProcessParams);
- double vMax = processParam.Value("MaxLimit");
- double vMin = processParam.Value("MinLimit");
+ double vMax = tempd[0].MaxLimit;// processParam.Value("MaxLimit");
+ double vMin = tempd[0].MinLimit;//processParam.Value("MinLimit");
bool isOpenLimit = processParam.Value("OpenUseLimit");
string limit = "";
if (vMax == vMin)
@@ -665,7 +665,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
limit = $"(+{vMax},-{vMin})";
if (isOpenLimit)
{
- dr[$"{tdata.Key}上下限"] = $"{processParam.Value("StandardValues")}{limit}";
+ dr[$"{tdata.Key}上下限"] = $"{tempd[0].StandardValues}{limit}";
}
else
dr[$"{tdata.Key}上下限"] = $"";
diff --git a/halftoneproject-master/Models/Order.cs b/halftoneproject-master/Models/Order.cs
index dd8fb6cc..e92814dd 100644
--- a/halftoneproject-master/Models/Order.cs
+++ b/halftoneproject-master/Models/Order.cs
@@ -1,6 +1,7 @@
using SqlSugar;
using System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -367,6 +368,11 @@ namespace Models
public string StepName { get; set; }
//是否为均值结果
public bool isAverage { get; set; }
+
+ //上下限
+ public double StandardValues { get; set; }
+ public double MaxLimit { get; set; }
+ public double MinLimit { get; set; }
}
//2024-03-11 新表，存储不同步骤的均值测试数据