Skip to content

刘韬 / SO775-DUOStore

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

1

1 个父辈 181d32e7
全部展开
内嵌 并排
正在显示 6 个修改的文件 包含 105 行增加 和 63 行删除
source/Common/util/HttpHelper.cs
...@@ -47,10 +47,14 @@ namespace OnlineStore.Common ...@@ -47,10 +47,14 @@ namespace OnlineStore.Common
bool IsTimeOut = false; bool IsTimeOut = false;
return Post(url, paramData, Encoding.UTF8, timeOut, out IsTimeOut); return Post(url, paramData, Encoding.UTF8, timeOut, out IsTimeOut);
} }
public static Operation PostOperation(string url, Operation operation, bool simulate=false ) public static Operation PostOperation(string url, Operation operation, bool simulate = false)
{ {
try try
{ {
if (operation == null)
{
return null;
}
if (simulate) if (simulate)
{//模拟服务器返回 {//模拟服务器返回
operation.status = 200; operation.status = 200;
...@@ -65,24 +69,33 @@ namespace OnlineStore.Common ...@@ -65,24 +69,33 @@ namespace OnlineStore.Common
LogUtil.error("模拟HTTP服务器返回出库入库信息：" + json); LogUtil.error("模拟HTTP服务器返回出库入库信息：" + json);
return operation; return operation;
} }
} return null;
else }
try
{ {
string json = ""; if (url.ToLower().IndexOf("https", System.StringComparison.Ordinal) > -1)
try
{
json = JsonHelper.SerializeObject(operation);
}
catch (Exception ex)
{ {
LogUtil.error("JsonHelper.SerializeObject(operation) 出错【operation.op=" + operation.op + "】" + ex); ServicePointManager.ServerCertificateValidationCallback =
new RemoteCertificateValidationCallback((sender, certificate, chain, errors) => { return true; });
} }
string result = Post(url, json); string json = JsonHelper.SerializeObject(operation);
var wc = new MyWebClient(5000);
if (string.IsNullOrEmpty(wc.Headers["Content-Type"]))
wc.Headers.Add("Content-Type", "application/json;charset=UTF-8");
wc.Encoding = Encoding.UTF8;
string result = wc.UploadString(url, "POST", json);
if (!string.IsNullOrEmpty(result)) if (!string.IsNullOrEmpty(result))
{ {
try try
{ {
return JsonHelper.DeserializeJsonToObject<Operation>(result); Operation reOP= JsonHelper.DeserializeJsonToObject<Operation>(result);
if (isLog == 1||reOP.op>0)
{
LogUtil.info("【"+url+"】发送【" + json + "】收到【" + result + "】");
}
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -90,7 +103,16 @@ namespace OnlineStore.Common ...@@ -90,7 +103,16 @@ namespace OnlineStore.Common
} }
} }
} }
catch (WebException ex)
{
LogUtil.error("POST [" + url + "] WebException :" + ex.ToString(), 101);
}
catch (Exception e)
{
LogUtil.error("POST [" + url + "] ERROR:" + e.ToString(), 101);
}
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("Post 出错【operation.op=" + operation.op + "】：" + ex); LogUtil.error("Post 出错【operation.op=" + operation.op + "】：" + ex);
...@@ -99,24 +121,33 @@ namespace OnlineStore.Common ...@@ -99,24 +121,33 @@ namespace OnlineStore.Common
} }
public static string Post(string url, string paramData, Encoding encoding, int timeOut, out bool IsTimeOut) public static string Post(string url, string paramData, Encoding encoding, int timeOut, out bool IsTimeOut)
{ {
IsTimeOut = false;
if (isLog == 1)
{
LogUtil.info("给服务器发送数据【" + paramData + "】 ");
}
string result = "";
if (url.ToLower().IndexOf("https", System.StringComparison.Ordinal) > -1) if (paramData.Equals(""))
{ {
ServicePointManager.ServerCertificateValidationCallback = int index = url.IndexOf("?");
new RemoteCertificateValidationCallback((sender, certificate, chain, errors) => { return true; }); if (index > 0)
{
paramData = url.Substring(index + 1, url.Length - index - 1);
url = url.Substring(0, index);
}
} }
IsTimeOut = false;
if (isLog == 1)
{
LogUtil.info("给服务器发送数据【" + url + "】【" + paramData + "】 ");
}
string result = "";
try try
{ {
if (url.ToLower().IndexOf("https", System.StringComparison.Ordinal) > -1)
{
ServicePointManager.ServerCertificateValidationCallback =
new RemoteCertificateValidationCallback((sender, certificate, chain, errors) => { return true; });
}
var wc = new MyWebClient(timeOut); var wc = new MyWebClient(timeOut);
if (string.IsNullOrEmpty(wc.Headers["Content-Type"])) if (string.IsNullOrEmpty(wc.Headers["Content-Type"]))
wc.Headers.Add("Content-Type", "application/json;charset=UTF-8"); wc.Headers.Add("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
wc.Encoding = encoding; wc.Encoding = encoding;
result = wc.UploadString(url, "POST", paramData); result = wc.UploadString(url, "POST", paramData);
...@@ -131,10 +162,7 @@ namespace OnlineStore.Common ...@@ -131,10 +162,7 @@ namespace OnlineStore.Common
{ {
LogUtil.error("POST [" + url + "] ERROR:" + e.ToString(), 101); LogUtil.error("POST [" + url + "] ERROR:" + e.ToString(), 101);
} }
if (!result.Contains("null") && result.Length != 0)
{
//LogUtil.debug( "receive << " + result);
}
if (isLog == 1) if (isLog == 1)
{ {
LogUtil.info("收到服务器数据【" + result + "】"); LogUtil.info("收到服务器数据【" + result + "】");
......
source/DUOStore/FrmBox.cs
...@@ -39,6 +39,7 @@ namespace OnlineStore.DUOStore ...@@ -39,6 +39,7 @@ namespace OnlineStore.DUOStore
{ {
LoadStore(); LoadStore();
LoadIOList(); LoadIOList();
LoadOk = true;
} }
public void LoadStore() public void LoadStore()
{ {
...@@ -79,7 +80,6 @@ namespace OnlineStore.DUOStore ...@@ -79,7 +80,6 @@ namespace OnlineStore.DUOStore
// txtTempPort.Text = BoxBean.Config.Humiture_Port; // txtTempPort.Text = BoxBean.Config.Humiture_Port;
timer1.Start(); timer1.Start();
LoadOk = true;
} }
#endregion #endregion
...@@ -420,7 +420,7 @@ namespace OnlineStore.DUOStore ...@@ -420,7 +420,7 @@ namespace OnlineStore.DUOStore
return false; return false;
} }
private void AxisABSMove(ConfigMoveAxis moveAxis, TextBox txtValue, int targetSpeed) private void AxisAbsMove(ConfigMoveAxis moveAxis, TextBox txtValue, int targetSpeed)
{ {
if (moveAxis.IsSameAxis(BoxBean.Config.UpDown_Axis) || moveAxis.IsSameAxis(BoxBean.Config.UpDown_Axis)) if (moveAxis.IsSameAxis(BoxBean.Config.UpDown_Axis) || moveAxis.IsSameAxis(BoxBean.Config.UpDown_Axis))
{ {
...@@ -435,87 +435,87 @@ namespace OnlineStore.DUOStore ...@@ -435,87 +435,87 @@ namespace OnlineStore.DUOStore
} }
private void btnUpDownP1_Click(object sender, EventArgs e) private void btnUpDownP1_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.UpDown_Axis, txtUpDownP1, BoxBean.Config.UpDownAxis_P1_Speed); AxisAbsMove(BoxBean.Config.UpDown_Axis, txtUpDownP1, BoxBean.Config.UpDownAxis_P1_Speed);
} }
private void btnUpDownP2_Click(object sender, EventArgs e) private void btnUpDownP2_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.UpDown_Axis, txtUpDownP2, BoxBean.Config.UpDownAxis_P2_Speed); AxisAbsMove(BoxBean.Config.UpDown_Axis, txtUpDownP2, BoxBean.Config.UpDownAxis_P2_Speed);
} }
private void btnUpDownP3_Click(object sender, EventArgs e) private void btnUpDownP3_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.UpDown_Axis, txtUpDownP3, BoxBean.Config.UpDownAxis_P3_Speed); AxisAbsMove(BoxBean.Config.UpDown_Axis, txtUpDownP3, BoxBean.Config.UpDownAxis_P3_Speed);
} }
private void btnUpDownP4_Click(object sender, EventArgs e) private void btnUpDownP4_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.UpDown_Axis, txtUpDownP4, BoxBean.Config.UpDownAxis_P4_Speed); AxisAbsMove(BoxBean.Config.UpDown_Axis, txtUpDownP4, BoxBean.Config.UpDownAxis_P4_Speed);
} }
private void btnUpDownP5_Click(object sender, EventArgs e) private void btnUpDownP5_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.UpDown_Axis, txtUpDownP5, BoxBean.Config.UpDownAxis_P5_Speed); AxisAbsMove(BoxBean.Config.UpDown_Axis, txtUpDownP5, BoxBean.Config.UpDownAxis_P5_Speed);
} }
private void btnUpDownP6_Click(object sender, EventArgs e) private void btnUpDownP6_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.UpDown_Axis, txtUpDownP6, BoxBean.Config.UpDownAxis_P6_Speed); AxisAbsMove(BoxBean.Config.UpDown_Axis, txtUpDownP6, BoxBean.Config.UpDownAxis_P6_Speed);
} }
private void btnUpdownP11_Click(object sender, EventArgs e) private void btnUpdownP11_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.UpDown_Axis, txtUpdownP11, BoxBean.Config.UpDownAxis_P11_Speed); AxisAbsMove(BoxBean.Config.UpDown_Axis, txtUpdownP11, BoxBean.Config.UpDownAxis_P11_Speed);
} }
private void btnInoutP11_Click(object sender, EventArgs e) private void btnInoutP11_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.UpDown_Axis, txtInoutP11, BoxBean.Config.InOutAxis_P11_Speed); AxisAbsMove(BoxBean.Config.UpDown_Axis, txtInoutP11, BoxBean.Config.InOutAxis_P11_Speed);
} }
private void btnMiddleP11_Click(object sender, EventArgs e) private void btnMiddleP11_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.UpDown_Axis, txtMiddleP11, BoxBean.Config.MiddleAxis_P11_Speed); AxisAbsMove(BoxBean.Config.UpDown_Axis, txtMiddleP11, BoxBean.Config.MiddleAxis_P11_Speed);
} }
private void btnMiddleP1_Click(object sender, EventArgs e) private void btnMiddleP1_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.Middle_Axis, txtMiddleP1, BoxBean.Config.MiddleAxis_P1_Speed); AxisAbsMove(BoxBean.Config.Middle_Axis, txtMiddleP1, BoxBean.Config.MiddleAxis_P1_Speed);
} }
private void btnMiddleP2_Click(object sender, EventArgs e) private void btnMiddleP2_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.Middle_Axis, txtMiddleP2, BoxBean.Config.MiddleAxis_P2_Speed); AxisAbsMove(BoxBean.Config.Middle_Axis, txtMiddleP2, BoxBean.Config.MiddleAxis_P2_Speed);
} }
private void btnInOutP1_Click(object sender, EventArgs e) private void btnInOutP1_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.InOut_Axis, txtInOutP1, BoxBean.Config.InOutAxis_P1_Speed); AxisAbsMove(BoxBean.Config.InOut_Axis, txtInOutP1, BoxBean.Config.InOutAxis_P1_Speed);
} }
private void btnInOutP3_Click(object sender, EventArgs e) private void btnInOutP3_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.InOut_Axis, txtInOutP3, BoxBean.Config.InOutAxis_P3_Speed); AxisAbsMove(BoxBean.Config.InOut_Axis, txtInOutP3, BoxBean.Config.InOutAxis_P3_Speed);
} }
private void btnInOutP2_Click(object sender, EventArgs e) private void btnInOutP2_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.InOut_Axis, txtInOutP2, BoxBean.Config.InOutAxis_P2_Speed); AxisAbsMove(BoxBean.Config.InOut_Axis, txtInOutP2, BoxBean.Config.InOutAxis_P2_Speed);
} }
private void btnComP2_Click(object sender, EventArgs e) private void btnComP2_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.Comp_Axis, txtComP2, BoxBean.Config.CompAxis_P2_Speed); AxisAbsMove(BoxBean.Config.Comp_Axis, txtComP2, BoxBean.Config.CompAxis_P2_Speed);
} }
private void btnComP1_Click(object sender, EventArgs e) private void btnComP1_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.Comp_Axis, txtComP1, BoxBean.Config.CompAxis_P1_Speed); AxisAbsMove(BoxBean.Config.Comp_Axis, txtComP1, BoxBean.Config.CompAxis_P1_Speed);
} }
private void btnComP3_Click(object sender, EventArgs e) private void btnComP3_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.Comp_Axis, txtComP3, BoxBean.Config.CompAxis_P3_Speed); AxisAbsMove(BoxBean.Config.Comp_Axis, txtComP3, BoxBean.Config.CompAxis_P3_Speed);
} }
int xWidth = SystemInformation.PrimaryMonitorSize.Width;//获取显示器屏幕宽度 int xWidth = SystemInformation.PrimaryMonitorSize.Width;//获取显示器屏幕宽度
int yHeight = SystemInformation.PrimaryMonitorSize.Height;//高度 int yHeight = SystemInformation.PrimaryMonitorSize.Height;//高度
...@@ -727,7 +727,7 @@ namespace OnlineStore.DUOStore ...@@ -727,7 +727,7 @@ namespace OnlineStore.DUOStore
private void btnUpdownP12_Click(object sender, EventArgs e) private void btnUpdownP12_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.UpDown_Axis, txtUpdownP12, BoxBean.Config.UpDownAxis_P12_Speed); AxisAbsMove(BoxBean.Config.UpDown_Axis, txtUpdownP12, BoxBean.Config.UpDownAxis_P12_Speed);
} }
#region IO处理 #region IO处理
...@@ -742,7 +742,7 @@ namespace OnlineStore.DUOStore ...@@ -742,7 +742,7 @@ namespace OnlineStore.DUOStore
this.tableLayoutPanel1.RowCount = BoxBean.Config.DIList.Count; this.tableLayoutPanel1.RowCount = BoxBean.Config.DIList.Count;
foreach (ConfigIO ioValue in BoxBean.Config.DIList.Values) foreach (ConfigIO ioValue in BoxBean.Config.DIList.Values)
{ {
this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 26)); this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName); IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
this.tableLayoutPanel1.Controls.Add(control, 0, roleindex); this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
roleindex++; roleindex++;
......
source/DUOStore/FrmIOStatus.cs
...@@ -48,6 +48,7 @@ namespace OnlineStore.DUOStore ...@@ -48,6 +48,7 @@ namespace OnlineStore.DUOStore
{ {
this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 26)); this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 26));
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName); IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
this.tableLayoutPanel1.Controls.Add(control, 0, roleindex); this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
roleindex++; roleindex++;
DIControlList.Add(ioValue.ProName, control); DIControlList.Add(ioValue.ProName, control);
...@@ -63,6 +64,7 @@ namespace OnlineStore.DUOStore ...@@ -63,6 +64,7 @@ namespace OnlineStore.DUOStore
{ {
this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28)); this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName); IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
control.Click += Control_Click;
this.tableLayoutPanel2.Controls.Add(control, 0, roleindex); this.tableLayoutPanel2.Controls.Add(control, 0, roleindex);
roleindex++; roleindex++;
DOControlList.Add(ioValue.ProName, control); DOControlList.Add(ioValue.ProName, control);
...@@ -75,6 +77,18 @@ namespace OnlineStore.DUOStore ...@@ -75,6 +77,18 @@ namespace OnlineStore.DUOStore
cmbWriteIO.DisplayMember = "DisplayStr"; cmbWriteIO.DisplayMember = "DisplayStr";
} }
private void Control_Click(object sender, EventArgs e)
{
IOTextControl control = (IOTextControl)sender;
string name = control.Name.Substring(3, control.Name.Length - 3);
List<string> keyList = new List<string>(DOControlList.Keys);
int index = keyList.IndexOf(name);
if (index >= 0)
{
cmbWriteIO.SelectedIndex = index;
}
}
private void timer1_Tick(object sender, EventArgs e) private void timer1_Tick(object sender, EventArgs e)
{ {
if (this.Visible) if (this.Visible)
......
source/DeviceLibrary/duoStore/DUOStoreBean_Partial.cs
...@@ -596,7 +596,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -596,7 +596,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StoreMoveStep.LI_07_HoisterForward)) else if (MoveInfo.IsStep(StoreMoveStep.LI_07_HoisterForward))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.LI_08_AxisUpToP2); MoveInfo.NextMoveStep(StoreMoveStep.LI_08_AxisUpToP2);
InOutStoreLog("入料检测：上料轴开始慢速上升到P2点，等待检测到料盘"); InOutStoreLog("入料检测：上料轴开始慢速上升到P2 [" + Config.BatchAxis_P2 + "]，等待检测到料盘");
BatchAxisToP2(true); BatchAxisToP2(true);
} }
else if (MoveInfo.IsStep(StoreMoveStep.LI_08_AxisUpToP2)) else if (MoveInfo.IsStep(StoreMoveStep.LI_08_AxisUpToP2))
...@@ -607,7 +607,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -607,7 +607,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(StoreMoveStep.LI_11_AxisToTray); MoveInfo.NextMoveStep(StoreMoveStep.LI_11_AxisToTray);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
InOutStoreLog("入料检测：有料盘：升降轴到料串高点P2，旋转轴到料串位置P4"); InOutStoreLog("入料检测：有料盘：升降轴到料串高点P2["+ Config.UpdownAxis_P2 + "]，旋转轴到料串位置P4["+ Config.MiddleAxis_P4 + "]");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P2, Config.UpdownAxis_P2Speed); T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P2, Config.UpdownAxis_P2Speed);
T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P4, Config.MiddleAxis_P4Speed); T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P4, Config.MiddleAxis_P4Speed);
...@@ -618,7 +618,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -618,7 +618,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StoreMoveStep.LI_11_AxisToTray)) else if (MoveInfo.IsStep(StoreMoveStep.LI_11_AxisToTray))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.LI_12_UpdownAxisToP3); MoveInfo.NextMoveStep(StoreMoveStep.LI_12_UpdownAxisToP3);
InOutStoreLog("取料：升降轴到料串低点P1"); InOutStoreLog("取料：升降轴到料串低点P1["+ Config.UpdownAxis_P1 + "]");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P1, Config.UpdownAxis_P1Speed); T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P1, Config.UpdownAxis_P1Speed);
} }
else if (MoveInfo.IsStep(StoreMoveStep.LI_12_UpdownAxisToP3)) else if (MoveInfo.IsStep(StoreMoveStep.LI_12_UpdownAxisToP3))
...@@ -630,7 +630,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -630,7 +630,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StoreMoveStep.LI_13_CylinderTighten)) else if (MoveInfo.IsStep(StoreMoveStep.LI_13_CylinderTighten))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.LI_14_UpdownToP1); MoveInfo.NextMoveStep(StoreMoveStep.LI_14_UpdownToP1);
InOutStoreLog("取料：升降轴到料串高点P2"); InOutStoreLog("取料：升降轴到料串高点P2["+ Config.UpdownAxis_P2 + "]");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P2, Config.UpdownAxis_P2Speed); T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P2, Config.UpdownAxis_P2Speed);
} }
else if (MoveInfo.IsStep(StoreMoveStep.LI_14_UpdownToP1)) else if (MoveInfo.IsStep(StoreMoveStep.LI_14_UpdownToP1))
...@@ -642,7 +642,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -642,7 +642,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StoreMoveStep.LI_15_WaitNoCheck)) else if (MoveInfo.IsStep(StoreMoveStep.LI_15_WaitNoCheck))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.LI_16_BatchAxisToP2); MoveInfo.NextMoveStep(StoreMoveStep.LI_16_BatchAxisToP2);
InOutStoreLog("取料：批量轴到P2,计算高度,"); InOutStoreLog("取料：批量轴到P2 ["+Config.BatchAxis_P2+"],计算高度,");
BatchAxisToP2(false); BatchAxisToP2(false);
} }
else if (MoveInfo.IsStep(StoreMoveStep.LI_16_BatchAxisToP2)) else if (MoveInfo.IsStep(StoreMoveStep.LI_16_BatchAxisToP2))
...@@ -702,13 +702,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -702,13 +702,13 @@ namespace OnlineStore.DeviceLibrary
//判断是左侧还是右侧 //判断是左侧还是右侧
if (LastPosParam.TargetBox.Equals(1)) if (LastPosParam.TargetBox.Equals(1))
{ {
InOutStoreLog("料盘移栽：获取库位号完成， BOX " + storeId + " 升降轴到料门口高点[" + Config.UpdownAxis_P4 + "]，旋转轴到料仓门口 [" + Config.MiddleAxis_P2 + "]"); InOutStoreLog("料盘移栽：获取库位号完成， BOX " + storeId + " 升降轴到料门口高点P4[" + Config.UpdownAxis_P4 + "]，旋转轴到料仓门口 P2[" + Config.MiddleAxis_P2 + "]");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P4, Config.UpdownAxis_P4Speed); T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P4, Config.UpdownAxis_P4Speed);
T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P2, Config.MiddleAxis_P2Speed); T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P2, Config.MiddleAxis_P2Speed);
} }
else else
{ {
InOutStoreLog("料盘移栽：获取库位号完成， BOX " + storeId + " 升降轴到料门口高点[" + Config.UpdownAxis_P6 + "]，旋转轴到料仓门口 [" + Config.MiddleAxis_P3 + "]"); InOutStoreLog("料盘移栽：获取库位号完成， BOX " + storeId + " 升降轴到料门口高点P6[" + Config.UpdownAxis_P6 + "]，旋转轴到料仓门口 P3[" + Config.MiddleAxis_P3 + "]");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P6, Config.UpdownAxis_P6Speed); T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P6, Config.UpdownAxis_P6Speed);
T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P3, Config.MiddleAxis_P3Speed); T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P3, Config.MiddleAxis_P3Speed);
} }
...@@ -728,12 +728,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -728,12 +728,12 @@ namespace OnlineStore.DeviceLibrary
YuScanCode(); YuScanCode();
if (LastPosParam.TargetBox.Equals(1)) if (LastPosParam.TargetBox.Equals(1))
{ {
InOutStoreLog("料盘移栽： 升降轴到料门口低点[" + Config.UpdownAxis_P3 + "]，开始预扫码"); InOutStoreLog("料盘移栽： 升降轴到料门口低点P3[" + Config.UpdownAxis_P3 + "]，开始预扫码");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P3, Config.UpdownAxis_P3Speed); T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P3, Config.UpdownAxis_P3Speed);
} }
else else
{ {
InOutStoreLog("料盘移栽： 升降轴到料门口低点[" + Config.UpdownAxis_P5 + "]，开始预扫码"); InOutStoreLog("料盘移栽： 升降轴到料门口低点P5[" + Config.UpdownAxis_P5 + "]，开始预扫码");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P5, Config.UpdownAxis_P5Speed); T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P5, Config.UpdownAxis_P5Speed);
} }
} }
...@@ -748,12 +748,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -748,12 +748,12 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StoreMoveStep.LI_25_UpdownUp); MoveInfo.NextMoveStep(StoreMoveStep.LI_25_UpdownUp);
if (LastPosParam.TargetBox.Equals(1)) if (LastPosParam.TargetBox.Equals(1))
{ {
InOutStoreLog("料盘移栽： 升降轴到料门口高点[" + Config.UpdownAxis_P4 + "]"); InOutStoreLog("料盘移栽： 升降轴到料门口高点P4[" + Config.UpdownAxis_P4 + "]");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P4, Config.UpdownAxis_P4Speed); T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P4, Config.UpdownAxis_P4Speed);
} }
else else
{ {
InOutStoreLog("料盘移栽： 升降轴到料门口高点[" + Config.UpdownAxis_P6 + "]"); InOutStoreLog("料盘移栽： 升降轴到料门口高点P6[" + Config.UpdownAxis_P6 + "]");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P6, Config.UpdownAxis_P6Speed); T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P6, Config.UpdownAxis_P6Speed);
} }
} }
...@@ -761,7 +761,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -761,7 +761,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(StoreMoveStep.LI_26_AxisToWait); MoveInfo.NextMoveStep(StoreMoveStep.LI_26_AxisToWait);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
InOutStoreLog("料盘移栽：旋转轴返回待机点P1,升降轴到料串高点P2"); InOutStoreLog("料盘移栽：旋转轴返回待机点P1["+ Config.MiddleAxis_P1 + "],升降轴到料串高点P2["+ Config.UpdownAxis_P2 + "]");
T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P1, Config.MiddleAxis_P1Speed); T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P1, Config.MiddleAxis_P1Speed);
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P2, Config.UpdownAxis_P2Speed); T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P2, Config.UpdownAxis_P2Speed);
} }
...@@ -917,7 +917,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -917,7 +917,7 @@ namespace OnlineStore.DeviceLibrary
private void LI_11_AxisToTray() private void LI_11_AxisToTray()
{ {
MoveInfo.NextMoveStep(StoreMoveStep.LI_11_AxisToTray); MoveInfo.NextMoveStep(StoreMoveStep.LI_11_AxisToTray);
InOutStoreLog("入料检测：有料盘：升降轴到料串高点P2，旋转轴到料串位置P4"); InOutStoreLog("入料检测：有料盘：升降轴到料串高点P2 ["+ Config.UpdownAxis_P2 + "]，旋转轴到料串位置P4 ["+ Config.MiddleAxis_P4 + "]");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P2, Config.UpdownAxis_P2Speed); T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P2, Config.UpdownAxis_P2Speed);
T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P4, Config.MiddleAxis_P4Speed); T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P4, Config.MiddleAxis_P4Speed);
} }
...@@ -1024,7 +1024,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1024,7 +1024,7 @@ namespace OnlineStore.DeviceLibrary
if (chaz > T1_BatchAxis.Config.CanErrorCountMax) if (chaz > T1_BatchAxis.Config.CanErrorCountMax)
{ {
MoveInfo.NextMoveStep(StoreMoveStep.LI_08_AxisUpToP2); MoveInfo.NextMoveStep(StoreMoveStep.LI_08_AxisUpToP2);
InOutStoreLog(" CheckHasTray：上料轴开始慢速上升到P2点，等待检测到料盘"); InOutStoreLog(" CheckHasTray：上料轴开始慢速上升到P2["+Config.BatchAxis_P2+"]，等待检测到料盘");
ShelfNoTray = false; ShelfNoTray = false;
BatchAxisToP2(false); BatchAxisToP2(false);
return; return;
...@@ -1040,7 +1040,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1040,7 +1040,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(StoreMoveStep.LI_31_BatchAxisToP1); MoveInfo.NextMoveStep(StoreMoveStep.LI_31_BatchAxisToP1);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
InOutStoreLog("料盘移栽 ：未检测到料盘，提升伺服到P1点 "); InOutStoreLog("料盘移栽 ：未检测到料盘，提升伺服到P1点 ["+ Config.BatchAxis_P1 + "] ");
UpdateShelfNum(CurrShelfNum, 0); UpdateShelfNum(CurrShelfNum, 0);
T1_BatchAxis.SuddenStop(); T1_BatchAxis.SuddenStop();
T1_BatchAxis.AbsMove(MoveInfo, Config.BatchAxis_P1, Config.BatchAxis_P2Speed); T1_BatchAxis.AbsMove(MoveInfo, Config.BatchAxis_P1, Config.BatchAxis_P2Speed);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!