Commit c9d259dc 刘韬

阳光电源

1 个父辈 1a16130e
...@@ -23,10 +23,11 @@ namespace MES ...@@ -23,10 +23,11 @@ namespace MES
public event PrintEvent Printing; public event PrintEvent Printing;
public event SerialNoEvent GetSN; public event SerialNoEvent GetSN;
public User() public User(string mesip)
{ {
InitializeComponent(); InitializeComponent();
printText = new Dictionary<string, string>(); printText = new Dictionary<string, string>();
_ip = mesip;
} }
/// <summary> /// <summary>
......
...@@ -232,6 +232,7 @@ namespace BLL ...@@ -232,6 +232,7 @@ namespace BLL
/// IO的IP地址 /// IO的IP地址
/// </summary> /// </summary>
public string IOAddress { get; private set; } public string IOAddress { get; private set; }
public string MES { get; private set; }
/// <summary> /// <summary>
/// 用户权限 /// 用户权限
...@@ -353,6 +354,8 @@ namespace BLL ...@@ -353,6 +354,8 @@ namespace BLL
Language = _node.InnerText; Language = _node.InnerText;
_node = _root.SelectSingleNode("IOIP"); _node = _root.SelectSingleNode("IOIP");
IOAddress = _node.InnerText; IOAddress = _node.InnerText;
_node = _root.SelectSingleNode("MES");
MES = _node.InnerText;
} }
catch (Exception ex) catch (Exception ex)
......
...@@ -473,7 +473,8 @@ namespace SmartCode ...@@ -473,7 +473,8 @@ namespace SmartCode
{ {
try try
{ {
userControl = new MES.User(); Common.log.Info($"MES:{Common.Config.MES}");
userControl = new MES.User(Common.Config.MES);
Control ctl = userControl.GetControl(); Control ctl = userControl.GetControl();
ctl.Location = new Point(6, PnlUser.TitleHeight + 6); ctl.Location = new Point(6, PnlUser.TitleHeight + 6);
ctl.Size = new Size(PnlUser.Width - 12, PnlUser.Height - PnlUser.TitleHeight - 12); ctl.Size = new Size(PnlUser.Width - 12, PnlUser.Height - PnlUser.TitleHeight - 12);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!