Skip to content

刘韬 / SO815-AutoInOutStore

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

1

1 个父辈 cd6ecf3e
内嵌 并排
正在显示 6 个修改的文件 包含 36 行增加 和 127 行删除
dll/CodeLibrary.dll
此文件类型无法预览
source/ACSingleStore/FrmAxisDebug.cs
...@@ -59,7 +59,11 @@ namespace OnlineStore.AutoInOutStore ...@@ -59,7 +59,11 @@ namespace OnlineStore.AutoInOutStore
UpdateUpdownPosition(); UpdateUpdownPosition();
UpdateAutoPosition(); UpdateAutoPosition();
UpdateCompPosition(); UpdateCompPosition();
}
protected override void FormLanPro()
{
this.picAxis.Image = null;
if (CurrLanguage.Equals(ResourceCulture.English)) if (CurrLanguage.Equals(ResourceCulture.English))
{ {
this.picAxis.Image = ResourceCulture.M_US_axis; this.picAxis.Image = ResourceCulture.M_US_axis;
...@@ -72,7 +76,6 @@ namespace OnlineStore.AutoInOutStore ...@@ -72,7 +76,6 @@ namespace OnlineStore.AutoInOutStore
{ {
this.picAxis.Image = ResourceCulture.M_axis; this.picAxis.Image = ResourceCulture.M_axis;
} }
// txtComPosition.Text = ShuoKeControls.GetABSPosition(compress_Slv).ToString();
} }
/// <summary> /// <summary>
/// 判断进出轴是否在P1点 /// 判断进出轴是否在P1点
......
source/ACSingleStore/FrmBase.cs
...@@ -97,6 +97,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -97,6 +97,7 @@ namespace OnlineStore.AutoInOutStore
{ {
((FrmStoreBox)this).processMenu(); ((FrmStoreBox)this).processMenu();
} }
FormLanPro();
} }
private void PreControlLanaguage(Control partentControl) private void PreControlLanaguage(Control partentControl)
...@@ -122,6 +123,11 @@ namespace OnlineStore.AutoInOutStore ...@@ -122,6 +123,11 @@ namespace OnlineStore.AutoInOutStore
} }
} }
protected virtual void FormLanPro()
{
}
private void FrmBase_VisibleChanged(object sender, EventArgs e) private void FrmBase_VisibleChanged(object sender, EventArgs e)
{ {
if (this.Visible.Equals(true)) if (this.Visible.Equals(true))
......
source/ACSingleStore/FrmIOStatus.Designer.cs
...@@ -396,7 +396,7 @@ ...@@ -396,7 +396,7 @@
this.cmbWriteIO.FormattingEnabled = true; this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.Location = new System.Drawing.Point(112, 23); this.cmbWriteIO.Location = new System.Drawing.Point(112, 23);
this.cmbWriteIO.Name = "cmbWriteIO"; this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(344, 24); this.cmbWriteIO.Size = new System.Drawing.Size(338, 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
...@@ -92,14 +92,12 @@ namespace OnlineStore.AutoInOutStore ...@@ -92,14 +92,12 @@ namespace OnlineStore.AutoInOutStore
timer1.Enabled = true; timer1.Enabled = true;
} }
#endregion #endregion
private string WaitStart = ResourceCulture.GetString(ResourceCulture.WaitStart, "等待启动"); private string WaitStart = ResourceCulture.GetString(ResourceCulture.WaitStart, "等待启动");
//private string dooropen = ResourceCulture.GetString(ResourceCulture.DoorHasOpen, " 前门未关");
private string HasWare = ResourceCulture.GetString(ResourceCulture.HasWare, " 叉子料盘检测有料，请检查"); private string HasWare = ResourceCulture.GetString(ResourceCulture.HasWare, " 叉子料盘检测有料，请检查");
private string StartAuto = ResourceCulture.GetString(ResourceCulture.StartAuto,"开始自动出入库"); private string StartAuto = ResourceCulture.GetString(ResourceCulture.StartAuto,"开始自动出入库");
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 static string warn = ResourceCulture.GetString(ResourceCulture.WarnMsg, "警告");
private string StartCycle = ResourceCulture.GetString(ResourceCulture.StartCycle, "开始循环出库"); private string StartCycle = ResourceCulture.GetString(ResourceCulture.StartCycle, "开始循环出库");
private string StopCycle = ResourceCulture.GetString(ResourceCulture.StopCycle, "停止循环出库"); private string StopCycle = ResourceCulture.GetString(ResourceCulture.StopCycle, "停止循环出库");
...@@ -114,19 +112,14 @@ namespace OnlineStore.AutoInOutStore ...@@ -114,19 +112,14 @@ namespace OnlineStore.AutoInOutStore
//ResourceCulture.GetString(ResourceCulture.CannotMove, "定位气缸不在下降端，不能移动进出轴"); //ResourceCulture.GetString(ResourceCulture.CannotMove, "定位气缸不在下降端，不能移动进出轴");
warn = ResourceCulture.GetString(ResourceCulture.WarnMsg, "警告"); warn = ResourceCulture.GetString(ResourceCulture.WarnMsg, "警告");
WaitStart = ResourceCulture.GetString(ResourceCulture.WaitStart, "等待启动"); WaitStart = ResourceCulture.GetString(ResourceCulture.WaitStart, "等待启动");
//dooropen = ResourceCulture.GetString(ResourceCulture.DoorHasOpen, " 前门未关");
HasWare = ResourceCulture.GetString(ResourceCulture.HasWare, " 叉子料盘检测有料，请检查"); HasWare = ResourceCulture.GetString(ResourceCulture.HasWare, " 叉子料盘检测有料，请检查");
StartAuto = ResourceCulture.GetString(ResourceCulture.StartAuto, StartAuto); StartAuto = ResourceCulture.GetString(ResourceCulture.StartAuto, StartAuto);
StopAuto = ResourceCulture.GetString(ResourceCulture.StopAuto, StopAuto); StopAuto = ResourceCulture.GetString(ResourceCulture.StopAuto, StopAuto);
AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库："); AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库：");
AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库："); AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库：");
openLog = ResourceCulture.GetString("打开日志", "打开日志"); openLog = ResourceCulture.GetString("打开日志", "打开日志");
closeLog = ResourceCulture.GetString("关闭日志", "关闭日志"); closeLog = ResourceCulture.GetString("关闭日志", "关闭日志");
//摄像机调试ToolStripMenuItem.Visible = CurrLanguage.Equals(ResourceCulture.China);
//toolStripSeparator10.Visible = CurrLanguage.Equals(ResourceCulture.China);
ToolStripItemCollection collection = menuStrip1.Items; ToolStripItemCollection collection = menuStrip1.Items;
for (int i = 0; i < collection.Count; i++) for (int i = 0; i < collection.Count; i++)
...@@ -148,6 +141,14 @@ namespace OnlineStore.AutoInOutStore ...@@ -148,6 +141,14 @@ namespace OnlineStore.AutoInOutStore
} }
} }
} }
if (groupAxis.Enabled)
{
出入库调试ToolStripMenuItem.Text = ResourceCulture.GetString("禁用调试", "禁用调试");
}
else
{
出入库调试ToolStripMenuItem.Text = ResourceCulture.GetString("启用调试", "启用调试");
}
if (tabControl1.TabPages.Contains(tabPage4)) if (tabControl1.TabPages.Contains(tabPage4))
{ {
打开日志ToolStripMenuItem.Text = closeLog; 打开日志ToolStripMenuItem.Text = closeLog;
...@@ -201,17 +202,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -201,17 +202,7 @@ namespace OnlineStore.AutoInOutStore
{ {
return; return;
} }
preOpen = isOpen; preOpen = isOpen;
//btnOutStore.Enabled = isOpen;
//btnInStore.Enabled = isOpen;
//btnAxisAMove.Enabled = isOpen;
//btnAxisReturnHome.Enabled = isOpen;
//btnAxisRMove.Enabled = isOpen;
//btnAxisVMove.Enabled = isOpen;
启动ToolStripMenuItem.Enabled = !isOpen; 启动ToolStripMenuItem.Enabled = !isOpen;
停止ToolStripMenuItem.Enabled = isOpen; 停止ToolStripMenuItem.Enabled = isOpen;
复位ToolStripMenuItem.Enabled = isOpen; 复位ToolStripMenuItem.Enabled = isOpen;
...@@ -491,19 +482,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -491,19 +482,7 @@ namespace OnlineStore.AutoInOutStore
btnSelTemp.Enabled = isRun; btnSelTemp.Enabled = isRun;
btnTempClose.Enabled = isRun; btnTempClose.Enabled = isRun;
btnTempInit.Enabled = !isRun; btnTempInit.Enabled = !isRun;
} }
private void Bt_ClearCounter_Click(object sender, EventArgs e)
{
string portName = txtAxisDeviceName.Text;
short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
//KTKSMCManager.WSetCountPulse(portName, SlvAddr, 0);
//KTKSMCManager.WSetOutPulse(portName, SlvAddr, 0);
}
private void FrmTest_FormClosing(object sender, FormClosingEventArgs e) private void FrmTest_FormClosing(object sender, FormClosingEventArgs e)
{ {
...@@ -971,12 +950,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -971,12 +950,7 @@ namespace OnlineStore.AutoInOutStore
{ {
button1_Click(null, null); button1_Click(null, null);
} }
private void 轴运动配置ToolStripMenuItem_Click(object sender, EventArgs e)
{
//FormManager.ShowAxisConfig(store);
}
private void 启动ToolStripMenuItem_Click(object sender, EventArgs e) private void 启动ToolStripMenuItem_Click(object sender, EventArgs e)
{ {
start_button_Click(null, null); start_button_Click(null, null);
...@@ -1017,11 +991,9 @@ namespace OnlineStore.AutoInOutStore ...@@ -1017,11 +991,9 @@ namespace OnlineStore.AutoInOutStore
} }
private void btnClearLog_Click(object sender, EventArgs e) private void btnClearLog_Click(object sender, EventArgs e)
{ {
//this.richTextBox1.Text = "";
LogUtil.ClearLog(); LogUtil.ClearLog();
} }
private void 料仓运转ONToolStripMenuItem_Click(object sender, EventArgs e) private void 料仓运转ONToolStripMenuItem_Click(object sender, EventArgs e)
{ {
...@@ -1286,93 +1258,21 @@ namespace OnlineStore.AutoInOutStore ...@@ -1286,93 +1258,21 @@ namespace OnlineStore.AutoInOutStore
private void 摄像机调试ToolStripMenuItem_Click(object sender, EventArgs e) private void 摄像机调试ToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (CurrLanguage.Equals(ResourceCulture.Japanese))
{
return;
}
IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.HIGH); IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.HIGH);
CodeLibrary.FrmCodeDecode frm = new FrmCodeDecode(); CodeLibrary.FrmCodeDecode frm = new FrmCodeDecode();
frm.ShowDialog(); frm.ShowDialog();
IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW); IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW);
} }
private void 学习二维码ToolStripMenuItem_Click(object sender, EventArgs e)
{
IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.HIGH);
string nameStr = ConfigAppSettings.GetValue(Setting_Init.CameraName);
string codeStr = ConfigAppSettings.GetValue(Setting_Init.CodeType);
HDCodeLearnHelper.LoadConfig(nameStr, codeStr);
FrmCodeLearn learn = new FrmCodeLearn();
learn.ShowDialog();
IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW);
}
private void btnReadHomeSingle_Click(object sender, EventArgs e) private void btnReadHomeSingle_Click(object sender, EventArgs e)
{ {
int value = ACServerManager.GetHomeSingle(GetPortName(), GetSlaveAddr()); int value = ACServerManager.GetHomeSingle(GetPortName(), GetSlaveAddr());
this.txtHomeSingle.Text = value.ToString(); this.txtHomeSingle.Text = value.ToString();
} }
//private void btnOpen_Click(object sender, EventArgs e)
//{
// if (StoreManager.OpenShuoKe(store))
// {
// ShuoKeControls.SetConfigSpeed(StoreManager.Config);
// FormComStatus(true);
// }
//}
//private void btnClose_Click(object sender, EventArgs e)
//{
// ShuoKeControls.ClosePort();
// FormComStatus(false);
//}
//private void btnVolMove_Click(object sender, EventArgs e)
//{
// int speed = FormUtil.GetIntValue(txtSpeed);
// ShuoKeControls.VolMove(store.Config.CompressAxis_Slv, speed);
//}
//private void btnGetPosition_Click(object sender, EventArgs e)
//{
// int value = ShuoKeControls.GetABSPosition(store.Config.CompressAxis_Slv);
// lblComMsg.Text = DateTime.Now.ToLongTimeString() + "：" + value;
//}
//private void btnStop_Click(object sender, EventArgs e)
//{
// ShuoKeControls.SuddownStop(this.store.Config.CompressAxis_Slv);
//}
//private void btnClearPosition_Click(object sender, EventArgs e)
//{
// ShuoKeControls.PositionClear(this.store.Config.CompressAxis_Slv, ShuoKeCMD.AbsPositionClear);
// ShuoKeControls.PositionClear(this.store.Config.CompressAxis_Slv, ShuoKeCMD.RelPositionClear);
//}
//private void btnHomeMove_Click(object sender, EventArgs e)
//{
// ShuoKeControls.HomeMove(this.store.Config.CompressAxis_Slv, byte.Parse(cmbHomeType.SelectedIndex.ToString()));
//}
//private void btnLineAbsMove_Click(object sender, EventArgs e)
//{
// int posi = FormUtil.GetIntValue(txtLinePosition);
// ShuoKeControls.AbsMove(this.store.Config.CompressAxis_Slv, posi);
//}
//private void btnRelMove_Click(object sender, EventArgs e)
//{
// int posi = FormUtil.GetIntValue(txtLinePosition);
// ShuoKeControls.RelativeMove(this.store.Config.CompressAxis_Slv, posi);
//}
//private void btnStatusSearch_Click(object sender, EventArgs e)
//{
// ShuoKeInfo info = ShuoKeControls.GetStatus(store.Config.CompressAxis_Slv);
// lblComMsg.Text = info.ToShowStr();
//}
//private void FormComStatus(bool isOpen)
//{
// btnOpen.Enabled = !isOpen;
// btnClose.Enabled = isOpen;
// btnClearPosition.Enabled = isOpen;
// btnVolMove.Enabled = isOpen;
// btnGetPosition.Enabled = isOpen;
// btnHomeMove.Enabled = isOpen;
// btnLineAbsMove.Enabled = isOpen;
// btnStatusSearch.Enabled = isOpen;
// // Bt_ClearCounter.Enabled = isOpen;
//}
private void btnBatchOutTest_Click(object sender, EventArgs e) private void btnBatchOutTest_Click(object sender, EventArgs e)
{ {
if (store.storeRunStatus >= StoreRunStatus.HomeMoving) if (store.storeRunStatus >= StoreRunStatus.HomeMoving)
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -553,7 +553,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -553,7 +553,7 @@ namespace OnlineStore.DeviceLibrary
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed); ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
} }
else if (StoreMove.MoveStep == StoreMoveStep.SI_14_GoBack) else if (StoreMove.MoveStep == StoreMoveStep.SI_14_GoBack)
{ {
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : ""; string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
LogUtil.info(LOGGER, " 【" + posId + "】 入库结束，耗时【" + FormUtil.GetSpanStr(InOutWatch.Elapsed) + "】！"); LogUtil.info(LOGGER, " 【" + posId + "】 入库结束，耗时【" + FormUtil.GetSpanStr(InOutWatch.Elapsed) + "】！");
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!