Commit 91286ccb LN

1

1 个父辈 b33bb81f
...@@ -2010,20 +2010,22 @@ ...@@ -2010,20 +2010,22 @@
this.显示ToolStripMenuItem, this.显示ToolStripMenuItem,
this.toolStripMenuItem1}); this.toolStripMenuItem1});
this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(116, 48); this.contextMenuStrip1.Size = new System.Drawing.Size(111, 56);
// //
// 显示ToolStripMenuItem // 显示ToolStripMenuItem
// //
this.显示ToolStripMenuItem.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem"; this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem";
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(115, 22); this.显示ToolStripMenuItem.Size = new System.Drawing.Size(110, 26);
this.显示ToolStripMenuItem.Text = "显示(&S)"; this.显示ToolStripMenuItem.Text = "显示";
this.显示ToolStripMenuItem.Click += new System.EventHandler(this.显示ToolStripMenuItem_Click); this.显示ToolStripMenuItem.Click += new System.EventHandler(this.显示ToolStripMenuItem_Click);
// //
// toolStripMenuItem1 // toolStripMenuItem1
// //
this.toolStripMenuItem1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.toolStripMenuItem1.Name = "toolStripMenuItem1"; this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(115, 22); this.toolStripMenuItem1.Size = new System.Drawing.Size(110, 26);
this.toolStripMenuItem1.Text = "退出(&E)"; this.toolStripMenuItem1.Text = "退出";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click); this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
// //
// notifyIcon1 // notifyIcon1
...@@ -2621,6 +2623,7 @@ ...@@ -2621,6 +2623,7 @@
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1; this.MainMenuStrip = this.menuStrip1;
this.Name = "FrmStoreBox"; this.Name = "FrmStoreBox";
this.Opacity = 0D;
this.Text = "AC_SA_料仓"; this.Text = "AC_SA_料仓";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing);
......
...@@ -1162,6 +1162,7 @@ namespace OnlineStore.ACSingleStore ...@@ -1162,6 +1162,7 @@ namespace OnlineStore.ACSingleStore
LogUtil.info("切换界面显示时,没有正确输入密码"); LogUtil.info("切换界面显示时,没有正确输入密码");
return; return;
} }
this.Opacity = 100;
this.Visible = true; this.Visible = true;
this.WindowState = FormWindowState.Maximized; this.WindowState = FormWindowState.Maximized;
this.notifyIcon1.Visible = false; this.notifyIcon1.Visible = false;
...@@ -1212,6 +1213,7 @@ namespace OnlineStore.ACSingleStore ...@@ -1212,6 +1213,7 @@ namespace OnlineStore.ACSingleStore
/// </summary> /// </summary>
private void HideForm() private void HideForm()
{ {
this.Opacity = 0;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.notifyIcon1.Visible = true; this.notifyIcon1.Visible = true;
this.Hide(); this.Hide();
......
...@@ -1393,8 +1393,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -1393,8 +1393,6 @@ namespace OnlineStore.DeviceLibrary
{ {
return; return;
} }
//HumitureServer.RandomData(Config.GetTempAddrList());
isInProcess = true; isInProcess = true;
if (StoreManager.IsConnectServer) if (StoreManager.IsConnectServer)
{ {
...@@ -1409,11 +1407,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -1409,11 +1407,6 @@ namespace OnlineStore.DeviceLibrary
} }
if (LineConnect.IsConnect()) if (LineConnect.IsConnect())
{ {
string posID = "";
if (StoreMove.MoveType.Equals(StoreMoveType.InStore) || StoreMove.MoveType.Equals(StoreMoveType.OutStore))
{
posID = StoreMove.MoveParam.PositionNum;
}
int hasTray = (int)IOManager.IOValue(IO_Type.TrayCheck_Door); int hasTray = (int)IOManager.IOValue(IO_Type.TrayCheck_Door);
int ss = (int)storeStatus; int ss = (int)storeStatus;
if (IsDebug) if (IsDebug)
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!