Skip to content

张东亮 / RC1250-DISTLineClient

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

线体定义修改

1 个父辈 98514e2e
内嵌 并排
正在显示 17 个修改的文件 包含 831 行增加 和 722 行删除
dll/ConfigHelper.dll 0 → 100644
此文件类型无法预览
source/Common/Common.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.Common</RootNamespace> <RootNamespace>OnlineStore.Common</RootNamespace>
<AssemblyName>Common</AssemblyName> <AssemblyName>Common</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
...@@ -33,6 +33,9 @@ ...@@ -33,6 +33,9 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="ConfigHelper">
<HintPath>..\..\dll\ConfigHelper.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\log4net.dll</HintPath> <HintPath>..\..\dll\log4net.dll</HintPath>
......
source/Common/util/ConfigAppSettings.cs
...@@ -26,175 +26,25 @@ namespace OnlineStore.Common ...@@ -26,175 +26,25 @@ namespace OnlineStore.Common
Interlocked.Increment(ref seq); Interlocked.Increment(ref seq);
return seq; return seq;
} }
public static string GetValue(string keyStr, string storeStr)
{
string key = keyStr + storeStr;
System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
if (config.AppSettings.Settings[key] == null)
{
return GetValue(keyStr);
}
else
{
return config.AppSettings.Settings[key].Value;
}
}
public static decimal GetNumValue(string keyStr, string storeStr)
{
string key = keyStr + storeStr;
decimal a = 0;
System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
if (config.AppSettings.Settings[key] == null)
{
return GetNumValue(keyStr);
}
else
{
Decimal.TryParse(config.AppSettings.Settings[key].Value, out a);
}
return a;
}
public static int GetIntValue(string keyStr, string storeStr)
{
string key = keyStr + storeStr;
int a = 0;
System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
if (config.AppSettings.Settings[key] == null)
{
return GetIntValue(keyStr);
}
else
{
Int32.TryParse(config.AppSettings.Settings[key].Value, out a);
}
return a;
}
public static string GetValue(string key)
{
System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
if (config.AppSettings.Settings[key] == null)
{
LOGGER.Error("未找到配置：" + key + ",请检查配置是否完整！");
return "";
}
else
{
return config.AppSettings.Settings[key].Value;
}
}
public static decimal GetNumValue(string key) public static string GetValue(string key, string val = "")
{ {
decimal a = 0; return ConfigHelper.Config.Get(key, val);
System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
if (config.AppSettings.Settings[key] == null)
{
LOGGER.Error("未找到配置：" + key + ",请检查配置是否完整！");
return a;
}
else
{
Decimal.TryParse(config.AppSettings.Settings[key].Value, out a);
}
return a;
} }
public static int GetIntValue(string key) public static int GetIntValue(string key, int val = 0)
{ {
int a = 0; return ConfigHelper.Config.Get(key, val);
System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
if (config.AppSettings.Settings[key] == null)
{
LOGGER.Error("未找到配置：" + key + ",请检查配置是否完整！");
return a;
}
else
{
Int32.TryParse(config.AppSettings.Settings[key].Value, out a);
}
return a;
} }
public static void SaveValue(string key, int value) public static void SaveValue(string key, int value)
{ {
SaveValue(key, value.ToString());
}
public static void SaveValue(string key, string value)
{
try try
{ {
if (key.Equals("") || value.Equals("")) ConfigHelper.Config.Set(key, value);
{
//return;
}
//增加的内容写在appSettings段下 <add key="RegCode" value="0"/>
System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
if (config.AppSettings.Settings[key] == null)
{
SetValue(key, value);
}
else
{
UpdateConfig(key, value);
}
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error(LOGGER, "SaveValue保存配置出错：AppKey=" + key + "，AppValue=" + value + "," + ex.StackTrace); LogUtil.error(LOGGER, "SaveValue保存配置出错：AppKey=" + key + "，AppValue=" + value + "," + ex.StackTrace);
} }
} }
/// <summary>
/// 更新配置文件信息
/// </summary>
/// <param name="name">配置文件字段名称</param>
/// <param name="Xvalue">值</param>
private static void UpdateConfig(string name, string Xvalue)
{
try
{
XmlDocument doc = new XmlDocument();
doc.Load(Application.ExecutablePath + ".config");
XmlNode node = doc.SelectSingleNode(@"//add[@key='" + name + "']");
XmlElement ele = (XmlElement)node;
ele.SetAttribute("value", Xvalue);
doc.Save(Application.ExecutablePath + ".config");
}
catch (Exception ex)
{
LogUtil.error(LOGGER, "UpdateConfig保存配置出错：name=" + name + "，Xvalue=" + Xvalue + "," + ex.StackTrace);
}
}
///<summary>
///向.config文件的appKey结写入信息AppValue 保存设置
///</summary>
///<param name="AppKey">节点名</param>
///<param name="AppValue">值</param>
private static void SetValue(String AppKey, String AppValue)
{
try
{
XmlDocument xDoc = new XmlDocument();
xDoc.Load(System.Windows.Forms.Application.ExecutablePath + ".config");
XmlNode xNode;
XmlElement xElem1;
XmlElement xElem2;
xNode = xDoc.SelectSingleNode("//appSettings");
xElem1 = (XmlElement)xNode.SelectSingleNode("//add[@key='" + AppKey + "']");
if (xElem1 != null)
xElem1.SetAttribute("value", AppValue);
else
{
xElem2 = xDoc.CreateElement("add");
xElem2.SetAttribute("key", AppKey);
xElem2.SetAttribute("value", AppValue);
xNode.AppendChild(xElem2);
}
xDoc.Save(System.Windows.Forms.Application.ExecutablePath + ".config");
}
catch (Exception ex)
{
LogUtil.error(LOGGER, "SetValue保存配置出错：AppKey=" + AppKey + "，AppValue=" + AppValue + "," + ex.StackTrace);
}
}
} }
} }
source/DISTLineClient/DISTLineClient.csproj
...@@ -53,6 +53,9 @@ ...@@ -53,6 +53,9 @@
<ApplicationIcon>dist.ico</ApplicationIcon> <ApplicationIcon>dist.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="ConfigHelper">
<HintPath>..\..\dll\ConfigHelper.dll</HintPath>
</Reference>
<Reference Include="log4net"> <Reference Include="log4net">
<HintPath>..\..\dll\log4net.dll</HintPath> <HintPath>..\..\dll\log4net.dll</HintPath>
</Reference> </Reference>
......
source/DISTLineClient/FrmDISTClient.Designer.cs
...@@ -39,23 +39,19 @@ ...@@ -39,23 +39,19 @@
this.btnDis = new System.Windows.Forms.Button(); this.btnDis = new System.Windows.Forms.Button();
this.btnInit = new System.Windows.Forms.Button(); this.btnInit = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.btnSwitch = new System.Windows.Forms.Button(); this.groupBox6 = new System.Windows.Forms.GroupBox();
this.btnRollerRun = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button();
this.btnTranverseRun = new System.Windows.Forms.Button(); this.txtDOIndex = new System.Windows.Forms.TextBox();
this.btnTranverse = new System.Windows.Forms.Button(); this.label14 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label(); this.btnWriteSingleDO = new System.Windows.Forms.Button();
this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); this.txtWriteTime = new System.Windows.Forms.TextBox();
this.btnStopTDown = new System.Windows.Forms.Button(); this.label5 = new System.Windows.Forms.Label();
this.cmbStopList = new System.Windows.Forms.ComboBox(); this.txtDoName = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
this.cmbWriteIO = new System.Windows.Forms.ComboBox();
this.btnCloseA = new System.Windows.Forms.Button(); this.btnCloseA = new System.Windows.Forms.Button();
this.btnClearL = new System.Windows.Forms.Button(); this.btnClearL = new System.Windows.Forms.Button();
this.btnLogDebug = new System.Windows.Forms.Button(); this.btnLogDebug = new System.Windows.Forms.Button();
this.btnOLOutStopDown = new System.Windows.Forms.Button();
this.btnOLInStopDown = new System.Windows.Forms.Button();
this.btnInLOutStopDown = new System.Windows.Forms.Button();
this.btnInLInStopDown = new System.Windows.Forms.Button();
this.btnInLineRun = new System.Windows.Forms.Button();
this.btnOutL = new System.Windows.Forms.Button();
this.groupBox4 = new System.Windows.Forms.GroupBox(); this.groupBox4 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
...@@ -75,7 +71,7 @@ ...@@ -75,7 +71,7 @@
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
this.groupBox5.SuspendLayout(); this.groupBox5.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); this.groupBox6.SuspendLayout();
this.groupBox4.SuspendLayout(); this.groupBox4.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
...@@ -103,24 +99,24 @@ ...@@ -103,24 +99,24 @@
this.toolStripSeparator8, this.toolStripSeparator8,
this.toolStripMenuItem1}); this.toolStripMenuItem1});
this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(113, 62); this.contextMenuStrip1.Size = new System.Drawing.Size(125, 74);
// //
// 显示ToolStripMenuItem // 显示ToolStripMenuItem
// //
this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem"; this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem";
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(112, 26); this.显示ToolStripMenuItem.Size = new System.Drawing.Size(124, 32);
this.显示ToolStripMenuItem.Text = "显示"; this.显示ToolStripMenuItem.Text = "显示";
this.显示ToolStripMenuItem.Click += new System.EventHandler(this.显示ToolStripMenuItem_Click); this.显示ToolStripMenuItem.Click += new System.EventHandler(this.显示ToolStripMenuItem_Click);
// //
// toolStripSeparator8 // toolStripSeparator8
// //
this.toolStripSeparator8.Name = "toolStripSeparator8"; this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(109, 6); this.toolStripSeparator8.Size = new System.Drawing.Size(121, 6);
// //
// toolStripMenuItem1 // toolStripMenuItem1
// //
this.toolStripMenuItem1.Name = "toolStripMenuItem1"; this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(112, 26); this.toolStripMenuItem1.Size = new System.Drawing.Size(124, 32);
this.toolStripMenuItem1.Text = "退出"; this.toolStripMenuItem1.Text = "退出";
this.toolStripMenuItem1.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click); this.toolStripMenuItem1.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click);
// //
...@@ -135,9 +131,11 @@ ...@@ -135,9 +131,11 @@
this.groupBox5.Controls.Add(this.btnNeedLeave); this.groupBox5.Controls.Add(this.btnNeedLeave);
this.groupBox5.Controls.Add(this.btnDis); this.groupBox5.Controls.Add(this.btnDis);
this.groupBox5.Controls.Add(this.btnInit); this.groupBox5.Controls.Add(this.btnInit);
this.groupBox5.Location = new System.Drawing.Point(450, 132); this.groupBox5.Location = new System.Drawing.Point(562, 260);
this.groupBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox5.Name = "groupBox5"; this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(728, 77); this.groupBox5.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox5.Size = new System.Drawing.Size(910, 96);
this.groupBox5.TabIndex = 277; this.groupBox5.TabIndex = 277;
this.groupBox5.TabStop = false; this.groupBox5.TabStop = false;
this.groupBox5.Text = "AGV调度通信"; this.groupBox5.Text = "AGV调度通信";
...@@ -147,9 +145,10 @@ ...@@ -147,9 +145,10 @@
this.chkBoxAGVCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkBoxAGVCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chkBoxAGVCancel.AutoSize = true; this.chkBoxAGVCancel.AutoSize = true;
this.chkBoxAGVCancel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chkBoxAGVCancel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkBoxAGVCancel.Location = new System.Drawing.Point(580, 41); this.chkBoxAGVCancel.Location = new System.Drawing.Point(724, 51);
this.chkBoxAGVCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chkBoxAGVCancel.Name = "chkBoxAGVCancel"; this.chkBoxAGVCancel.Name = "chkBoxAGVCancel";
this.chkBoxAGVCancel.Size = new System.Drawing.Size(142, 24); this.chkBoxAGVCancel.Size = new System.Drawing.Size(179, 28);
this.chkBoxAGVCancel.TabIndex = 275; this.chkBoxAGVCancel.TabIndex = 275;
this.chkBoxAGVCancel.Text = "AGV_CancelState"; this.chkBoxAGVCancel.Text = "AGV_CancelState";
this.chkBoxAGVCancel.UseVisualStyleBackColor = true; this.chkBoxAGVCancel.UseVisualStyleBackColor = true;
...@@ -158,29 +157,32 @@ ...@@ -158,29 +157,32 @@
// txtShelfId // txtShelfId
// //
this.txtShelfId.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtShelfId.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtShelfId.Location = new System.Drawing.Point(300, 31); this.txtShelfId.Location = new System.Drawing.Point(375, 39);
this.txtShelfId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtShelfId.MaxLength = 4; this.txtShelfId.MaxLength = 4;
this.txtShelfId.Name = "txtShelfId"; this.txtShelfId.Name = "txtShelfId";
this.txtShelfId.Size = new System.Drawing.Size(53, 26); this.txtShelfId.Size = new System.Drawing.Size(65, 31);
this.txtShelfId.TabIndex = 6; this.txtShelfId.TabIndex = 6;
this.txtShelfId.Text = "000"; this.txtShelfId.Text = "000";
// //
// txtname // txtname
// //
this.txtname.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtname.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtname.Location = new System.Drawing.Point(239, 31); this.txtname.Location = new System.Drawing.Point(299, 39);
this.txtname.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtname.MaxLength = 4; this.txtname.MaxLength = 4;
this.txtname.Name = "txtname"; this.txtname.Name = "txtname";
this.txtname.Size = new System.Drawing.Size(53, 26); this.txtname.Size = new System.Drawing.Size(65, 31);
this.txtname.TabIndex = 5; this.txtname.TabIndex = 5;
this.txtname.Text = "C2"; this.txtname.Text = "C2";
// //
// btnNeedEntry // btnNeedEntry
// //
this.btnNeedEntry.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnNeedEntry.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNeedEntry.Location = new System.Drawing.Point(469, 24); this.btnNeedEntry.Location = new System.Drawing.Point(586, 30);
this.btnNeedEntry.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnNeedEntry.Name = "btnNeedEntry"; this.btnNeedEntry.Name = "btnNeedEntry";
this.btnNeedEntry.Size = new System.Drawing.Size(100, 39); this.btnNeedEntry.Size = new System.Drawing.Size(125, 49);
this.btnNeedEntry.TabIndex = 4; this.btnNeedEntry.TabIndex = 4;
this.btnNeedEntry.Text = "NeedEnter"; this.btnNeedEntry.Text = "NeedEnter";
this.btnNeedEntry.UseVisualStyleBackColor = true; this.btnNeedEntry.UseVisualStyleBackColor = true;
...@@ -189,9 +191,10 @@ ...@@ -189,9 +191,10 @@
// btnNeedLeave // btnNeedLeave
// //
this.btnNeedLeave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnNeedLeave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNeedLeave.Location = new System.Drawing.Point(361, 24); this.btnNeedLeave.Location = new System.Drawing.Point(451, 30);
this.btnNeedLeave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnNeedLeave.Name = "btnNeedLeave"; this.btnNeedLeave.Name = "btnNeedLeave";
this.btnNeedLeave.Size = new System.Drawing.Size(100, 39); this.btnNeedLeave.Size = new System.Drawing.Size(125, 49);
this.btnNeedLeave.TabIndex = 3; this.btnNeedLeave.TabIndex = 3;
this.btnNeedLeave.Text = "NeedLeave"; this.btnNeedLeave.Text = "NeedLeave";
this.btnNeedLeave.UseVisualStyleBackColor = true; this.btnNeedLeave.UseVisualStyleBackColor = true;
...@@ -200,9 +203,10 @@ ...@@ -200,9 +203,10 @@
// btnDis // btnDis
// //
this.btnDis.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDis.Location = new System.Drawing.Point(131, 24); this.btnDis.Location = new System.Drawing.Point(164, 30);
this.btnDis.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnDis.Name = "btnDis"; this.btnDis.Name = "btnDis";
this.btnDis.Size = new System.Drawing.Size(100, 39); this.btnDis.Size = new System.Drawing.Size(125, 49);
this.btnDis.TabIndex = 2; this.btnDis.TabIndex = 2;
this.btnDis.Text = "断开"; this.btnDis.Text = "断开";
this.btnDis.UseVisualStyleBackColor = true; this.btnDis.UseVisualStyleBackColor = true;
...@@ -211,9 +215,10 @@ ...@@ -211,9 +215,10 @@
// btnInit // btnInit
// //
this.btnInit.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnInit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInit.Location = new System.Drawing.Point(23, 24); this.btnInit.Location = new System.Drawing.Point(29, 30);
this.btnInit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnInit.Name = "btnInit"; this.btnInit.Name = "btnInit";
this.btnInit.Size = new System.Drawing.Size(100, 39); this.btnInit.Size = new System.Drawing.Size(125, 49);
this.btnInit.TabIndex = 1; this.btnInit.TabIndex = 1;
this.btnInit.Text = "连接"; this.btnInit.Text = "连接";
this.btnInit.UseVisualStyleBackColor = true; this.btnInit.UseVisualStyleBackColor = true;
...@@ -223,144 +228,156 @@ ...@@ -223,144 +228,156 @@
// //
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox2.Controls.Add(this.btnSwitch); this.groupBox2.Controls.Add(this.groupBox6);
this.groupBox2.Controls.Add(this.btnRollerRun);
this.groupBox2.Controls.Add(this.btnTranverseRun);
this.groupBox2.Controls.Add(this.btnTranverse);
this.groupBox2.Controls.Add(this.label1);
this.groupBox2.Controls.Add(this.numericUpDown1);
this.groupBox2.Controls.Add(this.btnStopTDown);
this.groupBox2.Controls.Add(this.cmbStopList);
this.groupBox2.Controls.Add(this.btnCloseA); this.groupBox2.Controls.Add(this.btnCloseA);
this.groupBox2.Controls.Add(this.btnClearL); this.groupBox2.Controls.Add(this.btnClearL);
this.groupBox2.Controls.Add(this.btnLogDebug); this.groupBox2.Controls.Add(this.btnLogDebug);
this.groupBox2.Controls.Add(this.btnOLOutStopDown);
this.groupBox2.Controls.Add(this.btnOLInStopDown);
this.groupBox2.Controls.Add(this.btnInLOutStopDown);
this.groupBox2.Controls.Add(this.btnInLInStopDown);
this.groupBox2.Controls.Add(this.btnInLineRun);
this.groupBox2.Controls.Add(this.btnOutL);
this.groupBox2.Controls.Add(this.groupBox4); this.groupBox2.Controls.Add(this.groupBox4);
this.groupBox2.Controls.Add(this.groupBox1); this.groupBox2.Controls.Add(this.groupBox1);
this.groupBox2.Location = new System.Drawing.Point(10, 132); this.groupBox2.Location = new System.Drawing.Point(12, 252);
this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(434, 604); this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox2.Size = new System.Drawing.Size(542, 668);
this.groupBox2.TabIndex = 276; this.groupBox2.TabIndex = 276;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
// //
// btnSwitch // groupBox6
// //
this.btnSwitch.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.groupBox6.Controls.Add(this.button2);
this.btnSwitch.Location = new System.Drawing.Point(22, 413); this.groupBox6.Controls.Add(this.txtDOIndex);
this.btnSwitch.Name = "btnSwitch"; this.groupBox6.Controls.Add(this.label14);
this.btnSwitch.Size = new System.Drawing.Size(132, 39); this.groupBox6.Controls.Add(this.btnWriteSingleDO);
this.btnSwitch.TabIndex = 290; this.groupBox6.Controls.Add(this.txtWriteTime);
this.btnSwitch.Text = "料串切换气缸前进"; this.groupBox6.Controls.Add(this.label5);
this.btnSwitch.UseVisualStyleBackColor = true; this.groupBox6.Controls.Add(this.txtDoName);
this.btnSwitch.Click += new System.EventHandler(this.btnSwitch_Forward_Click); this.groupBox6.Controls.Add(this.label17);
// this.groupBox6.Controls.Add(this.cmbWriteIO);
// btnRollerRun this.groupBox6.Location = new System.Drawing.Point(21, 349);
// this.groupBox6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnRollerRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.groupBox6.Name = "groupBox6";
this.btnRollerRun.Location = new System.Drawing.Point(298, 368); this.groupBox6.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnRollerRun.Name = "btnRollerRun"; this.groupBox6.Size = new System.Drawing.Size(514, 206);
this.btnRollerRun.Size = new System.Drawing.Size(132, 39); this.groupBox6.TabIndex = 284;
this.btnRollerRun.TabIndex = 289; this.groupBox6.TabStop = false;
this.btnRollerRun.Text = "滚筒电机运转"; this.groupBox6.Text = "DO写入";
this.btnRollerRun.UseVisualStyleBackColor = true; //
this.btnRollerRun.Click += new System.EventHandler(this.btnRollerRun_Click); // button2
// //
// btnTranverseRun this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
// this.button2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTranverseRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button2.Location = new System.Drawing.Point(340, 131);
this.btnTranverseRun.Location = new System.Drawing.Point(298, 323); this.button2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnTranverseRun.Name = "btnTranverseRun"; this.button2.Name = "button2";
this.btnTranverseRun.Size = new System.Drawing.Size(132, 39); this.button2.Size = new System.Drawing.Size(109, 42);
this.btnTranverseRun.TabIndex = 288; this.button2.TabIndex = 262;
this.btnTranverseRun.Text = "横移电机运转"; this.button2.Text = "关闭";
this.btnTranverseRun.UseVisualStyleBackColor = true; this.button2.UseVisualStyleBackColor = true;
this.btnTranverseRun.Click += new System.EventHandler(this.btnTranverseRun_Click); this.button2.Click += new System.EventHandler(this.button2_Click);
// //
// btnTranverse // txtDOIndex
// //
this.btnTranverse.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTranverse.Location = new System.Drawing.Point(298, 278); this.txtDOIndex.Location = new System.Drawing.Point(360, 70);
this.btnTranverse.Name = "btnTranverse"; this.txtDOIndex.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnTranverse.Size = new System.Drawing.Size(132, 39); this.txtDOIndex.MaxLength = 10;
this.btnTranverse.TabIndex = 287; this.txtDOIndex.Name = "txtDOIndex";
this.btnTranverse.Text = "横移机构下降"; this.txtDOIndex.Size = new System.Drawing.Size(64, 27);
this.btnTranverse.UseVisualStyleBackColor = true; this.txtDOIndex.TabIndex = 261;
this.btnTranverse.Click += new System.EventHandler(this.btnTranverse_Click); this.txtDOIndex.Text = "0";
// //
// label1 // label14
// //
this.label1.AutoSize = true; this.label14.AutoSize = true;
this.label1.Location = new System.Drawing.Point(247, 496); this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Name = "label1"; this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Size = new System.Drawing.Size(25, 17); this.label14.Location = new System.Drawing.Point(274, 78);
this.label1.TabIndex = 286; this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Text = "ms"; this.label14.Name = "label14";
// this.label14.Size = new System.Drawing.Size(54, 20);
// numericUpDown1 this.label14.TabIndex = 260;
// this.label14.Text = "地址：";
this.numericUpDown1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.numericUpDown1.Increment = new decimal(new int[] { //
50, // btnWriteSingleDO
0, //
0, this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
0}); this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numericUpDown1.Location = new System.Drawing.Point(180, 491); this.btnWriteSingleDO.Location = new System.Drawing.Point(205, 131);
this.numericUpDown1.Maximum = new decimal(new int[] { this.btnWriteSingleDO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
300000, this.btnWriteSingleDO.Name = "btnWriteSingleDO";
0, this.btnWriteSingleDO.Size = new System.Drawing.Size(109, 42);
0, this.btnWriteSingleDO.TabIndex = 257;
0}); this.btnWriteSingleDO.Text = "打开";
this.numericUpDown1.Minimum = new decimal(new int[] { this.btnWriteSingleDO.UseVisualStyleBackColor = true;
100, this.btnWriteSingleDO.Click += new System.EventHandler(this.btnWriteSingleDO_Click);
0, //
0, // txtWriteTime
0}); //
this.numericUpDown1.Name = "numericUpDown1"; this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numericUpDown1.Size = new System.Drawing.Size(61, 26); this.txtWriteTime.Location = new System.Drawing.Point(95, 139);
this.numericUpDown1.TabIndex = 285; this.txtWriteTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.numericUpDown1.Value = new decimal(new int[] { this.txtWriteTime.MaxLength = 10;
600, this.txtWriteTime.Name = "txtWriteTime";
0, this.txtWriteTime.Size = new System.Drawing.Size(64, 27);
0, this.txtWriteTime.TabIndex = 259;
0}); this.txtWriteTime.Text = "0";
// //
// btnStopTDown // label5
// //
this.btnStopTDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label5.AutoSize = true;
this.btnStopTDown.Location = new System.Drawing.Point(278, 485); this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStopTDown.Name = "btnStopTDown"; this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.btnStopTDown.Size = new System.Drawing.Size(127, 39); this.label5.Location = new System.Drawing.Point(8, 142);
this.btnStopTDown.TabIndex = 284; this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.btnStopTDown.Text = "阻挡定时下降"; this.label5.Name = "label5";
this.btnStopTDown.UseVisualStyleBackColor = true; this.label5.Size = new System.Drawing.Size(74, 20);
this.btnStopTDown.Click += new System.EventHandler(this.btnStopTDown_Click); this.label5.TabIndex = 258;
// this.label5.Text = "定时(ms):";
// cmbStopList this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
this.cmbStopList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; // txtDoName
this.cmbStopList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); //
this.cmbStopList.FormattingEnabled = true; this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbStopList.Items.AddRange(new object[] { this.txtDoName.Location = new System.Drawing.Point(81, 70);
"分盘1进料线_阻挡", this.txtDoName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
"分盘1进料线_出口阻挡", this.txtDoName.MaxLength = 10;
"分盘2出料线_阻挡"}); this.txtDoName.Name = "txtDoName";
this.cmbStopList.Location = new System.Drawing.Point(21, 490); this.txtDoName.Size = new System.Drawing.Size(165, 27);
this.cmbStopList.Name = "cmbStopList"; this.txtDoName.TabIndex = 242;
this.cmbStopList.Size = new System.Drawing.Size(153, 28); this.txtDoName.Text = "0";
this.cmbStopList.TabIndex = 283; //
// label17
//
this.label17.AutoSize = true;
this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label17.Location = new System.Drawing.Point(8, 74);
this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(56, 20);
this.label17.TabIndex = 241;
this.label17.Text = "设备IP:";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// cmbWriteIO
//
this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.Location = new System.Drawing.Point(11, 28);
this.cmbWriteIO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(494, 28);
this.cmbWriteIO.TabIndex = 0;
this.cmbWriteIO.SelectedIndexChanged += new System.EventHandler(this.cmbWriteIO_SelectedIndexChanged);
// //
// btnCloseA // btnCloseA
// //
this.btnCloseA.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnCloseA.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCloseA.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseA.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseA.Location = new System.Drawing.Point(22, 548); this.btnCloseA.Location = new System.Drawing.Point(28, 598);
this.btnCloseA.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnCloseA.Name = "btnCloseA"; this.btnCloseA.Name = "btnCloseA";
this.btnCloseA.Size = new System.Drawing.Size(173, 39); this.btnCloseA.Size = new System.Drawing.Size(216, 49);
this.btnCloseA.TabIndex = 282; this.btnCloseA.TabIndex = 282;
this.btnCloseA.Text = "关闭所有DO"; this.btnCloseA.Text = "关闭所有DO";
this.btnCloseA.UseVisualStyleBackColor = true; this.btnCloseA.UseVisualStyleBackColor = true;
...@@ -370,9 +387,10 @@ ...@@ -370,9 +387,10 @@
// //
this.btnClearL.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnClearL.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnClearL.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClearL.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearL.Location = new System.Drawing.Point(301, 548); this.btnClearL.Location = new System.Drawing.Point(376, 598);
this.btnClearL.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnClearL.Name = "btnClearL"; this.btnClearL.Name = "btnClearL";
this.btnClearL.Size = new System.Drawing.Size(104, 39); this.btnClearL.Size = new System.Drawing.Size(130, 49);
this.btnClearL.TabIndex = 14; this.btnClearL.TabIndex = 14;
this.btnClearL.Text = "清理日志"; this.btnClearL.Text = "清理日志";
this.btnClearL.UseVisualStyleBackColor = true; this.btnClearL.UseVisualStyleBackColor = true;
...@@ -382,86 +400,23 @@ ...@@ -382,86 +400,23 @@
// //
this.btnLogDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnLogDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnLogDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLogDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLogDebug.Location = new System.Drawing.Point(196, 548); this.btnLogDebug.Location = new System.Drawing.Point(245, 598);
this.btnLogDebug.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnLogDebug.Name = "btnLogDebug"; this.btnLogDebug.Name = "btnLogDebug";
this.btnLogDebug.Size = new System.Drawing.Size(104, 39); this.btnLogDebug.Size = new System.Drawing.Size(130, 49);
this.btnLogDebug.TabIndex = 13; this.btnLogDebug.TabIndex = 13;
this.btnLogDebug.Text = "开启DEBUG"; this.btnLogDebug.Text = "开启DEBUG";
this.btnLogDebug.UseVisualStyleBackColor = true; this.btnLogDebug.UseVisualStyleBackColor = true;
this.btnLogDebug.Click += new System.EventHandler(this.btnLogDebug_Click); this.btnLogDebug.Click += new System.EventHandler(this.btnLogDebug_Click);
// //
// btnOLOutStopDown
//
this.btnOLOutStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOLOutStopDown.Location = new System.Drawing.Point(160, 368);
this.btnOLOutStopDown.Name = "btnOLOutStopDown";
this.btnOLOutStopDown.Size = new System.Drawing.Size(132, 39);
this.btnOLOutStopDown.TabIndex = 281;
this.btnOLOutStopDown.Text = "分盘2线体出口阻挡下降";
this.btnOLOutStopDown.UseVisualStyleBackColor = true;
this.btnOLOutStopDown.Click += new System.EventHandler(this.btnOLOutStopDown_Click);
//
// btnOLInStopDown
//
this.btnOLInStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOLInStopDown.Location = new System.Drawing.Point(160, 323);
this.btnOLInStopDown.Name = "btnOLInStopDown";
this.btnOLInStopDown.Size = new System.Drawing.Size(132, 39);
this.btnOLInStopDown.TabIndex = 280;
this.btnOLInStopDown.Text = "分盘2线体阻挡下降";
this.btnOLInStopDown.UseVisualStyleBackColor = true;
this.btnOLInStopDown.Click += new System.EventHandler(this.btnOLInStopDown_Click);
//
// btnInLOutStopDown
//
this.btnInLOutStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInLOutStopDown.Location = new System.Drawing.Point(22, 368);
this.btnInLOutStopDown.Name = "btnInLOutStopDown";
this.btnInLOutStopDown.Size = new System.Drawing.Size(132, 39);
this.btnInLOutStopDown.TabIndex = 279;
this.btnInLOutStopDown.Text = "分盘1线体出口阻挡下降";
this.btnInLOutStopDown.UseVisualStyleBackColor = true;
this.btnInLOutStopDown.Click += new System.EventHandler(this.btnInLOutStopDown_Click);
//
// btnInLInStopDown
//
this.btnInLInStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInLInStopDown.Location = new System.Drawing.Point(22, 323);
this.btnInLInStopDown.Name = "btnInLInStopDown";
this.btnInLInStopDown.Size = new System.Drawing.Size(132, 39);
this.btnInLInStopDown.TabIndex = 278;
this.btnInLInStopDown.Text = "分盘1线体阻挡下降";
this.btnInLInStopDown.UseVisualStyleBackColor = true;
this.btnInLInStopDown.Click += new System.EventHandler(this.btnInLInStopDown_Click);
//
// btnInLineRun
//
this.btnInLineRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInLineRun.Location = new System.Drawing.Point(22, 278);
this.btnInLineRun.Name = "btnInLineRun";
this.btnInLineRun.Size = new System.Drawing.Size(132, 39);
this.btnInLineRun.TabIndex = 276;
this.btnInLineRun.Text = "分盘1线体运转";
this.btnInLineRun.UseVisualStyleBackColor = true;
this.btnInLineRun.Click += new System.EventHandler(this.btnInLineRun_Click);
//
// btnOutL
//
this.btnOutL.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutL.Location = new System.Drawing.Point(160, 278);
this.btnOutL.Name = "btnOutL";
this.btnOutL.Size = new System.Drawing.Size(132, 39);
this.btnOutL.TabIndex = 277;
this.btnOutL.Text = "分盘2线体运转";
this.btnOutL.UseVisualStyleBackColor = true;
this.btnOutL.Click += new System.EventHandler(this.btnOutL_Click);
//
// groupBox4 // groupBox4
// //
this.groupBox4.Controls.Add(this.tableLayoutPanel2); this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(218, 15); this.groupBox4.Location = new System.Drawing.Point(275, 28);
this.groupBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox4.Name = "groupBox4"; this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(208, 251); this.groupBox4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox4.Size = new System.Drawing.Size(260, 314);
this.groupBox4.TabIndex = 275; this.groupBox4.TabIndex = 275;
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表"; this.groupBox4.Text = "DO列表";
...@@ -474,20 +429,23 @@ ...@@ -474,20 +429,23 @@
this.tableLayoutPanel2.AutoScroll = true; this.tableLayoutPanel2.AutoScroll = true;
this.tableLayoutPanel2.ColumnCount = 1; this.tableLayoutPanel2.ColumnCount = 1;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14); this.tableLayoutPanel2.Location = new System.Drawing.Point(6, 18);
this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2; 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, 21F));
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, 21F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(197, 231); this.tableLayoutPanel2.Size = new System.Drawing.Size(246, 289);
this.tableLayoutPanel2.TabIndex = 103; this.tableLayoutPanel2.TabIndex = 103;
// //
// groupBox1 // groupBox1
// //
this.groupBox1.Controls.Add(this.tableLayoutPanel1); this.groupBox1.Controls.Add(this.tableLayoutPanel1);
this.groupBox1.Location = new System.Drawing.Point(6, 15); this.groupBox1.Location = new System.Drawing.Point(8, 28);
this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(208, 251); this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Size = new System.Drawing.Size(260, 314);
this.groupBox1.TabIndex = 274; this.groupBox1.TabIndex = 274;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "DI列表"; this.groupBox1.Text = "DI列表";
...@@ -500,12 +458,13 @@ ...@@ -500,12 +458,13 @@
this.tableLayoutPanel1.AutoScroll = true; this.tableLayoutPanel1.AutoScroll = true;
this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14); this.tableLayoutPanel1.Location = new System.Drawing.Point(8, 18);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2; 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, 21F));
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, 21F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(197, 231); this.tableLayoutPanel1.Size = new System.Drawing.Size(246, 289);
this.tableLayoutPanel1.TabIndex = 102; this.tableLayoutPanel1.TabIndex = 102;
// //
// richTextBox1 // richTextBox1
...@@ -514,9 +473,10 @@ ...@@ -514,9 +473,10 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.richTextBox1.Location = new System.Drawing.Point(450, 215); this.richTextBox1.Location = new System.Drawing.Point(562, 364);
this.richTextBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(728, 521); this.richTextBox1.Size = new System.Drawing.Size(909, 555);
this.richTextBox1.TabIndex = 256; this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = ""; this.richTextBox1.Text = "";
this.richTextBox1.VisibleChanged += new System.EventHandler(this.richTextBox1_VisibleChanged); this.richTextBox1.VisibleChanged += new System.EventHandler(this.richTextBox1_VisibleChanged);
...@@ -528,9 +488,11 @@ ...@@ -528,9 +488,11 @@
this.groupBox3.Controls.Add(this.lblWarnMsg); this.groupBox3.Controls.Add(this.lblWarnMsg);
this.groupBox3.Controls.Add(this.panel1); this.groupBox3.Controls.Add(this.panel1);
this.groupBox3.Controls.Add(this.lblThisSta); this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Location = new System.Drawing.Point(10, 6); this.groupBox3.Location = new System.Drawing.Point(12, 8);
this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(1168, 124); this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox3.Size = new System.Drawing.Size(1460, 238);
this.groupBox3.TabIndex = 268; this.groupBox3.TabIndex = 268;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态"; this.groupBox3.Text = "设备状态";
...@@ -539,9 +501,10 @@ ...@@ -539,9 +501,10 @@
// //
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red; this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(267, 66); this.lblWarnMsg.Location = new System.Drawing.Point(382, 156);
this.lblWarnMsg.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblWarnMsg.Name = "lblWarnMsg"; this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(856, 52); this.lblWarnMsg.Size = new System.Drawing.Size(1070, 65);
this.lblWarnMsg.TabIndex = 224; this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
...@@ -556,19 +519,22 @@ ...@@ -556,19 +519,22 @@
this.panel1.Controls.Add(this.chbDebug); this.panel1.Controls.Add(this.chbDebug);
this.panel1.Controls.Add(this.btnDISTStop); this.panel1.Controls.Add(this.btnDISTStop);
this.panel1.Controls.Add(this.chbAuto); this.panel1.Controls.Add(this.chbAuto);
this.panel1.Location = new System.Drawing.Point(5, 15); this.panel1.Location = new System.Drawing.Point(6, 19);
this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1160, 48); this.panel1.Size = new System.Drawing.Size(1450, 134);
this.panel1.TabIndex = 273; this.panel1.TabIndex = 273;
this.panel1.Click += new System.EventHandler(this.panel1_Click);
// //
// chbMoveStop // chbMoveStop
// //
this.chbMoveStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbMoveStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbMoveStop.AutoSize = true; this.chbMoveStop.AutoSize = true;
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(704, 10); this.chbMoveStop.Location = new System.Drawing.Point(881, 12);
this.chbMoveStop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbMoveStop.Name = "chbMoveStop"; this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24); this.chbMoveStop.Size = new System.Drawing.Size(104, 28);
this.chbMoveStop.TabIndex = 274; this.chbMoveStop.TabIndex = 274;
this.chbMoveStop.Text = "暂停运动"; this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true; this.chbMoveStop.UseVisualStyleBackColor = true;
...@@ -577,9 +543,10 @@ ...@@ -577,9 +543,10 @@
// lblInfo // lblInfo
// //
this.lblInfo.AutoSize = true; this.lblInfo.AutoSize = true;
this.lblInfo.Location = new System.Drawing.Point(277, 5); this.lblInfo.Location = new System.Drawing.Point(346, 6);
this.lblInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblInfo.Name = "lblInfo"; this.lblInfo.Name = "lblInfo";
this.lblInfo.Size = new System.Drawing.Size(56, 17); this.lblInfo.Size = new System.Drawing.Size(69, 20);
this.lblInfo.TabIndex = 273; this.lblInfo.TabIndex = 273;
this.lblInfo.Text = "运行信息"; this.lblInfo.Text = "运行信息";
// //
...@@ -587,9 +554,10 @@ ...@@ -587,9 +554,10 @@
// //
this.btnDISTExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnDISTExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnDISTExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDISTExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDISTExit.Location = new System.Drawing.Point(1023, 3); this.btnDISTExit.Location = new System.Drawing.Point(1279, 4);
this.btnDISTExit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnDISTExit.Name = "btnDISTExit"; this.btnDISTExit.Name = "btnDISTExit";
this.btnDISTExit.Size = new System.Drawing.Size(132, 39); this.btnDISTExit.Size = new System.Drawing.Size(165, 49);
this.btnDISTExit.TabIndex = 4; this.btnDISTExit.TabIndex = 4;
this.btnDISTExit.Text = "退出"; this.btnDISTExit.Text = "退出";
this.btnDISTExit.UseVisualStyleBackColor = true; this.btnDISTExit.UseVisualStyleBackColor = true;
...@@ -598,9 +566,10 @@ ...@@ -598,9 +566,10 @@
// btnDISTStart // btnDISTStart
// //
this.btnDISTStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDISTStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDISTStart.Location = new System.Drawing.Point(4, 3); this.btnDISTStart.Location = new System.Drawing.Point(5, 4);
this.btnDISTStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnDISTStart.Name = "btnDISTStart"; this.btnDISTStart.Name = "btnDISTStart";
this.btnDISTStart.Size = new System.Drawing.Size(132, 39); this.btnDISTStart.Size = new System.Drawing.Size(165, 49);
this.btnDISTStart.TabIndex = 0; this.btnDISTStart.TabIndex = 0;
this.btnDISTStart.Text = "启动"; this.btnDISTStart.Text = "启动";
this.btnDISTStart.UseVisualStyleBackColor = true; this.btnDISTStart.UseVisualStyleBackColor = true;
...@@ -611,9 +580,10 @@ ...@@ -611,9 +580,10 @@
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true; 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.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(932, 10); this.chbDebug.Location = new System.Drawing.Point(1166, 12);
this.chbDebug.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24); this.chbDebug.Size = new System.Drawing.Size(104, 28);
this.chbDebug.TabIndex = 271; this.chbDebug.TabIndex = 271;
this.chbDebug.Text = "调试状态"; this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true; this.chbDebug.UseVisualStyleBackColor = true;
...@@ -622,9 +592,10 @@ ...@@ -622,9 +592,10 @@
// btnDISTStop // btnDISTStop
// //
this.btnDISTStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDISTStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDISTStop.Location = new System.Drawing.Point(139, 3); this.btnDISTStop.Location = new System.Drawing.Point(174, 4);
this.btnDISTStop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnDISTStop.Name = "btnDISTStop"; this.btnDISTStop.Name = "btnDISTStop";
this.btnDISTStop.Size = new System.Drawing.Size(132, 39); this.btnDISTStop.Size = new System.Drawing.Size(165, 49);
this.btnDISTStop.TabIndex = 1; this.btnDISTStop.TabIndex = 1;
this.btnDISTStop.Text = "停止"; this.btnDISTStop.Text = "停止";
this.btnDISTStop.UseVisualStyleBackColor = true; this.btnDISTStop.UseVisualStyleBackColor = true;
...@@ -635,9 +606,10 @@ ...@@ -635,9 +606,10 @@
this.chbAuto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbAuto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbAuto.AutoSize = true; this.chbAuto.AutoSize = true;
this.chbAuto.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAuto.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAuto.Location = new System.Drawing.Point(812, 10); this.chbAuto.Location = new System.Drawing.Point(1015, 12);
this.chbAuto.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbAuto.Name = "chbAuto"; this.chbAuto.Name = "chbAuto";
this.chbAuto.Size = new System.Drawing.Size(112, 24); this.chbAuto.Size = new System.Drawing.Size(140, 28);
this.chbAuto.TabIndex = 270; this.chbAuto.TabIndex = 270;
this.chbAuto.Text = "开机自动启动"; this.chbAuto.Text = "开机自动启动";
this.chbAuto.UseVisualStyleBackColor = true; this.chbAuto.UseVisualStyleBackColor = true;
...@@ -648,23 +620,24 @@ ...@@ -648,23 +620,24 @@
this.lblThisSta.AutoSize = true; this.lblThisSta.AutoSize = true;
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Green; this.lblThisSta.ForeColor = System.Drawing.Color.Green;
this.lblThisSta.Location = new System.Drawing.Point(8, 83); this.lblThisSta.Location = new System.Drawing.Point(16, 178);
this.lblThisSta.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(65, 19); this.lblThisSta.Size = new System.Drawing.Size(84, 25);
this.lblThisSta.TabIndex = 216; this.lblThisSta.TabIndex = 216;
this.lblThisSta.Text = "等待启动"; this.lblThisSta.Text = "等待启动";
// //
// FrmDISTClient // FrmDISTClient
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1184, 740); this.ClientSize = new System.Drawing.Size(1480, 925);
this.Controls.Add(this.groupBox5); this.Controls.Add(this.groupBox5);
this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox2);
this.Controls.Add(this.richTextBox1); this.Controls.Add(this.richTextBox1);
this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox3);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(4); this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.MaximizeBox = false; this.MaximizeBox = false;
this.Name = "FrmDISTClient"; this.Name = "FrmDISTClient";
this.Opacity = 0D; this.Opacity = 0D;
...@@ -677,8 +650,8 @@ ...@@ -677,8 +650,8 @@
this.groupBox5.ResumeLayout(false); this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout(); this.groupBox5.PerformLayout();
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout(); this.groupBox6.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); this.groupBox6.PerformLayout();
this.groupBox4.ResumeLayout(false); this.groupBox4.ResumeLayout(false);
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
this.groupBox3.ResumeLayout(false); this.groupBox3.ResumeLayout(false);
...@@ -715,30 +688,26 @@ ...@@ -715,30 +688,26 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8; private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
private System.Windows.Forms.GroupBox groupBox5; private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.Button btnOLOutStopDown;
private System.Windows.Forms.Button btnOLInStopDown;
private System.Windows.Forms.Button btnInLOutStopDown;
private System.Windows.Forms.Button btnInLInStopDown;
private System.Windows.Forms.Button btnInLineRun;
private System.Windows.Forms.Button btnOutL;
private System.Windows.Forms.Button btnCloseA; private System.Windows.Forms.Button btnCloseA;
private System.Windows.Forms.Button btnNeedEntry; private System.Windows.Forms.Button btnNeedEntry;
private System.Windows.Forms.Button btnNeedLeave; private System.Windows.Forms.Button btnNeedLeave;
private System.Windows.Forms.Button btnDis; private System.Windows.Forms.Button btnDis;
private System.Windows.Forms.Button btnInit; private System.Windows.Forms.Button btnInit;
private System.Windows.Forms.Label lblInfo; private System.Windows.Forms.Label lblInfo;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.NumericUpDown numericUpDown1;
private System.Windows.Forms.Button btnStopTDown;
private System.Windows.Forms.ComboBox cmbStopList;
private System.Windows.Forms.TextBox txtname; private System.Windows.Forms.TextBox txtname;
private System.Windows.Forms.TextBox txtShelfId; private System.Windows.Forms.TextBox txtShelfId;
private System.Windows.Forms.CheckBox chbMoveStop; private System.Windows.Forms.CheckBox chbMoveStop;
private System.Windows.Forms.CheckBox chkBoxAGVCancel; private System.Windows.Forms.CheckBox chkBoxAGVCancel;
private System.Windows.Forms.Button btnRollerRun; private System.Windows.Forms.GroupBox groupBox6;
private System.Windows.Forms.Button btnTranverseRun; private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button btnTranverse; private System.Windows.Forms.TextBox txtDOIndex;
private System.Windows.Forms.Button btnSwitch; private System.Windows.Forms.Label label14;
private System.Windows.Forms.Button btnWriteSingleDO;
private System.Windows.Forms.TextBox txtWriteTime;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.TextBox txtDoName;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.ComboBox cmbWriteIO;
} }
} }
source/DISTLineClient/FrmDISTClient.cs
...@@ -37,8 +37,11 @@ namespace OnlineStore.DISTLineClient ...@@ -37,8 +37,11 @@ namespace OnlineStore.DISTLineClient
private void FrmTest_Load(object sender, EventArgs e) private void FrmTest_Load(object sender, EventArgs e)
{ {
LogUtil.logBox = this.richTextBox1; LogUtil.logBox = this.richTextBox1;
cmbStopList.SelectedIndex = 0;
this.distLine = LineManager.InitStore(); this.distLine = LineManager.InitStore();
LoadIOList();
cmbWriteIO.DataSource = new List<ConfigIO>(LineManager.Config.StoreDOList.Values);
cmbWriteIO.ValueMember = "ProName";
cmbWriteIO.DisplayMember = "DisplayStr";
if (distLine == null) if (distLine == null)
{ {
LogUtil.error(LOGGER, "加载设备失败"); LogUtil.error(LOGGER, "加载设备失败");
...@@ -46,12 +49,13 @@ namespace OnlineStore.DISTLineClient ...@@ -46,12 +49,13 @@ namespace OnlineStore.DISTLineClient
return; return;
} }
timer1.Enabled = true; timer1.Enabled = true;
groupBox5.Text = "AGV调度通信，入料线体 [" + distLine.Config.L1_AgvName + "] ,出料线体 [" + distLine.Config.L2_AgvName + "] "; groupBox5.Text = "AGV调度通信，入料线体 [" + distLine.Config.L1_AgvName + "] ,出料串线体 [" + distLine.Config.L2_AgvName + "] 出包装料线体 [" + distLine.Config.L3_AgvName + "]";
chbDebug.Checked = distLine.IsDebug;
DebugMode(distLine.IsDebug);
this.ShowInTaskbar = true; this.ShowInTaskbar = true;
LoadIOList();
txtname.Text = distLine.Config.L2_AgvName; txtname.Text = distLine.Config.L2_AgvName;
notifyIcon1.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title); notifyIcon1.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title,"分盘线");
HideForm(); HideForm();
this.Opacity = 1; this.Opacity = 1;
...@@ -89,6 +93,12 @@ namespace OnlineStore.DISTLineClient ...@@ -89,6 +93,12 @@ namespace OnlineStore.DISTLineClient
this.SuspendLayout(); //此处为不闪屏，一定要有的！ this.SuspendLayout(); //此处为不闪屏，一定要有的！
} }
private void DebugMode(bool isdebug)
{
groupBox6.Enabled = isdebug;
chbDebug.Checked = isdebug;
groupBox5.Enabled = isdebug;
}
private void ReadIOList() private void ReadIOList()
{ {
foreach (string key in DIControlList.Keys) foreach (string key in DIControlList.Keys)
...@@ -298,6 +308,7 @@ namespace OnlineStore.DISTLineClient ...@@ -298,6 +308,7 @@ namespace OnlineStore.DISTLineClient
} }
} }
} }
DebugMode(distLine.IsDebug);
} }
...@@ -331,35 +342,6 @@ namespace OnlineStore.DISTLineClient ...@@ -331,35 +342,6 @@ namespace OnlineStore.DISTLineClient
btn.BackColor = Color.White; btn.BackColor = Color.White;
} }
} }
private void btnInLineRun_Click(object sender, EventArgs e)
{
BtnMove(btnInLineRun, "分盘1线体运转", "分盘1线体停止", IO_Type.L1_Run);
}
private void btnInLInStopDown_Click(object sender, EventArgs e)
{
BtnMove(btnInLInStopDown, "分盘1线体阻挡下降", "分盘1线体阻挡上升", IO_Type.L1_StopDown);
}
private void btnInLOutStopDown_Click(object sender, EventArgs e)
{
BtnMove(btnInLOutStopDown, "分盘1线体出口阻挡下降", "分盘1线体出口阻挡上升", IO_Type.L1_OutStopDown);
}
private void btnOLInStopDown_Click(object sender, EventArgs e)
{
BtnMove(btnOLInStopDown, "分盘2线体阻挡下降", "分盘2线体阻挡上升", IO_Type.L2_StopDown);
}
private void btnOutL_Click(object sender, EventArgs e)
{
BtnMove(btnOutL, "分盘2线体运转", "分盘2线体停止", IO_Type.L2_Run);
}
private void btnOLOutStopDown_Click(object sender, EventArgs e)
{
BtnMove(btnOLOutStopDown, "分盘2线体出口阻挡下降", "分盘2线体出口阻挡上升", IO_Type.L2_OutStopDown);
}
private void btnCloseA_Click(object sender, EventArgs e) private void btnCloseA_Click(object sender, EventArgs e)
{ {
...@@ -398,21 +380,6 @@ namespace OnlineStore.DISTLineClient ...@@ -398,21 +380,6 @@ namespace OnlineStore.DISTLineClient
AgvClient.Dispose(); AgvClient.Dispose();
} }
private void btnStopTDown_Click(object sender, EventArgs e)
{
int value = (int)numericUpDown1.Value;
string iotype = IO_Type.L1_StopDown;
if (cmbStopList.SelectedIndex.Equals(1))
{
iotype = IO_Type.L1_OutStopDown;
}
else if (cmbStopList.SelectedIndex.Equals(2))
{
iotype = IO_Type.L2_StopDown;
}
distLine.StopIOMove(iotype, value);
}
private void chbMoveStop_CheckedChanged(object sender, EventArgs e) private void chbMoveStop_CheckedChanged(object sender, EventArgs e)
{ {
distLine.MoveStop = chbMoveStop.Checked; distLine.MoveStop = chbMoveStop.Checked;
...@@ -424,43 +391,63 @@ namespace OnlineStore.DISTLineClient ...@@ -424,43 +391,63 @@ namespace OnlineStore.DISTLineClient
AgvClient.SetCancelState(chkBoxAGVCancel.Checked); AgvClient.SetCancelState(chkBoxAGVCancel.Checked);
} }
private void btnTranverse_Click(object sender, EventArgs e) private void btnWriteSingleDO_Click(object sender, EventArgs e)
{ {
if (btnTranverse.Text.Equals("横移机构下降")) WriteDO(IO_VALUE.HIGH);
{
IOManager.IOMove(IO_Type.Traverse_Down_SOL, IO_VALUE.LOW);
BtnMove(btnTranverse, "横移机构下降", "横移机构上升", IO_Type.Traverse_Up_SOL);
}
else
{
IOManager.IOMove(IO_Type.Traverse_Up_SOL, IO_VALUE.LOW);
BtnMove(btnTranverse, "横移机构上升", "横移机构下降", IO_Type.Traverse_Down_SOL);
}
} }
private void btnTranverseRun_Click(object sender, EventArgs e) private void button2_Click(object sender, EventArgs e)
{ {
BtnMove(btnTranverseRun, "横移电机运转", "横移电机停止", IO_Type.Traverse_Run); WriteDO(IO_VALUE.LOW);
} }
private void WriteDO(IO_VALUE value)
private void btnRollerRun_Click(object sender, EventArgs e)
{ {
BtnMove(btnRollerRun, "滚筒电机运转", "滚筒电机停止", IO_Type.Roller_Run); string deviceName = txtDoName.Text;
int index = FormUtil.GetIntValue(txtDOIndex);
int time = FormUtil.GetIntValue(txtWriteTime);
if (time > 0)
{
IOManager.instance.WriteSingleDO(deviceName, (byte)0, (ushort)index, value, time);
}
else
{
IOManager.instance.WriteSingleDO(deviceName, (byte)0, (ushort)index, value);
}
} }
IOTextControl selectControl = null;
private void btnSwitch_Forward_Click(object sender, EventArgs e) private void cmbWriteIO_SelectedIndexChanged(object sender, EventArgs e)
{ {
if (btnSwitch.Text.Equals("料串切换气缸前进")) if (cmbWriteIO.SelectedIndex >= 0)
{ {
IOManager.IOMove(IO_Type.Switch_Forward, IO_VALUE.LOW); ConfigIO io = GetSelectDO();
BtnMove(btnSwitch, "料串切换气缸前进", "料串切换气缸后退", IO_Type.Switch_Back); if (io != null)
{
// txtIp.Text = io.DeviceName;
txtDOIndex.Text = io.GetIOAddr().ToString();
txtDoName.Text = io.IO_IP;
IOTextControl newControl = DOControlList[io.ProName];
if (selectControl != null) { selectControl.BackColor = Color.White; }
newControl.BackColor = Color.SkyBlue;
selectControl = newControl;
}
} }
else }
private ConfigIO GetSelectDO()
{
string text = cmbWriteIO.SelectedValue.ToString();
if (LineManager.Config.StoreDOList.ContainsKey(text))
{ {
IOManager.IOMove(IO_Type.Switch_Back, IO_VALUE.LOW); ConfigIO io = LineManager.Config.StoreDOList[text];
BtnMove(btnSwitch, "料串切换气缸后退", "料串切换气缸前进", IO_Type.Switch_Forward); return io;
} }
return null;
}
private void panel1_Click(object sender, EventArgs e)
{
ConfigHelper.AdvanceConfigForm.ShowEditDialog(this);
} }
} }
} }
source/DISTLineClient/Program.cs
...@@ -71,7 +71,7 @@ namespace OnlineStore.DISTLineClient ...@@ -71,7 +71,7 @@ namespace OnlineStore.DISTLineClient
// 如果进程的句柄为0，即代表没有找到该窗体，即该窗体隐藏的情况时 // 如果进程的句柄为0，即代表没有找到该窗体，即该窗体隐藏的情况时
if (process.MainWindowHandle.ToInt32().Equals(0)) if (process.MainWindowHandle.ToInt32().Equals(0))
{ {
string formTitle = ConfigAppSettings.GetValue(Setting_Init.App_Title); string formTitle = ConfigAppSettings.GetValue(Setting_Init.App_Title,"分盘线");
// 获得窗体句柄 // 获得窗体句柄
formhwnd = FindWindow(null, formTitle); formhwnd = FindWindow(null, formTitle);
// 重新显示该窗体并切换到带入到前台 // 重新显示该窗体并切换到带入到前台
......
source/DeviceLibrary/LineConfig/DISTLineConfig.csv
类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID, 类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID,
PRO,IO模块对应的DI数量,IO_DILength,10.85.199.21#16,,,,,,, PRO,IO模块对应的DI数量,IO_DILength,10.85.199.21#16;10.85.199.22#16,,,,,,,
PRO,模块对应的DO数量,IO_DOLength,10.85.199.21#16,,,,,,, PRO,模块对应的DO数量,IO_DOLength,10.85.199.21#16;10.85.199.22#16,,,,,,,
PRO,IO模块IP,PRO_AOI_IP_1,10.85.199.21,,,,,,, PRO,IO模块IP,PRO_AOI_IP_1,10.85.199.21,,,,,,,
PRO,IO模块IP,PRO_AOI_IP_2,10.85.199.22,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X741,DI-01,0,
DI,分盘1线入口检测,L1_InCheck,1,PRO_AOI_IP_1,0,分盘1线入口检测,X742,DI-02,0,
DI,分盘1线阻挡检测,L1_StopCheck,2,PRO_AOI_IP_1,0,分盘1线阻挡检测,X743,DI-03,0,
DI,分盘1线出口检测,L1_OutCheck,3,PRO_AOI_IP_1,0,分盘1线出口检测,X744,DI-04,0,
DI,分盘2线入口检测,L2_InCheck,4,PRO_AOI_IP_1,0,分盘2线入口检测,X745,DI-05,0,
DI,分盘2线阻挡检测,L2_StopCheck,5,PRO_AOI_IP_1,0,分盘2线阻挡检测,X746,DI-06,0,
DI,分盘2线出口检测,L2_OutCheck,6,PRO_AOI_IP_1,0,分盘2线出口检测,X747,DI-07,0,
DI,分盘1线人工取料信号,L1_ManualRecSig,7,PRO_AOI_IP_1,0,分盘1线人工取料信号,X748,DI-08,0,
DI,分盘1线顶升上升端,L1_UpDown_Up_Sig,8,PRO_AOI_IP_1,0,分盘1线顶升上升端,X749,DI-09,0,
DI,分盘1线顶升下降端,L1_UpDown_Down_Sig,9,PRO_AOI_IP_1,0,分盘1线顶升下降端,X750,DI-10,0,
DI,分盘2线顶升上升端,L2_UpDown_Up_Sig,10,PRO_AOI_IP_1,0,分盘2线顶升上升端,X751,DI-11,0,
DI,分盘2线顶升下降端,L2_UpDown_Down_Sig,11,PRO_AOI_IP_1,0,分盘2线顶升下降端,X752,DI-12,0,
DI,包装料架检测信号,PackingShelf_Sig,12,PRO_AOI_IP_1,0,包装料架检测信号,X753,DI-13,0,
DI,料串切换气缸前进端,Switch_Forward_Sig,13,PRO_AOI_IP_1,0,料串切换气缸前进端,X754,DI-14,0,
DI,料串切换气缸后退端,Switch_Back_Sig,14,PRO_AOI_IP_1,0,料串切换气缸后退端,X755,DI-15,0,
,,,15,PRO_AOI_IP_1,0,,X756,DI-16,0,
DO,分盘2线驱动电机运转,L2_Run,0,PRO_AOI_IP_1,0,分盘2线驱动电机运转,Y741,D0-01,0,
DO,分盘1线驱动电机运转,L1_Run,1,PRO_AOI_IP_1,0,分盘1线驱动电机运转,Y742,DO-02,0,
DO,分盘1线阻挡1下降,L1_StopDown,2,PRO_AOI_IP_1,0,分盘1线阻挡1下降,Y743,DO-03,0,
DO,分盘1线出口阻挡下降,L1_OutStopDown,3,PRO_AOI_IP_1,0,分盘1线出口阻挡下降,Y744,DO-04,0,
DO,分盘2线阻挡1下降,L2_StopDown,4,PRO_AOI_IP_1,0,分盘2线阻挡1下降,Y745,DO-05,0,
DO,分盘2线出口阻挡下降,L2_OutStopDown,5,PRO_AOI_IP_1,0,分盘2线出口阻挡下降,Y746,DO-06,0,
DO,分盘线横移机构上升SOL,Traverse_Up_SOL,6,PRO_AOI_IP_1,0,分盘线横移机构上升SOL,Y747,DO-07,0,
DO,分盘线横移机构下降SOL,Traverse_Down_SOL,7,PRO_AOI_IP_1,0,分盘线横移机构下降SOL,Y748,DO-08,0,
DO,分盘线横移电机运转,Traverse_Run,8,PRO_AOI_IP_1,0,分盘线横移电机运转,Y749,DO-09,0,
DO,分盘线滚筒电机运转,Roller_Run,9,PRO_AOI_IP_1,0,分盘线滚筒电机运转,Y750,DO-10,0,
DO,料串切换气缸前进,Switch_Forward,10,PRO_AOI_IP_1,0,料串切换气缸前进,Y751,DO-11,0,
DO,料串切换气缸后退,Switch_Back,11,PRO_AOI_IP_1,0,料串切换气缸后退,Y752,DO-12,0,
,,,12,PRO_AOI_IP_1,0,,Y753,DO-13,0,
,,,13,PRO_AOI_IP_1,0,,Y754,DO-14,0,
,,,14,PRO_AOI_IP_1,0,,Y755,DO-15,0,
,,,15,PRO_AOI_IP_1,0,,Y756,DO-16,0,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,, PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,
PRO,分盘1线AGV节点名称,L1_AgvName,A8,,,,,,, PRO,分盘入料线AGV节点名称,L1_AgvName,A8,,,,,,,
PRO,分盘2线AGV节点名称,L2_AgvName,A7,,,,,,, PRO,分盘出料线AGV节点名称,L2_AgvName,A7,,,,,,,
PRO,分盘包装料出料线AGV节点名称,L3_AgvName,A9,,,,,,,
PRO,分盘线出口RFIDIP,L2Out_RFIDIP,10.85.199.130,,,,,, , PRO,分盘线出口RFIDIP,L2Out_RFIDIP,10.85.199.130,,,,,, ,
PRO,休眠秒数（秒）,SleepSeconds,60,,,,,,, PRO,休眠秒数（秒）,SleepSeconds,60,,,,,,,
,,,,,,,,,,
DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X801,DI-01,0,
DI,分盘入料线入口检测,L1_InCheck,1,PRO_AOI_IP_1,0,分盘入料线入口检测,X802,DI-02,0,
DI,分盘入料线阻挡检测,L1_StopCheck,2,PRO_AOI_IP_1,0,分盘入料线阻挡检测,X803,DI-03,0,
DI,分盘入料线出口检测,L1_OutCheck,3,PRO_AOI_IP_1,0,分盘入料线出口检测,X804,DI-04,0,
DI,分盘出料串线入口检测,L2_InCheck,4,PRO_AOI_IP_1,0,分盘出料串线入口检测,X805,DI-05,0,
DI,分盘出料串线阻挡检测,L2_StopCheck,5,PRO_AOI_IP_1,0,分盘出料串线阻挡检测,X806,DI-06,0,
DI,分盘出料串线出口检测,L2_OutCheck,6,PRO_AOI_IP_1,0,分盘出料串线出口检测,X807,DI-07,0,
DI,料串出料线脚踏信号,L2_ManualRecSig,7,PRO_AOI_IP_1,0,料串出料线脚踏信号,X808,DI-08,0,
DI,分盘入料线顶升上升端,L1_UpDown_Up_Sig,8,PRO_AOI_IP_1,0,分盘入料线顶升上升端,X809,DI-09,0,
DI,分盘入料线顶升下降端,L1_UpDown_Down_Sig,9,PRO_AOI_IP_1,0,分盘入料线顶升下降端,X810,DI-10,0,
DI,分盘出料串线顶升上升端,L2_UpDown_Up_Sig,10,PRO_AOI_IP_1,0,分盘出料串线顶升上升端,X811,DI-11,0,
DI,分盘出料串线顶升下降端,L2_UpDown_Down_Sig,11,PRO_AOI_IP_1,0,分盘出料串线顶升下降端,X812,DI-12,0,
DI,包装料架检测信号(分盘入料线）,PackingShelf_Sig,12,PRO_AOI_IP_1,0,包装料架检测信号(分盘入料线）,X813,DI-13,0,
DI,料串切换气缸前进端,Switch_Forward_Sig,13,PRO_AOI_IP_1,0,料串切换气缸前进端,X814,DI-14,0,
DI,料串切换气缸后退端,Switch_Back_Sig,14,PRO_AOI_IP_1,0,料串切换气缸后退端,X815,DI-15,0,
,,,15,PRO_AOI_IP_1,0,,X816,DI-16,0,
,,,,,,,,,,
DO,分盘出料串线驱动电机运转,L2_Run,0,PRO_AOI_IP_1,0,分盘出料串线驱动电机运转,Y801,D0-01,0,
DO,分盘入料线驱动电机运转,L1_Run,1,PRO_AOI_IP_1,0,分盘入料线驱动电机运转,Y802,DO-02,0,
DO,分盘入料线阻挡下降,L1_StopDown,2,PRO_AOI_IP_1,0,分盘入料线阻挡下降,Y803,DO-03,0,
DO,分盘入料线出口阻挡下降,L1_OutStopDown,3,PRO_AOI_IP_1,0,分盘入料线出口阻挡下降,Y804,DO-04,0,
DO,分盘出料串线阻挡下降,L2_StopDown,4,PRO_AOI_IP_1,0,分盘出料串线阻挡下降,Y805,DO-05,0,
DO,分盘出料串线出口阻挡下降,L2_OutStopDown,5,PRO_AOI_IP_1,0,分盘出料串线出口阻挡下降,Y806,DO-06,0,
DO,分盘入料线横移机构上升SOL,L1_Traverse_Up_SOL,6,PRO_AOI_IP_1,0,分盘入料线横移机构上升SOL,Y807,DO-07,0,
DO,分盘入料线横移机构下降SOL,L1_Traverse_Down_SOL,7,PRO_AOI_IP_1,0,分盘入料线横移机构下降SOL,Y808,DO-08,0,
DO,分盘入料线横移电机正转,L1_Traverse_Run,8,PRO_AOI_IP_1,0,分盘入料线横移电机正转,Y809,DO-09,0,
DO,料串出料线过渡滚筒电机运转,L2_Roller_Run,9,PRO_AOI_IP_1,0,料串出料线过渡滚筒电机运转,Y810,DO-10,0,
DO,料串切换气缸前进,Switch_Forward,10,PRO_AOI_IP_1,0,料串切换气缸前进,Y811,DO-11,0,
DO,料串切换气缸后退,Switch_Back,11,PRO_AOI_IP_1,0,料串切换气缸后退,Y812,DO-12,0,
DO,分盘入料线横移电机反转,L1_Traverse_BackRun,12,PRO_AOI_IP_1,0,分盘入料线横移电机反转,Y813,DO-13,0,
DO,分盘出料串线横移机构上升SOL,L2_Traverse_Up_SOL,13,PRO_AOI_IP_1,0,分盘出料串线横移机构上升SOL,Y814,DO-14,0,
DO,分盘出料串线横移机构下降SOL,L2_Traverse_Down_SOL,14,PRO_AOI_IP_1,0,分盘出料串线横移机构下降SOL,Y815,DO-15,0,
,,,15,PRO_AOI_IP_1,0,,Y816,DO-16,0,
,,,,,,,,,,
,,,,,,,,,,
DI,包装料架检测信号（料串出料线体出口）,L2Out_PkgDect_Sig,0,PRO_AOI_IP_2,0,包装料架检测信号（料串出料线体出口）,X821,DI-01,0,
DI,包装料架检测信号（包装料架出料线体出口）,L3Out_PkgDect_Sig,1,PRO_AOI_IP_2,0,包装料架检测信号（包装料架出料线体出口）,X822,DI-02,0,
DI,包装料架出料线脚踏信号,L3_ManualRecSig,2,PRO_AOI_IP_2,0,包装料架出料线脚踏信号,X823,DI-03,0,
DI,包装料架出料线体横移上升端,L3_UpDown_Up_Sig,3,PRO_AOI_IP_2,0,包装料架出料线体横移上升端,X824,DI-04,0,
DI,包装料架出料线体横移下降端,L3_UpDown_Down_Sig,4,PRO_AOI_IP_2,0,包装料架出料线体横移下降端,X825,DI-05,0,
DI,包装料架出料线入口检测,L3_InCheck,5,PRO_AOI_IP_2,0,包装料架出料线入口检测,X826,DI-06,0,
DI,包装料架出料线阻挡检测,L3_StopCheck,6,PRO_AOI_IP_2,0,包装料架出料线阻挡检测,X827,DI-07,0,
DI,包装料架出料线出口检测,L3_OutCheck,7,PRO_AOI_IP_2,0,包装料架出料线出口检测,X828,DI-08,0,
,,,8,PRO_AOI_IP_2,0,,X829,DI-09,0,
,,,9,PRO_AOI_IP_2,0,,X830,DI-10,0,
,,,10,PRO_AOI_IP_2,0,,X831,DI-11,0,
,,,11,PRO_AOI_IP_2,0,,X832,DI-12,0,
,,,12,PRO_AOI_IP_2,0,,X833,DI-13,0,
,,,13,PRO_AOI_IP_2,0,,X834,DI-14,0,
,,,14,PRO_AOI_IP_2,0,,X835,DI-15,0,
,,,15,PRO_AOI_IP_2,0,,X816,DI-16,0,
,,,,,,,,,,
DO,包装料架出料线驱动电机运转,L3_Run,0,PRO_AOI_IP_2,0,包装料架出料线驱动电机运转,Y821,D0-01,0,
DO,包装料架出料线过渡滚筒电机运转,L3_Roller_Run,1,PRO_AOI_IP_2,0,包装料架出料线过渡滚筒电机运转,Y822,DO-02,0,
DO,料串出料线横移电机运转,L2_Traverse_Run,2,PRO_AOI_IP_2,0,料串出料线横移电机运转,Y823,DO-03,0,
DO,包装料架出料线横移电机运转,L3_Traverse_Run,3,PRO_AOI_IP_2,0,包装料架出料线横移电机运转,Y824,DO-04,0,
DO,包装料架出料线横移机构上升SOL,L3_Traverse_Up_SOL,4,PRO_AOI_IP_2,0,包装料架出料线横移机构上升SOL,Y825,DO-05,0,
DO,包装料架出料线横移机构下降SOL,L3_Traverse_Down_SOL,5,PRO_AOI_IP_2,0,包装料架出料线横移机构下降SOL,Y826,DO-06,0,
DO,包装料架出料线阻挡下降,L3_StopDown,6,PRO_AOI_IP_2,0,包装料架出料线阻挡下降,Y827,DO-07,0,
DO,包装料架出料线出口阻挡下降,L3_OutStopDown,7,PRO_AOI_IP_2,0,包装料架出料线出口阻挡下降,Y828,DO-08,0,
,,,8,PRO_AOI_IP_2,0,,Y829,DO-09,0,
,,,9,PRO_AOI_IP_2,0,,Y830,DO-10,0,
,,,10,PRO_AOI_IP_2,0,,Y831,DO-11,0,
,,,11,PRO_AOI_IP_2,0,,Y832,DO-12,0,
,,,12,PRO_AOI_IP_2,0,,Y833,DO-13,0,
,,,13,PRO_AOI_IP_2,0,,Y834,DO-14,0,
,,,14,PRO_AOI_IP_2,0,,Y835,DO-15,0,
,,,15,PRO_AOI_IP_2,0,,Y836,DO-16,0,
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/acDISTLine/DISTLineBean.cs
...@@ -46,7 +46,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -46,7 +46,9 @@ namespace OnlineStore.DeviceLibrary
IOManager.Init(); IOManager.Init();
IOManager.instance.ConnectionIOList(Config.DIODeviceNameList); IOManager.instance.ConnectionIOList(Config.DIODeviceNameList);
RFIDManager.Open(new string[] { Config.L2Out_RFIDIP });//, Config.L1In_RFIDIP L2Out_RFIDIP = Config.L2Out_RFIDIP;
L3Out_RFIDIP = ConfigAppSettings.GetValue("L3Out_RFIDIP", "172.16.77.137");
RFIDManager.Open(new string[] { L2Out_RFIDIP, L3Out_RFIDIP });
AgvClient.NodeList.Add(config.L2_AgvName); AgvClient.NodeList.Add(config.L2_AgvName);
AgvClient.NodeList.Add(config.L1_AgvName); AgvClient.NodeList.Add(config.L1_AgvName);
mainTimer.Enabled = false; mainTimer.Enabled = false;
...@@ -103,10 +105,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -103,10 +105,19 @@ namespace OnlineStore.DeviceLibrary
IOManager.IOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L2_StopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_StopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Traverse_Down_SOL, IO_VALUE.HIGH); IOManager.IOMove(IO_Type.L1_Traverse_Up_SOL, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Traverse_Up_SOL, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L1_Traverse_Down_SOL, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.L2_Traverse_Up_SOL, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L2_Traverse_Down_SOL, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.L3_Traverse_Up_SOL, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L3_Traverse_Down_SOL, IO_VALUE.HIGH);
IOManager.CIOMove(IO_Type.Switch_Forward, IO_VALUE.LOW);
Thread.Sleep(500);
IOManager.CIOMove(IO_Type.Switch_Back, IO_VALUE.HIGH);
AgvClient.SetStatus(Config.L2_AgvName); AgvClient.SetStatus(Config.L2_AgvName);
AgvClient.SetStatus(Config.L1_AgvName); AgvClient.SetStatus(Config.L1_AgvName);
AgvClient.SetStatus(Config.L3_AgvName);
mainTimer.Enabled = true; mainTimer.Enabled = true;
serverConnectTimer.Enabled = true; serverConnectTimer.Enabled = true;
} }
...@@ -198,15 +209,27 @@ namespace OnlineStore.DeviceLibrary ...@@ -198,15 +209,27 @@ namespace OnlineStore.DeviceLibrary
public void StopMove() public void StopMove()
{ {
IOManager.IOMove(IO_Type.L1_Run, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L1_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L2_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L1_StopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L1_StopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L1_Traverse_BackRun, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L1_Traverse_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L1_Traverse_Up_SOL, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L1_Traverse_Down_SOL, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.L2_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L2_StopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_StopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Traverse_Run, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_Traverse_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Traverse_Down_SOL, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_Traverse_Up_SOL, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Traverse_Up_SOL, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_Traverse_Down_SOL, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.Roller_Run, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_Roller_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L3_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L3_StopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L3_OutStopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L3_Traverse_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L3_Traverse_Up_SOL, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L3_Traverse_Down_SOL, IO_VALUE.HIGH);
} }
private bool InProcess = false; private bool InProcess = false;
...@@ -242,8 +265,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -242,8 +265,9 @@ namespace OnlineStore.DeviceLibrary
} }
else if (runStatus.Equals(RunStatus.Runing)) else if (runStatus.Equals(RunStatus.Runing))
{ {
InLineTimerProcess(); TranverseManualProcess();
ReelStringOutLineTimerProcess();
InstoreOutLineTimerProcess();
OutLineTimerProcess(); OutLineTimerProcess();
IOTimeOutProcess(); IOTimeOutProcess();
...@@ -264,52 +288,37 @@ namespace OnlineStore.DeviceLibrary ...@@ -264,52 +288,37 @@ namespace OnlineStore.DeviceLibrary
InProcess = false; InProcess = false;
} }
private Stopwatch ol_noshelfWatch = new Stopwatch(); private Stopwatch l1_noshelfWatch = new Stopwatch();
private Stopwatch ol_noshelfWatch1 = new Stopwatch(); private Stopwatch l1_noshelfWatch1 = new Stopwatch();
private DateTime ol_lastSendShelfTime = DateTime.Now; private DateTime l1_lastSendShelfTime = DateTime.Now;
private int StopDownMS = 1500; private int StopDownMS = 2000;
/// <summary> /// <summary>
/// 出料线体定时处理 /// 入料线体定时处理
/// </summary> /// </summary>
private void OutLineTimerProcess() private void OutLineTimerProcess()
{ {
TimeSpan span = DateTime.Now - ol_lastSendShelfTime; TimeSpan span = DateTime.Now - l1_lastSendShelfTime;
bool manualSig = IOManager.IOValue(IO_Type.L1_ManualRecSig).Equals(IO_VALUE.HIGH); bool manualSig = IOManager.IOValue(IO_Type.L2_ManualRecSig).Equals(IO_VALUE.HIGH);
bool l1_up_sig = IOManager.IOValue(IO_Type.L1_UpDown_Up_Sig).Equals(IO_VALUE.HIGH); bool l1_up_sig = IOManager.IOValue(IO_Type.L1_UpDown_Up_Sig).Equals(IO_VALUE.HIGH);
bool l2_up_sig = IOManager.IOValue(IO_Type.L2_UpDown_Up_Sig).Equals(IO_VALUE.HIGH);
//如果出口无料架，持续1000以上，放开阻挡放出一个料架 //如果出口无料架，持续1000以上，放开阻挡放出一个料架
//每次放料架时间间隔3秒 //每次放料架时间间隔3秒
if (IOManager.IOValue(IO_Type.L2_StopCheck).Equals(IO_VALUE.HIGH) && if (IOManager.IOValue(IO_Type.L1_StopCheck).Equals(IO_VALUE.HIGH) &&
IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.LOW) && span.TotalSeconds > 3) IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.LOW) && !l1_up_sig && span.TotalSeconds > 5)
{
//如果出料线体出口无料架，放一个料架到出口
if (LineManager.checkWatch(ol_noshelfWatch, 1000))
{
IOManager.CIOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW);
LogUtil.info(" 分盘2线体出口无料架，下降 [" + IO_Type.L2_StopDown + "] [" + StopDownMS + "] 秒");
ol_lastSendShelfTime = DateTime.Now;
StopIOMove(IO_Type.L2_StopDown, StopDownMS);
}
}
else if (IOManager.IOValue(IO_Type.L1_StopCheck).Equals(IO_VALUE.HIGH) &&
IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.LOW) && !manualSig && !l1_up_sig && span.TotalSeconds > 3)
{ {
//如果出料线体出口无料架，放一个料架到出口 //如果出料线体出口无料架，放一个料架到出口
if (LineManager.checkWatch(ol_noshelfWatch1, 1000)) if (LineManager.checkWatch(l1_noshelfWatch1, 1000))
{ {
IOManager.CIOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW); LogUtil.info(" 分盘入料线体出口无料架，下降 [" + IO_Type.L1_StopDown + "] [" + StopDownMS + "] 秒");
LogUtil.info(" 分盘1线体出口无料架，下降 [" + IO_Type.L1_StopDown + "] [" + StopDownMS + "] 秒"); l1_lastSendShelfTime = DateTime.Now;
ol_lastSendShelfTime = DateTime.Now;
StopIOMove(IO_Type.L1_OutStopDown, StopDownMS); StopIOMove(IO_Type.L1_OutStopDown, StopDownMS);
StopIOMove(IO_Type.L1_StopDown, StopDownMS); StopIOMove(IO_Type.L1_StopDown, StopDownMS);
} }
} }
else if (span.TotalMilliseconds > StopDownMS) else if (span.TotalMilliseconds > StopDownMS)
{ {
ol_noshelfWatch.Stop(); l1_noshelfWatch.Stop();
ol_noshelfWatch1.Stop(); l1_noshelfWatch1.Stop();
IOManager.CIOMove(IO_Type.L2_StopDown, IO_VALUE.LOW);
IOManager.CIOMove(IO_Type.L1_StopDown, IO_VALUE.LOW); IOManager.CIOMove(IO_Type.L1_StopDown, IO_VALUE.LOW);
} }
...@@ -323,120 +332,239 @@ namespace OnlineStore.DeviceLibrary ...@@ -323,120 +332,239 @@ namespace OnlineStore.DeviceLibrary
AgvClient.SetToNone(Config.L1_AgvName, ""); AgvClient.SetToNone(Config.L1_AgvName, "");
} }
} }
private DateTime il_lastCallAgvTime = DateTime.Now.AddMinutes(-5); private DateTime l2_lastCallAgvTime = DateTime.Now.AddMinutes(-5);
private Stopwatch il_outstopCheckWarch = new Stopwatch(); private Stopwatch l2_outstopCheckWarch = new Stopwatch();
private Stopwatch il_manualCheckWatch = new Stopwatch(); private Stopwatch l2_noshelfWatch = new Stopwatch();
private DateTime l2_lastSendShelfTime = DateTime.Now;
/// <summary> /// <summary>
/// 入料线体定时处理 /// L2 空料串和不带载具的包装料架出料线体定时处理
/// </summary> /// </summary>
private void InLineTimerProcess() private void ReelStringOutLineTimerProcess()
{ {
TimeSpan span = DateTime.Now - il_lastCallAgvTime; TimeSpan span = DateTime.Now - l2_lastCallAgvTime;
//出口有料架，需要通知agv取走料架 //出口有料架，需要通知agv取走料架
//每次叫小车时间间隔3分钟？ //每次叫小车时间间隔3分钟？
//出口信号需要持续1秒钟 //出口信号需要持续1秒钟
if (IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.HIGH) && span.TotalSeconds > 60) if (IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.HIGH) && span.TotalSeconds > 6)
{ {
if (LastOutShelfId.Equals("000").Equals(false)) if (L2_LastOutShelfId.Equals("000").Equals(false))
{ {
if (LineManager.checkWatch(il_outstopCheckWarch, 1000)) if (LineManager.checkWatch(l2_outstopCheckWarch, 1000))
{ {
il_lastCallAgvTime = DateTime.Now; l2_lastCallAgvTime = DateTime.Now;
//StopIOMove(IO_Type.InL_OutStopDown, StopDownMS); IOManager.CIOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW);
//LogUtil.info(" 分盘空出料线体出口有料架" + L2_LastOutShelfId + "，呼叫agv小车[" + Config.L2_AgvName + "] [NeedLeave] ");
LogUtil.info(" 分盘2线体出口有料架" + LastOutShelfId + "，呼叫agv小车[" + Config.L2_AgvName + "] [NeedLeave] "); AgvClient.NeedLeave(Config.L2_AgvName, L2_LastOutShelfId);
AgvClient.NeedLeave(Config.L2_AgvName, LastOutShelfId);
} }
} }
} }
else if (span.TotalMilliseconds > StopDownMS) else if (span.TotalMilliseconds > StopDownMS)
{ {
il_outstopCheckWarch.Stop(); l2_outstopCheckWarch.Stop();
ClientAction currA = AgvClient.GetAction(Config.L2_AgvName); ClientAction currA = AgvClient.GetAction(Config.L2_AgvName);
if (currA.Equals(ClientAction.None) || currA.Equals(ClientAction.NeedLeave) || currA.Equals(ClientAction.NeedEnter)) if (currA.Equals(ClientAction.None) || currA.Equals(ClientAction.NeedLeave) || currA.Equals(ClientAction.NeedEnter))
{ {
if (IOManager.IOValue(IO_Type.L1_StopDown).Equals(IO_VALUE.HIGH)) if (IOManager.IOValue(IO_Type.L2_OutStopDown).Equals(IO_VALUE.HIGH))
{ {
IOManager.IOMove(IO_Type.L1_StopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW);
} }
} }
} }
//如果是出口无料架，NeedLeave状态，改为None //如果是出口无料架，NeedLeave状态，改为None
if (IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.LOW) && AgvClient.GetAction(Config.L2_AgvName).Equals(ClientAction.NeedLeave)) if (IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.LOW) && AgvClient.GetAction(Config.L2_AgvName).Equals(ClientAction.NeedLeave))
{ {
il_outstopCheckWarch.Stop(); l2_outstopCheckWarch.Stop();
LogUtil.info(" 分盘2线体出口无料架 ，更改[" + Config.L2_AgvName + "] 状态[None] "); LogUtil.info(" 分盘空出料线体出口有料架 ，更改[" + Config.L2_AgvName + "] 状态[None] ");
AgvClient.SetToNone(Config.L2_AgvName, ""); AgvClient.SetToNone(Config.L2_AgvName, "");
} }
TimeSpan span1 = DateTime.Now - l2_lastSendShelfTime;
//如果出口无料架，持续1000以上，放开阻挡放出一个料架
//每次放料架时间间隔3秒
if (IOManager.IOValue(IO_Type.L2_StopCheck).Equals(IO_VALUE.HIGH) &&
IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.LOW) && span1.TotalSeconds > 5)
{
//如果出料线体出口无料架，放一个料架到出口
if (LineManager.checkWatch(l2_noshelfWatch, 1000))
{
IOManager.CIOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW);
LogUtil.info(" 分盘空出料线体出口无料架，下降 [" + IO_Type.L2_StopDown + "] [" + StopDownMS + "] 秒");
l2_lastSendShelfTime = DateTime.Now;
StopIOMove(IO_Type.L2_StopDown, StopDownMS);
}
}
else if (span.TotalMilliseconds > StopDownMS)
{
l2_noshelfWatch.Stop();
IOManager.CIOMove(IO_Type.L2_StopDown, IO_VALUE.LOW);
}
} }
private static void TranverseProcess() private DateTime l3_lastCallAgvTime = DateTime.Now.AddMinutes(-5);
private Stopwatch l3_outstopCheckWarch = new Stopwatch();
private Stopwatch l3_noshelfWatch = new Stopwatch();
private DateTime l3_lastSendShelfTime = DateTime.Now;
/// <summary>
/// L3 入库料串和包装料架出料线体定时处理
/// </summary>
private void InstoreOutLineTimerProcess()
{ {
LogUtil.info(" TranverseProcess"); TimeSpan span = DateTime.Now - l3_lastCallAgvTime;
if(IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.PackingShelf_Sig).Equals(IO_VALUE.HIGH)) //出口有料架，需要通知agv取走料架
{ //每次叫小车时间间隔3分钟？
IOManager.CIOMove(IO_Type.Switch_Forward, IO_VALUE.LOW); //出口信号需要持续1秒钟
Thread.Sleep(500); if (IOManager.IOValue(IO_Type.L3_OutCheck).Equals(IO_VALUE.HIGH) && span.TotalSeconds > 6)// && IOManager.IOValue(IO_Type.L3Out_PkgDect_Sig).Equals(IO_VALUE.HIGH)
IOManager.CIOMove(IO_Type.Switch_Back, IO_VALUE.HIGH); {
LogUtil.info(" 横移包装料架"); if (L3_LastOutShelfId.Equals("000").Equals(false))
while(IOManager.IOValue(IO_Type.Switch_Back_Sig).Equals(IO_VALUE.LOW))
{ {
if (LineManager.checkWatch(l3_outstopCheckWarch, 1000))
{
l3_lastCallAgvTime = DateTime.Now;
IOManager.CIOMove(IO_Type.L3_OutStopDown, IO_VALUE.LOW);
AgvClient.NeedLeave(Config.L3_AgvName, L3_LastOutShelfId);
}
} }
LogUtil.info(" 料串气缸到达后退端");
} }
else if (IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.PackingShelf_Sig).Equals(IO_VALUE.LOW)) else if (span.TotalMilliseconds > StopDownMS)
{ {
IOManager.CIOMove(IO_Type.Switch_Back, IO_VALUE.LOW); l3_outstopCheckWarch.Stop();
Thread.Sleep(500); ClientAction currA = AgvClient.GetAction(Config.L3_AgvName);
IOManager.CIOMove(IO_Type.Switch_Forward, IO_VALUE.HIGH); if (currA.Equals(ClientAction.None) || currA.Equals(ClientAction.NeedLeave) || currA.Equals(ClientAction.NeedEnter))
LogUtil.info(" 横移料串");
while (IOManager.IOValue(IO_Type.Switch_Forward_Sig).Equals(IO_VALUE.LOW))
{ {
if (IOManager.IOValue(IO_Type.L3_OutStopDown).Equals(IO_VALUE.HIGH))
{
IOManager.IOMove(IO_Type.L3_OutStopDown, IO_VALUE.LOW);
}
} }
LogUtil.info(" 料串气缸到达前进端"); }
//如果是出口无料架，NeedLeave状态，改为None
if (IOManager.IOValue(IO_Type.L3_OutCheck).Equals(IO_VALUE.LOW) && AgvClient.GetAction(Config.L3_AgvName).Equals(ClientAction.NeedLeave))
{
l3_outstopCheckWarch.Stop();
LogUtil.info(" 分盘入库线体出口无料架 ，更改[" + Config.L3_AgvName + "] 状态[None] ");
AgvClient.SetToNone(Config.L3_AgvName, "");
} }
if (IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.L2_InCheck).Equals(IO_VALUE.LOW)) TimeSpan span1 = DateTime.Now - l3_lastSendShelfTime;
//如果出口无料架，持续1000以上，放开阻挡放出一个料架
//每次放料架时间间隔3秒
if (IOManager.IOValue(IO_Type.L3_StopCheck).Equals(IO_VALUE.HIGH) &&
IOManager.IOValue(IO_Type.L3_OutCheck).Equals(IO_VALUE.LOW) && span1.TotalSeconds > 5)
{ {
IOManager.CIOMove(IO_Type.Traverse_Down_SOL, IO_VALUE.LOW); //如果出料线体出口无料架，放一个料架到出口
Thread.Sleep(500); if (LineManager.checkWatch(l3_noshelfWatch, 1000))
IOManager.IOMove(IO_Type.Traverse_Up_SOL, IO_VALUE.HIGH);
Thread.Sleep(500);
LogUtil.info(" 横移机构上升");
while (IOManager.IOValue(IO_Type.L2_UpDown_Up_Sig).Equals(IO_VALUE.LOW))
{ {
IOManager.CIOMove(IO_Type.L3_OutStopDown, IO_VALUE.LOW);
LogUtil.info(" 分盘入库线体出口无料架，下降 [" + IO_Type.L3_StopDown + "] [" + StopDownMS + "] 秒");
l3_lastSendShelfTime = DateTime.Now;
StopIOMove(IO_Type.L3_StopDown, StopDownMS);
} }
IOManager.IOMove(IO_Type.Traverse_Run, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.Roller_Run, IO_VALUE.HIGH);
LogUtil.info(" 滚筒电机、横移机构电机运行");
} }
else if (span.TotalMilliseconds > StopDownMS)
{
l3_noshelfWatch.Stop();
IOManager.CIOMove(IO_Type.L3_StopDown, IO_VALUE.LOW);
}
}
private static void TranverseProcess()
{
LogUtil.info(" L1->L2 TranverseProcess");
//IOManager.CIOMove(IO_Type.Switch_Back, IO_VALUE.LOW);
//Thread.Sleep(500);
//IOManager.CIOMove(IO_Type.Switch_Forward, IO_VALUE.HIGH);
//LogUtil.info(" L1->L2 横移料串");
//while (IOManager.IOValue(IO_Type.Switch_Forward_Sig).Equals(IO_VALUE.LOW))
//{
//}
//LogUtil.info(" L1->L2 料串气缸到达前进端");
IOManager.CIOMove(IO_Type.L1_Traverse_Down_SOL, IO_VALUE.LOW);
IOManager.CIOMove(IO_Type.L2_Traverse_Down_SOL, IO_VALUE.LOW);
Thread.Sleep(500);
IOManager.IOMove(IO_Type.L1_Traverse_Up_SOL, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.L2_Traverse_Up_SOL, IO_VALUE.HIGH);
Thread.Sleep(500);
LogUtil.info(" L1->L2 横移机构上升");
while (IOManager.IOValue(IO_Type.L2_UpDown_Up_Sig).Equals(IO_VALUE.LOW) || IOManager.IOValue(IO_Type.L1_UpDown_Up_Sig).Equals(IO_VALUE.LOW))
{
}
IOManager.IOMove(IO_Type.L1_Traverse_BackRun, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L2_Traverse_Run, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.L2_Roller_Run, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.L1_Traverse_Run, IO_VALUE.HIGH);
LogUtil.info(" L1->L2 滚筒电机、横移机构电机运行");
Stopwatch stopwatch = new Stopwatch(); Stopwatch stopwatch = new Stopwatch();
stopwatch.Start(); stopwatch.Start();
while (IOManager.IOValue(IO_Type.L2_InCheck).Equals(IO_VALUE.LOW)) while (IOManager.IOValue(IO_Type.L2_InCheck).Equals(IO_VALUE.LOW))
{ {
if (stopwatch.Elapsed.TotalMinutes >= 2) if (stopwatch.Elapsed.TotalMinutes >= 2)
{ {
//stopwatch.Stop(); LogUtil.info(" L1->L2 横移机构转移料架超时");
//IOManager.CIOMove(IO_Type.Traverse_Run, IO_VALUE.LOW);
//IOManager.CIOMove(IO_Type.Roller_Run, IO_VALUE.LOW);
LogUtil.info(" 横移机构转移料架超时 [" + IO_Type.L1_StopDown + "] 大于2分钟");
//break;
} }
} }
stopwatch.Stop(); stopwatch.Stop();
Thread.Sleep(2000); Thread.Sleep(2000);
IOManager.IOMove(IO_Type.Traverse_Run, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_Traverse_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Roller_Run, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L1_Traverse_Run, IO_VALUE.LOW);
LogUtil.info(" 滚筒、横移电机停止"); IOManager.IOMove(IO_Type.L2_Roller_Run, IO_VALUE.LOW);
LogUtil.info(" L1->L2 滚筒、横移电机停止");
Thread.Sleep(1000); Thread.Sleep(1000);
IOManager.CIOMove(IO_Type.Traverse_Down_SOL, IO_VALUE.HIGH); IOManager.IOMove(IO_Type.L1_Traverse_Up_SOL, IO_VALUE.LOW);
IOManager.CIOMove(IO_Type.Traverse_Up_SOL, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_Traverse_Up_SOL, IO_VALUE.LOW);
LogUtil.info(" 横移机构下降"); Thread.Sleep(500);
LogUtil.info(" TranverseProcess Finish"); IOManager.CIOMove(IO_Type.L1_Traverse_Down_SOL, IO_VALUE.HIGH);
IOManager.CIOMove(IO_Type.L2_Traverse_Down_SOL, IO_VALUE.HIGH);
LogUtil.info(" L1->L2 横移机构下降");
LogUtil.info(" L1->L2 TranverseProcess Finish");
}
private static void TranverseProcess2()
{
LogUtil.info(" L1->L3 TranverseProcess");
IOManager.CIOMove(IO_Type.L1_Traverse_Down_SOL, IO_VALUE.LOW);
IOManager.CIOMove(IO_Type.L3_Traverse_Down_SOL, IO_VALUE.LOW);
Thread.Sleep(500);
IOManager.CIOMove(IO_Type.L1_Traverse_Up_SOL, IO_VALUE.HIGH);
IOManager.CIOMove(IO_Type.L3_Traverse_Up_SOL, IO_VALUE.HIGH);
Thread.Sleep(500);
LogUtil.info(" L1->L3 横移机构上升");
while (IOManager.IOValue(IO_Type.L3_UpDown_Up_Sig).Equals(IO_VALUE.LOW) || IOManager.IOValue(IO_Type.L1_UpDown_Up_Sig).Equals(IO_VALUE.LOW))
{
}
IOManager.CIOMove(IO_Type.L1_Traverse_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L3_Traverse_Run, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.L3_Roller_Run, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.L1_Traverse_BackRun, IO_VALUE.HIGH);
LogUtil.info(" L1->L3 滚筒电机、横移机构电机运行");
Stopwatch stopwatch = new Stopwatch();
stopwatch.Start();
while (IOManager.IOValue(IO_Type.L3_InCheck).Equals(IO_VALUE.LOW))
{
if (stopwatch.Elapsed.TotalMinutes >= 2)
{
LogUtil.info(" L1->L3 横移机构转移料架超时");
}
}
stopwatch.Stop();
Thread.Sleep(2000);
IOManager.IOMove(IO_Type.L1_Traverse_BackRun, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L3_Roller_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L3_Traverse_Run, IO_VALUE.LOW);
LogUtil.info(" L1->L3 滚筒、横移电机停止");
Thread.Sleep(1000);
IOManager.CIOMove(IO_Type.L1_Traverse_Up_SOL, IO_VALUE.LOW);
IOManager.CIOMove(IO_Type.L1_Traverse_Down_SOL, IO_VALUE.HIGH);
IOManager.CIOMove(IO_Type.L3_Traverse_Up_SOL, IO_VALUE.LOW);
IOManager.CIOMove(IO_Type.L3_Traverse_Down_SOL, IO_VALUE.HIGH);
LogUtil.info(" L1->L3 横移机构下降");
LogUtil.info(" L1->L3 TranverseProcess Finish");
} }
private Task TranverseTask; private Task TranverseTask;
//private void LedProcess() //private void LedProcess()
...@@ -474,14 +602,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -474,14 +602,14 @@ namespace OnlineStore.DeviceLibrary
//} //}
//private IO_VALUE LastResetValue = IO_VALUE.LOW; //private IO_VALUE LastResetValue = IO_VALUE.LOW;
private Stopwatch ol_tranverseShelfWatch = new Stopwatch();
public void IoCheckProcess() public void TranverseManualProcess()
{ {
DateTime time = DateTime.Now;
//人工取料 //人工取料
if (IOManager.IOValue(IO_Type.L1_ManualRecSig).Equals(IO_VALUE.HIGH)) if (IOManager.IOValue(IO_Type.L2_ManualRecSig).Equals(IO_VALUE.HIGH))
{ {
if (IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.L2_InCheck).Equals(IO_VALUE.LOW)) if (IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.L2_InCheck).Equals(IO_VALUE.LOW)
)// && IOManager.IOValue(IO_Type.PackingShelf_Sig).Equals(IO_VALUE.LOW)
{ {
//if (LineManager.checkWatch(ol_tranverseShelfWatch, 2000)) //if (LineManager.checkWatch(ol_tranverseShelfWatch, 2000))
...@@ -489,20 +617,36 @@ namespace OnlineStore.DeviceLibrary ...@@ -489,20 +617,36 @@ namespace OnlineStore.DeviceLibrary
if (TranverseTask == null) if (TranverseTask == null)
{ {
TranverseTask = Task.Factory.StartNew(new Action(TranverseProcess)); TranverseTask = Task.Factory.StartNew(new Action(TranverseProcess));
il_lastCallAgvTime = DateTime.Now;
} }
else if (TranverseTask.IsCompleted) else if (TranverseTask.IsCompleted)
{ {
TranverseTask = Task.Factory.StartNew(new Action(TranverseProcess)); TranverseTask = Task.Factory.StartNew(new Action(TranverseProcess));
il_lastCallAgvTime = DateTime.Now;
} }
} }
} }
} }
else else if (IOManager.IOValue(IO_Type.L3_ManualRecSig).Equals(IO_VALUE.HIGH))
{ {
ol_tranverseShelfWatch.Stop(); if (IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.L3_InCheck).Equals(IO_VALUE.LOW)
)// && IOManager.IOValue(IO_Type.PackingShelf_Sig).Equals(IO_VALUE.HIGH)
{
if (TranverseTask == null)
{
TranverseTask = Task.Factory.StartNew(new Action(TranverseProcess2));
}
else if (TranverseTask.IsCompleted)
{
TranverseTask = Task.Factory.StartNew(new Action(TranverseProcess2));
}
}
} }
}
public void IoCheckProcess()
{
DateTime time = DateTime.Now;
//if (runStatus.Equals(RunStatus.Wait)) //if (runStatus.Equals(RunStatus.Wait))
//{ //{
// //获取新的Io状态 // //获取新的Io状态
...@@ -593,9 +737,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -593,9 +737,12 @@ namespace OnlineStore.DeviceLibrary
} }
#region 与服务器通信定时器，每1秒向服务器通知一次状态,同时执行出库操作 #region 与服务器通信定时器，每1秒向服务器通知一次状态,同时执行出库操作
private string LastInShelfId = ""; public string LastInShelfId = "";
public string LastOutShelfId = ""; public string L2_LastOutShelfId = "";
public string L3_LastOutShelfId = "";
private bool isInProcess = false; private bool isInProcess = false;
string L3Out_RFIDIP = "";
string L2Out_RFIDIP = "";
public void server_connect_timer_Tick(object sender, EventArgs e) public void server_connect_timer_Tick(object sender, EventArgs e)
{ {
if (isInProcess) if (isInProcess)
...@@ -605,20 +752,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -605,20 +752,8 @@ namespace OnlineStore.DeviceLibrary
isInProcess = true; isInProcess = true;
try try
{ {
L2_LastOutShelfId = RFIDManager.ReadRFID(L2Out_RFIDIP, true).NumStr();
//LedProcess(); L3_LastOutShelfId = RFIDManager.ReadRFID(L3Out_RFIDIP, true).NumStr();
//LastInShelfId = RFIDManager.ReadRFID(Config.L1In_RFIDIP,true).NumStr();
LastOutShelfId = RFIDManager.ReadRFID(Config.L2Out_RFIDIP, true).NumStr();
//bool result = SendDISTRfid(LastInShelfId);
//if (result)
//{
// IOManager.CIOMove(IO_Type.InL_InStopDown, IO_VALUE.HIGH);
//}
//else
//{
// IOManager.CIOMove(IO_Type.InL_InStopDown, IO_VALUE.LOW);
//}
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -628,7 +763,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -628,7 +763,7 @@ namespace OnlineStore.DeviceLibrary
} }
private static string GetAddr(string addr, Dictionary<string, string> paramsMap) private static string GetAddr(string addr, Dictionary<string, string> paramsMap)
{ {
string server = ConfigAppSettings.GetValue(Setting_Init.http_server); string server = ConfigAppSettings.GetValue(Setting_Init.http_server, "http://10.85.160.25/myproject/");
if (server.EndsWith("/")) if (server.EndsWith("/"))
{ {
server = server.Substring(0, server.Length - 1); server = server.Substring(0, server.Length - 1);
...@@ -643,7 +778,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -643,7 +778,7 @@ namespace OnlineStore.DeviceLibrary
return path; return path;
} }
private string http_server = ConfigAppSettings.GetValue(Setting_Init.http_server); private string http_server = ConfigAppSettings.GetValue(Setting_Init.http_server, "http://10.85.160.25/myproject/");
private string api_communication = "/service/store/qisda/distRfid"; //分盘线状态通信接口 private string api_communication = "/service/store/qisda/distRfid"; //分盘线状态通信接口
private string lastLog = ""; private string lastLog = "";
public bool SendDISTRfid(string rfid) public bool SendDISTRfid(string rfid)
......
source/DeviceLibrary/acDISTLine/DISTLineBean_Partial.cs
...@@ -128,8 +128,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -128,8 +128,9 @@ namespace OnlineStore.DeviceLibrary
{ {
//return "进料线出口" + Config.L2_AgvName + "：" + AgvClient.GetAction(Config.L2_AgvName) + "，料架： " + LastInShelfId + "\r\n" + //return "进料线出口" + Config.L2_AgvName + "：" + AgvClient.GetAction(Config.L2_AgvName) + "，料架： " + LastInShelfId + "\r\n" +
// "出料线进口" + Config.L1_AgvName + "：" + AgvClient.GetAction(Config.L1_AgvName) + "，料架： " + LastOutShelfId + "\r\n"; // "出料线进口" + Config.L1_AgvName + "：" + AgvClient.GetAction(Config.L1_AgvName) + "，料架： " + LastOutShelfId + "\r\n";
return "分盘1线入料口" + Config.L1_AgvName + "：" + AgvClient.GetAction(Config.L1_AgvName) + "，料架： " + LastInShelfId + "\r\n" + return "入料线入料口" + Config.L1_AgvName + "：" + AgvClient.GetAction(Config.L1_AgvName) + "，料架： " + LastInShelfId + "\r\n" +
"分盘2线出料口" + Config.L2_AgvName + "：" + AgvClient.GetAction(Config.L2_AgvName) + "，料架： " + LastOutShelfId + "\r\n"; "入库料线出料口" + Config.L2_AgvName + "：" + AgvClient.GetAction(Config.L2_AgvName) + "，料架： " + L2_LastOutShelfId + "\r\n"+
"空料架线出料口" + Config.L3_AgvName + "：" + AgvClient.GetAction(Config.L3_AgvName) + "，料架： " + L3_LastOutShelfId;
} }
#endregion #endregion
...@@ -166,6 +167,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -166,6 +167,11 @@ namespace OnlineStore.DeviceLibrary
needCheckList.Add(IO_Type.L2_OutStopDown); needCheckList.Add(IO_Type.L2_OutStopDown);
needCheckList.Add(IO_Type.L2_StopCheck); needCheckList.Add(IO_Type.L2_StopCheck);
needCheckList.Add(IO_Type.L2_StopDown); needCheckList.Add(IO_Type.L2_StopDown);
needCheckList.Add(IO_Type.L3_InCheck);
needCheckList.Add(IO_Type.L3_OutCheck);
needCheckList.Add(IO_Type.L3_OutStopDown);
needCheckList.Add(IO_Type.L3_StopCheck);
needCheckList.Add(IO_Type.L3_StopDown);
} }
bool agvBusy = false; bool agvBusy = false;
ClientAction currA = AgvClient.GetAction(Config.L2_AgvName); ClientAction currA = AgvClient.GetAction(Config.L2_AgvName);
...@@ -236,6 +242,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -236,6 +242,7 @@ namespace OnlineStore.DeviceLibrary
IsSleep = true; IsSleep = true;
IOManager.IOMove(IO_Type.L1_Run, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L1_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L2_Run, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L3_Run, IO_VALUE.LOW);
} }
else else
{ {
...@@ -243,6 +250,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -243,6 +250,7 @@ namespace OnlineStore.DeviceLibrary
LastBusyTime = DateTime.Now; LastBusyTime = DateTime.Now;
IOManager.IOMove(IO_Type.L1_Run, IO_VALUE.HIGH); IOManager.IOMove(IO_Type.L1_Run, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.L2_Run, IO_VALUE.HIGH); IOManager.IOMove(IO_Type.L2_Run, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.L3_Run, IO_VALUE.HIGH);
}; };
} }
#endregion #endregion
......
source/DeviceLibrary/acDISTLine/LineManager.cs
...@@ -19,7 +19,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -19,7 +19,7 @@ namespace OnlineStore.DeviceLibrary
public static DISTLineBean DISTLine = null; public static DISTLineBean DISTLine = null;
public static DISTLineConfig Config = null; public static DISTLineConfig Config = null;
private static bool isInit = false; private static bool isInit = false;
public static bool IsConnectServer = !ConfigAppSettings.GetValue(Setting_Init.http_server).Equals(""); public static bool IsConnectServer = !ConfigAppSettings.GetValue(Setting_Init.http_server, "http://10.85.160.25/myproject/").Equals("");
public LineManager() public LineManager()
{ {
} }
...@@ -48,7 +48,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -48,7 +48,7 @@ namespace OnlineStore.DeviceLibrary
RobotConfig.ProIOIpMap = new Dictionary<string, string>(); RobotConfig.ProIOIpMap = new Dictionary<string, string>();
if (!isInit) if (!isInit)
{ {
string server = ConfigAppSettings.GetValue(Setting_Init.http_server); string server = ConfigAppSettings.GetValue(Setting_Init.http_server, "http://10.85.160.25/myproject/");
if (server.Equals("")) if (server.Equals(""))
{ {
IsConnectServer = false; IsConnectServer = false;
...@@ -59,7 +59,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -59,7 +59,7 @@ namespace OnlineStore.DeviceLibrary
isInit = true; isInit = true;
string appPath = Application.StartupPath; string appPath = Application.StartupPath;
string linefilePath = appPath + ConfigAppSettings.GetValue(Setting_Init.Line_Config); string linefilePath = appPath + ConfigAppSettings.GetValue(Setting_Init.Line_Config, "\\LineConfig\\DISTLineConfig.csv");
LogUtil.info(LOGGER, " 开始加载分盘流水线配置：" + linefilePath); LogUtil.info(LOGGER, " 开始加载分盘流水线配置：" + linefilePath);
RobotConfig storeConfig = CSVConfigReader.LoadConfig(linefilePath); RobotConfig storeConfig = CSVConfigReader.LoadConfig(linefilePath);
......
source/DeviceLibrary/agvClient/AgvClient.cs
...@@ -14,7 +14,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -14,7 +14,7 @@ namespace OnlineStore.DeviceLibrary
{ {
public class AgvClient public class AgvClient
{ {
private static string ServerIp = ConfigAppSettings.GetValue(Setting_Init.AgvServerIp); private static string ServerIp = ConfigAppSettings.GetValue(Setting_Init.AgvServerIp, "127.0.0.1");
private static Asa.AgvClient agvClient; private static Asa.AgvClient agvClient;
public static Dictionary<string, Asa.ClientAction> actionMap = new Dictionary<string, Asa.ClientAction>(); public static Dictionary<string, Asa.ClientAction> actionMap = new Dictionary<string, Asa.ClientAction>();
public static List<string> NodeList = new List<string>(); public static List<string> NodeList = new List<string>();
...@@ -88,6 +88,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -88,6 +88,7 @@ namespace OnlineStore.DeviceLibrary
UpdateAction(id, Asa.ClientAction.Ready); UpdateAction(id, Asa.ClientAction.Ready);
if (id.Equals(LineManager.Config.L1_AgvName)) if (id.Equals(LineManager.Config.L1_AgvName))
{ {
LineManager.DISTLine.LastInShelfId = rfid;
LineManager.DISTLine.UpdateSleep(false); LineManager.DISTLine.UpdateSleep(false);
if (IOManager.IOValue(IO_Type.L1_InCheck).Equals(IO_VALUE.LOW)) if (IOManager.IOValue(IO_Type.L1_InCheck).Equals(IO_VALUE.LOW))
{ {
...@@ -127,11 +128,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -127,11 +128,11 @@ namespace OnlineStore.DeviceLibrary
else if (id.Equals(LineManager.Config.L2_AgvName)) else if (id.Equals(LineManager.Config.L2_AgvName))
{ {
string shefId = LineManager.DISTLine.LastOutShelfId; string shefId = LineManager.DISTLine.L2_LastOutShelfId;
if (IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.HIGH)) if (IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.HIGH))
{ {
LineManager.DISTLine.UpdateSleep(false); LineManager.DISTLine.UpdateSleep(false);
LineManager.DISTLine.StopIOMove(IO_Type.L2_OutStopDown, 1500); LineManager.DISTLine.StopIOMove(IO_Type.L2_OutStopDown, 2000);
//agvClient.MayLeave(id); //agvClient.MayLeave(id);
SetStatus(id, shefId, ClientAction.MayLeave); SetStatus(id, shefId, ClientAction.MayLeave);
LogUtil.info(logName + "下降 L2_OutStopDown ， " + shefId); LogUtil.info(logName + "下降 L2_OutStopDown ， " + shefId);
...@@ -155,6 +156,36 @@ namespace OnlineStore.DeviceLibrary ...@@ -155,6 +156,36 @@ namespace OnlineStore.DeviceLibrary
SetStatus(id, "", ClientAction.None, ClientLevel.High); SetStatus(id, "", ClientAction.None, ClientLevel.High);
} }
} }
else if (id.Equals(LineManager.Config.L3_AgvName))
{
if (IOManager.IOValue(IO_Type.L3_OutCheck).Equals(IO_VALUE.HIGH))
{
string shefId = LineManager.DISTLine.L3_LastOutShelfId;
LineManager.DISTLine.UpdateSleep(false);
LineManager.DISTLine.StopIOMove(IO_Type.L3_OutStopDown, 2000);
//agvClient.MayLeave(id);
SetStatus(id, shefId, ClientAction.MayLeave);
LogUtil.info(logName + "下降 L3_OutStopDown ，"+ shefId);
Task.Factory.StartNew(delegate
{
//两秒后改为离开状态
Thread.Sleep(5000);
LogUtil.info(logName + " ，调用 FinishLeave " + shefId);
SetStatus(id, "", ClientAction.FinishLeave);
Thread.Sleep(5000);
LogUtil.info(logName + " ，处理结束 更新状态为None ");
SetStatus(id, "", ClientAction.None);
});
}
else
{
LogUtil.error(logName + " L3_OutCheck 未检测到料架，无法将料架进入AGV");
SetStatus(id, "", ClientAction.None, ClientLevel.High);
}
}
} }
private static void AgvClient_Arrive(string id, string rfid) private static void AgvClient_Arrive(string id, string rfid)
{ {
......
source/LoadCVSLibrary/Config/bean/DISTLineConfig.cs
...@@ -50,7 +50,11 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -50,7 +50,11 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[ConfigProAttribute("L2_AgvName")] [ConfigProAttribute("L2_AgvName")]
public string L2_AgvName { get; set; } public string L2_AgvName { get; set; }
/// <summary>
///PRO,分盘包装料出料线AGV节点名称,L3_AgvName,A9,,,,,,,
/// </summary>
[ConfigProAttribute("L3_AgvName")]
public string L3_AgvName { get; set; }
public double AirCheckSeconds = 60; public double AirCheckSeconds = 60;
......
source/LoadCVSLibrary/Config/bean/IO_Type.cs
...@@ -25,120 +25,200 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -25,120 +25,200 @@ namespace OnlineStore.LoadCSVLibrary
} }
/// <summary> /// <summary>
/// DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X741,DI-01,0, ///DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X801,DI-01,0,
/// </summary> /// </summary>
public static string SuddenStop_BTN = "SuddenStop_BTN"; public static string SuddenStop_BTN = "SuddenStop_BTN";
/// <summary> /// <summary>
/// DI,分盘1线入口检测,L1_InCheck,1,PRO_AOI_IP_1,0,分盘1线入口检测,X742,DI-02,0, ///DI,分盘入料线入口检测,L1_InCheck,1,PRO_AOI_IP_1,0,分盘入料线入口检测,X802,DI-02,0,
/// </summary> /// </summary>
public static string L1_InCheck = "L1_InCheck"; public static string L1_InCheck = "L1_InCheck";
/// <summary> /// <summary>
/// DI,分盘1线阻挡检测,L1_StopCheck,2,PRO_AOI_IP_1,0,分盘1线阻挡检测,X743,DI-03,0, /// DI,分盘入料线阻挡检测,L1_StopCheck,2,PRO_AOI_IP_1,0,分盘入料线阻挡检测,X803,DI-03,0,
/// </summary> /// </summary>
public static string L1_StopCheck = "L1_StopCheck"; public static string L1_StopCheck = "L1_StopCheck";
/// <summary> /// <summary>
/// DI,分盘1线出口检测,L1_OutCheck,3,PRO_AOI_IP_1,0,分盘1线出口检测,X744,DI-04,0, /// DI,分盘入料线出口检测,L1_OutCheck,3,PRO_AOI_IP_1,0,分盘入料线出口检测,X804,DI-04,0,
/// </summary> /// </summary>
public static string L1_OutCheck = "L1_OutCheck"; public static string L1_OutCheck = "L1_OutCheck";
/// <summary> /// <summary>
/// DI,分盘2线入口检测,L2_InCheck,4,PRO_AOI_IP_1,0,分盘2线入口检测,X745,DI-05,0, ///DI,分盘出料串线入口检测,L2_InCheck,4,PRO_AOI_IP_1,0,分盘出料串线入口检测,X805,DI-05,0,
/// </summary> /// </summary>
public static string L2_InCheck = "L2_InCheck"; public static string L2_InCheck = "L2_InCheck";
/// <summary> /// <summary>
/// DI,分盘2线阻挡检测,L2_StopCheck,5,PRO_AOI_IP_1,0,分盘2线阻挡检测,X746,DI-06,0, ///DI,分盘出料串线阻挡检测,L2_StopCheck,5,PRO_AOI_IP_1,0,分盘出料串线阻挡检测,X806,DI-06,0,
/// </summary> /// </summary>
public static string L2_StopCheck = "L2_StopCheck"; public static string L2_StopCheck = "L2_StopCheck";
/// <summary> /// <summary>
/// DI,分盘2线出口检测,L2_OutCheck,6,PRO_AOI_IP_1,0,分盘2线出口检测,X747,DI-07,0, ///DI,分盘出料串线出口检测,L2_OutCheck,6,PRO_AOI_IP_1,0,分盘出料串线出口检测,X807,DI-07,0,
/// </summary> /// </summary>
public static string L2_OutCheck = "L2_OutCheck"; public static string L2_OutCheck = "L2_OutCheck";
/// <summary> /// <summary>
/// DI,分盘1线人工取料信号,L1_ManualRecSig,7,PRO_AOI_IP_1,0,分盘1线人工取料信号,X748,DI-08,0, /// DI,料串出料线脚踏信号,L2_ManualRecSig,7,PRO_AOI_IP_1,0,料串出料线脚踏信号,X808,DI-08,0,
/// </summary> /// </summary>
public static string L1_ManualRecSig = "L1_ManualRecSig"; public static string L2_ManualRecSig = "L2_ManualRecSig";
/// <summary> /// <summary>
/// DI,分盘1线顶升上升端,L1_UpDown_Up_Sig,8,PRO_AOI_IP_1,0,分盘1线顶升上升端,X749,DI-09,0, /// DI,分盘入料线顶升上升端,L1_UpDown_Up_Sig,8,PRO_AOI_IP_1,0,分盘入料线顶升上升端,X809,DI-09,0,
/// </summary> /// </summary>
public static string L1_UpDown_Up_Sig = "L1_UpDown_Up_Sig"; public static string L1_UpDown_Up_Sig = "L1_UpDown_Up_Sig";
/// <summary> /// <summary>
/// DI,分盘1线顶升下降端,L1_UpDown_Down_Sig,9,PRO_AOI_IP_1,0,分盘1线顶升下降端,X750,DI-10,0, ///DI,分盘入料线顶升下降端,L1_UpDown_Down_Sig,9,PRO_AOI_IP_1,0,分盘入料线顶升下降端,X810,DI-10,0,
/// </summary> /// </summary>
public static string L1_UpDown_Down_Sig = "L1_UpDown_Down_Sig"; public static string L1_UpDown_Down_Sig = "L1_UpDown_Down_Sig";
/// <summary> /// <summary>
/// DI,分盘2线顶升上升端,L2_UpDown_Up_Sig,10,PRO_AOI_IP_1,0,分盘2线顶升上升端,X751,DI-11,0, /// DI,分盘出料串线顶升上升端,L2_UpDown_Up_Sig,10,PRO_AOI_IP_1,0,分盘出料串线顶升上升端,X811,DI-11,0,
/// </summary> /// </summary>
public static string L2_UpDown_Up_Sig = "L2_UpDown_Up_Sig"; public static string L2_UpDown_Up_Sig = "L2_UpDown_Up_Sig";
/// <summary> /// <summary>
/// DI,分盘2线顶升下降端,L2_UpDown_Down_Sig,11,PRO_AOI_IP_1,0,分盘2线顶升下降端,X752,DI-12,0, /// DI,分盘出料串线顶升下降端,L2_UpDown_Down_Sig,11,PRO_AOI_IP_1,0,分盘出料串线顶升下降端,X812,DI-12,0,
/// </summary> /// </summary>
public static string L2_UpDown_Down_Sig = "L2_UpDown_Down_Sig"; public static string L2_UpDown_Down_Sig = "L2_UpDown_Down_Sig";
/// <summary> /// <summary>
/// DI,包装料架检测信号,PackingShelf_Sig,12,PRO_AOI_IP_1,0,包装料架检测信号,X753,DI-13,0, /// DI,包装料架检测信号(分盘入料线）,PackingShelf_Sig,12,PRO_AOI_IP_1,0,包装料架检测信号(分盘入料线）,X813,DI-13,0,
/// </summary> /// </summary>
public static string PackingShelf_Sig = "PackingShelf_Sig"; public static string PackingShelf_Sig = "PackingShelf_Sig";
/// <summary> /// <summary>
/// DI,料串切换气缸前进端,Switch_Forward_Sig,13,PRO_AOI_IP_1,0,料串切换气缸前进端,X754,DI-14,0, /// DI,料串切换气缸前进端,Switch_Forward_Sig,13,PRO_AOI_IP_1,0,料串切换气缸前进端,X814,DI-14,0,
/// </summary> /// </summary>
public static string Switch_Forward_Sig = "Switch_Forward_Sig"; public static string Switch_Forward_Sig = "Switch_Forward_Sig";
/// <summary> /// <summary>
/// DI,料串切换气缸后退端,Switch_Back_Sig,14,PRO_AOI_IP_1,0,料串切换气缸后退端,X755,DI-15,0, /// DI,料串切换气缸后退端,Switch_Back_Sig,14,PRO_AOI_IP_1,0,料串切换气缸后退端,X815,DI-15,0,
/// </summary> /// </summary>
public static string Switch_Back_Sig = "Switch_Back_Sig"; public static string Switch_Back_Sig = "Switch_Back_Sig";
/// <summary> /// <summary>
/// DO,分盘1线驱动电机运转,L1_Run,0,PRO_AOI_IP_1,0,分盘1线驱动电机运转,Y741,DI-01,0, /// DO,分盘入料线驱动电机运转,L1_Run,1,PRO_AOI_IP_1,0,分盘入料线驱动电机运转,Y802,DO-02,0,
/// </summary> /// </summary>
public static string L1_Run = "L1_Run"; public static string L1_Run = "L1_Run";
/// <summary> /// <summary>
/// DO,分盘2线驱动电机运转,L2_Run,1,PRO_AOI_IP_1,0,分盘2线驱动电机运转,Y742,DI-02,0, /// DO,分盘出料串线驱动电机运转,L2_Run,0,PRO_AOI_IP_1,0,分盘出料串线驱动电机运转,Y801,D0-01,0,
/// </summary> /// </summary>
public static string L2_Run = "L2_Run"; public static string L2_Run = "L2_Run";
/// <summary> /// <summary>
/// DO,分盘1线阻挡1下降,L1_StopDown,2,PRO_AOI_IP_1,0,分盘1线阻挡1下降,Y743,DI-03,0, /// DO,分盘入料线阻挡下降,L1_StopDown,2,PRO_AOI_IP_1,0,分盘入料线阻挡下降,Y803,DO-03,0,
/// </summary> /// </summary>
public static string L1_StopDown = "L1_StopDown"; public static string L1_StopDown = "L1_StopDown";
/// <summary> /// <summary>
/// DO,分盘1线出口阻挡下降,L1_OutStopDown,3,PRO_AOI_IP_1,0,分盘1线出口阻挡下降,Y744,DI-04,0, /// DO,分盘入料线出口阻挡下降,L1_OutStopDown,3,PRO_AOI_IP_1,0,分盘入料线出口阻挡下降,Y804,DO-04,0,
/// </summary> /// </summary>
public static string L1_OutStopDown = "L1_OutStopDown"; public static string L1_OutStopDown = "L1_OutStopDown";
/// <summary> /// <summary>
/// DO,分盘2线阻挡1下降,L2_StopDown,4,PRO_AOI_IP_1,0,分盘2线阻挡1下降,Y745,DI-05,0, /// DO,分盘出料串线阻挡下降,L2_StopDown,4,PRO_AOI_IP_1,0,分盘出料串线阻挡下降,Y805,DO-05,0,
/// </summary> /// </summary>
public static string L2_StopDown = "L2_StopDown"; public static string L2_StopDown = "L2_StopDown";
/// <summary> /// <summary>
/// DO,分盘2线出口阻挡下降,L2_OutStopDown,5,PRO_AOI_IP_1,0,分盘2线出口阻挡下降,Y746,DI-06,0, /// DO,分盘出料串线出口阻挡下降,L2_OutStopDown,5,PRO_AOI_IP_1,0,分盘出料串线出口阻挡下降,Y806,DO-06,0,
/// </summary> /// </summary>
public static string L2_OutStopDown = "L2_OutStopDown"; public static string L2_OutStopDown = "L2_OutStopDown";
/// <summary> /// <summary>
/// DO,分盘线横移机构上升SOL,Traverse_Up_SOL,6,PRO_AOI_IP_1,0,,Y747,DO-07,0, /// DO,分盘入料线横移机构上升SOL,L1_Traverse_Up_SOL,6,PRO_AOI_IP_1,0,分盘入料线横移机构上升SOL,Y807,DO-07,0,
/// </summary> /// </summary>
public static string Traverse_Up_SOL = "Traverse_Up_SOL"; public static string L1_Traverse_Up_SOL = "L1_Traverse_Up_SOL";
/// <summary> /// <summary>
/// DO,分盘线横移机构下降SOL,Traverse_Down_SOL,7,PRO_AOI_IP_1,0,,Y748,DO-08,0, /// DO,分盘入料线横移机构下降SOL,L1_Traverse_Down_SOL,7,PRO_AOI_IP_1,0,分盘入料线横移机构下降SOL,Y808,DO-08,0,
/// </summary> /// </summary>
public static string Traverse_Down_SOL = "Traverse_Down_SOL"; public static string L1_Traverse_Down_SOL = "L1_Traverse_Down_SOL";
/// <summary> /// <summary>
/// DO,分盘线横移电机运转,Traverse_Run,8,PRO_AOI_IP_1,0,,Y749,DO-09,0, ///DO,分盘入料线横移电机正转,L1_Traverse_Run,8,PRO_AOI_IP_1,0,分盘入料线横移电机正转,Y809,DO-09,0,
/// </summary> /// </summary>
public static string Traverse_Run = "Traverse_Run"; public static string L1_Traverse_Run = "L1_Traverse_Run";
/// <summary> /// <summary>
/// DO,分盘线滚筒电机运转,Roller_Run,9,PRO_AOI_IP_1,0,,Y750,DO-10,0, /// DO,料串出料线过渡滚筒电机运转,L2_Roller_Run,9,PRO_AOI_IP_1,0,料串出料线过渡滚筒电机运转,Y810,DO-10,0,
/// </summary> /// </summary>
public static string Roller_Run = "Roller_Run"; public static string L2_Roller_Run = "L2_Roller_Run";
/// <summary> /// <summary>
/// DO,料串切换气缸前进,Switch_Forward,10,PRO_AOI_IP_1,0,料串切换气缸前进,Y751,DO-11,0, ///DO,料串切换气缸前进,Switch_Forward,10,PRO_AOI_IP_1,0,料串切换气缸前进,Y811,DO-11,0,
/// </summary> /// </summary>
public static string Switch_Forward = "Switch_Forward"; public static string Switch_Forward = "Switch_Forward";
/// <summary> /// <summary>
/// DO,料串切换气缸后退,Switch_Back,11,PRO_AOI_IP_1,0,料串切换气缸后退,Y752,DO-12,0, /// DO,料串切换气缸后退,Switch_Back,11,PRO_AOI_IP_1,0,料串切换气缸后退,Y812,DO-12,0,
/// </summary> /// </summary>
public static string Switch_Back = "Switch_Back"; public static string Switch_Back = "Switch_Back";
/// <summary>
/// DO,分盘入料线横移电机反转,L1_Traverse_BackRun,12,PRO_AOI_IP_1,0,分盘入料线横移电机反转,Y813,DO-13,0,
/// </summary>
public static string L1_Traverse_BackRun = "L1_Traverse_BackRun";
/// <summary>
///DO,分盘出料串线横移机构上升SOL,L2_Traverse_Up_SOL,13,PRO_AOI_IP_1,0,分盘出料串线横移机构上升SOL,Y814,DO-14,0,
/// </summary>
public static string L2_Traverse_Up_SOL = "L2_Traverse_Up_SOL";
/// <summary>
///DO,分盘出料串线横移机构下降SOL,L2_Traverse_Down_SOL,14,PRO_AOI_IP_1,0,分盘出料串线横移机构下降SOL,Y815,DO-15,0,
/// </summary>
public static string L2_Traverse_Down_SOL = "L2_Traverse_Down_SOL";
/// <summary>
/// DI,包装料架检测信号（料串出料线体出口）,L2Out_PkgDect_Sig,0,PRO_AOI_IP_2,0,包装料架检测信号（料串出料线体出口）,X821,DI-01,0,
/// </summary>
public static string L2Out_PkgDect_Sig = "L2Out_PkgDect_Sig";
/// <summary>
///DI,包装料架检测信号（包装料架出料线体出口）,L3Out_PkgDect_Sig,1,PRO_AOI_IP_2,0,包装料架检测信号（包装料架出料线体出口）,X822,DI-02,0,
/// </summary>
public static string L3Out_PkgDect_Sig = "L3Out_PkgDect_Sig";
/// <summary>
/// DI,包装料架出料线脚踏信号,L3_ManualRecSig,2,PRO_AOI_IP_2,0,包装料架出料线脚踏信号,X823,DI-03,0,
/// </summary>
public static string L3_ManualRecSig = "L3_ManualRecSig";
/// <summary>
///DI,包装料架出料线体横移上升端,L3_UpDown_Up_Sig,3,PRO_AOI_IP_2,0,包装料架出料线体横移上升端,X824,DI-04,0,
/// </summary>
public static string L3_UpDown_Up_Sig = "L3_UpDown_Up_Sig";
/// <summary>
///DI,包装料架出料线体横移下降端,L3_UpDown_Down_Sig,4,PRO_AOI_IP_2,0,包装料架出料线体横移下降端,X825,DI-05,0,
/// </summary>
public static string L3_UpDown_Down_Sig = "L3_UpDown_Down_Sig";
/// <summary>
/// DI,包装料架出料线入口检测,L3_InCheck,5,PRO_AOI_IP_2,0,包装料架出料线入口检测,X826,DI-06,0,
/// </summary>
public static string L3_InCheck = "L3_InCheck";
/// <summary>
///DI,包装料架出料线阻挡检测,L3_StopCheck,6,PRO_AOI_IP_2,0,包装料架出料线阻挡检测,X827,DI-07,0,
/// </summary>
public static string L3_StopCheck = "L3_StopCheck";
/// <summary>
///DI,包装料架出料线出口检测,L3_OutCheck,7,PRO_AOI_IP_2,0,包装料架出料线出口检测,X828,DI-08,0,
/// </summary>
public static string L3_OutCheck = "L3_OutCheck";
/// <summary>
/// DO,包装料架出料线驱动电机运转,L3_Run,0,PRO_AOI_IP_2,0,包装料架出料线驱动电机运转,Y821,D0-01,0,
/// </summary>
public static string L3_Run = "L3_Run";
/// <summary>
///DO,包装料架出料线过渡滚筒电机运转,L3_Roller_Run,1,PRO_AOI_IP_2,0,包装料架出料线过渡滚筒电机运转,Y822,DO-02,0,
/// </summary>
public static string L3_Roller_Run = "L3_Roller_Run";
/// <summary>
/// DO,料串出料线横移电机运转,L2_Traverse_Run,2,PRO_AOI_IP_2,0,料串出料线横移电机运转,Y823,DO-03,0,
/// </summary>
public static string L2_Traverse_Run = "L2_Traverse_Run";
/// <summary>
///DO,包装料架出料线横移电机运转,L3_Traverse_Run,3,PRO_AOI_IP_2,0,包装料架出料线横移电机运转,Y824,DO-04,0,
/// </summary>
public static string L3_Traverse_Run = "L3_Traverse_Run";
/// <summary>
///DO,包装料架出料线横移机构上升SOL,L3_Traverse_Up_SOL,4,PRO_AOI_IP_2,0,包装料架出料线横移机构上升SOL,Y825,DO-05,0,
/// </summary>
public static string L3_Traverse_Up_SOL = "L3_Traverse_Up_SOL";
/// <summary>
/// DO,包装料架出料线横移机构下降SOL,L3_Traverse_Down_SOL,5,PRO_AOI_IP_2,0,包装料架出料线横移机构下降SOL,Y826,DO-06,0,
/// </summary>
public static string L3_Traverse_Down_SOL = "L3_Traverse_Down_SOL";
/// <summary>
///DO,包装料架出料线阻挡下降,L3_StopDown,6,PRO_AOI_IP_2,0,包装料架出料线阻挡下降,Y827,DO-07,0,
/// </summary>
public static string L3_StopDown = "L3_StopDown";
/// <summary>
///DO,包装料架出料线出口阻挡下降,L3_OutStopDown,7,PRO_AOI_IP_2,0,包装料架出料线出口阻挡下降,Y828,DO-08,0,
/// </summary>
public static string L3_OutStopDown = "L3_OutStopDown";
} }
public enum IO_VALUE public enum IO_VALUE
{ {
......
source/LoadCVSLibrary/LoadCSVLibrary.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace> <RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace>
<AssemblyName>LoadCSVLibrary</AssemblyName> <AssemblyName>LoadCSVLibrary</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
source/UserFromControl/Properties/Resources.Designer.cs
...@@ -19,7 +19,7 @@ namespace UserFromControl.Properties { ...@@ -19,7 +19,7 @@ namespace UserFromControl.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
...@@ -47,8 +47,8 @@ namespace UserFromControl.Properties { ...@@ -47,8 +47,8 @@ namespace UserFromControl.Properties {
} }
/// <summary> /// <summary>
/// 使用此强类型资源类，为所有资源查找 /// 重写当前线程的 CurrentUICulture 属性，对
/// 重写当前线程的 CurrentUICulture 属性。 /// 使用此强类型资源类的所有资源查找执行重写。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture { internal static global::System.Globalization.CultureInfo Culture {
......
source/UserFromControl/UserFromControl.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>UserFromControl</RootNamespace> <RootNamespace>UserFromControl</RootNamespace>
<AssemblyName>UserFromControl</AssemblyName> <AssemblyName>UserFromControl</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!