上传当前项目状态
This commit is contained in:
@@ -21,57 +21,69 @@ namespace MesWork
|
||||
|
||||
public MesWorkForm()
|
||||
{
|
||||
Frm_Login frm_Login = new Frm_Login();
|
||||
if (frm_Login.ShowDialog() == DialogResult.OK)
|
||||
if (!TryAutoLogin())
|
||||
{
|
||||
OnStart();
|
||||
|
||||
InitializeComponent();
|
||||
InsertWeighingAnalysisNav();
|
||||
CheckForIllegalCrossThreadCalls = false;
|
||||
IsMdiContainer = false;
|
||||
|
||||
// 加载窗口图标
|
||||
LoadWindowIcon();
|
||||
|
||||
// 设置用户名
|
||||
lbl_UserName.Text = $"操作员:{MesWorkForm.Curr_UserName}";
|
||||
|
||||
// 标题追加工位号
|
||||
if (!string.IsNullOrEmpty(Curr_Station))
|
||||
Text = $"称重数据采集分析管理系统 - {Curr_Station}";
|
||||
|
||||
// 启动定时器
|
||||
timer_OnLine_Show.Interval = 1000;
|
||||
timer_OnLine_Show.Enabled = true;
|
||||
timer_Clock.Interval = 1000;
|
||||
timer_Clock.Enabled = true;
|
||||
|
||||
// 启动SQL在线检测
|
||||
CommunicationCheckOnLine();
|
||||
|
||||
// 初始化扫码枪
|
||||
if (MesWorkForm.IsUseBarcode == 1)
|
||||
Frm_Login frm_Login = new Frm_Login();
|
||||
if (frm_Login.ShowDialog() != DialogResult.OK)
|
||||
{
|
||||
BarcodeManager.Init();
|
||||
BarcodeManager.OnBarcodeScanned = (opName, barcode) =>
|
||||
{
|
||||
// 在线程池中执行业务处理(与PLC信号处理一致)
|
||||
System.Threading.ThreadPool.QueueUserWorkItem(_ =>
|
||||
{
|
||||
try { Barcode_HandleScan(opName, barcode); }
|
||||
catch { }
|
||||
});
|
||||
};
|
||||
Process.GetCurrentProcess().Kill();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// 默认选中"称重作业"
|
||||
SetActiveNav(pnl_NavWeighing);
|
||||
}
|
||||
else
|
||||
OnStart();
|
||||
|
||||
InitializeComponent();
|
||||
InsertWeighingAnalysisNav();
|
||||
CheckForIllegalCrossThreadCalls = false;
|
||||
IsMdiContainer = false;
|
||||
|
||||
// 加载窗口图标
|
||||
LoadWindowIcon();
|
||||
|
||||
// 设置用户名
|
||||
lbl_UserName.Text = $"操作员:{MesWorkForm.Curr_UserName}";
|
||||
|
||||
// 标题追加工位号
|
||||
if (!string.IsNullOrEmpty(Curr_Station))
|
||||
Text = $"称重数据采集分析管理系统 - {Curr_Station}";
|
||||
|
||||
// 启动定时器
|
||||
timer_OnLine_Show.Interval = 1000;
|
||||
timer_OnLine_Show.Enabled = true;
|
||||
timer_Clock.Interval = 1000;
|
||||
timer_Clock.Enabled = true;
|
||||
|
||||
// 启动SQL在线检测
|
||||
CommunicationCheckOnLine();
|
||||
|
||||
// 初始化扫码枪
|
||||
if (MesWorkForm.IsUseBarcode == 1)
|
||||
{
|
||||
Process.GetCurrentProcess().Kill();
|
||||
BarcodeManager.Init();
|
||||
BarcodeManager.OnBarcodeScanned = (opName, barcode) =>
|
||||
{
|
||||
// 在线程池中执行业务处理(与PLC信号处理一致)
|
||||
System.Threading.ThreadPool.QueueUserWorkItem(_ =>
|
||||
{
|
||||
try { Barcode_HandleScan(opName, barcode); }
|
||||
catch { }
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
// 默认选中"称重作业"
|
||||
SetActiveNav(pnl_NavWeighing);
|
||||
}
|
||||
|
||||
private bool TryAutoLogin()
|
||||
{
|
||||
if (!B_DB_Opera.LoginState_Query(out LoginStateInfo loginState)) return false;
|
||||
|
||||
Curr_LoginID = loginState.LoginID;
|
||||
Curr_UserName = loginState.UserName;
|
||||
Curr_UserPassWord = "";
|
||||
return true;
|
||||
}
|
||||
|
||||
// ====================================================================
|
||||
@@ -324,6 +336,7 @@ namespace MesWork
|
||||
BarcodeManager.Shutdown();
|
||||
|
||||
B_DB_Opera.SaveLog_Request(Curr_Station, Log_Type.ZK_Login, "", Log_FromAndTo.ZK, Log_FromAndTo.ZK, $"用户[{Curr_UserName}({Curr_LoginID})]退出称重系统", out long AID);
|
||||
B_DB_Opera.LoginState_Clear();
|
||||
Process.GetCurrentProcess().Kill();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user