meswork/WC-CZGKJ
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改回水含量和合格结果UI

Browse Source
This commit is contained in:
XingCheng3
2026-05-13 01:09:21 +08:00
parent 69b69af17f
commit 134a06a31d
3 changed files with 25 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SCADA/Funtion/MIS_Funtion.cs
View File

@@ -171,7 +171,6 @@ namespace MesWork
// 清除结果信息 // 清除结果信息
WeighingPage?.UpdateOilResult(stIdx, 0, 0); WeighingPage?.UpdateOilResult(stIdx, 0, 0);
WeighingPage?.ClearSaveResult(stIdx);
} }
catch (Exception err) catch (Exception err)
@@ -353,7 +352,6 @@ namespace MesWork
long curveWeighingRecordId = 0; long curveWeighingRecordId = 0;
B_DB_Opera.UpdateStationComplete(engineNo, opName, weight); // 过站记录保存最终采用重量 B_DB_Opera.UpdateStationComplete(engineNo, opName, weight); // 过站记录保存最终采用重量
WeighingPage?.UpdateFinalWeight(WeighingPage?.GetStationIndex(opName) ?? 1, weight);
string weighType = GetWeighingType(opName); string weighType = GetWeighingType(opName);
decimal oilReleaseQty = 0; decimal oilReleaseQty = 0;
decimal residualOilQty = 0; decimal residualOilQty = 0;

18
SCADA/Pages/UC_Weighing.Designer.cs generated
View File

