Skip to content

孙克 / RC1250-ACPackingStore

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

压紧轴位置配置修改

1 个父辈 b9ac6aa1
全部展开
内嵌 并排
正在显示 15 个修改的文件 包含 132 行增加 和 67 行删除
source/ACPackingStore/FormManager.cs
......@@ -14,6 +14,20 @@ namespace OnlineStore.ACPackingStore
{
private static FrmAxisDebug debug = null;
public static void CloseAxisDebug()
{
if (debug != null && debug.IsDisposed.Equals(false))
{
debug.Close();
}
}
public static void CloseIoStatus()
{
if (frmIo != null && frmIo.IsDisposed.Equals(false))
{
frmIo.Close();
}
}
public static void ShowAxisDebug(AC_BOX_Bean store)
{
if (debug == null)
......
source/ACPackingStore/FrmBox.cs
......@@ -72,6 +72,9 @@ namespace OnlineStore.ACPackingStore
cmbShelfPosition.SelectedIndex = 0;
shelrfP = CSVPositionReader<ShelfPosition>.GetPositon(cmbShelfPosition.Text);
}
txtComP4.Text = BoxBean.Config.CompAxis_P4_Position.ToString();
txtComMaxP3.Text = BoxBean.Config.CompAxis_Max_P3.ToString();
txtComP3_P2.Text = BoxBean.Config.CompAxis_P3_P2_Value.ToString();
if (shelrfP != null)
{
txtInoutP101.Text = shelrfP.InoutAxis_P101.ToString();
......@@ -95,23 +98,7 @@ namespace OnlineStore.ACPackingStore
txtInoutP11.Text = BoxBean.Config.InOutAxis_P11_Position.ToString();
//txtInOutP2.Text = BoxBean.Config.InOutAxis_DoorPosition_P2.ToString();
txtUpDownP1.Text = BoxBean.Config.UpDownAxis_P1.ToString();
if (ktkPosition != null)
{
txtMiddleP2.Text = ktkPosition.MiddleAxis_P2.ToString();
txtUpDownP3.Text = ktkPosition.UpdownAxis_IH_P3.ToString();
txtUpDownP4.Text = ktkPosition.UpdownAxis_IL_P4.ToString();
txtUpDownP5.Text = ktkPosition.UpdownAxis_OH_P5.ToString();
txtUpDownP6.Text = ktkPosition.UpdownAxis_OL_P6.ToString();
txtComP2.Text = BoxBean.Config.GetComP2(ktkPosition.BagHigh).TargetComP2().ToString();
txtComP3.Text = ktkPosition.ComAxis_P3.ToString();
txtInOutP3.Text = ktkPosition.InoutAxis_P3.ToString();
//txtUpDownP2.Text = ktkPosition.UpDownAxis_P2.ToString();
//txtUpDownP7.Text = ktkPosition.UpDownAxis_DoorOBPosition_P7.ToString();
//txtUpDownP8.Text = ktkPosition.UpDownAxis_DoorIBPosition_P8.ToString();
//txtUpDownP1.Text = ktkPosition.UpDownAxis_P1.ToString();
}
LoadPData(ktkPosition);
timer1.Start();
chbDebug.Checked = BoxBean.IsDebug;
......@@ -302,17 +289,26 @@ namespace OnlineStore.ACPackingStore
{
string selectPositionNum = cmbPosition.Text;
ACBoxPosition ktkPosition = CSVPositionReader<ACBoxPosition>.GetPositon(selectPositionNum);
LoadPData(ktkPosition);
if (ktkPosition != null)
}
}
private void LoadPData(ACBoxPosition acPosition)
{
if (acPosition != null)
{
txtMiddleP2.Text = ktkPosition.MiddleAxis_P2.ToString();
txtUpDownP3.Text = ktkPosition.UpdownAxis_IH_P3.ToString();
txtUpDownP4.Text = ktkPosition.UpdownAxis_IL_P4.ToString();
txtUpDownP5.Text = ktkPosition.UpdownAxis_OH_P5.ToString();
txtUpDownP6.Text = ktkPosition.UpdownAxis_OL_P6.ToString();
txtComP2.Text = BoxBean.Config.GetComP2(ktkPosition.BagHigh).TargetComP2().ToString();
txtComP3.Text = ktkPosition.ComAxis_P3.ToString();
txtInOutP3.Text = ktkPosition.InoutAxis_P3.ToString();
txtMiddleP2.Text = acPosition.MiddleAxis_P2.ToString();
txtUpDownP3.Text = acPosition.UpdownAxis_IH_P3.ToString();
txtUpDownP4.Text = acPosition.UpdownAxis_IL_P4.ToString();
txtUpDownP5.Text = acPosition.UpdownAxis_OH_P5.ToString();
txtUpDownP6.Text = acPosition.UpdownAxis_OL_P6.ToString();
int comP2 = BoxBean.Config.GetComP2(acPosition.BagHigh).TargetComP2();
txtComP2.Text = comP2.ToString();
txtComP3.Text = (comP2 + BoxBean.Config.CompAxis_P3_P2_Value).ToString();
btnComP2.Text = "" + acPosition.BagHigh + "mm压紧点P2:";
btnComP3.Text = "" + acPosition.BagHigh + "mm压紧前点P3:";
lblSize.Text = "尺寸：" + acPosition.BagWidth + "*" + acPosition.BagHigh;
txtInOutP3.Text = acPosition.InoutAxis_P3.ToString();
txtInOutP2.Text = BoxBean.Config.InOutAxis_P2_Position.ToString();
//txtUpDownP2.Text = ktkPosition.UpDownAxis_P2.ToString();
......@@ -322,7 +318,6 @@ namespace OnlineStore.ACPackingStore
//txtUpDownP1.Text = ktkPosition.UpDownAxis_P1.ToString();
}
}
}
private void btnSavePosition_Click(object sender, EventArgs e)
{
......@@ -338,10 +333,10 @@ namespace OnlineStore.ACPackingStore
ktkPosition.UpdownAxis_IL_P4 = FormUtil.GetIntValue(txtUpDownP4);
ktkPosition.InoutAxis_P3 = FormUtil.GetIntValue(txtInOutP3);
ktkPosition.ComAxis_P3 = FormUtil.GetIntValue(txtComP3);
// ktkPosition.ComAxis_P3 = FormUtil.GetIntValue(txtComP3);
ktkPosition.UpdownAxis_OH_P5 = FormUtil.GetIntValue(txtUpDownP5);
ktkPosition.UpdownAxis_OL_P6 = FormUtil.GetIntValue(txtUpDownP6);
ktkPosition.ComAxis_P2 = FormUtil.GetIntValue(txtComP2);
// ktkPosition.ComAxis_P2 = FormUtil.GetIntValue(txtComP2);
//ktkPosition.InOutAxis_P11 = FormUtil.GetIntValue(txtInoutP11);
//ktkPosition.UpDownAxis_P2 = FormUtil.GetIntValue(txtUpDownP2);
//ktkPosition.UpDownAxis_DoorOBPosition_P7 = FormUtil.GetIntValue(txtUpDownP7);
......@@ -427,6 +422,11 @@ namespace OnlineStore.ACPackingStore
BoxBean.Config.UpDownAxis_P1 = FormUtil.GetIntValue(txtUpDownP1);
needUpdate = true;
}
//if (BoxBean.Config.CompAxis_P3_Position != FormUtil.GetIntValue(txtComP3 ))
//{
// BoxBean.Config.CompAxis_P3_Position = FormUtil.GetIntValue(txtComP3);
// needUpdate = true;
//}
if (needUpdate)
{
//更新缓存
......@@ -864,9 +864,15 @@ namespace OnlineStore.ACPackingStore
int maxValue = FormUtil.GetIntValue(txtComMax);
ComP2Info p2Info = new ComP2Info(height, minValue, maxValue);
BoxBean.Config.UpdateComP2(height, p2Info);
BoxBean.Config.CompAxis_P4_Position = FormUtil.GetIntValue(txtComP4);
BoxBean.Config.CompAxis_Max_P3 = FormUtil.GetIntValue(txtComMaxP3);
BoxBean.Config.CompAxis_P3_P2_Value = FormUtil.GetIntValue(txtComP3_P2);
if (StoreManager.UpdateBoxConfig(BoxBean.Config))
{
LogUtil.info(BoxBean.Name + "更新ComP2 " + BoxBean.Config.CompAxis_P2_List);
LogUtil.info(BoxBean.Name + "更新ComP2【 " + BoxBean.Config.CompAxis_P2_List+ "】CompAxis_P4_Position【"+
BoxBean.Config. CompAxis_P4_Position + "】CompAxis_Max_P3【"+BoxBean.Config.CompAxis_Max_P3 + "】CompAxis_P3_P2_Value【"+ BoxBean.Config.CompAxis_P3_P2_Value + "】");
}
else
{
......@@ -917,5 +923,35 @@ namespace OnlineStore.ACPackingStore
ConfigAppSettings.SaveValue(Setting_Init.Store_CID + "_" + BoxBean.DeviceID, cid);
}
}
private void btnComP4_Click(object sender, EventArgs e)
{
int value = FormUtil.GetIntValue(txtComP4 );
AxisABSMove(BoxBean.Config.Comp_Axis, value, BoxBean.Config.CompAxis_P4_Speed);
}
private void btnMaxP3_Click(object sender, EventArgs e)
{
int value = FormUtil.GetIntValue(txtComMaxP3);
AxisABSMove(BoxBean.Config.Comp_Axis, value, BoxBean.Config.CompAxis_P3_Speed);
}
private void btnUpdownP11_Click(object sender, EventArgs e)
{
if (InOutIsIsP1())
{
int value = FormUtil.GetIntValue(txtUpdownP11);
AxisABSMove(BoxBean.Config.UpDown_Axis, value, BoxBean.Config.UpDownAxis_P2_Speed);
}
}
private void btnUpdownP12_Click(object sender, EventArgs e)
{
if (InOutIsIsP1())
{
int value = FormUtil.GetIntValue(txtUpdownP12);
AxisABSMove(BoxBean.Config.UpDown_Axis, value, BoxBean.Config.UpDownAxis_P1_Speed);
}
}
}
}
source/ACPackingStore/FrmStore.Designer.cs
......@@ -86,6 +86,7 @@
this.tabControl1.Size = new System.Drawing.Size(1342, 675);
this.tabControl1.TabIndex = 0;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
//
// tabPage1
//
......
source/ACPackingStore/FrmStore.cs
......@@ -463,5 +463,11 @@ namespace OnlineStore.ACPackingStore
LogUtil.info("去掉：检测到料架自动入库");
}
}
private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
{
FormManager.CloseAxisDebug();
FormManager.CloseIoStatus();
}
}
}
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs
......@@ -281,7 +281,7 @@ namespace OnlineStore.DeviceLibrary
private void StartSendTray(string str = "扫码失败")
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_71_ToNGDoor);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：" + str + "，升降轴移动到NG料门口上端P12，旋转轴移动到NG料门口P11");
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：" + str + "，升降轴到NG门口高点P12，旋转轴到NG门口P11");
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P12, Config.UpDownAxis_P1_Speed);
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P11, Config.MiddleAxis_P1_Speed);
......@@ -324,7 +324,7 @@ namespace OnlineStore.DeviceLibrary
InOutStoreLog("料架取料 " + MoveInfo.SLog + "：升降轴移动到P101低点，旋转轴移动到P101点，压紧轴到压紧前点");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_LP101, Config.UpDownAxis_P101_Speed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P101, Config.MiddleAxis_P101_Speed);
ACAxisMove(Config.Comp_Axis, Config.CompAxis_P3_Position, Config.CompAxis_P3_Speed);
ACAxisMove(Config.Comp_Axis, Config.CompAxis_Max_P3, Config.CompAxis_P3_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_12_MoveToShelf))
{
......@@ -537,13 +537,13 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_71_ToNGDoor))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_72_NGDoorUp);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：NG料口升降门上升");
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：NG升降门上升");
CylinderMove(MoveInfo, IO_Type.NGDoorCylinder_Down, IO_Type.NGDoowCylinder_Up);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_72_NGDoorUp))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_73_InoutToNGDoor);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：进出轴前进到NG料门口位置");
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：进出轴到NG料门口位置P11");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P11, Config.InOutAxis_P2_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_73_InoutToNGDoor))
......@@ -694,7 +694,8 @@ namespace OnlineStore.DeviceLibrary
return false;
}
LogInfo(" 收到服务器入库命令：库位号【" + posId + "】二维码【" + message + "】设置入库参数 ， 开始入库！");
MoveInfo.MoveParam.UpdatePosId(message, posId, plateW, plateH, ComTargetPosition);
int p3 = ComTargetPosition+ Config.CompAxis_P3_P2_Value;
MoveInfo.MoveParam.UpdatePosId(message, posId, plateW, plateH, ComTargetPosition,p3);
return true;
}
}
......
source/DeviceLibrary/ACPackingStore/StoreManager.cs
......@@ -218,7 +218,7 @@ namespace OnlineStore.DeviceLibrary
p.UpDown_P12 = box.Config.UpDownAxis_P12;
p.ComPress_P2 = box.Config.GetComP2(position.BagHigh).TargetComP2();
p.ComPress_P3 = position.ComAxis_P3;
p.ComPress_P3 =p.ComPress_P2+box.Config.CompAxis_P3_P2_Value ;
p.InOut_P3 = position.InoutAxis_P3;
p.Middle_P2 = position.MiddleAxis_P2;
p.UpDown_P3 = position.UpdownAxis_IH_P3;
......
source/DeviceLibrary/StoreConfig/BoxConfig_1.csv
......@@ -56,9 +56,9 @@ PRO,升降轴（轴2）P2扫码放料高点缓冲点,UpDownAxis_P2,600000,,,,,,,
PRO,旋转轴（轴1）P1待机点/扫码放料点,MiddleAxis_P1,310700,,,,,,,
PRO,进出轴（轴3）P1待机点,InOutAxis_P1_Position,1000,,,,,,,
PRO,压紧轴（轴4）P1待机点,CompAxis_P1_Position,97900,,,,,,,
PRO,压紧轴（轴4）P3压紧前点,CompAxis_P3_Position,97900,,,,,,,
PRO,压紧轴（轴4）P3最大压紧前点,CompAxis_Max_P3,97900,,,,,,,
PRO,压紧轴（轴4）P4目标压紧点,CompAxis_P4_Position,100000,,,,,,,
PRO,压紧轴（轴4）取料时的压紧前点对应压紧点的距离,CompAxis_P2-P3_Value,2000,,,,,,,
PRO,压紧轴（轴4）取料时的压紧前点相对压紧点的位置,CompAxis_P3_P2_Value,-50000,,,,,,,
PRO,压紧轴（轴4）压紧确认信号收到之后下降的位置,CompAxis_Down_Position,2000,,,,,,,
PRO,压紧轴（轴4）P2压紧点范围对应值（8=1000;2000#）,CompAxis_P2_List,8=1000;2000#12=2001;3000#16=3001;4000#20=4001;5000#22=5001;6000#24=6001;7000# ,,,,,,,
,,,,,,,,,,
......
source/DeviceLibrary/StoreConfig/BoxConfig_2.csv
......@@ -55,8 +55,9 @@ PRO,升降轴（轴2）P2扫码放料高点缓冲点,UpDownAxis_P2,602500,,,,,,,
PRO,旋转轴（轴1）P1待机点/扫码放料点,MiddleAxis_P1,308300,,,,,,,
PRO,进出轴（轴3）P1待机点,InOutAxis_P1_Position,1000,,,,,,,
PRO,压紧轴（轴4）P1待机点,CompAxis_P1_Position,30000,,,,,,,
PRO,压紧轴（轴4）P3压紧前点,CompAxis_P3_Position,93900,,,,,,,
PRO,压紧轴（轴4）P4目标压紧点,CompAxis_P4_Position,110000,,,,,,,
PRO,压紧轴（轴4）P3最大压紧前点,CompAxis_Max_P3,97900,,,,,,,
PRO,压紧轴（轴4）P4目标压紧点,CompAxis_P4_Position,100000,,,,,,,
PRO,压紧轴（轴4）取料时的压紧前点相对压紧点的位置,CompAxis_P3_P2_Value,-50000,,,,,,,
PRO,压紧轴（轴4）压紧确认信号收到之后下降的位置,CompAxis_Down_Position,2000,,,,,,,
PRO,压紧轴（轴4）P2压紧点范围对应值（8=1000;2000#）,CompAxis_P2_List,8=1000;2000#12=2001;3000#16=3001;4000#20=4001;5000#22=5001;6000#24=6001;7000# ,,,,,,,
,,,,,,,,,,
......
source/DeviceLibrary/store/InOutParam.cs
......@@ -133,7 +133,7 @@ namespace OnlineStore.DeviceLibrary
}
internal void UpdatePosId(string message, string posId, string plateW, string plateH,int comPosition)
internal void UpdatePosId(string message, string posId, string plateW, string plateH,int comP2,int comP3)
{
this.WareCode = message;
this.PosID = posId;
......@@ -148,8 +148,8 @@ namespace OnlineStore.DeviceLibrary
// MoveP.InOut_P11= position.InOutAxis_P11;
MoveP.ComPress_P2 = comPosition;
MoveP.ComPress_P3 = position.ComAxis_P3;
MoveP.ComPress_P2 = comP2;
MoveP.ComPress_P3 = comP3;
MoveP.InOut_P3 = position.InoutAxis_P3;
MoveP.Middle_P2 = position.MiddleAxis_P2;
MoveP.UpDown_P3 = position.UpdownAxis_IH_P3;
......
source/LoadCVSLibrary/CSVReaderBase.cs
......@@ -83,12 +83,6 @@ namespace OnlineStore.LoadCSVLibrary
{
try
{
if (File.Exists(filePath))
{
File.Delete(filePath);
}
File.WriteAllLines(filePath, lines, Encoding.GetEncoding("gbk"));
//备份保存
try
{
......@@ -105,12 +99,18 @@ namespace OnlineStore.LoadCSVLibrary
{
File.Delete(backFile);
}
File.WriteAllLines(backFile, lines, Encoding.GetEncoding("gbk"));
File.Copy(filePath, backFile, true);
// File.WriteAllLines(backFile, lines, Encoding.GetEncoding("gbk"));
}
catch (Exception e)
{
LOGGER.Error("出错：", e);
}
if (File.Exists(filePath))
{
File.Delete(filePath);
}
File.WriteAllLines(filePath, lines, Encoding.GetEncoding("gbk"));
}
catch (Exception ex)
{
......
source/LoadCVSLibrary/position/ACBoxPosition.cs
......@@ -46,16 +46,16 @@ namespace OnlineStore.LoadCSVLibrary
[CSVAttribute("进出轴库位点取料点P3")]
public int InoutAxis_P3 { get; set; }
/// <summary>
/// 压紧轴（压紧点）P2
/// </summary>
[CSVAttribute("压紧轴压紧点P2")]
public int ComAxis_P2 { get; set; }
/// <summary>
/// 压紧轴（压紧前点）P3
/// </summary>
[CSVAttribute("压紧轴压紧前点P3")]
public int ComAxis_P3 { get; set; }
///// <summary>
///// 压紧轴（压紧点）P2
///// </summary>
//[CSVAttribute("压紧轴压紧点P2")]
//public int ComAxis_P2 { get; set; }
///// <summary>
///// 压紧轴（压紧前点）P3
///// </summary>
//[CSVAttribute("压紧轴压紧前点P3")]
//public int ComAxis_P3 { get; set; }
///// <summary>
///// 轴3(进出轴） 扫码放料点P2
......
source/LoadCVSLibrary/storeConfig/config/AC_Box_Config.cs
......@@ -166,7 +166,6 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("UpDownAxis_P7_Speed")]
public int UpDownAxis_P7_Speed { get; set; }
/// <summary>
/// PRO 升降轴（轴2）P8速度 UpDownAxis_P8_Speed
/// </summary>
......@@ -202,6 +201,7 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("InOutAxis_P3_Speed")]
public int InOutAxis_P3_Speed { get; set; }
/// <summary>
/// PRO （轴一）旋转轴停止时可误差的脉冲数的最小值 MiddleAxis_ErrorCountMin 200
/// </summary>
......@@ -403,12 +403,6 @@ namespace OnlineStore.LoadCSVLibrary
public int MiddleAxis_P101_Speed { get; set; }
/// <summary>
/// PRO,压紧轴（轴4）P3压紧前点,CompAxis_P3_Position,10000,,,,,,,
/// </summary>
[ConfigProAttribute("CompAxis_P3_Position")]
public int CompAxis_P3_Position { get; set; }
/// <summary>
/// PRO （轴一）旋转轴最小限位 MiddleAxis_PositionMin
......@@ -522,11 +516,23 @@ namespace OnlineStore.LoadCSVLibrary
private List<string> CameraList = null;
/// <summary>
/// PRO,压紧轴（轴4）取料时的压紧前点相对压紧点的位置,CompAxis_P3_P2_Value,-50000,,,,,,,
/// /// </summary>
[ConfigProAttribute("CompAxis_P3_P2_Value")]
public int CompAxis_P3_P2_Value { get; set; }
/// <summary>
/// PRO 压紧轴（轴4）P2压紧点范围对应值 CompAxis_P2_List 8 = 1000; 2000#12=2001;3000#16=3001;4000#20=4001;5000#22=5001;6000#24=6001;7000#
/// </summary>
[ConfigProAttribute("CompAxis_P2_List")]
public string CompAxis_P2_List { get; set; }
/// <summary>
/// PRO,压紧轴（轴4）P3最大压紧前点,CompAxis_Max_P3,10000,,,,,,,
/// </summary>
[ConfigProAttribute("CompAxis_Max_P3")]
public int CompAxis_Max_P3 { get; set; }
private List< ComP2Info> ComP2List = null;
public ComP2Info GetComP2(int plateh)
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!