Skip to content

李娜 / SO664-HCSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit acba2b3f 由 LN
选项

料仓调试状态才能启用调试界面

1 个父辈 40e0cf04
内嵌 并排
正在显示 3 个修改的文件 包含 20 行增加 和 10 行删除
source/HCSingleStore/App.config
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<!-- 停止吹气的判断值（配置值=服务器发送的湿度值-停止吹气值）--> <!-- 停止吹气的判断值（配置值=服务器发送的湿度值-停止吹气值）-->
<add key="StopBlowValue" value="4" /> <add key="StopBlowValue" value="4" />
<!--Server address--> <!--Server address-->
<add key="http.server" value="http://10.85.162.124/myproject/" /> <add key="http.server" value="http://192.168.1.123:8800/" />
<!--storeType--> <!--storeType-->
<add key="store_count" value="2" /> <add key="store_count" value="2" />
<!--start one store config--> <!--start one store config-->
......
source/HCSingleStore/FrmBox.Designer.cs
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
this.lblLSend.AutoSize = true; this.lblLSend.AutoSize = true;
this.lblLSend.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblLSend.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblLSend.ForeColor = System.Drawing.Color.Green; this.lblLSend.ForeColor = System.Drawing.Color.Green;
this.lblLSend.Location = new System.Drawing.Point(13, 509); this.lblLSend.Location = new System.Drawing.Point(13, 513);
this.lblLSend.Name = "lblLSend"; this.lblLSend.Name = "lblLSend";
this.lblLSend.Size = new System.Drawing.Size(0, 17); this.lblLSend.Size = new System.Drawing.Size(0, 17);
this.lblLSend.TabIndex = 280; this.lblLSend.TabIndex = 280;
...@@ -384,7 +384,7 @@ ...@@ -384,7 +384,7 @@
this.lblSend.AutoSize = true; this.lblSend.AutoSize = true;
this.lblSend.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblSend.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblSend.ForeColor = System.Drawing.Color.Green; this.lblSend.ForeColor = System.Drawing.Color.Green;
this.lblSend.Location = new System.Drawing.Point(13, 533); this.lblSend.Location = new System.Drawing.Point(13, 537);
this.lblSend.Name = "lblSend"; this.lblSend.Name = "lblSend";
this.lblSend.Size = new System.Drawing.Size(0, 17); this.lblSend.Size = new System.Drawing.Size(0, 17);
this.lblSend.TabIndex = 278; this.lblSend.TabIndex = 278;
...@@ -424,7 +424,7 @@ ...@@ -424,7 +424,7 @@
this.groupBox1.Controls.Add(this.label43); this.groupBox1.Controls.Add(this.label43);
this.groupBox1.Controls.Add(this.label42); this.groupBox1.Controls.Add(this.label42);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(505, 356); this.groupBox1.Location = new System.Drawing.Point(505, 360);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(476, 136); this.groupBox1.Size = new System.Drawing.Size(476, 136);
this.groupBox1.TabIndex = 217; this.groupBox1.TabIndex = 217;
...@@ -604,7 +604,7 @@ ...@@ -604,7 +604,7 @@
this.groupBox2.Controls.Add(this.button6); this.groupBox2.Controls.Add(this.button6);
this.groupBox2.Controls.Add(this.button3); this.groupBox2.Controls.Add(this.button3);
this.groupBox2.Controls.Add(this.button5); this.groupBox2.Controls.Add(this.button5);
this.groupBox2.Location = new System.Drawing.Point(11, 397); this.groupBox2.Location = new System.Drawing.Point(11, 401);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(476, 78); this.groupBox2.Size = new System.Drawing.Size(476, 78);
this.groupBox2.TabIndex = 276; this.groupBox2.TabIndex = 276;
...@@ -706,9 +706,9 @@ ...@@ -706,9 +706,9 @@
// //
this.tabPage3.Controls.Add(this.tabControl2); this.tabPage3.Controls.Add(this.tabControl2);
this.tabPage3.Controls.Add(this.groupInout); this.tabPage3.Controls.Add(this.groupInout);
this.tabPage3.Location = new System.Drawing.Point(4, 22); this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3"; this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(192, 74); this.tabPage3.Size = new System.Drawing.Size(1091, 607);
this.tabPage3.TabIndex = 2; this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 库位操作/伺服调试 "; this.tabPage3.Text = " 库位操作/伺服调试 ";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
...@@ -858,7 +858,7 @@ ...@@ -858,7 +858,7 @@
this.groupInout.Enabled = false; this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(5, 6); this.groupInout.Location = new System.Drawing.Point(5, 6);
this.groupInout.Name = "groupInout"; this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(0, 51); this.groupInout.Size = new System.Drawing.Size(899, 584);
this.groupInout.TabIndex = 100; this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false; this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作"; this.groupInout.Text = "料仓操作";
...@@ -1554,10 +1554,10 @@ ...@@ -1554,10 +1554,10 @@
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.panel1); this.tabPage1.Controls.Add(this.panel1);
this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(192, 74); this.tabPage1.Size = new System.Drawing.Size(1091, 607);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO调试 "; this.tabPage1.Text = " IO调试 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
......
source/HCSingleStore/FrmBox.cs
...@@ -924,6 +924,7 @@ namespace OnlineStore.ACSingleStore ...@@ -924,6 +924,7 @@ namespace OnlineStore.ACSingleStore
boxBean.Config.ISDebug = 0; boxBean.Config.ISDebug = 0;
StoreManager.UpdateBoxConfig(boxBean.Config); StoreManager.UpdateBoxConfig(boxBean.Config);
LogUtil.info(boxBean.Name + "用户切换到正常工作状态 "); LogUtil.info(boxBean.Name + "用户切换到正常工作状态 ");
DebugStatus(false);
} }
} }
} }
...@@ -1033,6 +1034,15 @@ namespace OnlineStore.ACSingleStore ...@@ -1033,6 +1034,15 @@ namespace OnlineStore.ACSingleStore
} }
public void DebugStatus(bool status) public void DebugStatus(bool status)
{ {
//判断是否是调试状态
if (status)
{
if (!boxBean.IsDebug)
{
MessageBox.Show(boxBean.Name + "启用调试失败，请先勾选为调试状态","提示",MessageBoxButtons.OK,MessageBoxIcon.Error);
return;
}
}
axisMoveControl1.Enabled = status; axisMoveControl1.Enabled = status;
//groupComAxis.Enabled = status; //groupComAxis.Enabled = status;
groupInout.Enabled = status; groupInout.Enabled = status;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!