Skip to content

孙克 / RC1250-AssemblyLine

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

升降轴增加P3详细配置。扫码dll更新。

1 个父辈 6d749e6d
全部展开
内嵌 并排
正在显示 20 个修改的文件 包含 170 行增加 和 17 行删除
dll/CodeLibrary.dll
此文件类型无法预览
dll/zxing.dll
此文件类型无法预览
source/AssemblyLineClient/FrmDischargeLine.Designer.cs
......@@ -450,7 +450,7 @@
this.groupBox5.Controls.Add(this.btnStop1Up);
this.groupBox5.Location = new System.Drawing.Point(876, 6);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(424, 147);
this.groupBox5.Size = new System.Drawing.Size(417, 147);
this.groupBox5.TabIndex = 255;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试";
......
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
......@@ -918,9 +918,9 @@
this.groupDetial.Controls.Add(this.label2);
this.groupDetial.Controls.Add(this.cmbDSize);
this.groupDetial.Controls.Add(this.label1);
this.groupDetial.Location = new System.Drawing.Point(754, 9);
this.groupDetial.Location = new System.Drawing.Point(716, 9);
this.groupDetial.Name = "groupDetial";
this.groupDetial.Size = new System.Drawing.Size(381, 303);
this.groupDetial.Size = new System.Drawing.Size(381, 296);
this.groupDetial.TabIndex = 319;
this.groupDetial.TabStop = false;
this.groupDetial.Text = "移栽位置P2详细配置";
......@@ -1029,7 +1029,7 @@
this.groupBox9.Controls.Add(this.btnBP1);
this.groupBox9.Controls.Add(this.btnBP2);
this.groupBox9.Controls.Add(this.txtBP2);
this.groupBox9.Location = new System.Drawing.Point(548, 323);
this.groupBox9.Location = new System.Drawing.Point(548, 316);
this.groupBox9.Name = "groupBox9";
this.groupBox9.Size = new System.Drawing.Size(520, 143);
this.groupBox9.TabIndex = 220;
......@@ -1071,7 +1071,7 @@
this.btnBSave.BackColor = System.Drawing.SystemColors.Control;
this.btnBSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBSave.ForeColor = System.Drawing.Color.Red;
this.btnBSave.Location = new System.Drawing.Point(256, 67);
this.btnBSave.Location = new System.Drawing.Point(259, 67);
this.btnBSave.Name = "btnBSave";
this.btnBSave.Size = new System.Drawing.Size(163, 34);
this.btnBSave.TabIndex = 310;
......@@ -1116,7 +1116,7 @@
this.btnBP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBP2.ForeColor = System.Drawing.Color.Red;
this.btnBP2.Location = new System.Drawing.Point(14, 66);
this.btnBP2.Location = new System.Drawing.Point(14, 67);
this.btnBP2.Name = "btnBP2";
this.btnBP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBP2.Size = new System.Drawing.Size(163, 34);
......@@ -1131,7 +1131,7 @@
this.txtBP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBP2.Location = new System.Drawing.Point(180, 70);
this.txtBP2.Location = new System.Drawing.Point(180, 71);
this.txtBP2.MaxLength = 12;
this.txtBP2.Name = "txtBP2";
this.txtBP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1143,7 +1143,7 @@
//
this.axisMoveControl1.Location = new System.Drawing.Point(14, 4);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(734, 315);
this.axisMoveControl1.Size = new System.Drawing.Size(697, 309);
this.axisMoveControl1.TabIndex = 219;
//
// groupBox2
......@@ -1157,7 +1157,7 @@
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.btnMoveto);
this.groupBox2.Controls.Add(this.txtSizePosition);
this.groupBox2.Location = new System.Drawing.Point(22, 323);
this.groupBox2.Location = new System.Drawing.Point(22, 316);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(520, 143);
this.groupBox2.TabIndex = 218;
......
source/AssemblyLineClient/FrmMoveEquip.cs
......@@ -58,6 +58,7 @@ namespace OnlineStore.AssemblyLine
txtP1.Text = equipBean.Config.UpDownAxisP1.ToString();
lblName.Text = equipBean.Name;
LoadDP2();
LoadDP3();
chbUseTrayCheck.Checked = LineManager.useTrayCheck.Contains(equipBean.DeviceID);
IsLoad = true;
}
......@@ -519,7 +520,27 @@ namespace OnlineStore.AssemblyLine
}
txtDP2.Text = txtP2.Text;
}
private void LoadDP3()
{
cmbP3Height.Items.Clear();
foreach (int heigth in LineManager.GetTrayList())
{
cmbP3Height.Items.Add(heigth);
}
cmbP3Width.Items.Clear();
cmbP3Width.Items.AddRange(new object[] { 7, 11, 13, 15 });
cmbP3Width.SelectedIndex = 0;
cmbP3Height.SelectedIndex = 0;
listP3.Items.Clear();
Dictionary<string, int> DP3Map = equipBean.Config.LoadP3DetialMap();
foreach (string key in DP3Map.Keys)
{
listP3.Items.Add(key + "=" + DP3Map[key]);
}
txtlP3.Text = txtP3.Text;
}
private void btnDSave_Click(object sender, EventArgs e)
{
......@@ -618,6 +639,46 @@ namespace OnlineStore.AssemblyLine
}
}
}
private void cmbP3Width_SelectedIndexChanged(object sender, EventArgs e)
{
if (!IsLoad)
{
return;
}
if (cmbP3Width.SelectedIndex < 0 || cmbP3Height.SelectedIndex < 0)
{
return;
}
int size = Convert.ToInt32(cmbP3Width.Text);
int height = Convert.ToInt32(cmbP3Height.Text);
int position = equipBean.Config.GetUpdownP3Detial(height, size);
txtlP3.Text = position.ToString();
}
private void btnP3Save_Click(object sender, EventArgs e)
{
int size = Convert.ToInt32(cmbP3Width.Text);
int height = Convert.ToInt32(cmbP3Height.Text);
int position = FormUtil.GetIntValue(txtlP3);
DialogResult result = MessageBox.Show("保存后只能修改不能删除，是否确定保存？", "确定保存", MessageBoxButtons.OKCancel);
if (result.Equals(DialogResult.OK))
{
equipBean.Config.UpdateUpdownP3Detial(size, height, position);
LineManager.SaveMoveEquipConfig(equipBean.Config);
LogUtil.info(equipBean.Name + "用户操作：尺寸：" + size + "，高度：" + height + "，P3值：" + position + "，保存成功");
MessageBox.Show("保存成功！");
listP3.Items.Clear();
Dictionary<string, int> DP3Map = equipBean.Config.LoadP3DetialMap();
foreach (string key in DP3Map.Keys)
{
listP3.Items.Add(key + "=" + DP3Map[key]);
}
}
}
}
}
......
source/AssemblyLineClient/FrmProvidingEquip.Designer.cs
......@@ -592,7 +592,7 @@
this.groupDetial.Controls.Add(this.label2);
this.groupDetial.Controls.Add(this.cmbDSize);
this.groupDetial.Controls.Add(this.label1);
this.groupDetial.Location = new System.Drawing.Point(753, 179);
this.groupDetial.Location = new System.Drawing.Point(710, 179);
this.groupDetial.Name = "groupDetial";
this.groupDetial.Size = new System.Drawing.Size(537, 205);
this.groupDetial.TabIndex = 318;
......@@ -705,7 +705,7 @@
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.btnP2);
this.groupBox2.Controls.Add(this.txtP2);
this.groupBox2.Location = new System.Drawing.Point(753, 5);
this.groupBox2.Location = new System.Drawing.Point(710, 5);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(538, 168);
this.groupBox2.TabIndex = 219;
......@@ -843,7 +843,7 @@
this.axisMoveControl1.Location = new System.Drawing.Point(6, 5);
this.axisMoveControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(744, 349);
this.axisMoveControl1.Size = new System.Drawing.Size(698, 349);
this.axisMoveControl1.TabIndex = 0;
//
// panel1
......
source/AssemblyLineClient/记录.txt
20200226
20200305
进仓升降轴增加P3详细位置配置。需要修改配置文件。
扫码dll替换。
20200226
环形线更新文件 20210226-AssemblyLine-更新，能重启时帮忙更新下。
修改内容：
1.有料托盘需要入库时，若检测信号不亮，直接禁用托盘。
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_03.csv
......@@ -17,6 +17,7 @@ PRO,0,移栽上下轴走到待机点P1速度,UpdownAxis_P1Speed,400,,,,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,600,,,,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,600,,,,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=8000;,,,,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
,,,,,,,,,
DI,3,进仓03阻挡1托盘检测,StopCylinder_Check1,0,PRO_AOI_IP_21,0,进仓03阻挡1托盘检测,X291,X291
DI,3,进仓03阻挡2托盘检测,StopCylinder_Check2,1,PRO_AOI_IP_21,0,进仓03阻挡2托盘检测,X292,X292
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_04.csv
......@@ -17,3 +17,4 @@ PRO,0,移栽上下轴走到待机点P1速度,UpdownAxis_P1Speed,400,,,,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,600,,,,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,600,,,,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=8000;,,,,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_05.csv
......@@ -17,6 +17,7 @@ PRO,0,移栽上下轴走到待机点P1速度,UpdownAxis_P1Speed,400,,,,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,600,,,,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,600,,,,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=8000;,,,,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
,,,,,,,,,
DI,5,进仓05阻挡1托盘检测,StopCylinder_Check1,0,PRO_AOI_IP_23,0,进仓05阻挡1托盘检测,X321,X321
DI,5,进仓05阻挡2托盘检测,StopCylinder_Check2,1,PRO_AOI_IP_23,0,进仓05阻挡2托盘检测,X322,X322
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_06.csv
......@@ -17,3 +17,4 @@ PRO,0,移栽上下轴走到待机点P1速度,UpdownAxis_P1Speed,400,,,,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,600,,,,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,600,,,,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=8000;,,,,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_09.csv
......@@ -17,6 +17,7 @@ PRO,0,移栽上下轴走到待机点P1速度,UpdownAxis_P1Speed,400,,,,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,600,,,,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,600,,,,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=8000;,,,,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
,,,,,,,,,
DI,9,进仓09阻挡1托盘检测,StopCylinder_Check1,0,PRO_AOI_IP_27,0,进仓09阻挡1托盘检测,X381,X381
DI,9,进仓09阻挡2托盘检测,StopCylinder_Check2,1,PRO_AOI_IP_27,0,进仓09阻挡2托盘检测,X382,X382
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_10.csv
......@@ -17,3 +17,4 @@ PRO,0,移栽上下轴走到待机点P1速度,UpdownAxis_P1Speed,400,,,,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,600,,,,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,600,,,,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,13X56=61000,,,,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
source/DeviceLibrary/assemblyLine/MoveEquip.cs
......@@ -344,12 +344,12 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(MoveInfo, IO_Type.UpDownCylinder_Up, IO_Type.UpDownCylinder_Down);
}
}
private void UpdownDownP3Move(int trayHeight)
private void UpdownDownP3Move(int trayHeight, int traySize)
{
if (UseAxis)
{
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
int position = Config.GetUpdownP3(trayHeight);
int position = Config.GetUpdownP3Detial(trayHeight, traySize);
UpdownAxis.AbsMove(MoveInfo, position, Config.UpdownAxis_P3Speed);
}
else
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
......@@ -84,7 +84,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(LineMoveStep.MO_52_CylinderDown);
OutLog("出库 " + MoveInfo.SLog + ": 上下气缸下降 ");
UpdownDownP3Move(MoveInfo.MoveParam.PlateH);
UpdownDownP3Move(MoveInfo.MoveParam.PlateH,MoveInfo.MoveParam.PlateW);
// CylinderMove(MoveInfo, IO_Type.UpDownCylinder_Up, IO_Type.UpDownCylinder_Down);
}
else
......@@ -398,7 +398,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(LineMoveStep.MI_11_CylinderDown);
InLog("入库 " + MoveInfo.SLog + " ，上下气缸下降");
UpdownDownP3Move(MoveInfo.MoveParam.PlateH);
UpdownDownP3Move(MoveInfo.MoveParam.PlateH, MoveInfo.MoveParam.PlateW);
if (IsBigStore())
{
InLog("放托盘（放开阻挡）： " + MoveInfo.SLog + " 物品已移走，顶升气缸1下降");
......
source/LoadCVSLibrary/storeConfig/config/MoveEquip_Config.cs
......@@ -118,6 +118,13 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("UpDownP2DetialList", false)]
public string UpDownP2DetialList { get; set; }
/// <summary>
/// PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
/// </summary>
[ConfigProAttribute("UpDownP3DetialList", false)]
public string UpDownP3DetialList { get; set; }
#region P2
private Dictionary<string, int> UpdownP2DetialMap = null;
public Dictionary<string, int> LoadP2DetialMap()
......@@ -188,7 +195,81 @@ namespace OnlineStore.LoadCSVLibrary
UpDownP2DetialList = newPositionStr;
}
#endregion
#region P3
private Dictionary<string, int> UpdownP3DetialMap = null;
public Dictionary<string, int> LoadP3DetialMap()
{
try
{
if (UpdownP3DetialMap == null)
{
UpdownP3DetialMap = new Dictionary<string, int>();
string[] arrayList = UpDownP3DetialList.Split(';');
foreach (string str in arrayList)
{
string[] arrStr = str.Split('=');
if (arrStr.Length == 2)
{
string key = arrStr[0].Trim().ToUpper();
if (key.Equals("0X0"))
{
continue;
}
int length = Convert.ToInt32(arrStr[1].Trim());
UpdownP3DetialMap.Add(key, length);
}
}
}
}
catch (Exception ex)
{
}
return UpdownP3DetialMap;
}
public int GetUpdownP3Detial(int trayHeight, int traySize = 8)
{
LoadP3DetialMap();
string fkey = traySize + "X" + trayHeight;
if (UpdownP3DetialMap.ContainsKey(fkey))
{
return UpdownP3DetialMap[fkey];
}
else
{
return GetUpdownP3(trayHeight);
}
return -1;
}
public void UpdateUpdownP3Detial(int size, int height, int sizePosition)
{
string fkey = size + "X" + height;
string newPositionStr = "";
if (UpdownP3DetialMap.ContainsKey(fkey))
{
UpdownP3DetialMap[fkey] = sizePosition;
}
else
{
UpdownP3DetialMap.Add(fkey, sizePosition);
}
foreach (string key in UpdownP3DetialMap.Keys)
{
newPositionStr += key + "=" + UpdownP3DetialMap[key] + ";";
}
newPositionStr = newPositionStr.Substring(0, newPositionStr.Length - 1);
UpDownP3DetialList = newPositionStr;
}
#endregion
///// <summary>s
///// PRO,0,移栽上下轴下降速度,UpdownAxis_DownSpeed,500,,,,,
///// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!