Skip to content

孙克 / RC1250-ACPackingStore

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

rfid，io更新，界面调整

1 个父辈 3b0cd387
全部展开
内嵌 并排
正在显示 17 个修改的文件 包含 226 行增加 和 108 行删除
dll/Asa.IOModule.AIOBOX.xml
......@@ -331,11 +331,12 @@
日志操作类
</summary>
</member>
<member name="M:Asa.IOModule.LogFile.#ctor(System.String)">
<member name="M:Asa.IOModule.LogFile.#ctor(System.String,System.String)">
<summary>
日志
</summary>
<param name="path">文件夹路径</param>
<param name="args"></param>
</member>
<member name="M:Asa.IOModule.LogFile.Close">
<summary>
......
dll/RFID/Asa.RFID.xml
......@@ -9,26 +9,11 @@
RFID读卡器
</summary>
</member>
<member name="E:Asa.RFID.Reader.Data_Received">
<summary>
自动扫描接收到的数据
</summary>
</member>
<member name="M:Asa.RFID.Reader.#ctor">
<summary>
RFID读卡器
</summary>
</member>
<member name="P:Asa.RFID.Reader.LocalIP">
<summary>
本地IP地址，用于查找或修改远程IP
</summary>
</member>
<member name="P:Asa.RFID.Reader.RemoteIP">
<summary>
远程IP地址
</summary>
</member>
<member name="P:Asa.RFID.Reader.IsConn">
<summary>
是否连接
......@@ -44,35 +29,33 @@
是否存在ID卡
</summary>
</member>
<member name="M:Asa.RFID.Reader.Connect">
<member name="P:Asa.RFID.Reader.ErrCode">
<summary>
连接
错误代码
</summary>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader.Close">
<member name="P:Asa.RFID.Reader.ID">
<summary>
关闭
ID号码
</summary>
</member>
<member name="M:Asa.RFID.Reader.FindRFID">
<member name="M:Asa.RFID.Reader.Connect(System.String,System.Boolean)">
<summary>
查找电子标签
连接
</summary>
<param name="ip">设备IP地址</param>
<param name="autoScan">自动扫描</param>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader.AutoScan(System.Boolean,System.Int32)">
<member name="M:Asa.RFID.Reader.Close">
<summary>
自动读取扫描，使用查找模式
关闭
</summary>
<param name="open">扫描模式开启，true扫描</param>
<param name="time">间隔时间</param>
</member>
<member name="M:Asa.RFID.Reader.AutoScan(System.Boolean)">
<member name="M:Asa.RFID.Reader.FindRFID">
<summary>
自动读取扫描，使用扫描模式，扫描模式只读
查找电子标签，扫描模式不能使用
</summary>
<param name="open">扫描模式开启，true扫描</param>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader.Read">
......@@ -91,38 +74,20 @@
</member>
<member name="M:Asa.RFID.Reader.Write(System.Byte[])">
<summary>
写入数据到电子标签
写入数据到电子标签，扫描模式不能使用
</summary>
<param name="buff">数据，必须小于等于112字节</param>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader.Write(System.Byte[],System.Int32)">
<summary>
写入数据到电子标签
写入数据到电子标签，扫描模式不能使用
</summary>
<param name="buff"></param>
<param name="start"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader.FindIP">
<summary>
查找IP地址，需要设置LocalIP
</summary>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader.ModifyIP(System.String)">
<summary>
修改IP地址
</summary>
<param name="IP"></param>
</member>
<member name="M:Asa.RFID.Reader.Receive(System.Object)">
<summary>
自动扫描接受数据事件
</summary>
<param name="param"></param>
</member>
<member name="M:Asa.RFID.Reader.Receive2">
<member name="M:Asa.RFID.Reader.Receive">
<summary>
自动扫描接受数据事件
</summary>
......@@ -153,25 +118,156 @@
<param name="start"></param>
<param name="len"></param>
</member>
<member name="T:Asa.RFID.ReaderInfo">
<member name="T:Asa.RFID.Reader2">
<summary>
RFID读卡器
</summary>
</member>
<member name="M:Asa.RFID.Reader2.#ctor">
<summary>
RFID读卡器
</summary>
</member>
<member name="M:Asa.RFID.Reader2.IsConn(System.Int32)">
<summary>
是否连接
</summary>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader2.AddIP(System.String[])">
<summary>
添加设备IP地址
</summary>
<param name="ip"></param>
</member>
<member name="M:Asa.RFID.Reader2.Connect(System.Boolean)">
<summary>
连接
</summary>
<param name="autoScan">自动扫描</param>
</member>
<member name="M:Asa.RFID.Reader2.Connect(System.Int32,System.Boolean)">
<summary>
连接
</summary>
<param name="index"></param>
<param name="autoScan">自动扫描</param>
</member>
<member name="M:Asa.RFID.Reader2.Close">
<summary>
关闭所有
</summary>
</member>
<member name="M:Asa.RFID.Reader2.Close(System.Int32)">
<summary>
关闭
</summary>
<param name="index"></param>
</member>
<member name="M:Asa.RFID.Reader2.FindRFID(System.Int32)">
<summary>
查找电子标签
</summary>
<param name="index"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader2.GetID(System.Int32)">
<summary>
ID号码
</summary>
<param name="index"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader2.Read(System.Int32)">
<summary>
读取电子标签
</summary>
<param name="index"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader2.Read(System.Int32,System.Int32,System.Int32)">
<summary>
读取电子标签
</summary>
<param name="index"></param>
<param name="start"></param>
<param name="len"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader2.Write(System.Int32,System.Byte[],System.Int32)">
<summary>
写入数据到电子标签
</summary>
<param name="index"></param>
<param name="buff"></param>
<param name="start"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader2.AutoScan(System.Int32,System.Boolean)">
<summary>
自动读取扫描，扫描模式只读
</summary>
<param name="idx"></param>
<param name="open"></param>
</member>
<member name="M:Asa.RFID.Reader2.Receive(System.Object)">
<summary>
自动扫描接受数据事件
</summary>
</member>
<member name="M:Asa.RFID.Reader2.Find(System.Int32)">
<summary>
查找电子标签
</summary>
<param name="idx"></param>
</member>
<member name="M:Asa.RFID.Reader2.ReadRFID(System.Int32)">
<summary>
读取电子标签内所有数据
</summary>
<param name="idx"></param>
</member>
<member name="M:Asa.RFID.Reader2.ReadRFID(System.Int32,System.Int32)">
<summary>
读卡设备信息
读取电子标签指定块
</summary>
<param name="idx"></param>
<param name="num"></param>
</member>
<member name="F:Asa.RFID.ReaderInfo.IP">
<member name="M:Asa.RFID.Reader2.WriteRFID(System.Int32,System.Int32)">
<summary>
IP地址
写入指定块数据到电子标签
</summary>
<param name="idx"></param>
<param name="num"></param>
<returns></returns>
</member>
<member name="F:Asa.RFID.ReaderInfo.Mac">
<member name="T:Asa.RFID.IP">
<summary>
MAC地址
IP地址操作
</summary>
</member>
<member name="F:Asa.RFID.ReaderInfo.Port">
<member name="M:Asa.RFID.IP.Find(System.String)">
<summary>
端口
查找IP地址
</summary>
<param name="localIP"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.IP.Modify(System.String,System.String,System.String)">
<summary>
修改IP地址，需要先查找IP
</summary>
<param name="localIP">本地IP</param>
<param name="beforeIP">修改前的IP</param>
<param name="afterIP">修改后的IP</param>
<returns></returns>
</member>
<member name="M:Asa.RFID.IP.GetLocal">
<summary>
获取本地IPv4地址
</summary>
<returns></returns>
</member>
</members>
</doc>
dll/RFID/ClassLibrary1.dll 0 → 100644
此文件类型无法预览
dll/RFID/ConsoleApp1.exe 0 → 100644
此文件类型无法预览
dll/RFID/ReadMe.txt 0 → 100644
1.0.0.0 2019-11-19
1、钉盘上传
\ No newline at end of file
source/ACPackingStore/FrmRFIPEdit.Designer.cs
......@@ -46,6 +46,7 @@
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label6 = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lblResult = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.numNum)).BeginInit();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
......@@ -56,7 +57,7 @@
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(80, 36);
this.label1.Location = new System.Drawing.Point(83, 36);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(107, 20);
this.label1.TabIndex = 0;
......@@ -67,7 +68,7 @@
//
this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBack.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBack.Location = new System.Drawing.Point(295, 235);
this.btnBack.Location = new System.Drawing.Point(283, 257);
this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(120, 45);
this.btnBack.TabIndex = 274;
......@@ -78,7 +79,7 @@
// txtIP
//
this.txtIP.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtIP.Location = new System.Drawing.Point(196, 82);
this.txtIP.Location = new System.Drawing.Point(195, 78);
this.txtIP.Name = "txtIP";
this.txtIP.Size = new System.Drawing.Size(233, 26);
this.txtIP.TabIndex = 276;
......@@ -88,7 +89,7 @@
this.comboxType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboxType.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboxType.FormattingEnabled = true;
this.comboxType.Location = new System.Drawing.Point(196, 33);
this.comboxType.Location = new System.Drawing.Point(195, 33);
this.comboxType.Name = "comboxType";
this.comboxType.Size = new System.Drawing.Size(233, 28);
this.comboxType.TabIndex = 277;
......@@ -99,7 +100,7 @@
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(109, 84);
this.label2.Location = new System.Drawing.Point(111, 80);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(78, 20);
this.label2.TabIndex = 278;
......@@ -118,7 +119,7 @@
"C",
"D",
"E"});
this.comType.Location = new System.Drawing.Point(196, 129);
this.comType.Location = new System.Drawing.Point(195, 158);
this.comType.Name = "comType";
this.comType.Size = new System.Drawing.Size(120, 28);
this.comType.TabIndex = 280;
......@@ -128,7 +129,7 @@
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(122, 132);
this.label3.Location = new System.Drawing.Point(122, 161);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(65, 20);
this.label3.TabIndex = 279;
......@@ -139,7 +140,7 @@
//
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.Location = new System.Drawing.Point(151, 235);
this.button1.Location = new System.Drawing.Point(139, 257);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(120, 45);
this.button1.TabIndex = 281;
......@@ -152,7 +153,7 @@
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(136, 180);
this.label4.Location = new System.Drawing.Point(136, 207);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(51, 20);
this.label4.TabIndex = 282;
......@@ -162,7 +163,7 @@
// numNum
//
this.numNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numNum.Location = new System.Drawing.Point(196, 178);
this.numNum.Location = new System.Drawing.Point(195, 203);
this.numNum.Name = "numNum";
this.numNum.Size = new System.Drawing.Size(120, 26);
this.numNum.TabIndex = 283;
......@@ -222,6 +223,7 @@
this.groupBox1.TabIndex = 290;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "搜索RFID";
this.groupBox1.Visible = false;
//
// label6
//
......@@ -237,8 +239,10 @@
//
// groupBox2
//
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
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.Right)));
this.groupBox2.Controls.Add(this.lblResult);
this.groupBox2.Controls.Add(this.comboxType);
this.groupBox2.Controls.Add(this.label1);
this.groupBox2.Controls.Add(this.button1);
......@@ -249,18 +253,30 @@
this.groupBox2.Controls.Add(this.label3);
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.comType);
this.groupBox2.Location = new System.Drawing.Point(22, 160);
this.groupBox2.Location = new System.Drawing.Point(22, 12);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(614, 319);
this.groupBox2.Size = new System.Drawing.Size(489, 325);
this.groupBox2.TabIndex = 291;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "读取RFID";
//
// lblResult
//
this.lblResult.AutoSize = true;
this.lblResult.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblResult.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblResult.Location = new System.Drawing.Point(195, 121);
this.lblResult.Name = "lblResult";
this.lblResult.Size = new System.Drawing.Size(79, 20);
this.lblResult.TabIndex = 284;
this.lblResult.Text = "读取到数据";
this.lblResult.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// FrmRFIPEdit
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(662, 503);
this.ClientSize = new System.Drawing.Size(560, 361);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
......@@ -295,5 +311,6 @@
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label lblResult;
}
}
\ No newline at end of file
source/ACPackingStore/FrmRFIPEdit.cs
......@@ -74,7 +74,9 @@ namespace OnlineStore.ACPackingStore
}
}
lblResult.Text = resul;
MessageBox.Show("读取到数据：" + resul);
}
private void comboxType_SelectedIndexChanged(object sender, EventArgs e)
......@@ -94,8 +96,8 @@ namespace OnlineStore.ACPackingStore
private void btnSearch_Click(object sender, EventArgs e)
{
string text = cmbLocalIp.Text;
string ip = RFIDManager.SearchIP(text);
txtSearchIp.Text = ip;
// string ip = RFIDManager.SearchIP(text);
// txtSearchIp.Text = ip;
}
}
}
source/ACPackingStore/FrmStore.Designer.cs
......@@ -61,9 +61,9 @@
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.显示ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.menuStrip1.SuspendLayout();
......@@ -78,11 +78,11 @@
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed;
this.tabControl1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabControl1.Location = new System.Drawing.Point(12, 76);
this.tabControl1.Location = new System.Drawing.Point(5, 75);
this.tabControl1.Multiline = true;
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1740, 652);
this.tabControl1.Size = new System.Drawing.Size(1342, 650);
this.tabControl1.TabIndex = 0;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
//
......@@ -96,7 +96,7 @@
this.tabPage1.Controls.Add(this.logBox);
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(1732, 619);
this.tabPage1.Size = new System.Drawing.Size(1334, 617);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 日志信息 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -105,7 +105,7 @@
//
this.chbUseBuzzer.AutoSize = true;
this.chbUseBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbUseBuzzer.Location = new System.Drawing.Point(623, 31);
this.chbUseBuzzer.Location = new System.Drawing.Point(623, 13);
this.chbUseBuzzer.Name = "chbUseBuzzer";
this.chbUseBuzzer.Size = new System.Drawing.Size(98, 24);
this.chbUseBuzzer.TabIndex = 195;
......@@ -117,7 +117,7 @@
//
this.chkDebug.AutoSize = true;
this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkDebug.Location = new System.Drawing.Point(285, 30);
this.chkDebug.Location = new System.Drawing.Point(285, 12);
this.chkDebug.Name = "chkDebug";
this.chkDebug.Size = new System.Drawing.Size(132, 24);
this.chkDebug.TabIndex = 194;
......@@ -129,7 +129,7 @@
//
this.chbAutoRun.AutoSize = true;
this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRun.Location = new System.Drawing.Point(437, 30);
this.chbAutoRun.Location = new System.Drawing.Point(437, 12);
this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(140, 24);
this.chbAutoRun.TabIndex = 94;
......@@ -141,7 +141,7 @@
//
this.btnCopyLog.BackColor = System.Drawing.Color.White;
this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCopyLog.Location = new System.Drawing.Point(19, 25);
this.btnCopyLog.Location = new System.Drawing.Point(19, 7);
this.btnCopyLog.Name = "btnCopyLog";
this.btnCopyLog.Size = new System.Drawing.Size(105, 35);
this.btnCopyLog.TabIndex = 191;
......@@ -153,7 +153,7 @@
//
this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Location = new System.Drawing.Point(130, 25);
this.btnClearLog.Location = new System.Drawing.Point(130, 7);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(105, 35);
this.btnClearLog.TabIndex = 190;
......@@ -167,9 +167,9 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(10, 80);
this.logBox.Location = new System.Drawing.Point(10, 48);
this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(1714, 533);
this.logBox.Size = new System.Drawing.Size(1316, 563);
this.logBox.TabIndex = 106;
this.logBox.Text = "";
//
......@@ -179,9 +179,9 @@
| System.Windows.Forms.AnchorStyles.Right)));
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.Location = new System.Drawing.Point(601, 4);
this.lblWarnMsg.Location = new System.Drawing.Point(281, 4);
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(1141, 69);
this.lblWarnMsg.Size = new System.Drawing.Size(1045, 69);
this.lblWarnMsg.TabIndex = 96;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
......@@ -195,7 +195,7 @@
this.帮助ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1766, 29);
this.menuStrip1.Size = new System.Drawing.Size(1350, 29);
this.menuStrip1.TabIndex = 4;
this.menuStrip1.Text = "menuStrip1";
//
......@@ -343,19 +343,24 @@
this.toolStripSeparator8,
this.toolStripMenuItem1});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(181, 84);
this.contextMenuStrip1.Size = new System.Drawing.Size(113, 62);
//
// 显示ToolStripMenuItem
//
this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem";
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(112, 26);
this.显示ToolStripMenuItem.Text = "显示";
this.显示ToolStripMenuItem.Click += new System.EventHandler(this.显示ToolStripMenuItem_Click);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(109, 6);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(180, 26);
this.toolStripMenuItem1.Size = new System.Drawing.Size(112, 26);
this.toolStripMenuItem1.Text = "退出";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
//
......@@ -364,17 +369,12 @@
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(177, 6);
//
// FrmStore
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1766, 733);
this.ClientSize = new System.Drawing.Size(1350, 729);
this.Controls.Add(this.lblWarnMsg);
this.Controls.Add(this.menuStrip1);
this.Controls.Add(this.tabControl1);
......
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs
......@@ -155,7 +155,7 @@ namespace OnlineStore.DeviceLibrary
private int ComTargetPosition = 0;
private int LastWidth = 0;
private int LastHeight = 0;
private RFIDData LastShelfData = new RFIDData(0);
private RFIDData LastShelfData = new RFIDData(0,0);
......
source/DeviceLibrary/ACPackingStore/PackingStoreBean.cs
......@@ -77,7 +77,7 @@ namespace OnlineStore.DeviceLibrary
Task.Factory.StartNew(delegate
{
RFIDManager.ConnectRFIOList(rfidList);
// RFIDManager.RfidReader.Open(rfidList.ToArray());
IOManager.instance.ConnectionIOList(ioList);
addLastDI(IO_Type.Airpressure_Check, IOValue(IO_Type.Airpressure_Check));
addLastDI(IO_Type.SuddenStop_BTN, IOValue(IO_Type.SuddenStop_BTN));
......
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -39,8 +39,8 @@
<Reference Include="Asa.IOModule.AIOBOX">
<HintPath>..\..\dll\Asa.IOModule.AIOBOX.dll</HintPath>
</Reference>
<Reference Include="Asa.RFID">
<HintPath>..\..\dll\RFID\Asa.RFID.dll</HintPath>
<Reference Include="ClassLibrary1">
<HintPath>..\..\..\RC1250-AssemblyLine\dll\RFID\ClassLibrary1.dll</HintPath>
</Reference>
<Reference Include="Client">
<HintPath>..\..\dll\Client.dll</HintPath>
......
source/DeviceLibrary/StoreConfig/StoreConfig.csv
类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID,
PRO,IO模块对应的DI数量,IO_DILength,192.168.104.21#16;192.168.104.22#16;192.168.104.23#16,,,,,
PRO,IO模块对应的DO数量,IO_DOLength,192.168.104.21#16;192.168.104.22#16;192.168.104.23#16,,,,,
PRO,第一块IO模块IP,PRO_AOI_IP_1,192.168.104.21,,,,,,,
PRO,第二块IO模块IP,PRO_AOI_IP_2,192.168.104.22,,,,,,,
PRO,第三块IO模块IP,PRO_AOI_IP_3,192.168.104.23,,,,,,,
PRO,IO模块对应的DI数量,IO_DILength,192.168.105.21#16;192.168.105.22#16;192.168.105.23#16,,,,,
PRO,IO模块对应的DO数量,IO_DOLength,192.168.105.21#16;192.168.105.22#16;192.168.105.23#16,,,,,
PRO,第一块IO模块IP,PRO_AOI_IP_1,192.168.105.21,,,,,,,
PRO,第二块IO模块IP,PRO_AOI_IP_2,192.168.105.22,,,,,,,
PRO,第三块IO模块IP,PRO_AOI_IP_3,192.168.105.23,,,,,,,
,,,,,,,,,,
,,,,,,,,,,
DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X01,DI-01,0,
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!