Skip to content

刘韬 / SO815-AutoInOutStore

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

中英文修改

1 个父辈 2e74573d
内嵌 并排
正在显示 8 个修改的文件 包含 123 行增加 和 20 行删除
source/ACSingleStore/FrmStoreBox.cs
...@@ -347,11 +347,11 @@ namespace OnlineStore.AutoInOutStore ...@@ -347,11 +347,11 @@ namespace OnlineStore.AutoInOutStore
} }
if (store.TempOrHumidityIsAlarm) if (store.TempOrHumidityIsAlarm)
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 温湿度报警[" + store.TempAlarmTime.ToLongTimeString() + "]"; lblWarnMsg.Text = lblWarnMsg.Text + " "+ResourceCulture.GetString("温湿度报警")+"[" + store.TempAlarmTime.ToLongTimeString() + "]";
} }
if (ShuoKeControls.CheckErrorCount > 10) if (ShuoKeControls.CheckErrorCount > 10)
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 压紧轴通信异常[" + ShuoKeControls.CheckErrorCount + "]"; lblWarnMsg.Text = lblWarnMsg.Text + " " + ResourceCulture.GetString("压紧轴通信异常") + "[" + ShuoKeControls.CheckErrorCount + "]";
} }
if (store.autoNext) if (store.autoNext)
{ {
...@@ -363,8 +363,10 @@ namespace OnlineStore.AutoInOutStore ...@@ -363,8 +363,10 @@ namespace OnlineStore.AutoInOutStore
} }
try try
{ {
msg = msg.Replace("自动出库：", ""); msg = msg.Replace(AutoOut, "");
msg = msg.Replace("自动入库：", ""); msg = msg.Replace(AutoIn, "");
//msg = msg.Replace("自动出库：", "");
//msg = msg.Replace("自动入库：", "");
int index = store.PositionNumList.IndexOf(msg); int index = store.PositionNumList.IndexOf(msg);
if (index >= 0 && (!msg.Equals(""))) if (index >= 0 && (!msg.Equals("")))
{ {
...@@ -375,7 +377,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -375,7 +377,7 @@ namespace OnlineStore.AutoInOutStore
} }
else else
{ {
groupAuto.Text = "自动出入库操作"; groupAuto.Text =ResourceCulture.GetString( "自动出入库操作");
btnStart.Text = StartAuto; btnStart.Text = StartAuto;
} }
} }
...@@ -1664,7 +1666,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -1664,7 +1666,7 @@ namespace OnlineStore.AutoInOutStore
private void 出入库调试ToolStripMenuItem_Click(object sender, EventArgs e) private void 出入库调试ToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (出入库调试ToolStripMenuItem.Text.Equals("启用调试")) if (出入库调试ToolStripMenuItem.Text.Equals(ResourceCulture.GetString("启用调试","启用调试")))
{ {
DebugStatus(true); DebugStatus(true);
} }
...@@ -1678,11 +1680,11 @@ namespace OnlineStore.AutoInOutStore ...@@ -1678,11 +1680,11 @@ namespace OnlineStore.AutoInOutStore
{ {
if (status) if (status)
{ {
出入库调试ToolStripMenuItem.Text = "禁用调试"; 出入库调试ToolStripMenuItem.Text = ResourceCulture.GetString("禁用调试", "禁用调试");
} }
else else
{ {
出入库调试ToolStripMenuItem.Text = "启用调试"; 出入库调试ToolStripMenuItem.Text = ResourceCulture.GetString("启用调试", "启用调试");
} }
groupAxis.Enabled = status; groupAxis.Enabled = status;
groupComAxis.Enabled = status; groupComAxis.Enabled = status;
......
source/ACSingleStore/Properties/Resource.en-US.resx
...@@ -875,7 +875,7 @@ ...@@ -875,7 +875,7 @@
<value>Access controller block</value> <value>Access controller block</value>
</data> </data>
<data name="Y16" xml:space="preserve"> <data name="Y16" xml:space="preserve">
<value /> <value >alarm buzzer</value>
</data> </data>
<data name="X21" xml:space="preserve"> <data name="X21" xml:space="preserve">
<value>Feeding door close</value> <value>Feeding door close</value>
...@@ -1067,10 +1067,10 @@ ...@@ -1067,10 +1067,10 @@
<value>Reset feeding module</value> <value>Reset feeding module</value>
</data> </data>
<data name="FrmStoreBox_toolStripMenuItem4_Text" xml:space="preserve"> <data name="FrmStoreBox_toolStripMenuItem4_Text" xml:space="preserve">
<value>Access controller open</value> <value>Access controller block</value>
</data> </data>
<data name="FrmStoreBox_toolStripMenuItem5_Text" xml:space="preserve"> <data name="FrmStoreBox_toolStripMenuItem5_Text" xml:space="preserve">
<value>Access controller block</value> <value>Access controller open</value>
</data> </data>
<data name="FrmStoreBox_批量上下轴ONToolStripMenuItem_Text" xml:space="preserve"> <data name="FrmStoreBox_批量上下轴ONToolStripMenuItem_Text" xml:space="preserve">
<value>Batch loading axis ON</value> <value>Batch loading axis ON</value>
...@@ -1184,4 +1184,41 @@ ...@@ -1184,4 +1184,41 @@
<data name="FrmStoreBox_出入库调试ToolStripMenuItem_Text" xml:space="preserve"> <data name="FrmStoreBox_出入库调试ToolStripMenuItem_Text" xml:space="preserve">
<value>Enable debugging</value> <value>Enable debugging</value>
</data> </data>
<data name="启用调试" xml:space="preserve">
<value>Enable debugging</value>
</data>
<data name="禁用调试" xml:space="preserve">
<value>Disable debugging</value>
</data>
<data name="X25" xml:space="preserve">
<value>Doorlock cylinder open 2</value>
</data>
<data name="X26" xml:space="preserve">
<value>Doorlock cylinder open 2</value>
</data>
<data name="X27" xml:space="preserve">
<value>Batch shaft limit signal</value>
</data>
<data name="X28" xml:space="preserve">
<value>Door tray detection</value>
</data>
<data name="FrmIOStatus_radioButton2_Text" xml:space="preserve">
<value>Close</value>
</data>
<data name="FrmIOStatus_radioButton1_Text" xml:space="preserve">
<value>Open</value>
</data>
<data name="FrmAxisDebug_btnUpdate_Text" xml:space="preserve">
<value>Update location</value>
</data>
<data name="温湿度报警" xml:space="preserve">
<value>Temperature and humidity alarm</value>
</data>
<data name="压紧轴通信异常" xml:space="preserve">
<value>Abnormal compression shaft communication</value>
</data>
<data name="自动出入库操作" xml:space="preserve">
<value>Auto providing operation</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/Properties/Resource.zh-CN.resx
...@@ -871,7 +871,7 @@ ...@@ -871,7 +871,7 @@
<value>门禁功能屏蔽</value> <value>门禁功能屏蔽</value>
</data> </data>
<data name="Y16" xml:space="preserve"> <data name="Y16" xml:space="preserve">
<value /> <value >报警蜂鸣器</value>
</data> </data>
<data name="X21" xml:space="preserve"> <data name="X21" xml:space="preserve">
<value>上料机构门关闭</value> <value>上料机构门关闭</value>
...@@ -1182,5 +1182,42 @@ ...@@ -1182,5 +1182,42 @@
<data name="FrmStoreBox_出入库调试ToolStripMenuItem_Text" xml:space="preserve"> <data name="FrmStoreBox_出入库调试ToolStripMenuItem_Text" xml:space="preserve">
<value>启用调试</value> <value>启用调试</value>
</data> </data>
<data name="启用调试" xml:space="preserve">
<value>启用调试</value>
</data>
<data name="禁用调试" xml:space="preserve">
<value>禁用调试</value>
</data>
<data name="X25" xml:space="preserve">
<value>门锁气缸打开端2</value>
</data>
<data name="X26" xml:space="preserve">
<value>门锁气缸关闭端2</value>
</data>
<data name="X27" xml:space="preserve">
<value>批量轴极限信号</value>
</data>
<data name="X28" xml:space="preserve">
<value>仓门料盘检测信号</value>
</data>
<data name="FrmIOStatus_radioButton2_Text" xml:space="preserve">
<value>关闭</value>
</data>
<data name="FrmIOStatus_radioButton1_Text" xml:space="preserve">
<value>打开</value>
</data>
<data name="FrmAxisDebug_btnUpdate_Text" 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/ACSingleStore/ResourceCulture.cs
...@@ -14,7 +14,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -14,7 +14,7 @@ namespace OnlineStore.AutoInOutStore
{ {
public class ResourceCulture public class ResourceCulture
{ {
public static bool ShowLog = false ; public static bool ShowLog = true ;
public static string China = "zh-CN"; public static string China = "zh-CN";
public static string English = "en-US"; public static string English = "en-US";
public static string German = "ge-DE"; public static string German = "ge-DE";
...@@ -51,6 +51,9 @@ namespace OnlineStore.AutoInOutStore ...@@ -51,6 +51,9 @@ namespace OnlineStore.AutoInOutStore
} }
private static Assembly assembly = Assembly.GetExecutingAssembly(); private static Assembly assembly = Assembly.GetExecutingAssembly();
public static string GetString(string id)
{ return GetString(id, id);
}
public static string GetString(string id, string defaultStr) public static string GetString(string id, string defaultStr)
{ {
string strCurLanguage = ""; string strCurLanguage = "";
......
source/ACSingleStore/记录.txt
...@@ -207,7 +207,8 @@ IO模块读取时间改为可配置。 ...@@ -207,7 +207,8 @@ IO模块读取时间改为可配置。
单盘入库，如果没有放入料盘就关闭仓门，叉子退回后直接结束入库。 单盘入库，如果没有放入料盘就关闭仓门，叉子退回后直接结束入库。
20190610
部分中英文修改。
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -1478,7 +1478,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -1478,7 +1478,8 @@ namespace OnlineStore.DeviceLibrary
{ {
humidity = param.Humidity; humidity = param.Humidity;
temp = param.Temperate; temp = param.Temperate;
currTempStr = ("当前湿度：" + humidity.ToString() + "，当前温度：" + temp); currTempStr = ("" + humidity.ToString() + "%，" + temp+ "℃");
//currTempStr = ("当前湿度：" + humidity.ToString() + "，当前温度：" + temp);
} }
//double currMaxHumidity = HumitureServer.GetMaxHumidity(Config.GetTempAddrList()); //double currMaxHumidity = HumitureServer.GetMaxHumidity(Config.GetTempAddrList());
double currMaxHumidity = param.Humidity; double currMaxHumidity = param.Humidity;
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
...@@ -709,9 +709,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -709,9 +709,11 @@ namespace OnlineStore.DeviceLibrary
int count = Math.Abs(currValue - StoreManager.Config.BatchAxis_OutMaxValue); int count = Math.Abs(currValue - StoreManager.Config.BatchAxis_OutMaxValue);
if (IOManager.IOValue(IO_Type.BatchAxis_Limit).Equals(IO_VALUE.HIGH) || count < StoreManager.Config.Batch_Axis.CanErrorCountMax) if (IOManager.IOValue(IO_Type.BatchAxis_Limit).Equals(IO_VALUE.HIGH) || count < StoreManager.Config.Batch_Axis.CanErrorCountMax)
{ {
StoreMove.NextMoveStep(StoreMoveStep.AUTO_O05_BackToP2); StoreMove.NextMoveStep(StoreMoveStep.AUTO_O06_WaitDI12Low);
LogUtil.info(Name + "出料：上料轴移动到p2点【" + StoreManager.Config.BatchAxis_P2 + "】"); LogUtil.info(Name + " 出料,当前坐标【"+ currValue + "】已到达高点 ，等待出料检测信号关闭(最多等待10秒)");
ACAxisAbsMove(StoreManager.Config.Batch_Axis, StoreManager.Config.BatchAxis_P2, StoreManager.Config.BatchAxis_P2_Speed); StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.OutCheck, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(10000));
StoreMove.OneWaitCanEndStep = true;
} }
else else
{ {
...@@ -720,8 +722,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -720,8 +722,19 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(Name + " 出料 ，等待出料检测信号关闭"); LogUtil.info(Name + " 出料 ，等待出料检测信号关闭");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.OutCheck, IO_VALUE.LOW)); StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.OutCheck, IO_VALUE.LOW));
} }
}else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_O06_WaitDI12Low))
{
StoreMove.NextMoveStep(StoreMoveStep.AUTO_O06_WaitDI12Low);
LogUtil.info(Name + " 出料,等待1秒后批量轴回P2点");
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000));
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_O07_WaitDown))
{
StoreMove.NextMoveStep(StoreMoveStep.AUTO_O08_BackToP2);
LogUtil.info(Name + "出料：上料轴移动到p2点【" + StoreManager.Config.BatchAxis_P2 + "】");
ACAxisAbsMove(StoreManager.Config.Batch_Axis, StoreManager.Config.BatchAxis_P2, StoreManager.Config.BatchAxis_P2_Speed);
} }
else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_O05_BackToP2)) else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_O08_BackToP2))
{ {
//TODO //TODO
LogUtil.info(Name + "出料：回到待机点完成，出料结束"); LogUtil.info(Name + "出料：回到待机点完成，出料结束");
......
source/DeviceLibrary/store/StoreMoveStep.cs
...@@ -575,7 +575,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -575,7 +575,16 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 极限亮，返回P2点 /// 极限亮，返回P2点
/// </summary> /// </summary>
AUTO_O05_BackToP2=1305, AUTO_O08_BackToP2=1308,
/// <summary>
/// 等待X12灭
/// </summary>
AUTO_O06_WaitDI12Low=1306,
/// <summary>
/// 等待1秒钟后在下降
/// </summary>
AUTO_O07_WaitDown=1307,
#endregion #endregion
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!