Skip to content

孙克 / ACSingleStore

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

漏掉的中英文修改

1 个父辈 6484b6f1
内嵌 并排
正在显示 4 个修改的文件 包含 30 行增加 和 43 行删除
source/ACSingleStore/FrmStoreBox.cs
...@@ -164,6 +164,8 @@ namespace OnlineStore.ACSingleStore ...@@ -164,6 +164,8 @@ namespace OnlineStore.ACSingleStore
} }
private string WaitStart = ResourceCulture.GetString("等待启动"); private string WaitStart = ResourceCulture.GetString("等待启动");
private string dooropen = ResourceCulture.GetString("前门未关"); private string dooropen = ResourceCulture.GetString("前门未关");
private string ldooropen = ResourceCulture.GetString("左侧门未关");
private string rdooropen = ResourceCulture.GetString("右侧门未关");
private string HasWare = ResourceCulture.GetString("叉子料盘检测有料，请检查"); private string HasWare = ResourceCulture.GetString("叉子料盘检测有料，请检查");
private string StartAuto = ResourceCulture.GetString("开始自动出入库"); private string StartAuto = ResourceCulture.GetString("开始自动出入库");
private string StopAuto = ResourceCulture.GetString("停止自动出入库"); private string StopAuto = ResourceCulture.GetString("停止自动出入库");
...@@ -236,11 +238,11 @@ namespace OnlineStore.ACSingleStore ...@@ -236,11 +238,11 @@ namespace OnlineStore.ACSingleStore
} }
else if (store.Config.StoreDIList.ContainsKey(IO_Type.Door_LeftLimit)&& IOManager.IOValue(IO_Type.Door_LeftLimit).Equals(IO_VALUE.LOW)) else if (store.Config.StoreDIList.ContainsKey(IO_Type.Door_LeftLimit)&& IOManager.IOValue(IO_Type.Door_LeftLimit).Equals(IO_VALUE.LOW))
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 左侧门未关"; lblWarnMsg.Text = lblWarnMsg.Text + " "+ldooropen;
} }
else if (store.Config.StoreDIList.ContainsKey(IO_Type.Door_RightLimit) && IOManager.IOValue(IO_Type.Door_RightLimit).Equals(IO_VALUE.LOW)) else if (store.Config.StoreDIList.ContainsKey(IO_Type.Door_RightLimit) && IOManager.IOValue(IO_Type.Door_RightLimit).Equals(IO_VALUE.LOW))
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 右侧门未关"; lblWarnMsg.Text = lblWarnMsg.Text + " "+rdooropen;
} }
} }
//如果不在出入库中，且叉子上有信号，需要提示检查叉子 //如果不在出入库中，且叉子上有信号，需要提示检查叉子
...@@ -248,10 +250,10 @@ namespace OnlineStore.ACSingleStore ...@@ -248,10 +250,10 @@ namespace OnlineStore.ACSingleStore
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " "+ HasWare; lblWarnMsg.Text = lblWarnMsg.Text + " "+ HasWare;
} }
if (store.TempOrHumidityIsAlarm) //if (store.TempOrHumidityIsAlarm)
{ //{
lblWarnMsg.Text = lblWarnMsg.Text + " 温湿度报警[" + store.TempAlarmTime.ToLongTimeString() + "]"; // lblWarnMsg.Text = lblWarnMsg.Text + " 温湿度报警[" + store.TempAlarmTime.ToLongTimeString() + "]";
} //}
if (store.autoNext) if (store.autoNext)
{ {
string msg = store.autoMsg; string msg = store.autoMsg;
...@@ -1135,7 +1137,8 @@ namespace OnlineStore.ACSingleStore ...@@ -1135,7 +1137,8 @@ namespace OnlineStore.ACSingleStore
warn = ResourceCulture.GetString("警告"); warn = ResourceCulture.GetString("警告");
StartCycle = ResourceCulture.GetString("开始循环出库"); StartCycle = ResourceCulture.GetString("开始循环出库");
StopCycle = ResourceCulture.GetString("停止循环出库"); StopCycle = ResourceCulture.GetString("停止循环出库");
ldooropen = ResourceCulture.GetString("左侧门未关");
rdooropen = ResourceCulture.GetString("右侧门未关");
显示ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.GetTextIdStr(className, 显示ToolStripMenuItem.Name), 显示ToolStripMenuItem.Text); 显示ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.GetTextIdStr(className, 显示ToolStripMenuItem.Name), 显示ToolStripMenuItem.Text);
toolStripMenuItem1.Text = ResourceCulture.GetString(ResourceCulture.GetTextIdStr(className, toolStripMenuItem1.Name), toolStripMenuItem1.Text); toolStripMenuItem1.Text = ResourceCulture.GetString(ResourceCulture.GetTextIdStr(className, toolStripMenuItem1.Name), toolStripMenuItem1.Text);
......
source/ACSingleStore/resource/language.resource
...@@ -256,7 +256,7 @@ Y10,相机照明开,Camera light ON, ...@@ -256,7 +256,7 @@ Y10,相机照明开,Camera light ON,
倍目标速度,倍目标速度,Double target speed, 倍目标速度,倍目标速度,Double target speed,
禁用调试,禁用调试,Disable debugging, 禁用调试,禁用调试,Disable debugging,
无报警，无出入库或者重置操作时，才可以回待机点！,无报警，无出入库或者重置操作时，才可以回待机点！,"No alarm 无报警，无出入库或者重置操作时，才可以回待机点！,无报警，无出入库或者重置操作时，才可以回待机点！,"No alarm
inSuddenStop,收到急停信号",报警急停" inSuddenStop,收到急停信号，报警急停,Emergency stop signal received，alarm emergency stop
InoutAlarm,进出轴报警！复位失败，请检查,in-out axis alarm! Reset failed& please check, InoutAlarm,进出轴报警！复位失败，请检查,in-out axis alarm! Reset failed& please check,
OpenAxisFail,打开轴{0}失败,Failed to open axis {0}, OpenAxisFail,打开轴{0}失败,Failed to open axis {0},
NoAIr,未检测到气压信号,Pressure signal undetected, NoAIr,未检测到气压信号,Pressure signal undetected,
...@@ -296,3 +296,5 @@ trayHeight,料盘高度,Reel height, ...@@ -296,3 +296,5 @@ trayHeight,料盘高度,Reel height,
关闭DEBUG,关闭DEBUG, Close DEBUG 关闭DEBUG,关闭DEBUG, Close DEBUG
开启DEBUG,开启DEBUG, Open DEBUG 开启DEBUG,开启DEBUG, Open DEBUG
出库{0}叉子从库位退出后，未检测到料盘有料,出库{0}叉子从库位退出后，未检测到料盘有料,Outgoing {0} after the fork exits from the storage，no material on the tray is detected 出库{0}叉子从库位退出后，未检测到料盘有料,出库{0}叉子从库位退出后，未检测到料盘有料,Outgoing {0} after the fork exits from the storage，no material on the tray is detected
左侧门未关,左侧门未关,Left door open
右侧门未关,右侧门未关,Right door open
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/记录.txt
...@@ -102,3 +102,6 @@ DeCodeType=解码类型，0=halcon，1=zxing解码 西安料仓解析方式。2= ...@@ -102,3 +102,6 @@ DeCodeType=解码类型，0=halcon，1=zxing解码 西安料仓解析方式。2=
1.发给服务器的英文错误，英文内容和中文一样。 1.发给服务器的英文错误，英文内容和中文一样。
2.自动出入库修改，先当前库位入库，然后出库，再继续下一个库位。 2.自动出入库修改，先当前库位入库，然后出库，再继续下一个库位。
3.扫码枪重连修改。 3.扫码枪重连修改。
20200224
漏掉的中英文修改。
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -793,27 +793,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -793,27 +793,6 @@ namespace OnlineStore.DeviceLibrary
} }
if (storeMoveType.Equals(StoreMoveType.InStore)) if (storeMoveType.Equals(StoreMoveType.InStore))
{ {
// int newIndex = autoPositionIndex - 1;
//if (autoJiange == 0)
//{
// newIndex = autoPositionIndex;
//}
//if (newIndex < 0)
//{
// if (AutoStartIndex >= 0 && AutoStartIndex < PositionNumList.Count)
// {
// newIndex = AutoStartIndex;
// LogUtil.info(LOGGER, StoreName + "下一个索引不存在，重新开始自动出入库，索引【" + AutoStartIndex + "】");
// }
// else
// {
// autoNext = false;
// autoMsg = "自动出入库结束！";
// LogUtil.info(LOGGER, StoreName + "下一个索引不存在，自动 出入库结束！");
// }
//}
//else
//{
// autoPositionIndex = newIndex; // autoPositionIndex = newIndex;
string posid = PositionNumList[autoPositionIndex]; string posid = PositionNumList[autoPositionIndex];
...@@ -825,13 +804,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -825,13 +804,13 @@ namespace OnlineStore.DeviceLibrary
autoMsg = "自动出库：" + posid; autoMsg = "自动出库：" + posid;
AddWaitOutInfo(new FixtureCodeInfo(0, "", posid)); AddWaitOutInfo(new FixtureCodeInfo(0, "", posid));
} }
else if (CurrInOutCount >= Config.Box_ResetMCount) //else if (CurrInOutCount >= Config.Box_ResetMCount)
{ //{
LogUtil.info(LOGGER, StoreName + "自动进入下一个出库：posid=" + posid + ",当时已经出入库" + CurrInOutCount + "次，需要重置BOX旋转轴，先把出库信息存入排队列表中"); // LogUtil.info(LOGGER, StoreName + "自动进入下一个出库：posid=" + posid + ",当时已经出入库" + CurrInOutCount + "次，需要重置BOX旋转轴，先把出库信息存入排队列表中");
//ResetMiddleAxis(false); // //ResetMiddleAxis(false);
autoMsg = "自动出库：" + posid; // autoMsg = "自动出库：" + posid;
AddWaitOutInfo(new FixtureCodeInfo(0, "", posid)); // AddWaitOutInfo(new FixtureCodeInfo(0, "", posid));
} //}
else else
{ {
LogUtil.info(LOGGER, StoreName + "自动进入下一个出库：posid=" + posid); LogUtil.info(LOGGER, StoreName + "自动进入下一个出库：posid=" + posid);
...@@ -869,13 +848,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -869,13 +848,13 @@ namespace OnlineStore.DeviceLibrary
autoMsg = "自动入库：" + posid; autoMsg = "自动入库：" + posid;
AddWaitOutInfo(new FixtureCodeInfo(0, "AAAA", posid)); AddWaitOutInfo(new FixtureCodeInfo(0, "AAAA", posid));
} }
else if (CurrInOutCount >= Config.Box_ResetMCount) //else if (CurrInOutCount >= Config.Box_ResetMCount)
{ //{
LogUtil.info(LOGGER, StoreName + "自动进入下一个出库：posid=" + posid + ",当时已经出入库" + CurrInOutCount + "次，需要重置BOX旋转轴，先把出库信息存入排队列表中"); // LogUtil.info(LOGGER, StoreName + "自动进入下一个出库：posid=" + posid + ",当时已经出入库" + CurrInOutCount + "次，需要重置BOX旋转轴，先把出库信息存入排队列表中");
//ResetMiddleAxis(false); // //ResetMiddleAxis(false);
autoMsg = "自动入库：" + posid; // autoMsg = "自动入库：" + posid;
AddWaitOutInfo(new FixtureCodeInfo(0, "AAAA", posid)); // AddWaitOutInfo(new FixtureCodeInfo(0, "AAAA", posid));
} //}
else else
{ {
LogUtil.info(LOGGER, StoreName + "自动进入下一个入库：posid=" + posid); LogUtil.info(LOGGER, StoreName + "自动进入下一个入库：posid=" + posid);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!