@@ -382,7 +382,7 @@
this.lbl_S2_Info1.TabIndex = 3; this.lbl_S2_Info1.TabIndex = 3;
this.lbl_S2_Info1.Text = "最终重量：—"; this.lbl_S2_Info1.Text = "水含量：—";
// //
@@ -411,7 +411,7 @@
this.lbl_S2_WaterTitle.Name = "lbl_S2_WaterTitle"; this.lbl_S2_WaterTitle.Name = "lbl_S2_WaterTitle";
this.lbl_S2_WaterTitle.Size = new System.Drawing.Size(100, 19); this.lbl_S2_WaterTitle.Size = new System.Drawing.Size(100, 19);
this.lbl_S2_WaterTitle.TabIndex = 0; this.lbl_S2_WaterTitle.TabIndex = 0;
this.lbl_S2_WaterTitle.Text = "最终重量"; this.lbl_S2_WaterTitle.Text = "水含量";
// //
@@ -424,7 +424,7 @@
this.lbl_S2_WaterUnit.Name = "lbl_S2_WaterUnit"; this.lbl_S2_WaterUnit.Name = "lbl_S2_WaterUnit";
this.lbl_S2_WaterUnit.Size = new System.Drawing.Size(18, 19); this.lbl_S2_WaterUnit.Size = new System.Drawing.Size(18, 19);
this.lbl_S2_WaterUnit.TabIndex = 1; this.lbl_S2_WaterUnit.TabIndex = 1;
this.lbl_S2_WaterUnit.Text = "KG"; this.lbl_S2_WaterUnit.Text = "%";
// //
@@ -557,11 +557,11 @@
this.lbl_S2_QualityTitle.Location = new System.Drawing.Point(15, 7); this.lbl_S2_QualityTitle.Location = new System.Drawing.Point(15, 7);
this.lbl_S2_QualityTitle.Name = "lbl_S2_QualityTitle"; this.lbl_S2_QualityTitle.Name = "lbl_S2_QualityTitle";
this.lbl_S2_QualityTitle.Size = new System.Drawing.Size(120, 22); this.lbl_S2_QualityTitle.Size = new System.Drawing.Size(120, 22);
this.lbl_S2_QualityTitle.Text = "水含量"; this.lbl_S2_QualityTitle.Text = "合格结果";
this.lbl_S2_QualityVal.Location = new System.Drawing.Point(40, 22); this.lbl_S2_QualityVal.Location = new System.Drawing.Point(40, 22);
this.lbl_S2_QualityVal.Name = "lbl_S2_QualityVal"; this.lbl_S2_QualityVal.Name = "lbl_S2_QualityVal";
this.lbl_S2_QualityVal.Size = new System.Drawing.Size(260, 42); this.lbl_S2_QualityVal.Size = new System.Drawing.Size(260, 42);
this.lbl_S2_QualityVal.Text = "0.00 ppm"; this.lbl_S2_QualityVal.Text = "--";
this.lbl_S2_QualityVal.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lbl_S2_QualityVal.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// pnl_S2_WeightBox // pnl_S2_WeightBox
@@ -978,7 +978,7 @@
this.lbl_S1_Info1.TabIndex = 2; this.lbl_S1_Info1.TabIndex = 2;
this.lbl_S1_Info1.Text = "最终重量：0.000"; this.lbl_S1_Info1.Text = "水含量：0.00";
this.lbl_S1_Info1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lbl_S1_Info1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1036,7 +1036,7 @@
this.lbl_S1_QualityVal.TabIndex = 0; this.lbl_S1_QualityVal.TabIndex = 0;
this.lbl_S1_QualityVal.Text = "水含量：0.00 ppm"; this.lbl_S1_QualityVal.Text = "合格结果：--";
this.lbl_S1_QualityVal.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lbl_S1_QualityVal.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1630,7 +1630,7 @@
this.lbl_S2_Info1.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold); this.lbl_S2_Info1.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
this.lbl_S2_Info1.Location = new System.Drawing.Point(660, 375); this.lbl_S2_Info1.Location = new System.Drawing.Point(660, 375);
this.lbl_S2_Info1.Size = new System.Drawing.Size(599, 164); this.lbl_S2_Info1.Size = new System.Drawing.Size(599, 164);
this.lbl_S2_Info1.Text = "最终重量：0.000"; this.lbl_S2_Info1.Text = "水含量：0.00";
this.lbl_S2_Info1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lbl_S2_Info1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.pnl_S2_MetricBox.Location = new System.Drawing.Point(30, 570); this.pnl_S2_MetricBox.Location = new System.Drawing.Point(30, 570);
@@ -1682,7 +1682,7 @@
this.lbl_S2_QualityVal.Font = new System.Drawing.Font("微软雅黑", 13F, System.Drawing.FontStyle.Bold); this.lbl_S2_QualityVal.Font = new System.Drawing.Font("微软雅黑", 13F, System.Drawing.FontStyle.Bold);
this.lbl_S2_QualityVal.Location = new System.Drawing.Point(840, 93); this.lbl_S2_QualityVal.Location = new System.Drawing.Point(840, 93);
this.lbl_S2_QualityVal.Size = new System.Drawing.Size(389, 80); this.lbl_S2_QualityVal.Size = new System.Drawing.Size(389, 80);
this.lbl_S2_QualityVal.Text = "水含量：0.00 ppm"; this.lbl_S2_QualityVal.Text = "合格结果：--";
this.lbl_S2_QualityVal.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lbl_S2_QualityVal.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.lbl_S2_AlarmLabel.Font = new System.Drawing.Font("微软雅黑", 13F, System.Drawing.FontStyle.Bold); this.lbl_S2_AlarmLabel.Font = new System.Drawing.Font("微软雅黑", 13F, System.Drawing.FontStyle.Bold);

54
SCADA/Pages/UC_Weighing.cs
View File

