Skip to content

孙克 / RC30-AutoInOutStore

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

中英文切换界面调整

1 个父辈 8faa17ac
全部展开
内嵌 并排
正在显示 14 个修改的文件 包含 59 行增加 和 20 行删除
source/ACSingleStore/FrmIOStatus.Designer.cs
...@@ -465,7 +465,7 @@ ...@@ -465,7 +465,7 @@
this.cmbWriteIO.FormattingEnabled = true; this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.Location = new System.Drawing.Point(113, 74); this.cmbWriteIO.Location = new System.Drawing.Point(113, 74);
this.cmbWriteIO.Name = "cmbWriteIO"; this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(237, 24); this.cmbWriteIO.Size = new System.Drawing.Size(282, 24);
this.cmbWriteIO.TabIndex = 234; this.cmbWriteIO.TabIndex = 234;
this.cmbWriteIO.ValueMember = "ProName"; this.cmbWriteIO.ValueMember = "ProName";
this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem); this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem);
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -124,15 +124,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -124,15 +124,7 @@ namespace OnlineStore.AutoInOutStore
AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库："); AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库：");
//摄像机调试ToolStripMenuItem.Visible = CurrLanguage.Equals(ResourceCulture.China); //摄像机调试ToolStripMenuItem.Visible = CurrLanguage.Equals(ResourceCulture.China);
//toolStripSeparator10.Visible = CurrLanguage.Equals(ResourceCulture.China); //toolStripSeparator10.Visible = CurrLanguage.Equals(ResourceCulture.China);
if (CurrLanguage.Equals(ResourceCulture.China))
{
LogUtil.logBox = this.richTextBox1;
}
else
{
LogUtil.ClearLog();
LogUtil.logBox = null;
}
ToolStripItemCollection collection = menuStrip1.Items; ToolStripItemCollection collection = menuStrip1.Items;
...@@ -158,6 +150,16 @@ namespace OnlineStore.AutoInOutStore ...@@ -158,6 +150,16 @@ namespace OnlineStore.AutoInOutStore
显示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);
notifyIcon1.Text = this.Text; notifyIcon1.Text = this.Text;
if (CurrLanguage.Equals(ResourceCulture.China))
{
LogUtil.logBox = this.richTextBox1;
}
else
{
LogUtil.ClearLog();
LogUtil.logBox = null;
this.richTextBox1.Clear();
}
} }
private void start_button_Click(object sender, EventArgs e) private void start_button_Click(object sender, EventArgs e)
...@@ -233,14 +235,15 @@ namespace OnlineStore.AutoInOutStore ...@@ -233,14 +235,15 @@ namespace OnlineStore.AutoInOutStore
{ {
try try
{ {
if (this.Visible.Equals(false)&& this.notifyIcon1.Visible) if (this.Visible.Equals(false) )
{ {
return; return;
} }
BatchInoutStatus(); BatchInoutStatus();
lblTemp.Text = store.currTempStr; lblTemp.Text = store.currTempStr;
lblBatchMsg.Text = AutomaticBaiting.WarnMsg;
lblWarnMsg.Text = store.WarnMsg;
//忙碌状态不读取状态 //忙碌状态不读取状态
if (!store.storeRunStatus.Equals(StoreRunStatus.Busy)) if (!store.storeRunStatus.Equals(StoreRunStatus.Busy))
{ {
...@@ -266,8 +269,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -266,8 +269,7 @@ namespace OnlineStore.AutoInOutStore
} }
lblBatchStatus.Text = store.GetRunStr(AutomaticBaiting.AutoBaitingStatus, false); lblBatchStatus.Text = store.GetRunStr(AutomaticBaiting.AutoBaitingStatus, false);
lblBatchMsg.Text = AutomaticBaiting.WarnMsg;
//ReadPosistion(); //ReadPosistion();
if (store.storeRunStatus > StoreRunStatus.Wait) if (store.storeRunStatus > StoreRunStatus.Wait)
{ {
...@@ -303,7 +305,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -303,7 +305,7 @@ namespace OnlineStore.AutoInOutStore
} }
} }
} }
lblWarnMsg.Text = store.WarnMsg;
//string deviceMsg = "叉子上有料盘，请打开仓门检查"; //string deviceMsg = "叉子上有料盘，请打开仓门检查";
if (store.storeRunStatus.Equals(StoreRunStatus.Runing) && store.StoreMove.MoveType.Equals(StoreMoveType.None) && KND.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH)) if (store.storeRunStatus.Equals(StoreRunStatus.Runing) && store.StoreMove.MoveType.Equals(StoreMoveType.None) && KND.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{ {
...@@ -342,7 +344,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -342,7 +344,7 @@ namespace OnlineStore.AutoInOutStore
else else
{ {
lblThisSta.Text = WaitStart; lblThisSta.Text = WaitStart;
lblWarnMsg.Text = ""; //lblWarnMsg.Text = "";
btnStartAuTo.Text =StartAuto; btnStartAuTo.Text =StartAuto;
lblDoorStatus.Text =ResourceCulture.GetString(ResourceCulture.NoDoorStatus, "仓门状态未知"); lblDoorStatus.Text =ResourceCulture.GetString(ResourceCulture.NoDoorStatus, "仓门状态未知");
} }
......
source/DeviceLibrary/PanasonicServo/ACServerManager.cs
...@@ -302,8 +302,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -302,8 +302,8 @@ namespace OnlineStore.DeviceLibrary
int homeSingle = GetHomeSingle(portName, slvAddr); int homeSingle = GetHomeSingle(portName, slvAddr);
if (homeSingle.Equals(1)) if (homeSingle.Equals(1))
{ {
int isHomeEnd = GetHomeEndStatus(portName, slvAddr); //int isHomeEnd = GetHomeEndStatus(portName, slvAddr);
if (isHomeEnd.Equals(1)) //if (isHomeEnd.Equals(1))
{ {
int value = 2000; int value = 2000;
if ( StoreManager.Config.Batch_Axis.IsSameAxis(portName,slvAddr)) if ( StoreManager.Config.Batch_Axis.IsSameAxis(portName,slvAddr))
......
source/DeviceLibrary/ResourceControl.cs
...@@ -295,5 +295,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -295,5 +295,18 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public static string doorOpen = "doorOpen"; public static string doorOpen = "doorOpen";
/// <summary>
///启动失败：压紧轴连接失败
/// </summary>
public static string PreConnectFail = "PreConnectFail";
/// <summary>
///启动失败：急停未开
/// </summary>
public static string startFail = "startFail";
/// <summary>
///启动失败：没有气压信号
/// </summary>
public static string startFailAir = "startFailAir";
} }
} }
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -189,13 +189,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -189,13 +189,15 @@ namespace OnlineStore.DeviceLibrary
{ {
if (ShuoKeControls.isRun == false && (!StoreManager.OpenShuoKe(this))) if (ShuoKeControls.isRun == false && (!StoreManager.OpenShuoKe(this)))
{ {
LogUtil.info(StoreName + "打开驱动器串口失败，启动失败！"); WarnMsg = ResourceControl.GetString(ResourceControl.PreConnectFail,"启动失败：压紧轴连接失败");
LogUtil.error(StoreName + "打开驱动器串口失败，启动失败！");
return false; return false;
} }
} }
string canStart = AutomaticBaiting.CanStart(); string canStart = AutomaticBaiting.CanStart();
if (!canStart.Equals("")) if (!canStart.Equals(""))
{ {
WarnMsg = canStart;
LogUtil.info(StoreName + canStart); LogUtil.info(StoreName + canStart);
return false; return false;
} }
...@@ -231,10 +233,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -231,10 +233,12 @@ namespace OnlineStore.DeviceLibrary
{ {
if (suddenBtn.Equals(IO_VALUE.LOW)) if (suddenBtn.Equals(IO_VALUE.LOW))
{ {
WarnMsg = ResourceControl.GetString(ResourceControl.startFail, "启动失败：急停未开");
LogUtil.error(LOGGER, " (" + StoreName + ")启动出现错误：急停没开 ！启动失败！"); LogUtil.error(LOGGER, " (" + StoreName + ")启动出现错误：急停没开 ！启动失败！");
} }
else else
{ {
WarnMsg = ResourceControl.GetString(ResourceControl.startFailAir, "启动失败：没有气压信号");
LogUtil.error(LOGGER, " (" + StoreName + ")启动出现错误：没有气压信号 ！启动失败！"); LogUtil.error(LOGGER, " (" + StoreName + ")启动出现错误：没有气压信号 ！启动失败！");
} }
return false; return false;
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
...@@ -84,7 +84,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -84,7 +84,7 @@ namespace OnlineStore.DeviceLibrary
//需要判断门关闭 //需要判断门关闭
if (!DoorIsClose()) if (!DoorIsClose())
{ {
msg = "上料机构门未关闭"; msg = (ResourceControl.GetString(ResourceControl.CloseError, "锁门失败：请先关闭上料机构")); ;
return msg; return msg;
} }
...@@ -303,6 +303,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -303,6 +303,9 @@ namespace OnlineStore.DeviceLibrary
{ {
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.WidthCheck1, IO_VALUE.HIGH)); StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.WidthCheck1, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.WidthCheck2, IO_VALUE.HIGH)); StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.WidthCheck2, IO_VALUE.HIGH));
}else if (StoreManager.Config.Default_TrayWidth.Equals(0))
{
} }
} }
else if (SuckingDisc_WorkCount < 3) else if (SuckingDisc_WorkCount < 3)
...@@ -337,6 +340,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -337,6 +340,17 @@ namespace OnlineStore.DeviceLibrary
if (StoreManager.Store.CanStarInOut()) if (StoreManager.Store.CanStarInOut())
{ {
LastWidth = StoreManager.Config.Default_TrayWidth; LastWidth = StoreManager.Config.Default_TrayWidth;
if (LastWidth.Equals(0))
{
if (KND.IOValue(IO_Type.WidthCheck1).Equals(IO_VALUE.HIGH) && KND.IOValue(IO_Type.WidthCheck2).Equals(IO_VALUE.HIGH))
{
LastWidth = 13;
}
else
{
LastWidth = 7;
}
}
LastHeight = GetHeight(); LastHeight = GetHeight();
BatchInStoreCount++; BatchInStoreCount++;
BatchInStoreHeight += LastHeight; BatchInStoreHeight += LastHeight;
......
source/DeviceLibrary/store/InOrOutStoreParam.cs
...@@ -86,6 +86,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -86,6 +86,7 @@ namespace OnlineStore.DeviceLibrary
else else
{ {
this.PlagtW = StoreManager.Config.Default_TrayWidth; this.PlagtW = StoreManager.Config.Default_TrayWidth;
if (this.PlagtW.Equals(0)) { this.PlagtW = 13; }
this.PlateH = StoreManager.Config.GetDefaultHeight(); this.PlateH = StoreManager.Config.GetDefaultHeight();
} }
} }
......
source/DeviceLibrary/store/model/FixtureCodeInfo.cs
...@@ -39,6 +39,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -39,6 +39,7 @@ namespace OnlineStore.DeviceLibrary
else else
{ {
this.plateW = StoreManager.Config.Default_TrayWidth; this.plateW = StoreManager.Config.Default_TrayWidth;
if (this.plateW.Equals(0)) { this.plateW = 13; }
this.plateH = StoreManager.Config.GetDefaultHeight(); this.plateH = StoreManager.Config.GetDefaultHeight();
} }
} }
......
source/LoadCVSLibrary/storeConfig/config/AUTO_SA_Config.cs
...@@ -740,6 +740,9 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -740,6 +740,9 @@ namespace OnlineStore.LoadCSVLibrary
if (Default_TrayWidth.Equals(13)) if (Default_TrayWidth.Equals(13))
{ {
defaultH = 40; defaultH = 40;
}else if (Default_TrayWidth.Equals(0))
{
return 12;
} }
return defaultH; return defaultH;
} }
......
source/UserFromControl/IOStatusControl.Designer.cs
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
this.label1.Size = new System.Drawing.Size(41, 12); this.label1.Size = new System.Drawing.Size(41, 12);
this.label1.TabIndex = 0; this.label1.TabIndex = 0;
this.label1.Text = "label1"; this.label1.Text = "label1";
this.label1.Visible = false;
// //
// pictureBox1 // pictureBox1
// //
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!