25111501 调整参数本地可保存小数;主界面显示测试参数
This commit is contained in:
@@ -392,15 +392,15 @@ namespace SLC1_N
|
||||
Form1.f1.GetYiqiParam(CH, PorN).delaytime1 = Convert.ToInt32(tb_DelayTime1.Text);
|
||||
Form1.f1.GetYiqiParam(CH, PorN).delaytime2 = Convert.ToInt32(tb_DelayTime2.Text);
|
||||
Form1.f1.GetYiqiParam(CH, PorN).relievedelay = Convert.ToInt32(tb_RelieveDelay.Text);
|
||||
Form1.f1.GetYiqiParam(CH, PorN).evolume = Convert.ToInt32(tb_Evolume.Text);
|
||||
Form1.f1.GetYiqiParam(CH, PorN).evolume = StringToFloat(tb_Evolume.Text);
|
||||
|
||||
Form1.f1.GetYiqiParam(CH, PorN).fptoplimit = Convert.ToInt32(tb_FPtoplimit.Text);
|
||||
Form1.f1.GetYiqiParam(CH, PorN).fplowlimit = Convert.ToInt32(tb_FPlowlimit.Text);
|
||||
Form1.f1.GetYiqiParam(CH, PorN).balanpremax = Convert.ToInt32(tb_BalanPreMax.Text);
|
||||
Form1.f1.GetYiqiParam(CH, PorN).balanpremin = Convert.ToInt32(tb_BalanPreMin.Text);
|
||||
Form1.f1.GetYiqiParam(CH, PorN).fptoplimit = StringToFloat(tb_FPtoplimit.Text);
|
||||
Form1.f1.GetYiqiParam(CH, PorN).fplowlimit = StringToFloat(tb_FPlowlimit.Text);
|
||||
Form1.f1.GetYiqiParam(CH, PorN).balanpremax = StringToFloat(tb_BalanPreMax.Text);
|
||||
Form1.f1.GetYiqiParam(CH, PorN).balanpremin = StringToFloat(tb_BalanPreMin.Text);
|
||||
|
||||
Form1.f1.GetYiqiParam(CH, PorN).leaktoplimit = Convert.ToInt32(tb_Leaktoplimit.Text);
|
||||
Form1.f1.GetYiqiParam(CH, PorN).leaklowlimit = Convert.ToInt32(tb_Leaklowlimit.Text);
|
||||
Form1.f1.GetYiqiParam(CH, PorN).leaktoplimit = StringToFloat(tb_Leaktoplimit.Text);
|
||||
Form1.f1.GetYiqiParam(CH, PorN).leaklowlimit = StringToFloat(tb_Leaklowlimit.Text);
|
||||
Form1.f1.GetYiqiParam(CH, PorN).punit = cb_PUnit.SelectedIndex;
|
||||
Form1.f1.GetYiqiParam(CH, PorN).lunit = cb_LUnit.SelectedIndex;
|
||||
|
||||
@@ -411,6 +411,11 @@ namespace SLC1_N
|
||||
//MessageBox.Show("仪器编号:" + CH + "保存" + i + "组参数成功!");
|
||||
}
|
||||
|
||||
private float StringToFloat(string value, float defaultValue = 0f)
|
||||
{
|
||||
return float.TryParse(value, out float result) ? result : defaultValue;
|
||||
}
|
||||
|
||||
// 读取本地参数记录
|
||||
private void ReadParametersJson(string CH, string i, string PorN)
|
||||
{
|
||||
|
||||
1122
SLC1-N/Form1.Designer.cs
generated
1122
SLC1-N/Form1.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
183
SLC1-N/Form1.cs
183
SLC1-N/Form1.cs
@@ -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");
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<ProjectGuid>{F7F71589-095A-45C2-975C-739BE2D1CE15}</ProjectGuid>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<RootNamespace>SLC1_N</RootNamespace>
|
||||
<AssemblyName>LL28-V25111302-c</AssemblyName>
|
||||
<AssemblyName>LL28-C_V25111501</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
|
||||
Binary file not shown.
BIN
SLC1-N/bin/Debug/LL28-C_V25111501.pdb
Normal file
BIN
SLC1-N/bin/Debug/LL28-C_V25111501.pdb
Normal file
Binary file not shown.
Binary file not shown.
@@ -1,28 +0,0 @@
|
||||
2025-10-16 13:58:51.555 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567891","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 13:58:51"}
|
||||
2025-10-16 13:58:54.614 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时
|
||||
2025-10-16 14:00:30.665 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567890","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 14:00:30"}
|
||||
2025-10-16 14:00:33.677 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时
|
||||
2025-10-16 15:53:53.051 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567891","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 15:53:53"}
|
||||
2025-10-16 15:53:56.075 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时
|
||||
2025-10-16 15:54:15.143 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567892","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 15:54:15"}
|
||||
2025-10-16 15:54:18.163 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时
|
||||
2025-10-16 15:54:32.565 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567893","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 15:54:32"}
|
||||
2025-10-16 15:54:35.608 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时
|
||||
2025-10-16 16:37:28.764 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567893","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:37:28"}
|
||||
2025-10-16 16:37:31.851 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时
|
||||
2025-10-16 16:37:40.365 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567894","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:37:40"}
|
||||
2025-10-16 16:37:43.385 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时
|
||||
2025-10-16 16:38:00.879 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567895","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:38:00"}
|
||||
2025-10-16 16:38:03.898 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时
|
||||
2025-10-16 16:39:46.522 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"12345678951234567895","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:39:46"}
|
||||
2025-10-16 16:39:46.695 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567895","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:39:46"}
|
||||
2025-10-16 16:39:49.567 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时
|
||||
2025-10-16 16:39:49.712 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时
|
||||
2025-10-16 16:43:59.780 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"12345678951234567895","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:43:59"}
|
||||
2025-10-16 16:44:02.843 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时
|
||||
2025-10-16 16:44:08.923 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567894","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:44:08"}
|
||||
2025-10-16 16:44:11.948 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时
|
||||
2025-10-16 16:52:29.050 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567894","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:52:29"}
|
||||
2025-10-16 16:52:32.089 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时
|
||||
2025-10-16 16:52:34.581 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567895","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:52:34"}
|
||||
2025-10-16 16:52:37.601 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时
|
||||
Binary file not shown.
Binary file not shown.
@@ -142,8 +142,8 @@
|
||||
"chk_ContinueTest": true,
|
||||
"rbt_VolumeMode": false,
|
||||
"rbt_OpeningMode": true,
|
||||
"rbt_PpressureMode": true,
|
||||
"rbt_NpressureMode": false,
|
||||
"rbt_PpressureMode": false,
|
||||
"rbt_NpressureMode": true,
|
||||
"tb_ContinueTestCount": 3,
|
||||
"1Nparams_number1": "1",
|
||||
"1Nparaname1": "产品1负压",
|
||||
@@ -212,10 +212,10 @@
|
||||
"2Ndelaytime21": "1",
|
||||
"2Nrelievedelay1": "0",
|
||||
"2Nevolume1": "5",
|
||||
"2Nfptoplimit1": "999",
|
||||
"2Nfplowlimit1": "-999",
|
||||
"2Nbalanpremax1": "999",
|
||||
"2Nbalanpremin1": "-999",
|
||||
"2Nfptoplimit1": "99.1",
|
||||
"2Nfplowlimit1": "-99.2",
|
||||
"2Nbalanpremax1": "99.3",
|
||||
"2Nbalanpremin1": "-99.4",
|
||||
"2Nleaktoplimit1": "999",
|
||||
"2Nleaklowlimit1": "-999",
|
||||
"2Npunit1": 1,
|
||||
@@ -346,5 +346,6 @@
|
||||
"1Npunit2": 1,
|
||||
"1Nlunit2": 1,
|
||||
"1Nbee2": false,
|
||||
"1Nopmode2": false
|
||||
"1Nopmode2": false,
|
||||
"2Nopmode1": false
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"ProductionData": {
|
||||
"Total": 197,
|
||||
"OK": 189,
|
||||
"Total": 201,
|
||||
"OK": 193,
|
||||
"NG": 8,
|
||||
"LastUpdate": "2025-11-13T21:21:03.5024133+08:00",
|
||||
"OKRate": 95.94,
|
||||
"NGRate": 4.06
|
||||
"LastUpdate": "2025-11-15T10:39:41.659068+08:00",
|
||||
"OKRate": 96.02,
|
||||
"NGRate": 3.98
|
||||
}
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
SLC1-N/obj/Debug/LL28-C_V25111501.pdb
Normal file
BIN
SLC1-N/obj/Debug/LL28-C_V25111501.pdb
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
|
||||
e243c2a7e876228fdb35cebda95fefde21416cc1fcc67108400c68731d1b4700
|
||||
aacf5b050de7acd90af410ba8d75385da81a3d8bb5ff20764b8cd3a5b7363f84
|
||||
|
||||
@@ -670,3 +670,47 @@ D:\桌面\莫禧亮\华贝\差压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.cspro
|
||||
D:\桌面\莫禧亮\华贝\差压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.Up2Date
|
||||
D:\桌面\莫禧亮\华贝\差压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-V25111302-c.exe
|
||||
D:\桌面\莫禧亮\华贝\差压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-V25111302-c.pdb
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\TCP\ITcpClient.cs
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\TCP\ITcpClient.Designer.cs
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\DocumentFormat.OpenXml.dll
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\EasyModbus.dll
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\Guna.UI.dll
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\Guna.UI2.dll
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\HslCommunication.dll
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\NetWorkHelper.dll
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\Newtonsoft.Json.dll
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\Spire.XLS.dll
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\SunnyUI.Common.dll
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\SunnyUI.dll
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\EasyModbus.xml
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\Newtonsoft.Json.xml
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.AssemblyReference.cache
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\Interop.ADOX.dll
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.ResolveComReference.cache
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_Alarm.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_hbMESset.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_HQMESconfig.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_NetworkSet.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Electricity.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form1.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_PLC_Serialport.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_PLCcontrol.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_PLC_TCP.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_RootSet.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.LeakCompensate.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_LogOn.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_SaomaSet.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Properties.Resources.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_Save.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.UserManagement.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.UserPassword.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Warning.resources
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.GenerateResource.cache
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.CoreCompileInputs.cache
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.Up2Date
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111501.exe.config
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111501.exe
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111501.pdb
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-C_V25111501.exe
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-C_V25111501.pdb
|
||||
D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\NetWorkHelper.pdb
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user