@@ -253,9 +253,7 @@ namespace MesWork.Pages
ConfigureWeightCard(weightBox, weightTitle, weightValue, weightUnit, topCardWidth, 128, 41F); ConfigureWeightCard(weightBox, weightTitle, weightValue, weightUnit, topCardWidth, 128, 41F);
weightBox.Location = new Point(margin, weightY); weightBox.Location = new Point(margin, weightY);
ConfigureMetricCard(station, waterBox, waterTitle, waterValue, waterUnit, "最终重量", "KG", margin + topCardWidth + gap, weightY, topCardWidth, 128, 28F); ConfigureMetricCard(station, waterBox, waterTitle, waterValue, waterUnit, "水含量", "ppm", margin + topCardWidth + gap, weightY, topCardWidth, 128, 28F);
if (string.IsNullOrWhiteSpace(waterValue.Text) || waterValue.Text == "0.00")
waterValue.Text = "0.000";
metricBox.BackColor = Color.White; metricBox.BackColor = Color.White;
metricBox.Location = new Point(margin, metricY); metricBox.Location = new Point(margin, metricY);
@@ -268,9 +266,7 @@ namespace MesWork.Pages
ConfigureMetricCard(metricBox, extractOilBox, extractOilTitle, extractOilValue, extractOilUnit, "抽油量", "L", (metricCardWidth + gap) * 2, 0, metricCardWidth, 74, 18F); ConfigureMetricCard(metricBox, extractOilBox, extractOilTitle, extractOilValue, extractOilUnit, "抽油量", "L", (metricCardWidth + gap) * 2, 0, metricCardWidth, 74, 18F);
ConfigureMetricCard(metricBox, oilReleaseBox, oilReleaseTitle, oilReleaseValue, oilReleaseUnit, "放油量", "L", 0, 74 + metricRowGap, metricCardWidth, 74, 18F); ConfigureMetricCard(metricBox, oilReleaseBox, oilReleaseTitle, oilReleaseValue, oilReleaseUnit, "放油量", "L", 0, 74 + metricRowGap, metricCardWidth, 74, 18F);
ConfigureMetricCard(metricBox, residualOilBox, residualOilTitle, residualOilValue, residualOilUnit, "残油量", "L", metricCardWidth + gap, 74 + metricRowGap, metricCardWidth, 74, 18F); ConfigureMetricCard(metricBox, residualOilBox, residualOilTitle, residualOilValue, residualOilUnit, "残油量", "L", metricCardWidth + gap, 74 + metricRowGap, metricCardWidth, 74, 18F);
ConfigureMetricCard(metricBox, qualityBox, qualityTitle, qualityValue, null, "水含量", "", (metricCardWidth + gap) * 2, 74 + metricRowGap, metricCardWidth, 74, 18F); ConfigureMetricCard(metricBox, qualityBox, qualityTitle, qualityValue, null, "合格结果", "", (metricCardWidth + gap) * 2, 74 + metricRowGap, metricCardWidth, 74, 18F);
if (string.IsNullOrWhiteSpace(qualityValue.Text) || qualityValue.Text == "--" || qualityValue.Text == "0.00")
qualityValue.Text = "0.00 ppm";
} }
private void LayoutStationHeaderSection( private void LayoutStationHeaderSection(
@@ -601,7 +597,7 @@ namespace MesWork.Pages
waterValue.Font = new Font("微软雅黑", 18F, FontStyle.Bold); waterValue.Font = new Font("微软雅黑", 18F, FontStyle.Bold);
waterValue.Location = new Point(660, 401); waterValue.Location = new Point(660, 401);
waterValue.Size = new Size(599, 164); waterValue.Size = new Size(599, 164);
waterValue.Text = "最终重量：0.000 KG"; waterValue.Text = "水含量：0.00 ppm";
waterValue.TextAlign = ContentAlignment.MiddleCenter; waterValue.TextAlign = ContentAlignment.MiddleCenter;
waterValue.AutoSize = false; waterValue.AutoSize = false;
@@ -614,7 +610,7 @@ namespace MesWork.Pages
ConfigureDesignerMetricLabel(extractOilValue, "抽油量：0.00", 840, 0); ConfigureDesignerMetricLabel(extractOilValue, "抽油量：0.00", 840, 0);
ConfigureDesignerMetricLabel(oilReleaseValue, "放油量：0.00", 0, 93); ConfigureDesignerMetricLabel(oilReleaseValue, "放油量：0.00", 0, 93);
ConfigureDesignerMetricLabel(residualOilValue, "残油量：0.00", 420, 93); ConfigureDesignerMetricLabel(residualOilValue, "残油量：0.00", 420, 93);
ConfigureDesignerMetricLabel(qualityValue, "水含量：0.00 ppm", 840, 93); ConfigureDesignerMetricLabel(qualityValue, "合格结果：--", 840, 93);
alarmLabel.Font = new Font("微软雅黑", 13F, FontStyle.Bold); alarmLabel.Font = new Font("微软雅黑", 13F, FontStyle.Bold);
alarmLabel.Location = new Point(30, 792); alarmLabel.Location = new Point(30, 792);
@@ -683,12 +679,12 @@ namespace MesWork.Pages
{ {
if (!string.IsNullOrEmpty(_op1)) if (!string.IsNullOrEmpty(_op1))
PollStation(1, _op1, _s1Signals, PollStation(1, _op1, _s1Signals,
lbl_S1_Weight, lbl_S1_QualityVal, lbl_S1_Info2, lbl_S1_Weight, lbl_S1_Info1, lbl_S1_Info2,
lbl_S1_PalletVal, lbl_S1_AlarmVal); lbl_S1_PalletVal, lbl_S1_AlarmVal);
if (!string.IsNullOrEmpty(_op2)) if (!string.IsNullOrEmpty(_op2))
PollStation(2, _op2, _s2Signals, PollStation(2, _op2, _s2Signals,
lbl_S2_Weight, lbl_S2_QualityVal, lbl_S2_Info2, lbl_S2_Weight, lbl_S2_Info1, lbl_S2_Info2,
lbl_S2_PalletVal, lbl_S2_AlarmVal); lbl_S2_PalletVal, lbl_S2_AlarmVal);
} }
catch { } catch { }
@@ -732,6 +728,9 @@ namespace MesWork.Pages
signals[11].BackColor = qColor; signals[11].BackColor = qColor;
signals[11].Invalidate(); signals[11].Invalidate();
} }
var lblQuality = station == 1 ? lbl_S1_QualityVal : lbl_S2_QualityVal;
lblQuality.Text = qFlag == 1 ? "合格" : (qFlag == 2 ? "不合格" : "--");
lblQuality.ForeColor = qFlag == 2 ? C_SignalBad : Color.FromArgb(30, 58, 95);
} }
catch { } catch { }
@@ -757,7 +756,7 @@ namespace MesWork.Pages
{ {
var sv = PlcLinkForm.ReadPLC(100180, opName); var sv = PlcLinkForm.ReadPLC(100180, opName);
if (sv != null) if (sv != null)
lblWater.Text = $"{Convert.ToDouble(sv):F2} ppm"; lblWater.Text = Convert.ToDouble(sv).ToString("F2");
} }
catch { } catch { }
@@ -813,39 +812,6 @@ namespace MesWork.Pages
lbl.Text = weight.ToString("F3"); lbl.Text = weight.ToString("F3");
} }
/// <summary>
/// 更新保存时采用的最终重量显示。
/// </summary>
public void UpdateFinalWeight(int station, decimal weight)
{
var lbl = station == 1 ? lbl_S1_Info1 : lbl_S2_Info1;
Action act = () => lbl.Text = weight.ToString("F3");
if (lbl.InvokeRequired) lbl.Invoke(act); else act();
}
/// <summary>
/// 清空保存结果相关显示。
/// </summary>
public void ClearSaveResult(int station)
{
Action act = () =>
{
if (station == 1)
{
lbl_S1_Info1.Text = "0.000";
lbl_S1_QualityVal.Text = "0.00 ppm";
lbl_S1_QualityVal.ForeColor = Color.FromArgb(30, 58, 95);
}
else
{
lbl_S2_Info1.Text = "0.000";
lbl_S2_QualityVal.Text = "0.00 ppm";
lbl_S2_QualityVal.ForeColor = Color.FromArgb(30, 58, 95);
}
};
if (InvokeRequired) Invoke(act); else act();
}
public void UpdateStationInfo(int station, string engineNo, string modelNo, string orderNo) public void UpdateStationInfo(int station, string engineNo, string modelNo, string orderNo)
{ {
Action act = () => Action act = () =>