Skip to content

孙克 / RC1250-ACPackingStore

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

rfid修改

1 个父辈 c5ac6de8
全部展开
内嵌 并排
正在显示 9 个修改的文件 包含 37 行增加 和 32 行删除
dll/Client.dll
此文件类型无法预览
dll/Client.xml
...@@ -230,11 +230,6 @@ ...@@ -230,11 +230,6 @@
</summary> </summary>
<param name="s"></param> <param name="s"></param>
</member> </member>
<member name="E:Asa.Client2.GetRFID">
<summary>
服务端发送的RFID
</summary>
</member>
<member name="E:Asa.Client2.Arrive"> <member name="E:Asa.Client2.Arrive">
<summary> <summary>
小车到达，仅包装料仓 小车到达，仅包装料仓
...@@ -281,13 +276,6 @@ ...@@ -281,13 +276,6 @@
<param name="action"></param> <param name="action"></param>
<param name="level"></param> <param name="level"></param>
</member> </member>
<member name="M:Asa.Client2.Reconnect">
<summary>
发送RFID
</summary>
<param name="name"></param>
<param name="content"></param>
</member>
<member name="M:Asa.Client2.Splice(Asa.ClientNode)"> <member name="M:Asa.Client2.Splice(Asa.ClientNode)">
<summary> <summary>
拼接命令 拼接命令
...@@ -385,12 +373,12 @@ ...@@ -385,12 +373,12 @@
</member> </member>
<member name="F:Asa.ClientAction.MayEnter"> <member name="F:Asa.ClientAction.MayEnter">
<summary> <summary>
可以进入料架（包装料仓） 可以进入料架，Arrive事件使用，让小车开始对接
</summary> </summary>
</member> </member>
<member name="F:Asa.ClientAction.MayLeave"> <member name="F:Asa.ClientAction.MayLeave">
<summary> <summary>
可以出去料架（包装料仓） 可以出去料架，Arrive事件使用，让小车开始对接
</summary> </summary>
</member> </member>
<member name="F:Asa.ClientAction.NeedEnter"> <member name="F:Asa.ClientAction.NeedEnter">
...@@ -415,12 +403,12 @@ ...@@ -415,12 +403,12 @@
</member> </member>
<member name="F:Asa.ClientAction.Arrive"> <member name="F:Asa.ClientAction.Arrive">
<summary> <summary>
小车到达 小车到达，到达包装料仓门口，等待开门
</summary> </summary>
</member> </member>
<member name="F:Asa.ClientAction.Ready"> <member name="F:Asa.ClientAction.Ready">
<summary> <summary>
小车已准备好 小车已准备，已对接上流水线
</summary> </summary>
</member> </member>
<member name="T:Asa.ClientLevel"> <member name="T:Asa.ClientLevel">
......
dll/RFID/RFIDLibrary.dll deleted 100644 → 0
此文件类型无法预览
dll/RFID/ReadMe.txt 0 → 100644
1.0.0.0 2019-11-19
1、钉盘上传
\ No newline at end of file \ No newline at end of file
source/ACPackingStore/FrmRFIPEdit.Designer.cs
...@@ -205,6 +205,7 @@ ...@@ -205,6 +205,7 @@
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmRFIPEdit"; this.Name = "FrmRFIPEdit";
this.Text = "托盘编码"; this.Text = "托盘编码";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmRFIPEdit_FormClosed);
this.Load += new System.EventHandler(this.FrmPwd_Load); this.Load += new System.EventHandler(this.FrmPwd_Load);
((System.ComponentModel.ISupportInitialize)(this.numNum)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numNum)).EndInit();
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);
......
source/ACPackingStore/FrmRFIPEdit.cs
...@@ -36,9 +36,17 @@ namespace OnlineStore.ACPackingStore ...@@ -36,9 +36,17 @@ namespace OnlineStore.ACPackingStore
comboxType.SelectedIndex = 0; comboxType.SelectedIndex = 0;
comType.SelectedIndex = 0; comType.SelectedIndex = 0;
string hostN = Dns.GetHostName(); List<string> List = new List<string>();
IPAddress[] addresss = Dns.GetHostAddresses(hostN); List = new List<string>(rfMap.Values);
if (StoreManager.Store.storeRunStatus <= StoreRunStatus.Wait)
{
Task.Factory.StartNew(delegate
{
LogUtil.info(Name + "RFIDManager.Open");
RFIDManager.Open(List.ToArray());
});
}
} }
private void btnBack_Click(object sender, EventArgs e) private void btnBack_Click(object sender, EventArgs e)
...@@ -79,5 +87,16 @@ namespace OnlineStore.ACPackingStore ...@@ -79,5 +87,16 @@ namespace OnlineStore.ACPackingStore
} }
} }
} }
private void FrmRFIPEdit_FormClosed(object sender, FormClosedEventArgs e)
{
if (StoreManager.Store.storeRunStatus <= StoreRunStatus.Wait)
{
Task.Factory.StartNew(delegate
{
LogUtil.info(Name + "RFIDManager.Close");
RFIDManager.Close();
});
}
}
} }
} }
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -83,9 +83,8 @@ ...@@ -83,9 +83,8 @@
<Compile Include="device\PanasonicServo\ACCMDManager.cs" /> <Compile Include="device\PanasonicServo\ACCMDManager.cs" />
<Compile Include="device\PanasonicServo\ACServerManager.cs" /> <Compile Include="device\PanasonicServo\ACServerManager.cs" />
<Compile Include="device\PanasonicServo\ACServerManager_Partial.cs" /> <Compile Include="device\PanasonicServo\ACServerManager_Partial.cs" />
<Compile Include="device\RFID\RFIDAuto.cs" />
<Compile Include="device\RFID\RFIDManager.cs" /> <Compile Include="device\RFID\RFIDManager.cs" />
<Compile Include="device\RFID\RFIDAutoReader.cs" /> <Compile Include="device\RFID\RFIDReader.cs" />
<Compile Include="store\AutoInoutInfo.cs" /> <Compile Include="store\AutoInoutInfo.cs" />
<Compile Include="store\LineMoveP.cs" /> <Compile Include="store\LineMoveP.cs" />
<Compile Include="store\LineAlarm.cs"> <Compile Include="store\LineAlarm.cs">
......
source/DeviceLibrary/device/RFID/RFIDManager.cs
...@@ -17,8 +17,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -17,8 +17,9 @@ namespace OnlineStore.DeviceLibrary
{ {
try try
{ {
RFIDAutoReader.Open(null, iparray); RFIDReader.Open(iparray);
}catch(Exception ex) }
catch (Exception ex)
{ {
LogUtil.error("Open 出错：" + ex.ToString()); LogUtil.error("Open 出错：" + ex.ToString());
} }
...@@ -31,14 +32,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -31,14 +32,9 @@ namespace OnlineStore.DeviceLibrary
if (String.IsNullOrEmpty(ip).Equals(false)) if (String.IsNullOrEmpty(ip).Equals(false))
{ {
byte[] bdata = null; byte[] bdata = null;
if (isClear)
{ bdata = RFIDReader.Read(ip, isClear);
bdata = RFIDAutoReader.ReadAndClear(ip);
}
else
{
bdata = RFIDAutoReader.Read(ip);
}
if (bdata == null) if (bdata == null)
{ {
LogUtil.error("RFID [ " + ip + " ] 读到数据=null"); LogUtil.error("RFID [ " + ip + " ] 读到数据=null");
...@@ -59,7 +55,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -59,7 +55,7 @@ namespace OnlineStore.DeviceLibrary
{ {
try try
{ {
RFIDAutoReader.CloseAll(); RFIDReader.CloseAll();
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -77,7 +73,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -77,7 +73,7 @@ namespace OnlineStore.DeviceLibrary
public int Num = 0; public int Num = 0;
public RFIDData(int num=0, int t=0) public RFIDData(int num = 0, int t = 0)
{ {
if (t < 65) if (t < 65)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!