ll/LL-28
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

25111501 调整参数本地可保存小数；主界面显示测试参数

Browse Source
This commit is contained in:
moxiliang
2025-11-15 10:47:17 +08:00
parent 5139e0c4d7
commit f55f980981
33 changed files with 953 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

183
SLC1-N/Form1.cs
View File

@@ -1235,15 +1235,15 @@ namespace SLC1_N
GetYiqiParam(i, "P").delaytime1 = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "P" + "delaytime1" + j, "0"));
GetYiqiParam(i, "P").delaytime2 = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "P" + "delaytime2" + j, "0"));
GetYiqiParam(i, "P").relievedelay = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "P" + "relievedelay" + j, "0"));
GetYiqiParam(i, "P").evolume = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "P" + "evolume" + j, "0"));
GetYiqiParam(i, "P").evolume = StringToFloat(jsconfig.GetValue<string>($"{i}" + "P" + "evolume" + j, "0"));
GetYiqiParam(i, "P").fptoplimit = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "P" + "fptoplimit" + j, "0"));
GetYiqiParam(i, "P").fplowlimit = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "P" + "fplowlimit" + j, "0"));
GetYiqiParam(i, "P").balanpremax = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "P" + "balanpremax" + j, "0"));
GetYiqiParam(i, "P").balanpremin = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "P" + "balanpremin" + j, "0"));
GetYiqiParam(i, "P").fptoplimit = StringToFloat(jsconfig.GetValue<string>($"{i}" + "P" + "fptoplimit" + j, "0"));
GetYiqiParam(i, "P").fplowlimit = StringToFloat(jsconfig.GetValue<string>($"{i}" + "P" + "fplowlimit" + j, "0"));
GetYiqiParam(i, "P").balanpremax = StringToFloat(jsconfig.GetValue<string>($"{i}" + "P" + "balanpremax" + j, "0"));
GetYiqiParam(i, "P").balanpremin = StringToFloat(jsconfig.GetValue<string>($"{i}" + "P" + "balanpremin" + j, "0"));
GetYiqiParam(i, "P").leaktoplimit = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "P" + "leaktoplimit" + j, "0"));
GetYiqiParam(i, "P").leaklowlimit = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "P" + "leaklowlimit" + j, "0"));
GetYiqiParam(i, "P").leaktoplimit = StringToFloat(jsconfig.GetValue<string>($"{i}" + "P" + "leaktoplimit" + j, "0"));
GetYiqiParam(i, "P").leaklowlimit = StringToFloat(jsconfig.GetValue<string>($"{i}" + "P" + "leaklowlimit" + j, "0"));
GetYiqiParam(i, "P").punit = jsconfig.GetValue<int>($"{i}" + "P" + "punit" + j, 0);
GetYiqiParam(i, "P").lunit = jsconfig.GetValue<int>($"{i}" + "P" + "lunit" + j, 0);
@@ -1258,15 +1258,15 @@ namespace SLC1_N
GetYiqiParam(i, "N").delaytime1 = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "N" + "delaytime1" + j, "0"));
GetYiqiParam(i, "N").delaytime2 = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "N" + "delaytime2" + j, "0"));
GetYiqiParam(i, "N").relievedelay = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "N" + "relievedelay" + j, "0"));
GetYiqiParam(i, "N").evolume = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "N" + "evolume" + j, "0"));
GetYiqiParam(i, "N").evolume = StringToFloat(jsconfig.GetValue<string>($"{i}" + "N" + "evolume" + j, "0"));
GetYiqiParam(i, "N").fptoplimit = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "N" + "fptoplimit" + j, "0"));
GetYiqiParam(i, "N").fplowlimit = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "N" + "fplowlimit" + j, "0"));
GetYiqiParam(i, "N").balanpremax = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "N" + "balanpremax" + j, "0"));
GetYiqiParam(i, "N").balanpremin = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "N" + "balanpremin" + j, "0"));
GetYiqiParam(i, "N").fptoplimit = StringToFloat(jsconfig.GetValue<string>($"{i}" + "N" + "fptoplimit" + j, "0"));
GetYiqiParam(i, "N").fplowlimit = StringToFloat(jsconfig.GetValue<string>($"{i}" + "N" + "fplowlimit" + j, "0"));
GetYiqiParam(i, "N").balanpremax = StringToFloat(jsconfig.GetValue<string>($"{i}" + "N" + "balanpremax" + j, "0"));
GetYiqiParam(i, "N").balanpremin = StringToFloat(jsconfig.GetValue<string>($"{i}" + "N" + "balanpremin" + j, "0"));
GetYiqiParam(i, "N").leaktoplimit = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "N" + "leaktoplimit" + j, "0"));
GetYiqiParam(i, "N").leaklowlimit = Convert.ToInt32(jsconfig.GetValue<string>($"{i}" + "N" + "leaklowlimit" + j, "0"));
GetYiqiParam(i, "N").leaktoplimit = StringToFloat(jsconfig.GetValue<string>($"{i}" + "N" + "leaktoplimit" + j, "0"));
GetYiqiParam(i, "N").leaklowlimit = StringToFloat(jsconfig.GetValue<string>($"{i}" + "N" + "leaklowlimit" + j, "0"));
GetYiqiParam(i, "N").punit = jsconfig.GetValue<int>($"{i}" + "N" + "punit" + j, 0);
GetYiqiParam(i, "N").lunit = jsconfig.GetValue<int>($"{i}" + "N" + "lunit" + j, 0);
@@ -1406,6 +1406,15 @@ namespace SLC1_N
if (LL28CH1client.ArrCoil[2])
{
prepareOutTime_Dictionary.Remove(1);
SetLabelText(lb_CH1ProcessTime1, (LL28CH1client.ArrRegister[6] / 10.0).ToString() + " s");
SetLabelText(lb_CH1ProcessTime2, (LL28CH1client.ArrRegister[7] / 10.0).ToString() + " s");
SetLabelText(lb_CH1ProcessTime3, (LL28CH1client.ArrRegister[8] / 10.0).ToString() + " s");
SetLabelText(lb_CH1ProcessTime4, (LL28CH1client.ArrRegister[9] / 10.0).ToString() + " s");
SetLabelText(lb_CH1TestPressureUp, LL28CH1client.readFloat(13));
SetLabelText(lb_CH1TestPressureDown, LL28CH1client.readFloat(15));
ch1workstation = (int)yiqi.test;
}
}
@@ -1453,17 +1462,17 @@ namespace SLC1_N
int lunit = Convert.ToInt32(LL28CH1client.ArrRegister[28]);
SetLUnit(1, lunit);
// 当前压力
string fNowpressure = LL28CH1client.readFloatF2(48);
SetLabelText(lb_CH1nowPressure, fNowpressure);
//// 当前压力
//string fNowpressure = LL28CH1client.readFloatF2(48);
//SetLabelText(lb_CH1nowPressure, fNowpressure);
// 充气压力（测试压力）
string fTestpressure = LL28CH1client.readFloatF2(57);
SetLabelText(lb_CH1_TestPressure, fTestpressure);
// 大漏（平衡压差）
string fBigLeak = LL28CH1client.readFloatF2(35);
SetLabelText(lb_CH1BigLeak, fBigLeak);
//// 大漏（平衡压差）
//string fBigLeak = LL28CH1client.readFloatF2(35);
//SetLabelText(lb_CH1BigLeak, fBigLeak);
// 微漏（泄漏量）
string fSmallLeak = LL28CH1client.readFloatF2(38);
@@ -1524,17 +1533,17 @@ namespace SLC1_N
SetLabelText(lb_CH1_Status, "完成");
CH1TestTime.stopTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
// 当前压力
string fNowpressure = LL28CH1client.readFloatF2(48);
SetLabelText(lb_CH1nowPressure, fNowpressure);
//// 当前压力
//string fNowpressure = LL28CH1client.readFloatF2(48);
//SetLabelText(lb_CH1nowPressure, fNowpressure);
// 充气压力
string fTestpressure = LL28CH1client.readFloatF2(57);
SetLabelText(lb_CH1_TestPressure, fTestpressure);
//大漏
string fBigLeak = LL28CH1client.readFloatF2(35);
SetLabelText(lb_CH1BigLeak, fBigLeak);
////大漏
//string fBigLeak = LL28CH1client.readFloatF2(35);
//SetLabelText(lb_CH1BigLeak, fBigLeak);
//微漏
string fSmallLeak = LL28CH1client.readFloatF2(38);
@@ -1773,6 +1782,15 @@ namespace SLC1_N
if (LL28CH2client.ArrCoil[2])
{
prepareOutTime_Dictionary.Remove(2);
SetLabelText(lb_CH2ProcessTime1, (LL28CH2client.ArrRegister[6] / 10.0).ToString() + " s");
SetLabelText(lb_CH2ProcessTime2, (LL28CH2client.ArrRegister[7] / 10.0).ToString() + " s");
SetLabelText(lb_CH2ProcessTime3, (LL28CH2client.ArrRegister[8] / 10.0).ToString() + " s");
SetLabelText(lb_CH2ProcessTime4, (LL28CH2client.ArrRegister[9] / 10.0).ToString() + " s");
SetLabelText(lb_CH2TestPressureUp, LL28CH2client.readFloat(13));
SetLabelText(lb_CH2TestPressureDown, LL28CH2client.readFloat(15));
ch2workstation = (int)yiqi.test;
}
}
@@ -1820,17 +1838,17 @@ namespace SLC1_N
int lunit = Convert.ToInt32(LL28CH2client.ArrRegister[28]);
SetLUnit(2, lunit);
// 当前压力
string fNowpressure = LL28CH2client.readFloatF2(48);
SetLabelText(lb_CH2nowPressure, fNowpressure);
//// 当前压力
//string fNowpressure = LL28CH2client.readFloatF2(48);
//SetLabelText(lb_CH2nowPressure, fNowpressure);
// 充气压力（测试压力）
string fTestpressure = LL28CH2client.readFloatF2(57);
SetLabelText(lb_CH2_TestPressure, fTestpressure);
// 大漏（平衡压差）
string fBigLeak = LL28CH2client.readFloatF2(35);
SetLabelText(lb_CH2BigLeak, fBigLeak);
//// 大漏（平衡压差）
//string fBigLeak = LL28CH2client.readFloatF2(35);
//SetLabelText(lb_CH2BigLeak, fBigLeak);
// 微漏（泄漏量）
string fSmallLeak = LL28CH2client.readFloatF2(38);
@@ -1891,17 +1909,17 @@ namespace SLC1_N
SetLabelText(lb_CH2_Status, "完成");
CH2TestTime.stopTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
// 当前压力
string fNowpressure = LL28CH2client.readFloatF2(48);
SetLabelText(lb_CH2nowPressure, fNowpressure);
//// 当前压力
//string fNowpressure = LL28CH2client.readFloatF2(48);
//SetLabelText(lb_CH2nowPressure, fNowpressure);
// 充气压力
string fTestpressure = LL28CH2client.readFloatF2(57);
SetLabelText(lb_CH2_TestPressure, fTestpressure);
//大漏
string fBigLeak = LL28CH2client.readFloatF2(35);
SetLabelText(lb_CH2BigLeak, fBigLeak);
////大漏
//string fBigLeak = LL28CH2client.readFloatF2(35);
//SetLabelText(lb_CH2BigLeak, fBigLeak);
//微漏
string fSmallLeak = LL28CH2client.readFloatF2(38);
@@ -2140,6 +2158,15 @@ namespace SLC1_N
if (LL28CH3client.ArrCoil[2])
{
prepareOutTime_Dictionary.Remove(3);
SetLabelText(lb_CH3ProcessTime1, (LL28CH3client.ArrRegister[6] / 10.0).ToString() + " s");
SetLabelText(lb_CH3ProcessTime2, (LL28CH3client.ArrRegister[7] / 10.0).ToString() + " s");
SetLabelText(lb_CH3ProcessTime3, (LL28CH3client.ArrRegister[8] / 10.0).ToString() + " s");
SetLabelText(lb_CH3ProcessTime4, (LL28CH3client.ArrRegister[9] / 10.0).ToString() + " s");
SetLabelText(lb_CH3TestPressureUp, LL28CH3client.readFloat(13));
SetLabelText(lb_CH3TestPressureDown, LL28CH3client.readFloat(15));
ch3workstation = (int)yiqi.test;
}
}
@@ -2187,17 +2214,17 @@ namespace SLC1_N
int lunit = Convert.ToInt32(LL28CH3client.ArrRegister[28]);
SetLUnit(3, lunit);
// 当前压力
string fNowpressure = LL28CH3client.readFloatF2(48);
SetLabelText(lb_CH3nowPressure, fNowpressure);
//// 当前压力
//string fNowpressure = LL28CH3client.readFloatF2(48);
//SetLabelText(lb_CH3nowPressure, fNowpressure);
// 充气压力（测试压力）
string fTestpressure = LL28CH3client.readFloatF2(57);
SetLabelText(lb_CH3_TestPressure, fTestpressure);
// 大漏（平衡压差）
string fBigLeak = LL28CH3client.readFloatF2(35);
SetLabelText(lb_CH3BigLeak, fBigLeak);
//// 大漏（平衡压差）
//string fBigLeak = LL28CH3client.readFloatF2(35);
//SetLabelText(lb_CH3BigLeak, fBigLeak);
// 微漏（泄漏量）
string fSmallLeak = LL28CH3client.readFloatF2(38);
@@ -2258,17 +2285,17 @@ namespace SLC1_N
SetLabelText(lb_CH3_Status, "完成");
CH3TestTime.stopTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
// 当前压力
string fNowpressure = LL28CH3client.readFloatF2(48);
SetLabelText(lb_CH3nowPressure, fNowpressure);
//// 当前压力
//string fNowpressure = LL28CH3client.readFloatF2(48);
//SetLabelText(lb_CH3nowPressure, fNowpressure);
// 充气压力
string fTestpressure = LL28CH3client.readFloatF2(57);
SetLabelText(lb_CH3_TestPressure, fTestpressure);
//大漏
string fBigLeak = LL28CH3client.readFloatF2(35);
SetLabelText(lb_CH3BigLeak, fBigLeak);
////大漏
//string fBigLeak = LL28CH3client.readFloatF2(35);
//SetLabelText(lb_CH3BigLeak, fBigLeak);
//微漏
string fSmallLeak = LL28CH3client.readFloatF2(38);
@@ -2508,6 +2535,15 @@ namespace SLC1_N
if (LL28CH4client.ArrCoil[2])
{
prepareOutTime_Dictionary.Remove(4);
SetLabelText(lb_CH4ProcessTime1, (LL28CH4client.ArrRegister[6] / 10.0).ToString() + " s");
SetLabelText(lb_CH4ProcessTime2, (LL28CH4client.ArrRegister[7] / 10.0).ToString() + " s");
SetLabelText(lb_CH4ProcessTime3, (LL28CH4client.ArrRegister[8] / 10.0).ToString() + " s");
SetLabelText(lb_CH4ProcessTime4, (LL28CH4client.ArrRegister[9] / 10.0).ToString() + " s");
SetLabelText(lb_CH4TestPressureUp, LL28CH4client.readFloat(13));
SetLabelText(lb_CH4TestPressureDown, LL28CH4client.readFloat(15));
ch4workstation = (int)yiqi.test;
}
}
@@ -2555,17 +2591,17 @@ namespace SLC1_N
int lunit = Convert.ToInt32(LL28CH4client.ArrRegister[28]);
SetLUnit(4, lunit);
// 当前压力
string fNowpressure = LL28CH4client.readFloatF2(48);
SetLabelText(lb_CH4nowPressure, fNowpressure);
//// 当前压力
//string fNowpressure = LL28CH4client.readFloatF2(48);
//SetLabelText(lb_CH4nowPressure, fNowpressure);
// 充气压力（测试压力）
string fTestpressure = LL28CH4client.readFloatF2(57);
SetLabelText(lb_CH4_TestPressure, fTestpressure);
// 大漏（平衡压差）
string fBigLeak = LL28CH4client.readFloatF2(35);
SetLabelText(lb_CH4BigLeak, fBigLeak);
//// 大漏（平衡压差）
//string fBigLeak = LL28CH4client.readFloatF2(35);
//SetLabelText(lb_CH4BigLeak, fBigLeak);
// 微漏（泄漏量）
string fSmallLeak = LL28CH4client.readFloatF2(38);
@@ -2626,17 +2662,17 @@ namespace SLC1_N
SetLabelText(lb_CH4_Status, "完成");
CH4TestTime.stopTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
// 当前压力
string fNowpressure = LL28CH4client.readFloatF2(48);
SetLabelText(lb_CH4nowPressure, fNowpressure);
//// 当前压力
//string fNowpressure = LL28CH4client.readFloatF2(48);
//SetLabelText(lb_CH4nowPressure, fNowpressure);
// 充气压力
string fTestpressure = LL28CH4client.readFloatF2(57);
SetLabelText(lb_CH4_TestPressure, fTestpressure);
//大漏
string fBigLeak = LL28CH4client.readFloatF2(35);
SetLabelText(lb_CH4BigLeak, fBigLeak);
////大漏
//string fBigLeak = LL28CH4client.readFloatF2(35);
//SetLabelText(lb_CH4BigLeak, fBigLeak);
//微漏
string fSmallLeak = LL28CH4client.readFloatF2(38);
@@ -2809,6 +2845,11 @@ namespace SLC1_N
}
}
private float StringToFloat(string value, float defaultValue = 0f)
{
return float.TryParse(value, out float result) ? result : defaultValue;
}
// 更新产能数据
void UploadProductionData(int total, int ok, int ng, double okRate)
{
@@ -2873,32 +2914,32 @@ namespace SLC1_N
case 1:
lb_CH1_PressureUnit.Invoke((MethodInvoker)delegate
{
lb_CH1BigLeakUnit.Text = PUnit;
lb_CH1_nowPressureUnit.Text = PUnit;
//lb_CH1BigLeakUnit.Text = PUnit;
//lb_CH1_nowPressureUnit.Text = PUnit;
lb_CH1_PressureUnit.Text = PUnit;
});
break;
case 2:
lb_CH2_PressureUnit.Invoke((MethodInvoker)delegate
{
lb_CH2BigLeakUnit.Text = PUnit;
lb_CH2_nowPressureUnit.Text = PUnit;
//lb_CH2BigLeakUnit.Text = PUnit;
//lb_CH2_nowPressureUnit.Text = PUnit;
lb_CH2_PressureUnit.Text = PUnit;
});
break;
case 3:
lb_CH3_PressureUnit.Invoke((MethodInvoker)delegate
{
lb_CH3BigLeakUnit.Text = PUnit;
lb_CH3_nowPressureUnit.Text = PUnit;
//lb_CH3BigLeakUnit.Text = PUnit;
//lb_CH3_nowPressureUnit.Text = PUnit;
lb_CH3_PressureUnit.Text = PUnit;
});
break;
case 4:
lb_CH4_PressureUnit.Invoke((MethodInvoker)delegate
{
lb_CH4BigLeakUnit.Text = PUnit;
lb_CH4_nowPressureUnit.Text = PUnit;
//lb_CH4BigLeakUnit.Text = PUnit;
//lb_CH4_nowPressureUnit.Text = PUnit;
lb_CH4_PressureUnit.Text = PUnit;
});
break;
@@ -3614,7 +3655,7 @@ namespace SLC1_N
//fileWriter.Write(ch2params.Leaklowlimit + ch2params.LUnit + ",");
fileWriter.Write(lb_CH2_Result.Text + ",");
//fileWriter.Write(CH2LeakPress.Text + ch2params.PUnit + ",");
fileWriter.Write(lb_CH2BigLeak.Text + ",");
//fileWriter.Write(lb_CH2BigLeak.Text + ",");
//fileWriter.Write(CH2SmallLeak.Text + ch2params.LUnit + ",");
fileWriter.Write(lb_CH2_Result.Text + "\n");
}