Skip to content

刘韬 / SO775-DUOStore

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

1

1 个父辈 181d32e7
内嵌 并排
正在显示 6 个修改的文件 包含 223 行增加 和 185 行删除
source/Common/util/HttpHelper.cs
......@@ -47,10 +47,14 @@ namespace OnlineStore.Common
bool IsTimeOut = false;
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
{
{
if (operation == null)
{
return null;
}
if (simulate)
{//模拟服务器返回
operation.status = 200;
......@@ -65,24 +69,33 @@ namespace OnlineStore.Common
LogUtil.error("模拟HTTP服务器返回出库入库信息：" + json);
return operation;
}
}
else
return null;
}
try
{
string json = "";
try
{
json = JsonHelper.SerializeObject(operation);
}
catch (Exception ex)
if (url.ToLower().IndexOf("https", System.StringComparison.Ordinal) > -1)
{
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))
{
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)
{
......@@ -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)
{
LogUtil.error("Post 出错【operation.op=" + operation.op + "】：" + ex);
......@@ -99,24 +121,33 @@ namespace OnlineStore.Common
}
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 =
new RemoteCertificateValidationCallback((sender, certificate, chain, errors) => { return true; });
int index = url.IndexOf("?");
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
{
if (url.ToLower().IndexOf("https", System.StringComparison.Ordinal) > -1)
{
ServicePointManager.ServerCertificateValidationCallback =
new RemoteCertificateValidationCallback((sender, certificate, chain, errors) => { return true; });
}
var wc = new MyWebClient(timeOut);
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;
result = wc.UploadString(url, "POST", paramData);
......@@ -131,10 +162,7 @@ namespace OnlineStore.Common
{
LogUtil.error("POST [" + url + "] ERROR:" + e.ToString(), 101);
}
if (!result.Contains("null") && result.Length != 0)
{
//LogUtil.debug( "receive << " + result);
}
if (isLog == 1)
{
LogUtil.info("收到服务器数据【" + result + "】");
......
source/DUOStore/FrmAxisMove.Designer.cs
......@@ -28,7 +28,8 @@ namespace OnlineStore.DUOStore
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAxisMove));
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.groupInout = new System.Windows.Forms.GroupBox();
this.btnSaveP = new System.Windows.Forms.Button();
this.textBox1 = new System.Windows.Forms.TextBox();
this.button1 = new System.Windows.Forms.Button();
this.txtUpdownP6 = new System.Windows.Forms.TextBox();
this.btnUpdownP6 = new System.Windows.Forms.Button();
this.txtUpdownP5 = new System.Windows.Forms.TextBox();
......@@ -51,11 +52,10 @@ namespace OnlineStore.DUOStore
this.btnUpdownP3 = new System.Windows.Forms.Button();
this.txtMiddleP3 = new System.Windows.Forms.TextBox();
this.btnMiddleP3 = new System.Windows.Forms.Button();
this.btnSaveP = new System.Windows.Forms.Button();
this.btnAxisOff = new System.Windows.Forms.Button();
this.btnAxisOn = new System.Windows.Forms.Button();
this.axisMoveControl1 = new OnlineStore.DUOStore.AxisMoveControl();
this.textBox1 = new System.Windows.Forms.TextBox();
this.button1 = new System.Windows.Forms.Button();
this.groupInout.SuspendLayout();
this.SuspendLayout();
//
......@@ -66,10 +66,13 @@ namespace OnlineStore.DUOStore
//
// groupInout
//
this.groupInout.Controls.Add(this.btnSaveP);
this.groupInout.Controls.Add(this.textBox1);
this.groupInout.Controls.Add(this.button1);
this.groupInout.Controls.Add(this.txtUpdownP6);
this.groupInout.Controls.Add(this.btnAxisOff);
this.groupInout.Controls.Add(this.btnUpdownP6);
this.groupInout.Controls.Add(this.btnAxisOn);
this.groupInout.Controls.Add(this.txtUpdownP5);
this.groupInout.Controls.Add(this.btnUpdownP5);
this.groupInout.Controls.Add(this.txtUpdownP4);
......@@ -91,23 +94,45 @@ namespace OnlineStore.DUOStore
this.groupInout.Controls.Add(this.txtMiddleP3);
this.groupInout.Controls.Add(this.btnMiddleP3);
this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(12, 317);
this.groupInout.Location = new System.Drawing.Point(12, 308);
this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(734, 299);
this.groupInout.Size = new System.Drawing.Size(851, 274);
this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false;
this.groupInout.Text = "提升机构位置信息";
//
// btnSaveP
// textBox1
//
this.btnSaveP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveP.Location = new System.Drawing.Point(752, 530);
this.btnSaveP.Name = "btnSaveP";
this.btnSaveP.Size = new System.Drawing.Size(128, 39);
this.btnSaveP.TabIndex = 313;
this.btnSaveP.Text = "保存位置";
this.btnSaveP.UseVisualStyleBackColor = true;
this.btnSaveP.Click += new System.EventHandler(this.btnSaveP_Click);
this.textBox1.AcceptsReturn = true;
this.textBox1.BackColor = System.Drawing.SystemColors.Window;
this.textBox1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.textBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox1.ForeColor = System.Drawing.SystemColors.WindowText;
this.textBox1.Location = new System.Drawing.Point(220, 222);
this.textBox1.MaxLength = 20;
this.textBox1.Name = "textBox1";
this.textBox1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.textBox1.Size = new System.Drawing.Size(89, 23);
this.textBox1.TabIndex = 314;
this.textBox1.Text = "999999";
//
// button1
//
this.button1.AutoSize = true;
this.button1.BackColor = System.Drawing.SystemColors.Control;
this.button1.Cursor = System.Windows.Forms.Cursors.Default;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.button1.Location = new System.Drawing.Point(21, 217);
this.button1.Name = "button1";
this.button1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.button1.Size = new System.Drawing.Size(193, 33);
this.button1.TabIndex = 313;
this.button1.Text = "T2_旋转轴_料串取放料点P4:";
this.button1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.button1.UseVisualStyleBackColor = false;
//
// txtUpdownP6
//
......@@ -116,7 +141,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP6.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP6.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP6.Location = new System.Drawing.Point(602, 238);
this.txtUpdownP6.Location = new System.Drawing.Point(558, 222);
this.txtUpdownP6.MaxLength = 0;
this.txtUpdownP6.Name = "txtUpdownP6";
this.txtUpdownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -133,7 +158,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP6.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP6.Location = new System.Drawing.Point(382, 233);
this.btnUpdownP6.Location = new System.Drawing.Point(347, 217);
this.btnUpdownP6.Name = "btnUpdownP6";
this.btnUpdownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP6.Size = new System.Drawing.Size(205, 33);
......@@ -150,7 +175,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP5.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP5.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP5.Location = new System.Drawing.Point(602, 197);
this.txtUpdownP5.Location = new System.Drawing.Point(558, 185);
this.txtUpdownP5.MaxLength = 0;
this.txtUpdownP5.Name = "txtUpdownP5";
this.txtUpdownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -167,7 +192,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP5.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP5.Location = new System.Drawing.Point(382, 192);
this.btnUpdownP5.Location = new System.Drawing.Point(347, 180);
this.btnUpdownP5.Name = "btnUpdownP5";
this.btnUpdownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP5.Size = new System.Drawing.Size(205, 33);
......@@ -184,7 +209,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP4.Location = new System.Drawing.Point(602, 156);
this.txtUpdownP4.Location = new System.Drawing.Point(558, 147);
this.txtUpdownP4.MaxLength = 0;
this.txtUpdownP4.Name = "txtUpdownP4";
this.txtUpdownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -201,7 +226,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP4.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP4.Location = new System.Drawing.Point(382, 151);
this.btnUpdownP4.Location = new System.Drawing.Point(347, 142);
this.btnUpdownP4.Name = "btnUpdownP4";
this.btnUpdownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP4.Size = new System.Drawing.Size(205, 33);
......@@ -218,7 +243,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP1.Location = new System.Drawing.Point(603, 33);
this.txtUpdownP1.Location = new System.Drawing.Point(559, 33);
this.txtUpdownP1.MaxLength = 20;
this.txtUpdownP1.Name = "txtUpdownP1";
this.txtUpdownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -233,7 +258,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP2.Location = new System.Drawing.Point(602, 74);
this.txtUpdownP2.Location = new System.Drawing.Point(558, 71);
this.txtUpdownP2.MaxLength = 20;
this.txtUpdownP2.Name = "txtUpdownP2";
this.txtUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -248,7 +273,7 @@ namespace OnlineStore.DUOStore
this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP1.Location = new System.Drawing.Point(228, 115);
this.txtMiddleP1.Location = new System.Drawing.Point(220, 109);
this.txtMiddleP1.MaxLength = 20;
this.txtMiddleP1.Name = "txtMiddleP1";
this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -263,7 +288,7 @@ namespace OnlineStore.DUOStore
this.txtBatchP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBatchP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBatchP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBatchP1.Location = new System.Drawing.Point(228, 34);
this.txtBatchP1.Location = new System.Drawing.Point(220, 33);
this.txtBatchP1.MaxLength = 20;
this.txtBatchP1.Name = "txtBatchP1";
this.txtBatchP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -278,7 +303,7 @@ namespace OnlineStore.DUOStore
this.txtBatchP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBatchP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBatchP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBatchP2.Location = new System.Drawing.Point(228, 73);
this.txtBatchP2.Location = new System.Drawing.Point(220, 71);
this.txtBatchP2.MaxLength = 20;
this.txtBatchP2.Name = "txtBatchP2";
this.txtBatchP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -293,7 +318,7 @@ namespace OnlineStore.DUOStore
this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP2.Location = new System.Drawing.Point(228, 154);
this.txtMiddleP2.Location = new System.Drawing.Point(220, 147);
this.txtMiddleP2.MaxLength = 20;
this.txtMiddleP2.Name = "txtMiddleP2";
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -310,7 +335,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP1.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP1.Location = new System.Drawing.Point(382, 28);
this.btnUpdownP1.Location = new System.Drawing.Point(347, 28);
this.btnUpdownP1.Name = "btnUpdownP1";
this.btnUpdownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP1.Size = new System.Drawing.Size(205, 33);
......@@ -329,7 +354,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP2.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP2.Location = new System.Drawing.Point(382, 69);
this.btnUpdownP2.Location = new System.Drawing.Point(347, 66);
this.btnUpdownP2.Name = "btnUpdownP2";
this.btnUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP2.Size = new System.Drawing.Size(205, 33);
......@@ -348,7 +373,7 @@ namespace OnlineStore.DUOStore
this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP1.Location = new System.Drawing.Point(21, 109);
this.btnMiddleP1.Location = new System.Drawing.Point(21, 104);
this.btnMiddleP1.Name = "btnMiddleP1";
this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP1.Size = new System.Drawing.Size(193, 33);
......@@ -386,7 +411,7 @@ namespace OnlineStore.DUOStore
this.btnBatchP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBatchP2.ForeColor = System.Drawing.Color.Red;
this.btnBatchP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnBatchP2.Location = new System.Drawing.Point(21, 67);
this.btnBatchP2.Location = new System.Drawing.Point(21, 66);
this.btnBatchP2.Name = "btnBatchP2";
this.btnBatchP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBatchP2.Size = new System.Drawing.Size(193, 33);
......@@ -404,7 +429,7 @@ namespace OnlineStore.DUOStore
this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP2.Location = new System.Drawing.Point(21, 148);
this.btnMiddleP2.Location = new System.Drawing.Point(21, 142);
this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP2.Size = new System.Drawing.Size(193, 33);
......@@ -421,7 +446,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP3.Location = new System.Drawing.Point(602, 115);
this.txtUpdownP3.Location = new System.Drawing.Point(558, 109);
this.txtUpdownP3.MaxLength = 0;
this.txtUpdownP3.Name = "txtUpdownP3";
this.txtUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -438,7 +463,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP3.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP3.Location = new System.Drawing.Point(382, 110);
this.btnUpdownP3.Location = new System.Drawing.Point(347, 104);
this.btnUpdownP3.Name = "btnUpdownP3";
this.btnUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP3.Size = new System.Drawing.Size(205, 33);
......@@ -455,7 +480,7 @@ namespace OnlineStore.DUOStore
this.txtMiddleP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP3.Location = new System.Drawing.Point(228, 193);
this.txtMiddleP3.Location = new System.Drawing.Point(220, 185);
this.txtMiddleP3.MaxLength = 0;
this.txtMiddleP3.Name = "txtMiddleP3";
this.txtMiddleP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -472,7 +497,7 @@ namespace OnlineStore.DUOStore
this.btnMiddleP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP3.Location = new System.Drawing.Point(21, 187);
this.btnMiddleP3.Location = new System.Drawing.Point(21, 180);
this.btnMiddleP3.Name = "btnMiddleP3";
this.btnMiddleP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP3.Size = new System.Drawing.Size(193, 33);
......@@ -482,10 +507,21 @@ namespace OnlineStore.DUOStore
this.btnMiddleP3.UseVisualStyleBackColor = false;
this.btnMiddleP3.Click += new System.EventHandler(this.btnMiddleP3_Click);
//
// btnSaveP
//
this.btnSaveP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveP.Location = new System.Drawing.Point(682, 187);
this.btnSaveP.Name = "btnSaveP";
this.btnSaveP.Size = new System.Drawing.Size(128, 39);
this.btnSaveP.TabIndex = 313;
this.btnSaveP.Text = "保存位置";
this.btnSaveP.UseVisualStyleBackColor = true;
this.btnSaveP.Click += new System.EventHandler(this.btnSaveP_Click);
//
// btnAxisOff
//
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOff.Location = new System.Drawing.Point(752, 57);
this.btnAxisOff.Location = new System.Drawing.Point(682, 107);
this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(128, 39);
this.btnAxisOff.TabIndex = 276;
......@@ -496,7 +532,7 @@ namespace OnlineStore.DUOStore
// btnAxisOn
//
this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOn.Location = new System.Drawing.Point(752, 12);
this.btnAxisOn.Location = new System.Drawing.Point(682, 62);
this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(128, 39);
this.btnAxisOn.TabIndex = 275;
......@@ -509,52 +545,16 @@ namespace OnlineStore.DUOStore
this.axisMoveControl1.Enabled = false;
this.axisMoveControl1.Location = new System.Drawing.Point(11, 1);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(735, 312);
this.axisMoveControl1.Size = new System.Drawing.Size(735, 305);
this.axisMoveControl1.TabIndex = 274;
//
// textBox1
//
this.textBox1.AcceptsReturn = true;
this.textBox1.BackColor = System.Drawing.SystemColors.Window;
this.textBox1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.textBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox1.ForeColor = System.Drawing.SystemColors.WindowText;
this.textBox1.Location = new System.Drawing.Point(228, 234);
this.textBox1.MaxLength = 20;
this.textBox1.Name = "textBox1";
this.textBox1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.textBox1.Size = new System.Drawing.Size(89, 23);
this.textBox1.TabIndex = 314;
this.textBox1.Text = "999999";
//
// button1
//
this.button1.AutoSize = true;
this.button1.BackColor = System.Drawing.SystemColors.Control;
this.button1.Cursor = System.Windows.Forms.Cursors.Default;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.button1.Location = new System.Drawing.Point(21, 228);
this.button1.Name = "button1";
this.button1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.button1.Size = new System.Drawing.Size(193, 33);
this.button1.TabIndex = 313;
this.button1.Text = "T2_旋转轴_料串取放料点P4:";
this.button1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.button1.UseVisualStyleBackColor = false;
//
// FrmAxisMove
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(964, 630);
this.Controls.Add(this.btnSaveP);
this.Controls.Add(this.groupInout);
this.Controls.Add(this.axisMoveControl1);
this.Controls.Add(this.btnAxisOff);
this.Controls.Add(this.btnAxisOn);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(4);
......
source/DUOStore/FrmBox.Designer.cs
......@@ -103,13 +103,13 @@ namespace OnlineStore.DUOStore
this.btnDoorDown = new System.Windows.Forms.Button();
this.btnDoorUp = new System.Windows.Forms.Button();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.lblCanOut = new System.Windows.Forms.Label();
this.lblMoveEquipInfo = new System.Windows.Forms.Label();
this.btnSotreReset = new System.Windows.Forms.Button();
this.btnStoreStop = new System.Windows.Forms.Button();
this.btnStoreStart = new System.Windows.Forms.Button();
this.lblWarnMsg = new System.Windows.Forms.Label();
this.lblThisSta = new System.Windows.Forms.Label();
this.lblCanOut = new System.Windows.Forms.Label();
this.groupBox4.SuspendLayout();
this.groupBox1.SuspendLayout();
this.tabControl1.SuspendLayout();
......@@ -130,7 +130,7 @@ namespace OnlineStore.DUOStore
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(153, 518);
this.chbDebug.Location = new System.Drawing.Point(153, 522);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 271;
......@@ -152,9 +152,9 @@ namespace OnlineStore.DUOStore
//
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox4.Location = new System.Drawing.Point(8, 112);
this.groupBox4.Location = new System.Drawing.Point(5, 109);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(225, 193);
this.groupBox4.Size = new System.Drawing.Size(228, 198);
this.groupBox4.TabIndex = 270;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -164,7 +164,6 @@ namespace OnlineStore.DUOStore
this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel2.AutoScroll = true;
this.tableLayoutPanel2.ColumnCount = 1;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14);
......@@ -172,7 +171,7 @@ namespace OnlineStore.DUOStore
this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(214, 173);
this.tableLayoutPanel2.Size = new System.Drawing.Size(217, 178);
this.tableLayoutPanel2.TabIndex = 103;
//
// lblTemp
......@@ -191,9 +190,9 @@ namespace OnlineStore.DUOStore
//
this.groupBox1.Controls.Add(this.tableLayoutPanel1);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(8, 311);
this.groupBox1.Location = new System.Drawing.Point(5, 310);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(225, 193);
this.groupBox1.Size = new System.Drawing.Size(228, 198);
this.groupBox1.TabIndex = 269;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DI列表";
......@@ -203,7 +202,6 @@ namespace OnlineStore.DUOStore
this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel1.AutoScroll = true;
this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
......@@ -211,7 +209,7 @@ namespace OnlineStore.DUOStore
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(214, 173);
this.tableLayoutPanel1.Size = new System.Drawing.Size(217, 178);
this.tableLayoutPanel1.TabIndex = 102;
//
// tabControl1
......@@ -314,7 +312,7 @@ namespace OnlineStore.DUOStore
// btnAxisP
//
this.btnAxisP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisP.Location = new System.Drawing.Point(538, 326);
this.btnAxisP.Location = new System.Drawing.Point(558, 321);
this.btnAxisP.Name = "btnAxisP";
this.btnAxisP.Size = new System.Drawing.Size(128, 39);
this.btnAxisP.TabIndex = 8;
......@@ -342,7 +340,7 @@ namespace OnlineStore.DUOStore
this.txtComP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP1.Location = new System.Drawing.Point(398, 272);
this.txtComP1.Location = new System.Drawing.Point(409, 272);
this.txtComP1.MaxLength = 20;
this.txtComP1.Name = "txtComP1";
this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -357,7 +355,7 @@ namespace OnlineStore.DUOStore
this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP2.Location = new System.Drawing.Point(672, 228);
this.txtInOutP2.Location = new System.Drawing.Point(692, 223);
this.txtInOutP2.MaxLength = 20;
this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -372,7 +370,7 @@ namespace OnlineStore.DUOStore
this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP1.Location = new System.Drawing.Point(672, 154);
this.txtInOutP1.Location = new System.Drawing.Point(692, 149);
this.txtInOutP1.MaxLength = 20;
this.txtInOutP1.Name = "txtInOutP1";
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -432,7 +430,7 @@ namespace OnlineStore.DUOStore
this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3.Location = new System.Drawing.Point(397, 346);
this.txtComP3.Location = new System.Drawing.Point(408, 346);
this.txtComP3.MaxLength = 20;
this.txtComP3.Name = "txtComP3";
this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -447,7 +445,7 @@ namespace OnlineStore.DUOStore
this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP2.Location = new System.Drawing.Point(397, 309);
this.txtComP2.Location = new System.Drawing.Point(408, 309);
this.txtComP2.MaxLength = 20;
this.txtComP2.Name = "txtComP2";
this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -462,7 +460,7 @@ namespace OnlineStore.DUOStore
this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP3.Location = new System.Drawing.Point(672, 191);
this.txtInOutP3.Location = new System.Drawing.Point(692, 186);
this.txtInOutP3.MaxLength = 20;
this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -492,7 +490,7 @@ namespace OnlineStore.DUOStore
this.txtUpDownP5.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP5.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP5.Location = new System.Drawing.Point(397, 191);
this.txtUpDownP5.Location = new System.Drawing.Point(408, 191);
this.txtUpDownP5.MaxLength = 20;
this.txtUpDownP5.Name = "txtUpDownP5";
this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -507,7 +505,7 @@ namespace OnlineStore.DUOStore
this.txtUpDownP6.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP6.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP6.Location = new System.Drawing.Point(397, 228);
this.txtUpDownP6.Location = new System.Drawing.Point(408, 228);
this.txtUpDownP6.MaxLength = 20;
this.txtUpDownP6.Name = "txtUpDownP6";
this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -522,7 +520,7 @@ namespace OnlineStore.DUOStore
this.txtUpDownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP3.Location = new System.Drawing.Point(397, 117);
this.txtUpDownP3.Location = new System.Drawing.Point(408, 117);
this.txtUpDownP3.MaxLength = 20;
this.txtUpDownP3.Name = "txtUpDownP3";
this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -537,7 +535,7 @@ namespace OnlineStore.DUOStore
this.txtUpDownP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP4.Location = new System.Drawing.Point(397, 154);
this.txtUpDownP4.Location = new System.Drawing.Point(408, 154);
this.txtUpDownP4.MaxLength = 20;
this.txtUpDownP4.Name = "txtUpDownP4";
this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -554,7 +552,7 @@ namespace OnlineStore.DUOStore
this.btnComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP1.ForeColor = System.Drawing.Color.Purple;
this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnComP1.Location = new System.Drawing.Point(254, 267);
this.btnComP1.Location = new System.Drawing.Point(265, 267);
this.btnComP1.Name = "btnComP1";
this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP1.Size = new System.Drawing.Size(140, 33);
......@@ -573,7 +571,7 @@ namespace OnlineStore.DUOStore
this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.Location = new System.Drawing.Point(502, 223);
this.btnInOutP2.Location = new System.Drawing.Point(522, 218);
this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(164, 33);
......@@ -592,7 +590,7 @@ namespace OnlineStore.DUOStore
this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP1.ForeColor = System.Drawing.Color.Green;
this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(502, 149);
this.btnInOutP1.Location = new System.Drawing.Point(522, 144);
this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(164, 33);
......@@ -667,7 +665,7 @@ namespace OnlineStore.DUOStore
this.btnComP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP3.ForeColor = System.Drawing.Color.Purple;
this.btnComP3.Location = new System.Drawing.Point(254, 341);
this.btnComP3.Location = new System.Drawing.Point(265, 341);
this.btnComP3.Name = "btnComP3";
this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP3.Size = new System.Drawing.Size(140, 33);
......@@ -685,7 +683,7 @@ namespace OnlineStore.DUOStore
this.btnComP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP2.ForeColor = System.Drawing.Color.Purple;
this.btnComP2.Location = new System.Drawing.Point(254, 304);
this.btnComP2.Location = new System.Drawing.Point(265, 304);
this.btnComP2.Name = "btnComP2";
this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP2.Size = new System.Drawing.Size(140, 33);
......@@ -703,7 +701,7 @@ namespace OnlineStore.DUOStore
this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP3.ForeColor = System.Drawing.Color.Green;
this.btnInOutP3.Location = new System.Drawing.Point(502, 186);
this.btnInOutP3.Location = new System.Drawing.Point(522, 181);
this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP3.Size = new System.Drawing.Size(164, 33);
......@@ -739,7 +737,7 @@ namespace OnlineStore.DUOStore
this.btnUpDownP5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP5.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP5.Location = new System.Drawing.Point(254, 186);
this.btnUpDownP5.Location = new System.Drawing.Point(265, 186);
this.btnUpDownP5.Name = "btnUpDownP5";
this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP5.Size = new System.Drawing.Size(140, 33);
......@@ -757,7 +755,7 @@ namespace OnlineStore.DUOStore
this.btnUpDownP6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP6.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP6.Location = new System.Drawing.Point(254, 223);
this.btnUpDownP6.Location = new System.Drawing.Point(265, 223);
this.btnUpDownP6.Name = "btnUpDownP6";
this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP6.Size = new System.Drawing.Size(140, 33);
......@@ -775,7 +773,7 @@ namespace OnlineStore.DUOStore
this.btnUpDownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP3.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP3.Location = new System.Drawing.Point(254, 112);
this.btnUpDownP3.Location = new System.Drawing.Point(265, 112);
this.btnUpDownP3.Name = "btnUpDownP3";
this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP3.Size = new System.Drawing.Size(140, 33);
......@@ -793,7 +791,7 @@ namespace OnlineStore.DUOStore
this.btnUpDownP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP4.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP4.Location = new System.Drawing.Point(254, 149);
this.btnUpDownP4.Location = new System.Drawing.Point(265, 149);
this.btnUpDownP4.Name = "btnUpDownP4";
this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP4.Size = new System.Drawing.Size(140, 33);
......@@ -850,7 +848,7 @@ namespace OnlineStore.DUOStore
this.txtInoutP11.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInoutP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInoutP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInoutP11.Location = new System.Drawing.Point(672, 265);
this.txtInoutP11.Location = new System.Drawing.Point(692, 260);
this.txtInoutP11.MaxLength = 0;
this.txtInoutP11.Name = "txtInoutP11";
this.txtInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -867,7 +865,7 @@ namespace OnlineStore.DUOStore
this.btnInoutP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInoutP11.ForeColor = System.Drawing.Color.Green;
this.btnInoutP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInoutP11.Location = new System.Drawing.Point(502, 260);
this.btnInoutP11.Location = new System.Drawing.Point(522, 255);
this.btnInoutP11.Name = "btnInoutP11";
this.btnInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInoutP11.Size = new System.Drawing.Size(164, 33);
......@@ -1215,7 +1213,7 @@ namespace OnlineStore.DUOStore
//
this.btnDoorDown.BackColor = System.Drawing.Color.White;
this.btnDoorDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDoorDown.Location = new System.Drawing.Point(10, 561);
this.btnDoorDown.Location = new System.Drawing.Point(10, 560);
this.btnDoorDown.Name = "btnDoorDown";
this.btnDoorDown.Size = new System.Drawing.Size(137, 39);
this.btnDoorDown.TabIndex = 272;
......@@ -1227,7 +1225,7 @@ namespace OnlineStore.DUOStore
//
this.btnDoorUp.BackColor = System.Drawing.Color.White;
this.btnDoorUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDoorUp.Location = new System.Drawing.Point(11, 510);
this.btnDoorUp.Location = new System.Drawing.Point(10, 514);
this.btnDoorUp.Name = "btnDoorUp";
this.btnDoorUp.Size = new System.Drawing.Size(137, 39);
this.btnDoorUp.TabIndex = 271;
......@@ -1253,6 +1251,17 @@ namespace OnlineStore.DUOStore
this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态";
//
// lblCanOut
//
this.lblCanOut.AutoSize = true;
this.lblCanOut.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCanOut.ForeColor = System.Drawing.Color.Green;
this.lblCanOut.Location = new System.Drawing.Point(949, 74);
this.lblCanOut.Name = "lblCanOut";
this.lblCanOut.Size = new System.Drawing.Size(51, 19);
this.lblCanOut.TabIndex = 273;
this.lblCanOut.Text = "可出库";
//
// lblMoveEquipInfo
//
this.lblMoveEquipInfo.AutoSize = true;
......@@ -1320,17 +1329,6 @@ namespace OnlineStore.DUOStore
this.lblThisSta.TabIndex = 216;
this.lblThisSta.Text = "等待启动";
//
// lblCanOut
//
this.lblCanOut.AutoSize = true;
this.lblCanOut.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCanOut.ForeColor = System.Drawing.Color.Green;
this.lblCanOut.Location = new System.Drawing.Point(949, 74);
this.lblCanOut.Name = "lblCanOut";
this.lblCanOut.Size = new System.Drawing.Size(51, 19);
this.lblCanOut.TabIndex = 273;
this.lblCanOut.Text = "可出库";
//
// FrmBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......@@ -1348,9 +1346,7 @@ namespace OnlineStore.DUOStore
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "FrmBox";
this.Opacity = 0D;
this.Text = "AC_SA_料仓";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.FrmTest_Load);
this.Shown += new System.EventHandler(this.FrmStoreBox_Shown);
this.groupBox4.ResumeLayout(false);
......
source/DUOStore/FrmBox.cs
......@@ -39,6 +39,7 @@ namespace OnlineStore.DUOStore
{
LoadStore();
LoadIOList();
LoadOk = true;
}
public void LoadStore()
{
......@@ -79,7 +80,6 @@ namespace OnlineStore.DUOStore
// txtTempPort.Text = BoxBean.Config.Humiture_Port;
timer1.Start();
LoadOk = true;
}
#endregion
......@@ -420,7 +420,7 @@ namespace OnlineStore.DUOStore
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))
{
......@@ -435,87 +435,87 @@ namespace OnlineStore.DUOStore
}
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)
{
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)
{
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)
{
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)
{
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)
{
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)
{
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)
{
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)
{
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)
{
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)
{
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)
{
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)
{
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)
{
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)
{
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)
{
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)
{
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 yHeight = SystemInformation.PrimaryMonitorSize.Height;//高度
......@@ -727,7 +727,7 @@ namespace OnlineStore.DUOStore
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处理
......@@ -742,7 +742,7 @@ namespace OnlineStore.DUOStore
this.tableLayoutPanel1.RowCount = BoxBean.Config.DIList.Count;
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);
this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
roleindex++;
......
source/DUOStore/FrmIOStatus.cs
......@@ -48,6 +48,7 @@ namespace OnlineStore.DUOStore
{
this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 26));
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
roleindex++;
DIControlList.Add(ioValue.ProName, control);
......@@ -63,6 +64,7 @@ namespace OnlineStore.DUOStore
{
this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
control.Click += Control_Click;
this.tableLayoutPanel2.Controls.Add(control, 0, roleindex);
roleindex++;
DOControlList.Add(ioValue.ProName, control);
......@@ -75,6 +77,18 @@ namespace OnlineStore.DUOStore
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)
{
if (this.Visible)
......
source/DeviceLibrary/duoStore/DUOStoreBean_Partial.cs
......@@ -596,7 +596,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StoreMoveStep.LI_07_HoisterForward))
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_08_AxisUpToP2);
InOutStoreLog("入料检测：上料轴开始慢速上升到P2点，等待检测到料盘");
InOutStoreLog("入料检测：上料轴开始慢速上升到P2 [" + Config.BatchAxis_P2 + "]，等待检测到料盘");
BatchAxisToP2(true);
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_08_AxisUpToP2))
......@@ -607,7 +607,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_11_AxisToTray);
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);
T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P4, Config.MiddleAxis_P4Speed);
......@@ -618,7 +618,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StoreMoveStep.LI_11_AxisToTray))
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_12_UpdownAxisToP3);
InOutStoreLog("取料：升降轴到料串低点P1");
InOutStoreLog("取料：升降轴到料串低点P1["+ Config.UpdownAxis_P1 + "]");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P1, Config.UpdownAxis_P1Speed);
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_12_UpdownAxisToP3))
......@@ -630,7 +630,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StoreMoveStep.LI_13_CylinderTighten))
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_14_UpdownToP1);
InOutStoreLog("取料：升降轴到料串高点P2");
InOutStoreLog("取料：升降轴到料串高点P2["+ Config.UpdownAxis_P2 + "]");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P2, Config.UpdownAxis_P2Speed);
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_14_UpdownToP1))
......@@ -642,7 +642,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StoreMoveStep.LI_15_WaitNoCheck))
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_16_BatchAxisToP2);
InOutStoreLog("取料：批量轴到P2,计算高度,");
InOutStoreLog("取料：批量轴到P2 ["+Config.BatchAxis_P2+"],计算高度,");
BatchAxisToP2(false);
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_16_BatchAxisToP2))
......@@ -702,13 +702,13 @@ namespace OnlineStore.DeviceLibrary
//判断是左侧还是右侧
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);
T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P2, Config.MiddleAxis_P2Speed);
}
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);
T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P3, Config.MiddleAxis_P3Speed);
}
......@@ -728,12 +728,12 @@ namespace OnlineStore.DeviceLibrary
YuScanCode();
if (LastPosParam.TargetBox.Equals(1))
{
InOutStoreLog("料盘移栽： 升降轴到料门口低点[" + Config.UpdownAxis_P3 + "]，开始预扫码");
InOutStoreLog("料盘移栽： 升降轴到料门口低点P3[" + Config.UpdownAxis_P3 + "]，开始预扫码");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P3, Config.UpdownAxis_P3Speed);
}
else
{
InOutStoreLog("料盘移栽： 升降轴到料门口低点[" + Config.UpdownAxis_P5 + "]，开始预扫码");
InOutStoreLog("料盘移栽： 升降轴到料门口低点P5[" + Config.UpdownAxis_P5 + "]，开始预扫码");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P5, Config.UpdownAxis_P5Speed);
}
}
......@@ -748,12 +748,12 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StoreMoveStep.LI_25_UpdownUp);
if (LastPosParam.TargetBox.Equals(1))
{
InOutStoreLog("料盘移栽： 升降轴到料门口高点[" + Config.UpdownAxis_P4 + "]");
InOutStoreLog("料盘移栽： 升降轴到料门口高点P4[" + Config.UpdownAxis_P4 + "]");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P4, Config.UpdownAxis_P4Speed);
}
else
{
InOutStoreLog("料盘移栽： 升降轴到料门口高点[" + Config.UpdownAxis_P6 + "]");
InOutStoreLog("料盘移栽： 升降轴到料门口高点P6[" + Config.UpdownAxis_P6 + "]");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P6, Config.UpdownAxis_P6Speed);
}
}
......@@ -761,7 +761,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_26_AxisToWait);
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);
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P2, Config.UpdownAxis_P2Speed);
}
......@@ -917,7 +917,7 @@ namespace OnlineStore.DeviceLibrary
private void 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);
T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P4, Config.MiddleAxis_P4Speed);
}
......@@ -1024,7 +1024,7 @@ namespace OnlineStore.DeviceLibrary
if (chaz > T1_BatchAxis.Config.CanErrorCountMax)
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_08_AxisUpToP2);
InOutStoreLog(" CheckHasTray：上料轴开始慢速上升到P2点，等待检测到料盘");
InOutStoreLog(" CheckHasTray：上料轴开始慢速上升到P2["+Config.BatchAxis_P2+"]，等待检测到料盘");
ShelfNoTray = false;
BatchAxisToP2(false);
return;
......@@ -1040,7 +1040,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_31_BatchAxisToP1);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
InOutStoreLog("料盘移栽 ：未检测到料盘，提升伺服到P1点 ");
InOutStoreLog("料盘移栽 ：未检测到料盘，提升伺服到P1点 ["+ Config.BatchAxis_P1 + "] ");
UpdateShelfNum(CurrShelfNum, 0);
T1_BatchAxis.SuddenStop();
T1_BatchAxis.AbsMove(MoveInfo, Config.BatchAxis_P1, Config.BatchAxis_P2Speed);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!