Skip to content

刘韬 / SO815-AutoInOutStore

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

中英文修改

1 个父辈 57d6a377
内嵌 并排
正在显示 7 个修改的文件 包含 80 行增加 和 20 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -261,23 +261,24 @@ ...@@ -261,23 +261,24 @@
// //
// contextMenuStrip1 // contextMenuStrip1
// //
this.contextMenuStrip1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.显示ToolStripMenuItem, this.显示ToolStripMenuItem,
this.toolStripMenuItem1}); this.toolStripMenuItem1});
this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(101, 48); this.contextMenuStrip1.Size = new System.Drawing.Size(107, 52);
// //
// 显示ToolStripMenuItem // 显示ToolStripMenuItem
// //
this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem"; this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem";
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); this.显示ToolStripMenuItem.Size = new System.Drawing.Size(106, 24);
this.显示ToolStripMenuItem.Text = "显示"; 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.Name = "toolStripMenuItem1"; this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(100, 22); this.toolStripMenuItem1.Size = new System.Drawing.Size(106, 24);
this.toolStripMenuItem1.Text = "退出"; this.toolStripMenuItem1.Text = "退出";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click); this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
// //
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -30,6 +30,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -30,6 +30,7 @@ namespace OnlineStore.AutoInOutStore
Control.CheckForIllegalCrossThreadCalls = false; Control.CheckForIllegalCrossThreadCalls = false;
InitializeComponent(); InitializeComponent();
chbAuto.Checked = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun).Equals(1); chbAuto.Checked = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun).Equals(1);
processMenu();
} }
#region "初始化界面数据" #region "初始化界面数据"
...@@ -356,11 +357,11 @@ namespace OnlineStore.AutoInOutStore ...@@ -356,11 +357,11 @@ namespace OnlineStore.AutoInOutStore
{ {
if (IOManager.IOValue(IO_Type.LeftDoorColse_Single).Equals(IO_VALUE.LOW)) if (IOManager.IOValue(IO_Type.LeftDoorColse_Single).Equals(IO_VALUE.LOW))
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 左侧门未关"; lblWarnMsg.Text = lblWarnMsg.Text + " "+ResourceCulture.GetString("左侧门未关", "左侧门未关");
} }
else if (IOManager.IOValue(IO_Type.RightDoorColse_Single).Equals(IO_VALUE.LOW)) else if (IOManager.IOValue(IO_Type.RightDoorColse_Single).Equals(IO_VALUE.LOW))
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 右侧门未关"; lblWarnMsg.Text = lblWarnMsg.Text + " "+ResourceCulture.GetString("右侧门未关", "右侧门未关");
} }
} }
//if (ShuoKeControls.CheckErrorCount > 10) //if (ShuoKeControls.CheckErrorCount > 10)
...@@ -464,11 +465,11 @@ namespace OnlineStore.AutoInOutStore ...@@ -464,11 +465,11 @@ namespace OnlineStore.AutoInOutStore
//判断私服是否打开、 //判断私服是否打开、
if (ACServerManager.ServerOnStatus(portName, SlvAddr)) if (ACServerManager.ServerOnStatus(portName, SlvAddr))
{ {
lblServerOn.Text = "伺服ON"; lblServerOn.Text =ResourceCulture.GetString("伺服ON", "伺服ON");
} }
else else
{ {
lblServerOn.Text = "伺服OFF"; lblServerOn.Text = ResourceCulture.GetString("伺服OFF", "伺服OFF");
} }
string deviceName = GetPortName(); string deviceName = GetPortName();
if (ACServerManager.ServerOnStatus(store.Config.Middle_Axis.DeviceName, store.Config.Middle_Axis.GetAxisValue())) if (ACServerManager.ServerOnStatus(store.Config.Middle_Axis.DeviceName, store.Config.Middle_Axis.GetAxisValue()))
...@@ -1773,7 +1774,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -1773,7 +1774,7 @@ namespace OnlineStore.AutoInOutStore
} }
else else
{ {
DialogResult res = MessageBox.Show("确定开始自动出入库？", "提示", MessageBoxButtons.YesNo); DialogResult res = MessageBox.Show(ResourceCulture.GetString("确定开始自动出入库？","确定开始自动出入库？"), ResourceCulture.GetString(ResourceCulture.MsgTitle,"提示"), MessageBoxButtons.YesNo);
if (res.Equals(DialogResult.Yes)) if (res.Equals(DialogResult.Yes))
{ {
int jiange = cmbJianGe.SelectedIndex; int jiange = cmbJianGe.SelectedIndex;
...@@ -1786,7 +1787,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -1786,7 +1787,7 @@ namespace OnlineStore.AutoInOutStore
string poText = cmbPosition.Text; string poText = cmbPosition.Text;
ConfigAppSettings.SaveValue(Setting_Init.DebugPosId, poText); ConfigAppSettings.SaveValue(Setting_Init.DebugPosId, poText);
store.autoMsg = "自动出入库：" + poText; store.autoMsg =ResourceCulture.GetString("自动出入库", "自动出入库")+ "：" + poText;
store.autoNext = true; store.autoNext = true;
LogUtil.info(LOGGER, store.StoreName + "开启自动出入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + ""); LogUtil.info(LOGGER, store.StoreName + "开启自动出入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "");
btnStart.Text = StopAuto; btnStart.Text = StopAuto;
...@@ -1797,7 +1798,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -1797,7 +1798,7 @@ namespace OnlineStore.AutoInOutStore
} }
else else
{ {
MessageBox.Show("请先启动料仓！"); MessageBox.Show(ResourceCulture.GetString(ResourceCulture.PleaseStartStore, "请先启动料仓！"));
} }
} }
...@@ -1861,14 +1862,15 @@ namespace OnlineStore.AutoInOutStore ...@@ -1861,14 +1862,15 @@ namespace OnlineStore.AutoInOutStore
else else
{ {
string poText = cmbPosition.Text; string poText = cmbPosition.Text;
DialogResult res = MessageBox.Show("确定开始[" + poText + "]循环出库？", "提示", MessageBoxButtons.YesNo); string msg = ResourceCulture.GetString("确定开始{0}循环出库", "确定开始{0}循环出库", poText);
DialogResult res = MessageBox.Show(msg, ResourceCulture.GetString(ResourceCulture.MsgTitle, "提示"), MessageBoxButtons.YesNo);
if (res.Equals(DialogResult.Yes) && cmbPosition.SelectedIndex >= 0) if (res.Equals(DialogResult.Yes) && cmbPosition.SelectedIndex >= 0)
{ {
store.CyclePosId = poText; store.CyclePosId = poText;
ConfigAppSettings.SaveValue(Setting_Init.DebugPosId, poText); ConfigAppSettings.SaveValue(Setting_Init.DebugPosId, poText);
store.autoMsg = "循环出库：" + poText; store.autoMsg = ResourceCulture.GetString("循环出库", "循环出库")+"：" + poText;
bool result = store.StartOutStoreMove(new InOutStoreParam("CCC", poText), true); bool result = store.StartOutStoreMove(new InOutStoreParam("CCC", poText), true);
LogUtil.info(LOGGER, store.StoreName + "开始循环出库，开始位置【" + poText + "】结果： " + result); LogUtil.info(LOGGER, store.StoreName + "开始循环出库，开始位置【" + poText + "】结果： " + result);
...@@ -1884,7 +1886,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -1884,7 +1886,7 @@ namespace OnlineStore.AutoInOutStore
} }
else else
{ {
MessageBox.Show("请先启动料仓！"); MessageBox.Show(ResourceCulture.GetString(ResourceCulture.PleaseStartStore, "请先启动料仓！"));
} }
} }
} }
......
source/ACSingleStore/Properties/Resource.en-US.resx
...@@ -1379,6 +1379,36 @@ ...@@ -1379,6 +1379,36 @@
<value>Batch shaft is full, please take out the material tray</value> <value>Batch shaft is full, please take out the material tray</value>
</data> </data>
<data name="TheDoorOpen" xml:space="preserve"> <data name="TheDoorOpen" xml:space="preserve">
<value>门锁未关闭，无法出库</value> <value>The door lock is not closed</value>
</data>
<data name="伺服OFF" xml:space="preserve">
<value>Servo OFF</value>
</data>
<data name="伺服ON" xml:space="preserve">
<value>Servo ON</value>
</data>
<data name="右侧门未关" xml:space="preserve">
<value>Right door open</value>
</data>
<data name="左侧门未关" xml:space="preserve">
<value>Left door open</value>
</data>
<data name="循环出库" xml:space="preserve">
<value>Cycle of outbound</value>
</data>
<data name="确定开始{0}循环出库" xml:space="preserve">
<value>Make sure to start the {0} loop out of the library</value>
</data>
<data name="确定开始自动出入库？" xml:space="preserve">
<value>Make sure to start automatic storage ？</value>
</data>
<data name="自动入库" xml:space="preserve">
<value>automatic warehousing </value>
</data>
<data name="自动出入库" xml:space="preserve">
<value>Automatic entry and exit</value>
</data>
<data name="自动出库" xml:space="preserve">
<value>Automated outbound</value>
</data> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/Properties/Resource.zh-CN.resx
...@@ -1380,4 +1380,34 @@ ...@@ -1380,4 +1380,34 @@
<data name="TheDoorOpen" xml:space="preserve"> <data name="TheDoorOpen" xml:space="preserve">
<value>The door lock is not closed, unable to exit the warehouse</value> <value>The door lock is not closed, unable to exit the warehouse</value>
</data> </data>
<data name="伺服OFF" xml:space="preserve">
<value>伺服OFF</value>
</data>
<data name="伺服ON" xml:space="preserve">
<value>伺服ON</value>
</data>
<data name="右侧门未关" xml:space="preserve">
<value>右侧门未关</value>
</data>
<data name="左侧门未关" xml:space="preserve">
<value>左侧门未关</value>
</data>
<data name="循环出库" xml:space="preserve">
<value>循环出库</value>
</data>
<data name="确定开始{0}循环出库" xml:space="preserve">
<value>确定开始{0}循环出库</value>
</data>
<data name="确定开始自动出入库？" xml:space="preserve">
<value>确定开始自动出入库？</value>
</data>
<data name="自动入库" xml:space="preserve">
<value>自动入库</value>
</data>
<data name="自动出入库" xml:space="preserve">
<value>自动出入库</value>
</data>
<data name="自动出库" xml:space="preserve">
<value>自动出库</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
source/Common/Common.csproj
...@@ -69,9 +69,6 @@ ...@@ -69,9 +69,6 @@
<Compile Include="util\TcpClient.cs" /> <Compile Include="util\TcpClient.cs" />
<Compile Include="util\TcpServer.cs" /> <Compile Include="util\TcpServer.cs" />
<Compile Include="util\UdpServer.cs" /> <Compile Include="util\UdpServer.cs" />
<Compile Include="xml\ModblsPositionXML.cs" />
<Compile Include="xml\XMLCache.cs" />
<Compile Include="xml\XmlData.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<WCFMetadata Include="Service References\" /> <WCFMetadata Include="Service References\" />
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -1309,7 +1309,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1309,7 +1309,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
autoMsg = "自动出库：RI:" + readId; autoMsg = ResourceControl.GetString("自动出库", "自动出库") + "：RI:" + readId;
result = HttpHelper.Post(StoreManager.GetAPI("", StoreManager.api_stackOut) + "?RIS=" + readId); result = HttpHelper.Post(StoreManager.GetAPI("", StoreManager.api_stackOut) + "?RIS=" + readId);
LogUtil.info("自动出入库：自动出库：RI: " + readId + " ," + result); LogUtil.info("自动出入库：自动出库：RI: " + readId + " ," + result);
} }
...@@ -1948,7 +1948,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1948,7 +1948,7 @@ namespace OnlineStore.DeviceLibrary
} }
if (autoNext) if (autoNext)
{ {
autoMsg = "自动出库：" + posId; autoMsg = ResourceControl.GetString("自动出库", "自动出库") + "：" + posId;
} }
} }
else else
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -1228,7 +1228,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1228,7 +1228,7 @@ namespace OnlineStore.DeviceLibrary
if (PositionNumList.Count > autoPositionIndex) if (PositionNumList.Count > autoPositionIndex)
{ {
posid = PositionNumList[autoPositionIndex]; posid = PositionNumList[autoPositionIndex];
autoMsg = "自动入库：" +posid; autoMsg = ResourceControl.GetString("自动入库", "自动入库") + "：" +posid;
//到下一个库位 //到下一个库位
if (isNext) if (isNext)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!