Skip to content

孙克 / ACSquareStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit f465e1c4 由 张东亮
选项

出入库动作优化

1 个父辈 5774c13c
全部展开
内嵌 并排
正在显示 7 个修改的文件 包含 32 行增加 和 5 行删除
source/ACSquareStore/FrmStoreBox.cs
...@@ -91,6 +91,7 @@ namespace OnlineStore.ACSquareStore ...@@ -91,6 +91,7 @@ namespace OnlineStore.ACSquareStore
} }
txtMiddleP1.Text = store.Config.MiddleAxis_P1_Position.ToString(); txtMiddleP1.Text = store.Config.MiddleAxis_P1_Position.ToString();
txtMiddleSafe.Text = store.Config.MiddleAxis_Safe_Position.ToString();
txtUpDownP1.Text = store.Config.UpDownAxis_DoorO_P1.ToString(); txtUpDownP1.Text = store.Config.UpDownAxis_DoorO_P1.ToString();
txtInOutP1.Text = store.Config.InOutAxis_P1_Position.ToString(); txtInOutP1.Text = store.Config.InOutAxis_P1_Position.ToString();
...@@ -423,7 +424,7 @@ namespace OnlineStore.ACSquareStore ...@@ -423,7 +424,7 @@ namespace OnlineStore.ACSquareStore
ktk.InOut_P4 = FormUtil.GetIntValue(txtInOutP4); ktk.InOut_P4 = FormUtil.GetIntValue(txtInOutP4);
ktk.Middle_P1 = FormUtil.GetIntValue(txtMiddleP1); ktk.Middle_P1 = FormUtil.GetIntValue(txtMiddleP1);
ktk.Middle_P2 = FormUtil.GetIntValue(txtMiddleP2); ktk.Middle_P2 = FormUtil.GetIntValue(txtMiddleP2);
ktk.MiddleAxis_Safe_Position= FormUtil.GetIntValue(txtMiddleSafe);
ktk.UpDown_P1 = FormUtil.GetIntValue(txtUpDownP1); ktk.UpDown_P1 = FormUtil.GetIntValue(txtUpDownP1);
ktk.UpDown_P2 = FormUtil.GetIntValue(txtUpDownP2); ktk.UpDown_P2 = FormUtil.GetIntValue(txtUpDownP2);
ktk.UpDown_P3 = FormUtil.GetIntValue(txtUpDownP3); ktk.UpDown_P3 = FormUtil.GetIntValue(txtUpDownP3);
...@@ -432,6 +433,7 @@ namespace OnlineStore.ACSquareStore ...@@ -432,6 +433,7 @@ namespace OnlineStore.ACSquareStore
ktk.UpDown_P6 = FormUtil.GetIntValue(txtUpDownP6); ktk.UpDown_P6 = FormUtil.GetIntValue(txtUpDownP6);
ktk.UpDown_P7 = FormUtil.GetIntValue(txtUpDownP7); ktk.UpDown_P7 = FormUtil.GetIntValue(txtUpDownP7);
ktk.UpDown_P8 = FormUtil.GetIntValue(txtUpDownP8); ktk.UpDown_P8 = FormUtil.GetIntValue(txtUpDownP8);
return ktk; return ktk;
} }
private void btnComAlarmClear_Click(object sender, EventArgs e) private void btnComAlarmClear_Click(object sender, EventArgs e)
...@@ -612,6 +614,11 @@ namespace OnlineStore.ACSquareStore ...@@ -612,6 +614,11 @@ namespace OnlineStore.ACSquareStore
store.Config.MiddleAxis_P1_Position = FormUtil.GetIntValue(txtMiddleP1); store.Config.MiddleAxis_P1_Position = FormUtil.GetIntValue(txtMiddleP1);
needUpdate = true; needUpdate = true;
} }
if (store.Config.MiddleAxis_Safe_Position != FormUtil.GetIntValue(txtMiddleSafe))
{
store.Config.MiddleAxis_Safe_Position = FormUtil.GetIntValue(txtMiddleSafe);
needUpdate = true;
}
if (store.Config.UpDownAxis_DoorO_P1 != FormUtil.GetIntValue(txtUpDownP1)) if (store.Config.UpDownAxis_DoorO_P1 != FormUtil.GetIntValue(txtUpDownP1))
{ {
store.Config.UpDownAxis_DoorO_P1 = FormUtil.GetIntValue(txtUpDownP1); store.Config.UpDownAxis_DoorO_P1 = FormUtil.GetIntValue(txtUpDownP1);
...@@ -1324,5 +1331,14 @@ namespace OnlineStore.ACSquareStore ...@@ -1324,5 +1331,14 @@ namespace OnlineStore.ACSquareStore
store.use_Alarm_Buzzer = checkBox1.Checked; store.use_Alarm_Buzzer = checkBox1.Checked;
ConfigAppSettings.SaveValue(Setting_Init.UseAlarmBuzzer, store.use_Alarm_Buzzer ? 1 : 0); ConfigAppSettings.SaveValue(Setting_Init.UseAlarmBuzzer, store.use_Alarm_Buzzer ? 1 : 0);
} }
private void btnMiddleSafe_Click(object sender, EventArgs e)
{
if (InOutIsIsP1())
{
int value = FormUtil.GetIntValue(txtMiddleSafe);
AxisABSMove(store.Config.Middle_Axis, value, store.Config.MiddleAxis_P1_Speed);
}
}
} }
} }
source/DeviceLibrary/StoreConfig/StoreConfig.csv
...@@ -45,6 +45,7 @@ PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorI_P2,321500,,,,,,, ...@@ -45,6 +45,7 @@ PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorI_P2,321500,,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOB_P7,321500,,,,,,, PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOB_P7,321500,,,,,,,
PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIB_P8,301400,,,,,,, PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIB_P8,301400,,,,,,,
PRO,（X轴-前后轴）P1 待机原位点,MiddleAxis_P1_Position,325000,,,,,,, PRO,（X轴-前后轴）P1 待机原位点,MiddleAxis_P1_Position,325000,,,,,,,
PRO,（X轴-前后轴）安全位置点,MiddleAxis_Safe_Position,325000,,,,,,,
PRO,（ Y轴-进出轴）P1待机原位点,InOutAxis_P1_Position,500,,,,,,, PRO,（ Y轴-进出轴）P1待机原位点,InOutAxis_P1_Position,500,,,,,,,
PRO,（ Y轴-进出轴）P1左侧托架取料点P2,InOutAxis_P2_Position,7900,,,,,,, PRO,（ Y轴-进出轴）P1左侧托架取料点P2,InOutAxis_P2_Position,7900,,,,,,,
PRO,（ Y轴-进出轴）P1右侧托架取料点P3,InOutAxis_P3_Position,-7900,,,,,,, PRO,（ Y轴-进出轴）P1右侧托架取料点P3,InOutAxis_P3_Position,-7900,,,,,,,
......
source/DeviceLibrary/store/LineMoveP.cs
...@@ -44,7 +44,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -44,7 +44,10 @@ namespace OnlineStore.DeviceLibrary
/// 轴2（ 升降轴） 进料口出料缓冲点P8 /// 轴2（ 升降轴） 进料口出料缓冲点P8
/// </summary> /// </summary>
public int UpDown_P8 { get; set; } public int UpDown_P8 { get; set; }
/// <summary>
/// 轴1前后轴 安全位置点
/// </summary>
public int MiddleAxis_Safe_Position { get; set; }
/// <summary> /// <summary>
/// 轴1前后轴 待机原位点 P1 /// 轴1前后轴 待机原位点 P1
/// </summary> /// </summary>
......
source/DeviceLibrary/store/StoreStep.cs
...@@ -278,11 +278,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -278,11 +278,14 @@ namespace OnlineStore.DeviceLibrary
/// 入库。。叉子 从入料口抽出，轴3（ 叉子） 至P1（ 待机点） /// 入库。。叉子 从入料口抽出，轴3（ 叉子） 至P1（ 待机点）
/// </summary> /// </summary>
SI_07_InOutToP1 = 207, SI_07_InOutToP1 = 207,
/// <summary>
/// 入库。。X轴到安全点
/// </summary>
SI_08_ToSafePosition=208,
/// <summary> /// <summary>
/// 入库。。等待物料信号到位 /// 入库。。等待物料信号到位
/// </summary> /// </summary>
SI_08_WaitShelfDI = 208, //SI_08_WaitShelfDI = 208,
/// <summary> /// <summary>
/// 入库。。移动到库位点，前后轴 至P3(库位入库前点） /// 入库。。移动到库位点，前后轴 至P3(库位入库前点）
/// </summary> /// </summary>
...@@ -317,7 +320,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -317,7 +320,6 @@ namespace OnlineStore.DeviceLibrary
/// 入库。。进出轴返回 /// 入库。。进出轴返回
/// </summary> /// </summary>
SI_16_GoBack = 216, SI_16_GoBack = 216,
#endregion #endregion
#region 手动料仓出入库步骤 #region 手动料仓出入库步骤
......
source/LoadCVSLibrary/storeConfig/config/Box_Config.cs
...@@ -316,6 +316,11 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -316,6 +316,11 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("MiddleAxis_P1_Position")] [ConfigProAttribute("MiddleAxis_P1_Position")]
public int MiddleAxis_P1_Position { get; set; } public int MiddleAxis_P1_Position { get; set; }
/// <summary> /// <summary>
/// PRO （X轴-前后轴）安全位置点 MiddleAxis_Safe_Position
/// </summary>
[ConfigProAttribute("MiddleAxis_Safe_Position")]
public int MiddleAxis_Safe_Position { get; set; }
/// <summary>
/// PRO ( Y轴-进出轴）P1待机原位点 InOutAxis_P1_Position /// PRO ( Y轴-进出轴）P1待机原位点 InOutAxis_P1_Position
/// </summary> /// </summary>
[ConfigProAttribute("InOutAxis_P1_Position")] [ConfigProAttribute("InOutAxis_P1_Position")]
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!