This commit is contained in:
2026-03-05 10:20:43 +08:00
parent 88483b38ad
commit f3413b42ee
8 changed files with 270 additions and 164 deletions

View File

@@ -825,7 +825,7 @@ namespace FATrace.App
btnRawName1.Name = "btnRawName1";
btnRawName1.Size = new Size(266, 48);
btnRawName1.TabIndex = 1;
btnRawName1.Text = "YG05030013 瑞士乳杆菌GCL1815";
btnRawName1.Text = "1121000265 瑞士乳杆菌GCL1815";
btnRawName1.UseVisualStyleBackColor = true;
btnRawName1.Click += btnRawName1_Click;
//
@@ -1109,6 +1109,7 @@ namespace FATrace.App
StartPosition = FormStartPosition.CenterScreen;
Text = "管理界面";
WindowState = FormWindowState.Maximized;
FormClosing += frmMain_FormClosing;
FormClosed += frmMain_FormClosed;
Load += frmMain_Load;
statusStrip1.ResumeLayout(false);

View File

@@ -37,6 +37,11 @@ namespace FATrace.App
// TouchSocket 版称重客户端
private TScalTcp? _scaleTcp;
/// <summary>
/// 关闭确认标记:用于避免重复弹窗(如关闭过程触发多次 FormClosing
/// </summary>
private bool _closeConfirmed;
// 打印机连接参数(用于状态检测)
private string _printerIp = "192.0.1.21";
private int _printerPort = 9100;
@@ -251,7 +256,7 @@ namespace FATrace.App
{
new RawCtrInfo(){
RawName="瑞士乳杆菌GCL1815",
RawCode="YG05030013",
RawCode="1121000265",
BtnControlName="btnRawName1",
RawSource=RawSource.Japan
},
@@ -993,20 +998,6 @@ namespace FATrace.App
ShowError();
}
// 窗体关闭时,停止称重服务,释放网络连接
protected override void OnFormClosed(FormClosedEventArgs e)
{
try
{
_scaleTcp?.StopAsync().GetAwaiter().GetResult();
}
catch
{
}
base.OnFormClosed(e);
}
/// <param name="e"></param>
private void btnLogin_Click(object sender, EventArgs e)
{
@@ -1443,5 +1434,37 @@ namespace FATrace.App
MessageBox.Show($"保存配置失败:{ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void frmMain_FormClosing(object sender, FormClosingEventArgs e)
{
if (!_closeConfirmed && e.CloseReason == CloseReason.UserClosing)
{
try
{
var result = MessageBox.Show(
"确认退出系统?",
"退出确认",
MessageBoxButtons.YesNo,
MessageBoxIcon.Question,
MessageBoxDefaultButton.Button2);
if (result != DialogResult.Yes)
{
e.Cancel = true;
logger.Info("已取消关闭");
return;
}
_closeConfirmed = true;
logger.Info("用户确认关闭,开始退出");
}
catch (Exception ex)
{
// 弹窗异常时,为保证可关闭,默认继续退出,但记录日志
logger.Error(ex, "关闭确认弹窗异常");
_closeConfirmed = true;
}
}
}
}
}