Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit a7e239d7 由 几米阳光
选项

部分文字调整

1 个父辈 01011033
内嵌 并排
正在显示 4 个修改的文件 包含 47 行增加 和 44 行删除
source/ACSingleStore/FrmAxisDebug.cs
...@@ -100,7 +100,7 @@ namespace OnlineStore.ACSingleStore ...@@ -100,7 +100,7 @@ namespace OnlineStore.ACSingleStore
{ {
if (ACStoreManager.store.LoacationIsDown().Equals(false)) if (ACStoreManager.store.LoacationIsDown().Equals(false))
{ {
MessageBox.Show( cannotMove,warn, MessageBoxButtons.OK, MessageBoxIcon.Warning); MessageBox.Show( FrmStoreBox.cannotMove, FrmStoreBox.warn, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return; return;
} }
int speed = FormUtil.GetIntValue(txtInOutSpeed); int speed = FormUtil.GetIntValue(txtInOutSpeed);
...@@ -147,8 +147,8 @@ namespace OnlineStore.ACSingleStore ...@@ -147,8 +147,8 @@ namespace OnlineStore.ACSingleStore
// ShuoKeControls.SuddownStop(compress_Slv); // ShuoKeControls.SuddownStop(compress_Slv);
// } // }
//} //}
private string cannotMove = ResourceCulture.GetString(ResourceCulture.CannotMove, "定位气缸不在下降端，不能移动进出轴"); //private string cannotMove = ResourceCulture.GetString(ResourceCulture.CannotMove, "定位气缸不在下降端，不能移动进出轴");
private string warn = ResourceCulture.GetString(ResourceCulture.WarnMsg, "警告"); //private string warn = ResourceCulture.GetString(ResourceCulture.WarnMsg, "警告");
private void btnMiddleMovej_MouseDown(object sender, MouseEventArgs e) private void btnMiddleMovej_MouseDown(object sender, MouseEventArgs e)
{ {
int speed = FormUtil.GetIntValue(txtMiddleSpeed); int speed = FormUtil.GetIntValue(txtMiddleSpeed);
...@@ -197,7 +197,7 @@ namespace OnlineStore.ACSingleStore ...@@ -197,7 +197,7 @@ namespace OnlineStore.ACSingleStore
{ {
if (ACStoreManager.store.LoacationIsDown().Equals(false)) if (ACStoreManager.store.LoacationIsDown().Equals(false))
{ {
MessageBox.Show(cannotMove, warn, MessageBoxButtons.OK, MessageBoxIcon.Warning); MessageBox.Show(FrmStoreBox.cannotMove, FrmStoreBox.warn, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return; return;
} }
int speed = FormUtil.GetIntValue(txtInOutSpeed); int speed = FormUtil.GetIntValue(txtInOutSpeed);
......
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -31,6 +31,9 @@ ...@@ -31,6 +31,9 @@
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
this.chbAuto = new System.Windows.Forms.CheckBox(); this.chbAuto = new System.Windows.Forms.CheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.axis_1_Alarm = new UserFromControl.IOStatusControl();
this.axis_3_Alarm = new UserFromControl.IOStatusControl();
this.axis_2_Alarm = new UserFromControl.IOStatusControl();
this.label38 = new System.Windows.Forms.Label(); this.label38 = new System.Windows.Forms.Label();
this.txtMiddleTarget = new System.Windows.Forms.TextBox(); this.txtMiddleTarget = new System.Windows.Forms.TextBox();
this.txtInoutTarget = new System.Windows.Forms.TextBox(); this.txtInoutTarget = new System.Windows.Forms.TextBox();
...@@ -175,9 +178,6 @@ ...@@ -175,9 +178,6 @@
this.英文ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.英文ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
this.德文ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.德文ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.axis_1_Alarm = new UserFromControl.IOStatusControl();
this.axis_3_Alarm = new UserFromControl.IOStatusControl();
this.axis_2_Alarm = new UserFromControl.IOStatusControl();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
...@@ -262,6 +262,36 @@ ...@@ -262,6 +262,36 @@
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "伺服状态"; this.groupBox1.Text = "伺服状态";
// //
// axis_1_Alarm
//
this.axis_1_Alarm.IOName = "";
this.axis_1_Alarm.IOValue = 0;
this.axis_1_Alarm.isCanClick = false;
this.axis_1_Alarm.Location = new System.Drawing.Point(200, 64);
this.axis_1_Alarm.Name = "axis_1_Alarm";
this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_1_Alarm.TabIndex = 264;
//
// axis_3_Alarm
//
this.axis_3_Alarm.IOName = "";
this.axis_3_Alarm.IOValue = 0;
this.axis_3_Alarm.isCanClick = false;
this.axis_3_Alarm.Location = new System.Drawing.Point(402, 64);
this.axis_3_Alarm.Name = "axis_3_Alarm";
this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_3_Alarm.TabIndex = 266;
//
// axis_2_Alarm
//
this.axis_2_Alarm.IOName = "";
this.axis_2_Alarm.IOValue = 0;
this.axis_2_Alarm.isCanClick = false;
this.axis_2_Alarm.Location = new System.Drawing.Point(297, 64);
this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_2_Alarm.TabIndex = 265;
//
// label38 // label38
// //
this.label38.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label38.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -1901,41 +1931,11 @@ ...@@ -1901,41 +1931,11 @@
// 德文ToolStripMenuItem // 德文ToolStripMenuItem
// //
this.德文ToolStripMenuItem.Name = "德文ToolStripMenuItem"; this.德文ToolStripMenuItem.Name = "德文ToolStripMenuItem";
this.德文ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.德文ToolStripMenuItem.Size = new System.Drawing.Size(112, 26);
this.德文ToolStripMenuItem.Text = "德文"; this.德文ToolStripMenuItem.Text = "德文";
this.德文ToolStripMenuItem.Visible = false; this.德文ToolStripMenuItem.Visible = false;
this.德文ToolStripMenuItem.Click += new System.EventHandler(this.德文ToolStripMenuItem_Click); this.德文ToolStripMenuItem.Click += new System.EventHandler(this.德文ToolStripMenuItem_Click);
// //
// axis_1_Alarm
//
this.axis_1_Alarm.IOName = "";
this.axis_1_Alarm.IOValue = 0;
this.axis_1_Alarm.isCanClick = false;
this.axis_1_Alarm.Location = new System.Drawing.Point(200, 64);
this.axis_1_Alarm.Name = "axis_1_Alarm";
this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_1_Alarm.TabIndex = 264;
//
// axis_3_Alarm
//
this.axis_3_Alarm.IOName = "";
this.axis_3_Alarm.IOValue = 0;
this.axis_3_Alarm.isCanClick = false;
this.axis_3_Alarm.Location = new System.Drawing.Point(402, 64);
this.axis_3_Alarm.Name = "axis_3_Alarm";
this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_3_Alarm.TabIndex = 266;
//
// axis_2_Alarm
//
this.axis_2_Alarm.IOName = "";
this.axis_2_Alarm.IOValue = 0;
this.axis_2_Alarm.isCanClick = false;
this.axis_2_Alarm.Location = new System.Drawing.Point(297, 64);
this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_2_Alarm.TabIndex = 265;
//
// FrmStoreBox // FrmStoreBox
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -100,11 +100,15 @@ namespace OnlineStore.ACSingleStore ...@@ -100,11 +100,15 @@ namespace OnlineStore.ACSingleStore
private string StopAuto = ResourceCulture.GetString(ResourceCulture.StopAuto, "停止自动出入库"); private string StopAuto = ResourceCulture.GetString(ResourceCulture.StopAuto, "停止自动出入库");
private string AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库："); private string AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库：");
private string AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库："); private string AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库：");
public static string cannotMove = ResourceCulture.GetString(ResourceCulture.CannotMove, "定位气缸不在下降端，不能移动进出轴");
public static string warn = ResourceCulture.GetString(ResourceCulture.WarnMsg, "警告");
public void processMenu() public void processMenu()
{ {
string className = this.ClassName; string className = this.ClassName;
CurrLanguage = ResourceCulture.CurrLanguage; CurrLanguage = ResourceCulture.CurrLanguage;
ResourceCulture.GetString(ResourceCulture.CannotMove, "定位气缸不在下降端，不能移动进出轴");
warn = ResourceCulture.GetString(ResourceCulture.WarnMsg, "警告");
WaitStart = ResourceCulture.GetString(ResourceCulture.WaitStart, "等待启动"); WaitStart = ResourceCulture.GetString(ResourceCulture.WaitStart, "等待启动");
dooropen = ResourceCulture.GetString(ResourceCulture.DoorOpen, " 前门未关"); dooropen = ResourceCulture.GetString(ResourceCulture.DoorOpen, " 前门未关");
HasWare = ResourceCulture.GetString(ResourceCulture.HasWare, " 叉子料盘检测有料，请检查"); HasWare = ResourceCulture.GetString(ResourceCulture.HasWare, " 叉子料盘检测有料，请检查");
...@@ -510,8 +514,7 @@ namespace OnlineStore.ACSingleStore ...@@ -510,8 +514,7 @@ namespace OnlineStore.ACSingleStore
//} //}
} }
} }
private string cannotMove = ResourceCulture.GetString(ResourceCulture.CannotMove, "定位气缸不在下降端，不能移动进出轴");
private string warn = ResourceCulture.GetString(ResourceCulture.WarnMsg, "警告");
private void btnAxisAMove_Click(object sender, EventArgs e) private void btnAxisAMove_Click(object sender, EventArgs e)
{ {
//ConfigMoveAxis axisC = store.moveAxisList[cmbAxisList.SelectedIndex]; //ConfigMoveAxis axisC = store.moveAxisList[cmbAxisList.SelectedIndex];
...@@ -844,11 +847,11 @@ namespace OnlineStore.ACSingleStore ...@@ -844,11 +847,11 @@ namespace OnlineStore.ACSingleStore
if (store.autoNext) if (store.autoNext)
{ {
store.autoNext = false; store.autoNext = false;
btnStartAuTo.Text = "开始自动出入库"; btnStartAuTo.Text = StartAuto;;
} }
else else
{ {
DialogResult res = MessageBox.Show("确定开始自动出入库？", "提示", MessageBoxButtons.YesNo); DialogResult res = MessageBox.Show(StartAuto+"？", "提示", MessageBoxButtons.YesNo);
if (res.Equals(DialogResult.Yes)) if (res.Equals(DialogResult.Yes))
{ {
store.autoNext = true; store.autoNext = true;
...@@ -865,7 +868,7 @@ namespace OnlineStore.ACSingleStore ...@@ -865,7 +868,7 @@ namespace OnlineStore.ACSingleStore
//store.StartOutStoreMove(new InOutStoreParam("", poText)); //store.StartOutStoreMove(new InOutStoreParam("", poText));
store.StartInStoreMove(new InOutStoreParam("", poText)); store.StartInStoreMove(new InOutStoreParam("", poText));
} }
btnStartAuTo.Text = "停止自动出入库"; btnStartAuTo.Text = StopAuto;
} }
} }
} }
......
source/ACSingleStore/FrmStoreBox.resx
...@@ -1263,7 +1263,7 @@ ...@@ -1263,7 +1263,7 @@
<value>107, 16</value> <value>107, 16</value>
</metadata> </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>106</value> <value>162</value>
</metadata> </metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!