Skip to content

孙克 / RC1250-AssemblyLine

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

入料ng的盘不需要更新位置

1 个父辈 a2fd34d6
内嵌 并排
正在显示 14 个修改的文件 包含 193 行增加 和 428 行删除
dll/Client.dll
此文件类型无法预览
dll/Client.xml
...@@ -4,355 +4,184 @@ ...@@ -4,355 +4,184 @@
<name>Client</name> <name>Client</name>
</assembly> </assembly>
<members> <members>
<member name="T:Asa.Common"> <member name="T:Asa.Client">
<summary> <summary>
公用 电脑客户端
</summary>
</member>
<member name="F:Asa.Common.PORT">
<summary>
网络连接的端口
</summary>
</member>
<member name="F:Asa.Common.LOG_PATH">
<summary>
日志文件路径
</summary> </summary>
</member> </member>
<member name="F:Asa.Common.HEART"> <member name="F:Asa.Client.HEART">
<summary> <summary>
心跳包，HEART 心跳包，HEART
</summary> </summary>
</member> </member>
<member name="F:Asa.Common.SERVER_OFF"> <member name="F:Asa.Client.SERVER_OFF">
<summary> <summary>
服务器关闭，OFF 服务器关闭，OFF
</summary> </summary>
</member> </member>
<member name="F:Asa.Common.CLIENT_OFF"> <member name="F:Asa.Client.CLIENT_OFF">
<summary> <summary>
客户端关闭，OFF 客户端关闭，OFF
</summary> </summary>
</member> </member>
<member name="T:Asa.Common.Connection_Event"> <member name="T:Asa.Client.ActionEvent">
<summary>
连接事件
</summary>
</member>
<member name="T:Asa.Common.String_Event">
<summary>
显示字符串事件
</summary>
<param name="s"></param>
</member>
<member name="T:Asa.Common.Action_Event">
<summary> <summary>
小车动作事件 小车动作事件
</summary> </summary>
<param name="name"></param>
<param name="action"></param>
<returns></returns>
</member>
<member name="T:Asa.Common.ConsoleEventDelegate">
<summary>
控制台事件
</summary>
<param name="eventType"></param>
<returns></returns>
</member>
<member name="M:Asa.Common.SetConsoleCtrlHandler(Asa.Common.ConsoleEventDelegate,System.Boolean)">
<summary>
添加或删除应用程序处理函数列表
</summary>
<param name="callback"></param>
<param name="add"></param>
<returns></returns>
</member>
<member name="M:Asa.Common.CheckRemoteIP(System.String)">
<summary>
检查远程IP地址
</summary>
<param name="ip"></param>
<returns></returns>
</member>
<member name="M:Asa.Common.CheckLocalIP(System.String)">
<summary>
检查IP地址
</summary>
<param name="ip"></param>
<returns></returns>
</member>
<member name="M:Asa.Common.GetLocalIP">
<summary>
获取本地IPv4地址
</summary>
<returns></returns>
</member>
<member name="M:Asa.Common.HexBuff(System.Byte[])">
<summary>
16进制
</summary>
<param name="buff"></param>
<returns></returns>
</member>
<member name="M:Asa.Common.IsHeart(System.Byte[])">
<summary>
是否心跳包
</summary>
<param name="buff"></param>
<returns></returns>
</member>
<member name="M:Asa.Common.IsServerOffline(System.Byte[])">
<summary>
是否服务器断开
</summary>
<param name="buff"></param>
<returns></returns>
</member>
<member name="M:Asa.Common.IsClientOffline(System.Byte[])">
<summary>
是否客户端断开
</summary>
<param name="buff"></param>
<returns></returns>
</member>
<member name="T:Asa.Actions">
<summary>
动作
</summary>
</member>
<member name="F:Asa.Actions.ServerClose">
<summary>
服务器关闭(C)
</summary>
</member> </member>
<member name="F:Asa.Actions.ClientClose"> <member name="E:Asa.Client.GetRFID">
<summary> <summary>
客户端关闭(S) 服务端发送的RFID
</summary> </summary>
</member> </member>
<member name="F:Asa.Actions.SendRFID"> <member name="E:Asa.Client.Arrive">
<summary> <summary>
发送RFID信息(CS) 小车到达，仅包装料仓
</summary> </summary>
</member> </member>
<member name="F:Asa.Actions.ReadyEmpty"> <member name="E:Asa.Client.Ready">
<summary> <summary>
准备空车(S) 小车已准备，对接完成
</summary> </summary>
</member> </member>
<member name="F:Asa.Actions.ReadyShelf"> <member name="E:Asa.Client.CanEnter">
<summary> <summary>
准备小车带料架(S) 能否进入，仅流水线
</summary> </summary>
</member> </member>
<member name="F:Asa.Actions.MayEnter"> <member name="T:Asa.Client.LogEvent">
<summary> <summary>
可以进入(S) 日志事件
</summary>
</member>
<member name="F:Asa.Actions.FinishEnter">
<summary>
完成进入(S)
</summary>
</member>
<member name="F:Asa.Actions.MayOut">
<summary>
可以出去(S)
</summary>
</member>
<member name="F:Asa.Actions.FinishOut">
<summary>
完成出去(C)
</summary>
</member>
<member name="F:Asa.Actions.Arrive">
<summary>
小车到达(C)
</summary>
</member>
<member name="F:Asa.Actions.GetOut">
<summary>
小车离开(S)
</summary>
</member>
<member name="F:Asa.Actions.Usable">
<summary>
是否可用(CS)
</summary>
</member>
<member name="T:Asa.IOInfo">
<summary>
IO设备信息
</summary>
</member>
<member name="F:Asa.IOInfo.IP">
<summary>
IP地址
</summary>
</member>
<member name="F:Asa.IOInfo.DI">
<summary>
DI
</summary>
</member>
<member name="F:Asa.IOInfo.DO">
<summary>
DO
</summary>
</member>
<member name="T:Asa.Register">
<summary>
寄存器
</summary>
</member>
<member name="F:Asa.Register.ID">
<summary>
模块寄存器ID
</summary>
</member>
<member name="F:Asa.Register.Name">
<summary>
号码管名称
</summary>
</member>
<member name="F:Asa.Register.Explain">
<summary>
解释说明
</summary>
</member>
<member name="M:Asa.Register.#ctor(System.String,System.String,System.String)">
<summary>
寄存器
</summary>
<param name="ID">模块寄存器ID</param>
<param name="Name">号码管名称</param>
<param name="Explain">解释说明</param>
</member>
<member name="T:BLL.Client">
<summary>
电脑客户端
</summary>
</member>
<member name="E:BLL.Client.Connected">
<summary>
通信连接
</summary>
</member>
<member name="E:BLL.Client.Info">
<summary>
显示信息
</summary>
</member>
<member name="E:BLL.Client.Log">
<summary>
日志信息
</summary> </summary>
<param name="s"></param>
</member> </member>
<member name="E:BLL.Client.Action"> <member name="E:Asa.Client.Log">
<summary> <summary>
小车动作 日志
</summary> </summary>
</member> </member>
<member name="P:BLL.Client.ErrInfo"> <member name="P:Asa.Client.ErrInfo">
<summary> <summary>
错误信息 错误信息
</summary> </summary>
</member> </member>
<member name="P:BLL.Client.IsConn"> <member name="P:Asa.Client.IsConn">
<summary> <summary>
是否连接服务器 是否连接服务器
</summary> </summary>
</member> </member>
<member name="P:BLL.Client.RFID"> <member name="P:Asa.Client.RFID">
<summary> <summary>
RFID的内容 RFID的内容
</summary> </summary>
</member> </member>
<member name="M:BLL.Client.#ctor(System.String)"> <member name="M:Asa.Client.#ctor(System.String)">
<summary> <summary>
电脑客户端 电脑客户端
</summary> </summary>
<param name="RemoteIP">远程IP地址</param> <param name="serverIP">服务器IP地址</param>
</member> </member>
<member name="M:BLL.Client.Connect"> <member name="M:Asa.Client.Connect">
<summary> <summary>
连接 连接
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:BLL.Client.Close"> <member name="M:Asa.Client.Close">
<summary> <summary>
关闭 关闭
</summary> </summary>
</member> </member>
<member name="M:BLL.Client.SetNodeID(System.String[])"> <member name="M:Asa.Client.SetNodeID(System.String[])">
<summary> <summary>
连接后设置节点ID 连接后设置节点ID
</summary> </summary>
<param name="id"></param> <param name="id"></param>
<returns></returns>
</member> </member>
<member name="M:BLL.Client.ReadyEmpty(System.String)"> <member name="M:Asa.Client.SendRFID(System.String,System.String)">
<summary> <summary>
准备空车 发送RFID信息
</summary> </summary>
<param name="id"></param> <param name="id"></param>
<param name="s"></param>
<returns></returns>
</member> </member>
<member name="M:BLL.Client.SendRFID(System.String,System.Byte[])"> <member name="M:Asa.Client.NeedEnter(System.String)">
<summary> <summary>
发送RFID信息 需要进入料架
</summary> </summary>
<param name="id"></param> <param name="id"></param>
<param name="content"></param> <returns></returns>
</member> </member>
<member name="M:BLL.Client.ReadyShelf(System.String)"> <member name="M:Asa.Client.NeedLeave(System.String)">
<summary> <summary>
准备小车带料架 需要出料架
</summary> </summary>
<param name="id"></param> <param name="id"></param>
<returns></returns>
</member> </member>
<member name="M:BLL.Client.MayEnter(System.String)"> <member name="M:Asa.Client.MayEnter(System.String)">
<summary> <summary>
可以进入 可以进入
</summary> </summary>
<param name="id"></param> <param name="id"></param>
<returns></returns>
</member> </member>
<member name="M:BLL.Client.FinishEnter(System.String)"> <member name="M:Asa.Client.FinishEnter(System.String)">
<summary> <summary>
完成进入 完成进入
</summary> </summary>
<param name="id"></param> <param name="id"></param>
<returns></returns>
</member> </member>
<member name="M:BLL.Client.MayOut(System.String)"> <member name="M:Asa.Client.MayLeave(System.String)">
<summary> <summary>
可以出去 可以出去
</summary> </summary>
<param name="id"></param> <param name="id"></param>
<returns></returns>
</member> </member>
<member name="M:BLL.Client.GetOut(System.String)"> <member name="M:Asa.Client.FinishLeave(System.String)">
<summary> <summary>
小车离开 完成出去
</summary> </summary>
<param name="id"></param> <param name="id"></param>
<returns></returns>
</member>
<member name="M:Asa.Client.IsEnter(System.String,System.Boolean)">
<summary>
是否可以进入，仅用于CanEnter事件
</summary>
<param name="id"></param>
<param name="val"></param>
<returns></returns>
</member> </member>
<member name="M:BLL.Client.Send(System.Byte[])"> <member name="M:Asa.Client.Send(System.Byte[])">
<summary> <summary>
发送命令 发送命令
</summary> </summary>
<param name="buff"></param> <param name="buff"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:BLL.Client.ListenNet"> <member name="M:Asa.Client.HexBuff(System.Byte[])">
<summary>
16进制
</summary>
<param name="buff"></param>
<returns></returns>
</member>
<member name="M:Asa.Client.ListenNet">
<summary> <summary>
监听线程 监听线程
</summary> </summary>
</member> </member>
<member name="M:BLL.Client.Resolve"> <member name="M:Asa.Client.Resolve">
<summary> <summary>
分析数据包 分析数据包
</summary> </summary>
</member> </member>
<member name="M:BLL.Client.Splice(System.Byte,System.String,System.Byte[])"> <member name="M:Asa.Client.Splice(System.Byte,System.String,System.Byte[])">
<summary> <summary>
拼接命令 拼接命令
</summary> </summary>
...@@ -361,5 +190,26 @@ ...@@ -361,5 +190,26 @@
<param name="content"></param> <param name="content"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Client.CheckRemoteIP(System.String)">
<summary>
检查远程IP地址
</summary>
<param name="ip"></param>
<returns></returns>
</member>
<member name="M:Asa.Client.IsHeart(System.Byte[])">
<summary>
是否心跳包
</summary>
<param name="buff"></param>
<returns></returns>
</member>
<member name="M:Asa.Client.IsServerOffline(System.Byte[])">
<summary>
是否服务器断开
</summary>
<param name="buff"></param>
<returns></returns>
</member>
</members> </members>
</doc> </doc>
source/AssemblyLineClient/AssemblyLineClient.csproj
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<PropertyGroup /> <PropertyGroup />
<ItemGroup> <ItemGroup>
<Reference Include="Client"> <Reference Include="Client">
<HintPath>..\..\dll\Client.dll</HintPath> <HintPath>..\..\..\RC1250-ACPackingStore\dll\Client.dll</HintPath>
</Reference> </Reference>
<Reference Include="CodeLibrary"> <Reference Include="CodeLibrary">
<HintPath>..\..\dll\CodeLibrary.dll</HintPath> <HintPath>..\..\dll\CodeLibrary.dll</HintPath>
......
source/AssemblyLineClient/FrmDischargeLine.Designer.cs
...@@ -305,10 +305,10 @@ ...@@ -305,10 +305,10 @@
this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox6.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)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Controls.Add(this.lblMoveInfo); this.groupBox6.Controls.Add(this.lblMoveInfo);
this.groupBox6.Controls.Add(this.lblTrayNum); this.groupBox6.Controls.Add(this.lblTrayNum);
this.groupBox6.Controls.Add(this.lblInstoreList); this.groupBox6.Controls.Add(this.lblInstoreList);
this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Location = new System.Drawing.Point(495, 227); this.groupBox6.Location = new System.Drawing.Point(495, 227);
this.groupBox6.Name = "groupBox6"; this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(797, 256); this.groupBox6.Size = new System.Drawing.Size(797, 256);
......
source/AssemblyLineClient/FrmFeedingEquip.cs
...@@ -17,7 +17,6 @@ using UserFromControl; ...@@ -17,7 +17,6 @@ using UserFromControl;
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using OnlineStore.Common; using OnlineStore.Common;
namespace OnlineStore.AssemblyLine namespace OnlineStore.AssemblyLine
{ {
internal partial class FrmFeedingEquip : FrmEquipBase internal partial class FrmFeedingEquip : FrmEquipBase
......
source/AssemblyLineClient/FrmLineStore.Designer.cs
...@@ -140,16 +140,16 @@ ...@@ -140,16 +140,16 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | 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.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(460, 180); this.logBox.Location = new System.Drawing.Point(448, 153);
this.logBox.Name = "logBox"; this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(860, 350); this.logBox.Size = new System.Drawing.Size(872, 453);
this.logBox.TabIndex = 106; this.logBox.TabIndex = 106;
this.logBox.Text = ""; this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged); this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
// //
// groupBox3 // groupBox3
// //
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox3.Controls.Add(this.label5); this.groupBox3.Controls.Add(this.label5);
this.groupBox3.Controls.Add(this.chbInStoNG); this.groupBox3.Controls.Add(this.chbInStoNG);
...@@ -163,9 +163,9 @@ ...@@ -163,9 +163,9 @@
this.groupBox3.Controls.Add(this.cmbTray); this.groupBox3.Controls.Add(this.cmbTray);
this.groupBox3.Controls.Add(this.label1); this.groupBox3.Controls.Add(this.label1);
this.groupBox3.Controls.Add(this.btnUpdateTray); this.groupBox3.Controls.Add(this.btnUpdateTray);
this.groupBox3.Location = new System.Drawing.Point(460, 534); this.groupBox3.Location = new System.Drawing.Point(448, 77);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(860, 68); this.groupBox3.Size = new System.Drawing.Size(872, 68);
this.groupBox3.TabIndex = 197; this.groupBox3.TabIndex = 197;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "托盘信息编辑"; this.groupBox3.Text = "托盘信息编辑";
...@@ -305,9 +305,9 @@ ...@@ -305,9 +305,9 @@
this.groupBox2.Controls.Add(this.chkDebug); this.groupBox2.Controls.Add(this.chkDebug);
this.groupBox2.Controls.Add(this.btnClearLog); this.groupBox2.Controls.Add(this.btnClearLog);
this.groupBox2.Controls.Add(this.btnCopyLog); this.groupBox2.Controls.Add(this.btnCopyLog);
this.groupBox2.Location = new System.Drawing.Point(460, 4); this.groupBox2.Location = new System.Drawing.Point(448, 4);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(860, 71); this.groupBox2.Size = new System.Drawing.Size(872, 71);
this.groupBox2.TabIndex = 196; this.groupBox2.TabIndex = 196;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "状态信息"; this.groupBox2.Text = "状态信息";
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
this.btnClearTray.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnClearTray.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnClearTray.BackColor = System.Drawing.Color.White; this.btnClearTray.BackColor = System.Drawing.Color.White;
this.btnClearTray.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClearTray.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearTray.Location = new System.Drawing.Point(334, 21); this.btnClearTray.Location = new System.Drawing.Point(346, 21);
this.btnClearTray.Name = "btnClearTray"; this.btnClearTray.Name = "btnClearTray";
this.btnClearTray.Size = new System.Drawing.Size(105, 35); this.btnClearTray.Size = new System.Drawing.Size(105, 35);
this.btnClearTray.TabIndex = 196; this.btnClearTray.TabIndex = 196;
...@@ -330,7 +330,7 @@ ...@@ -330,7 +330,7 @@
this.btnTrayInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnTrayInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnTrayInfo.BackColor = System.Drawing.Color.White; this.btnTrayInfo.BackColor = System.Drawing.Color.White;
this.btnTrayInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTrayInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTrayInfo.Location = new System.Drawing.Point(445, 22); this.btnTrayInfo.Location = new System.Drawing.Point(457, 22);
this.btnTrayInfo.Name = "btnTrayInfo"; this.btnTrayInfo.Name = "btnTrayInfo";
this.btnTrayInfo.Size = new System.Drawing.Size(105, 35); this.btnTrayInfo.Size = new System.Drawing.Size(105, 35);
this.btnTrayInfo.TabIndex = 195; this.btnTrayInfo.TabIndex = 195;
...@@ -365,7 +365,7 @@ ...@@ -365,7 +365,7 @@
this.chkDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.chkDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.chkDebug.AutoSize = true; 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.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkDebug.Location = new System.Drawing.Point(781, 27); this.chkDebug.Location = new System.Drawing.Point(793, 27);
this.chkDebug.Name = "chkDebug"; this.chkDebug.Name = "chkDebug";
this.chkDebug.Size = new System.Drawing.Size(72, 24); this.chkDebug.Size = new System.Drawing.Size(72, 24);
this.chkDebug.TabIndex = 194; this.chkDebug.TabIndex = 194;
...@@ -377,7 +377,7 @@ ...@@ -377,7 +377,7 @@
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnClearLog.BackColor = System.Drawing.Color.White; this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Location = new System.Drawing.Point(669, 22); this.btnClearLog.Location = new System.Drawing.Point(681, 22);
this.btnClearLog.Name = "btnClearLog"; this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(105, 35); this.btnClearLog.Size = new System.Drawing.Size(105, 35);
this.btnClearLog.TabIndex = 190; this.btnClearLog.TabIndex = 190;
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
this.btnCopyLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnCopyLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCopyLog.BackColor = System.Drawing.Color.White; this.btnCopyLog.BackColor = System.Drawing.Color.White;
this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCopyLog.Location = new System.Drawing.Point(557, 22); this.btnCopyLog.Location = new System.Drawing.Point(569, 22);
this.btnCopyLog.Name = "btnCopyLog"; this.btnCopyLog.Name = "btnCopyLog";
this.btnCopyLog.Size = new System.Drawing.Size(105, 35); this.btnCopyLog.Size = new System.Drawing.Size(105, 35);
this.btnCopyLog.TabIndex = 191; this.btnCopyLog.TabIndex = 191;
...@@ -409,12 +409,13 @@ ...@@ -409,12 +409,13 @@
this.groupBox1.Controls.Add(this.btnInStoreTset); this.groupBox1.Controls.Add(this.btnInStoreTset);
this.groupBox1.Controls.Add(this.button2); this.groupBox1.Controls.Add(this.button2);
this.groupBox1.Controls.Add(this.button1); this.groupBox1.Controls.Add(this.button1);
this.groupBox1.Location = new System.Drawing.Point(460, 84); this.groupBox1.Location = new System.Drawing.Point(448, 101);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(860, 78); this.groupBox1.Size = new System.Drawing.Size(872, 61);
this.groupBox1.TabIndex = 195; this.groupBox1.TabIndex = 195;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "料仓通信测试"; this.groupBox1.Text = "料仓通信测试";
this.groupBox1.Visible = false;
// //
// lblPosId // lblPosId
// //
...@@ -430,7 +431,7 @@ ...@@ -430,7 +431,7 @@
this.btnUpdateStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnUpdateStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnUpdateStatus.BackColor = System.Drawing.Color.White; this.btnUpdateStatus.BackColor = System.Drawing.Color.White;
this.btnUpdateStatus.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpdateStatus.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateStatus.Location = new System.Drawing.Point(629, 28); this.btnUpdateStatus.Location = new System.Drawing.Point(641, 11);
this.btnUpdateStatus.Name = "btnUpdateStatus"; this.btnUpdateStatus.Name = "btnUpdateStatus";
this.btnUpdateStatus.Size = new System.Drawing.Size(222, 35); this.btnUpdateStatus.Size = new System.Drawing.Size(222, 35);
this.btnUpdateStatus.TabIndex = 195; this.btnUpdateStatus.TabIndex = 195;
...@@ -522,11 +523,12 @@ ...@@ -522,11 +523,12 @@
// //
this.lblWarnMsg.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.lblWarnMsg.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | 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.AutoEllipsis = true;
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 9F, 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(308, 3); this.lblWarnMsg.Location = new System.Drawing.Point(308, 3);
this.lblWarnMsg.Name = "lblWarnMsg"; this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(1028, 68); this.lblWarnMsg.Size = new System.Drawing.Size(1028, 75);
this.lblWarnMsg.TabIndex = 96; this.lblWarnMsg.TabIndex = 96;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
...@@ -743,10 +745,10 @@ ...@@ -743,10 +745,10 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.White; this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1350, 729); this.ClientSize = new System.Drawing.Size(1350, 729);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.lblStatus); this.Controls.Add(this.lblStatus);
this.Controls.Add(this.lblWarnMsg); this.Controls.Add(this.lblWarnMsg);
this.Controls.Add(this.menuStrip1); this.Controls.Add(this.menuStrip1);
this.Controls.Add(this.tabControl1);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
......
source/AssemblyLineClient/FrmLineStore.cs
...@@ -432,10 +432,10 @@ namespace OnlineStore.AssemblyLine ...@@ -432,10 +432,10 @@ namespace OnlineStore.AssemblyLine
string canScanCode = ""; string canScanCode = "";
if (lineBean.lineStatus.Equals(LineStatus.StoreOnline) && lineBean.runStatus.Equals(LineRunStatus.Runing)) if (lineBean.lineStatus.Equals(LineStatus.StoreOnline) && lineBean.runStatus.Equals(LineRunStatus.Runing))
{ {
canScanCode = lineBean.CanScanCode() ? "（可扫码入库）" : "（出库未完成，不可扫码入库）"; //canScanCode = lineBean.CanScanCode() ? "（可扫码入库）" : "（出库未完成，不可扫码入库）";
} }
lblStatus.Text = KTK_Store.GetRunStr(lineBean.lineStatus, lineBean.runStatus)+canScanCode; lblStatus.Text = KTK_Store.GetRunStr(lineBean.lineStatus, lineBean.runStatus)+canScanCode;
lblWarnMsg.Text = LineManager.Line.WarnMsg; string warnMsg= LineManager.Line.WarnMsg.Equals("")?"":LineManager.Line.WarnMsg+"\r\n";
//if (lineBean.isNotScanCode && lblWarnMsg.Text.Equals("")) //if (lineBean.isNotScanCode && lblWarnMsg.Text.Equals(""))
//{ //{
// lblWarnMsg.Text = "未扫到二维码，请重新放入料盘"; // lblWarnMsg.Text = "未扫到二维码，请重新放入料盘";
...@@ -451,11 +451,12 @@ namespace OnlineStore.AssemblyLine ...@@ -451,11 +451,12 @@ namespace OnlineStore.AssemblyLine
{ {
if (move.WarnMsg.Equals("").Equals(false)) if (move.WarnMsg.Equals("").Equals(false))
{ {
lblWarnMsg.Text = move.WarnMsg; warnMsg+= move.WarnMsg+ "\r\n";
break; break;
} }
} }
} }
lblWarnMsg.Text = warnMsg;
int i = 0; int i = 0;
int item_debug_index = 1; int item_debug_index = 1;
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<HintPath>..\..\dll\Asa.IOModule.AIOBOX.dll</HintPath> <HintPath>..\..\dll\Asa.IOModule.AIOBOX.dll</HintPath>
</Reference> </Reference>
<Reference Include="Client"> <Reference Include="Client">
<HintPath>..\..\dll\Client.dll</HintPath> <HintPath>..\..\..\RC1250-ACPackingStore\dll\Client.dll</HintPath>
</Reference> </Reference>
<Reference Include="CodeLibrary"> <Reference Include="CodeLibrary">
<HintPath>..\..\dll\CodeLibrary.dll</HintPath> <HintPath>..\..\dll\CodeLibrary.dll</HintPath>
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -354,6 +354,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -354,6 +354,8 @@ namespace OnlineStore.DeviceLibrary
protected DateTime preRWTime = DateTime.Now; protected DateTime preRWTime = DateTime.Now;
internal void CheckWait(LineMoveInfo moveInfo) internal void CheckWait(LineMoveInfo moveInfo)
{ {
try
{
List<WaitResultInfo> list = moveInfo.WaitList; List<WaitResultInfo> list = moveInfo.WaitList;
if (list.Count <= 0) if (list.Count <= 0)
{ {
...@@ -375,7 +377,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -375,7 +377,7 @@ namespace OnlineStore.DeviceLibrary
{ {
continue; continue;
} }
NotOkMsg =" ["+ wait.ToStr()+"] "; NotOkMsg = " [" + wait.ToStr() + "] ";
if (wait.WaitType.Equals(WaitEnum.W001_AxisMove)) if (wait.WaitType.Equals(WaitEnum.W001_AxisMove))
{ {
TimeSpan axisSpan = DateTime.Now - preCheckAxisTime; TimeSpan axisSpan = DateTime.Now - preCheckAxisTime;
...@@ -492,14 +494,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -492,14 +494,18 @@ namespace OnlineStore.DeviceLibrary
{ {
moveInfo.EndStepWait(); moveInfo.EndStepWait();
} }
else if (span.TotalSeconds > moveInfo.TimeOutSeconds ) else if (span.TotalSeconds > moveInfo.TimeOutSeconds)
{ {
WarnMsg = moveInfo.Name + "[" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "]等待" + NotOkMsg WarnMsg = moveInfo.Name + "[" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "]等待" + NotOkMsg
+ "超时[" + Math.Round(span.TotalSeconds, 1) + "]秒"; + "超时[" + Math.Round(span.TotalSeconds, 1) + "]秒";
LogUtil.error(WarnMsg, DeviceID + 15); LogUtil.error(WarnMsg, DeviceID + 15);
Alarm(LineAlarmType.IoSingleTimeOut); Alarm(LineAlarmType.IoSingleTimeOut);
} }
}
catch (Exception ex)
{
LogUtil.error(moveInfo.Name + " [" + moveInfo.MoveStep + "] CheckWait 出错：" + ex.StackTrace + ex.Message + ex.ToString());
}
} }
protected virtual bool CheckWaitResult(LineMoveInfo moveInfo, WaitResultInfo wait) protected virtual bool CheckWaitResult(LineMoveInfo moveInfo, WaitResultInfo wait)
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -732,6 +732,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -732,6 +732,8 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(WarnMsg, DeviceID + 12); LogUtil.error(WarnMsg, DeviceID + 12);
Alarm(LineAlarmType.IoSingleTimeOut); Alarm(LineAlarmType.IoSingleTimeOut);
} }
//送出料架处理
} }
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_21_UpdownAxisToP2)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_21_UpdownAxisToP2))
......
source/DeviceLibrary/assemblyLine/LineBean.cs
...@@ -172,11 +172,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -172,11 +172,6 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.info(Name + "开始连接IO模块 "); LogUtil.info(Name + "开始连接IO模块 ");
IOManager.instance.ConnectionIOList(cioList); IOManager.instance.ConnectionIOList(cioList);
//Thread.Sleep(5);
//Task.Factory.StartNew(delegate
//{
// RFIDManager.Open(rfidList.ToArray());
//});
addLastDI(IO_Type.Airpressure_Check, IOValue(IO_Type.Airpressure_Check)); addLastDI(IO_Type.Airpressure_Check, IOValue(IO_Type.Airpressure_Check));
addLastDI(IO_Type.SuddenStop_BTN, IOValue(IO_Type.SuddenStop_BTN)); addLastDI(IO_Type.SuddenStop_BTN, IOValue(IO_Type.SuddenStop_BTN));
addLastDI(IO_Type.Reset_BTN, IOValue(IO_Type.Reset_BTN)); addLastDI(IO_Type.Reset_BTN, IOValue(IO_Type.Reset_BTN));
...@@ -307,7 +302,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -307,7 +302,6 @@ namespace OnlineStore.DeviceLibrary
// }); // });
Thread.Sleep(60); Thread.Sleep(60);
} }
} }
private void RHomeOp() private void RHomeOp()
{ {
...@@ -316,7 +310,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -316,7 +310,6 @@ namespace OnlineStore.DeviceLibrary
alarmType = LineAlarmType.None; alarmType = LineAlarmType.None;
mainTimer.Enabled = false; mainTimer.Enabled = false;
IoCheckTimer.Enabled = false; IoCheckTimer.Enabled = false;
isInprocess = false;
isInSuddenDown = false; isInSuddenDown = false;
isNoAirCheck = false; isNoAirCheck = false;
TrayManager.TrayErrorMsg = ""; TrayManager.TrayErrorMsg = "";
...@@ -334,8 +327,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -334,8 +327,6 @@ namespace OnlineStore.DeviceLibrary
TrayManager.ErrorDeviceId = -1; TrayManager.ErrorDeviceId = -1;
WriteDrivetMotorRun( IO_VALUE.LOW); WriteDrivetMotorRun( IO_VALUE.LOW);
//NG气缸后退
// CylinderMove(MoveInfo, IO_Type.NGCylinder_Before, IO_Type.NGCylinder_After);
//横移轨道下降 //横移轨道下降
SideWayStop(); SideWayStop();
...@@ -355,11 +346,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -355,11 +346,8 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(MoveInfo, IO_Type.SW1_TopCylinder_Up, IO_Type.SW1_TopCylinder_Down); CylinderMove(MoveInfo, IO_Type.SW1_TopCylinder_Up, IO_Type.SW1_TopCylinder_Down);
CylinderMove(MoveInfo, IO_Type.SW4_TopCylinder_Up, IO_Type.SW4_TopCylinder_Down); CylinderMove(MoveInfo, IO_Type.SW4_TopCylinder_Up, IO_Type.SW4_TopCylinder_Down);
} }
public override bool Reset() public override bool Reset()
{ {
mainTimer.Enabled = false; mainTimer.Enabled = false;
...@@ -776,9 +764,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -776,9 +764,6 @@ namespace OnlineStore.DeviceLibrary
case LineRunStatus.Runing: case LineRunStatus.Runing:
if ((isInSuddenDown.Equals(false) && isNoAirCheck.Equals(false))) if ((isInSuddenDown.Equals(false) && isNoAirCheck.Equals(false)))
{ {
//出入库定时检测处理
InOutTimerProcess();
//清理超时异常 //清理超时异常
IOTimeOutProcess(); IOTimeOutProcess();
} }
...@@ -845,6 +830,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -845,6 +830,7 @@ namespace OnlineStore.DeviceLibrary
bool isReviceInfo = false; bool isReviceInfo = false;
if (moveEquip.MoveInfo.MoveType.Equals(LineMoveType.InStore) && moveEquip.MoveInfo.MoveParam != null && moveEquip.MoveInfo.MoveParam.PosId.Equals(posId)) if (moveEquip.MoveInfo.MoveType.Equals(LineMoveType.InStore) && moveEquip.MoveInfo.MoveParam != null && moveEquip.MoveInfo.MoveParam.PosId.Equals(posId))
{ {
LogInfo(" IsReviceInPosId 正在入库中：" + MoveInfo.MoveParam.ToStr());
isReviceInfo = true; isReviceInfo = true;
} }
if (!isReviceInfo && moveEquip.waitInStoreList.Count > 0) if (!isReviceInfo && moveEquip.waitInStoreList.Count > 0)
...@@ -853,6 +839,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -853,6 +839,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (inout.PosId.Equals(posId) && (!inout.WareCode.Equals(""))) if (inout.PosId.Equals(posId) && (!inout.WareCode.Equals("")))
{ {
LogInfo(" IsReviceInPosId 已存在入库任务：" + inout.ToStr());
isReviceInfo = true; isReviceInfo = true;
break; break;
} }
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
...@@ -16,12 +16,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -16,12 +16,8 @@ namespace OnlineStore.DeviceLibrary
public bool LineCanRun() public bool LineCanRun()
{ {
//if (IOValue(IO_Type.Line_Run).Equals(IO_VALUE.HIGH))
{
return true; return true;
} }
return false;
}
public bool CanProcessLine(bool isCheckSleep = true) public bool CanProcessLine(bool isCheckSleep = true)
{ {
...@@ -36,86 +32,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -36,86 +32,10 @@ namespace OnlineStore.DeviceLibrary
IOManager.IOValue(IO_Type.DriveMotor_Run4, 0).Equals(IO_VALUE.HIGH)) IOManager.IOValue(IO_Type.DriveMotor_Run4, 0).Equals(IO_VALUE.HIGH))
{ {
return true; return true;
if (isCheckSleep)
{
if (runStatus >= LineRunStatus.Runing && IsSleep.Equals(false))
{
return true;
}
else
{
return false;
}
}
return true;
}
return false;
}
/// <summary>
/// 判断出料流水线是否可以开始出料
/// </summary>
internal bool DLineStartOut(int dlineId, int LineNum)
{
foreach (DischargeLine line in DisLineMap.Values)
{
if ((line.DeviceID % 100).Equals(dlineId))
{
if (line.CanStartOut(LineNum))
{
return true;
}
}
} }
return false; return false;
} }
private bool isInprocess = false;
private DateTime lastProTime = DateTime.Now;
private void InOutTimerProcess()
{
TimeSpan span = DateTime.Now - lastProTime;
if (isInprocess && span.TotalSeconds < 10)
{
return;
}
try
{
isInprocess = true;
lastProTime = DateTime.Now;
//出入料口条件： 各料仓无报警（ 伺服）， 各移栽装置处 于原位待机， 检测夹具IO，驱动电机运转
//if (!CanProcessLine(false))
//{
// isWaitOutGo = false;
// isInprocess = false;
// return;
//}
//TODO 需要处理NG料盘推出
}
catch (Exception ex)
{
LogUtil.error("InOutTimerProcess出错：" + ex.StackTrace);
}
isInprocess = false;
}
/// <summary>
/// 判断当前是否可以开始扫码
/// </summary>
public bool CanScanCode()
{
//若有移栽在出库过程中，则不能扫码
foreach (MoveEquip move in MoveEquipMap.Values)
{
List<InOutParam> ps = new List<InOutParam>(move.waitOutStoreList);
if (move.MoveInfo.MoveType.Equals(LineMoveType.OutStore) || ps.Count > 0)
{
return false;
}
}
return true;
}
private DateTime preIoTimerOutTime = DateTime.Now; private DateTime preIoTimerOutTime = DateTime.Now;
private void IOTimeOutProcess() private void IOTimeOutProcess()
...@@ -253,32 +173,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -253,32 +173,11 @@ namespace OnlineStore.DeviceLibrary
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error(checkWaitInfo.Name + " [" + checkWaitInfo.MoveStep + "] CheckWait 出错：" + ex.StackTrace); LogUtil.error(checkWaitInfo.Name + " [" + checkWaitInfo.MoveStep + "] CheckWait 出错：" +ex.StackTrace+ ex.Message+ex.ToString());
} }
} }
/// <summary>
/// 判断指定的皮带线是否可用
/// </summary>
/// <param name="lineNum"></param>
/// <returns></returns>
internal bool ProvidingCanUse(List<int> lineList)
{
//有一条线可用就返回true
foreach (int lineNum in lineList)
{
int deviceN = 200 + lineNum;
if (ProvidingEquipMap.ContainsKey(deviceN))
{
ProvidingEquip pro = ProvidingEquipMap[deviceN];
if (pro.runStatus >= LineRunStatus.HomeMoving && pro.isInSuddenDown.Equals(false) && pro.isNoAirCheck.Equals(false))
{
return true;
}
}
}
return false;
}
#endregion #endregion
...@@ -287,64 +186,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -287,64 +186,22 @@ namespace OnlineStore.DeviceLibrary
public override bool StartOutStoreMove(InOutParam param) public override bool StartOutStoreMove(InOutParam param)
{ {
//阻挡气缸0-2下降
runStatus = LineRunStatus.Busy;
InOutLog("开始出库忙碌中[BUSY]");
MoveInfo.NewMove(LineMoveType.OutStore, param);
MoveInfo.NextMoveStep(LineMoveStep.LO_00_Wait100);
return true; return true;
} }
protected override void OutStoreProcess() protected override void OutStoreProcess()
{ {
if (!LineCanRun())
{
return;
}
if (MoveInfo.IsInWait)
{
CheckWait(MoveInfo);
}
if (MoveInfo.IsInWait)
{
return;
}
} }
#endregion #endregion
#region 入库 #region 入库
/// <summary>
/// 开始入库移动移动
/// </summary>
public override bool StartInStoreMove(InOutParam param) public override bool StartInStoreMove(InOutParam param)
{ {
//TODO:发送数据给服务器，获取需要入库的库位号，记录盘信息，料仓位置信息到缓存中
runStatus = LineRunStatus.Busy;
InOutLog("开始入库忙碌中[BUSY]");
MoveInfo.NewMove(LineMoveType.InStore);
MoveInfo.NextMoveStep(LineMoveStep.LI_00_Wait100);
MoveInfo.MoveParam = param;
//等待料仓验证成功，最多等待10秒，若验证不成功，直接失败
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000));
MoveInfo.WaitList.Add(WaitResultInfo.WaitCanInstore());
MoveInfo.OneWaitCanEndStep = true;
return true; return true;
} }
protected override void InStoreProcess() protected override void InStoreProcess()
{ {
if (!LineCanRun())
{
return;
}
if (MoveInfo.IsInWait)
{
CheckWait(MoveInfo);
}
if (MoveInfo.IsInWait)
{
return;
}
} }
#endregion #endregion
...@@ -372,6 +229,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -372,6 +229,7 @@ namespace OnlineStore.DeviceLibrary
internal int Sw23TrayNum = 0; internal int Sw23TrayNum = 0;
private void Equip_TrayPEndEvent(int swNum, int trayNum) private void Equip_TrayPEndEvent(int swNum, int trayNum)
{ {
try {
if (swNum <= 0 || this.runStatus <= (LineRunStatus.Wait)) if (swNum <= 0 || this.runStatus <= (LineRunStatus.Wait))
{ {
return; return;
...@@ -411,6 +269,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -411,6 +269,10 @@ namespace OnlineStore.DeviceLibrary
LogInfo("Equip_TrayPEndEvent【" + swNum + "】【" + trayNum + "】失败，SW41_MoveInfo 忙碌中"); LogInfo("Equip_TrayPEndEvent【" + swNum + "】【" + trayNum + "】失败，SW41_MoveInfo 忙碌中");
} }
} }
}catch(Exception ex)
{
LogUtil.error(Name + "Equip_TrayPEndEvent出错：" + ex.ToString());
}
} }
/// <summary> /// <summary>
...@@ -986,7 +848,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -986,7 +848,10 @@ namespace OnlineStore.DeviceLibrary
} }
return false; return false;
} }
/// <summary>
/// 判断指定的移栽是否可以入库
/// </summary>
/// <returns></returns>
public bool CanIntore(int id) public bool CanIntore(int id)
{ {
if (!NoErrorAlarm()) if (!NoErrorAlarm())
...@@ -1013,6 +878,46 @@ namespace OnlineStore.DeviceLibrary ...@@ -1013,6 +878,46 @@ namespace OnlineStore.DeviceLibrary
// LogUtil.error("runStatus【" + runStatus + "】，move.MoveInfo.MoveType【" + move.MoveInfo.MoveType + "】，move.runStatus【" + move.runStatus + "】 "); // LogUtil.error("runStatus【" + runStatus + "】，move.MoveInfo.MoveType【" + move.MoveInfo.MoveType + "】，move.runStatus【" + move.runStatus + "】 ");
return false; return false;
} }
/// <summary>
/// 判断指定的皮带线是否可用
/// </summary>
/// <param name="lineNum"></param>
/// <returns></returns>
internal bool ProvidingCanUse(List<int> lineList)
{
//有一条线可用就返回true
foreach (int lineNum in lineList)
{
int deviceN = 200 + lineNum;
if (ProvidingEquipMap.ContainsKey(deviceN))
{
ProvidingEquip pro = ProvidingEquipMap[deviceN];
if (pro.runStatus >= LineRunStatus.HomeMoving && pro.isInSuddenDown.Equals(false) && pro.isNoAirCheck.Equals(false))
{
return true;
}
}
}
return false;
}
/// <summary>
/// 判断出料流水线是否可以开始出料
/// </summary>
internal bool DLineStartOut(int dlineId, int LineNum)
{
foreach (DischargeLine line in DisLineMap.Values)
{
if ((line.DeviceID % 100).Equals(dlineId))
{
if (line.CanStartOut(LineNum))
{
return true;
}
}
}
return false;
}
#endregion #endregion
#region AGV小车判断 #region AGV小车判断
......
source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs
...@@ -400,12 +400,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -400,12 +400,19 @@ namespace OnlineStore.DeviceLibrary
{ {
int lineId = DeviceID % 100; int lineId = DeviceID % 100;
MoveInfo.NextMoveStep(LineMoveStep.PO_03_ClampCylinderSlack); MoveInfo.NextMoveStep(LineMoveStep.PO_03_ClampCylinderSlack);
OutLog("出库 " + MoveInfo.SLog + " : 夹料气缸夹紧，更新料盘位置【"+ MoveInfo.MoveParam.WareCode + "】【INBELT】【"+ lineId + "】");
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Tighten, IO_Type.ClampCylinder_Slack); CylinderMove(MoveInfo, IO_Type.ClampCylinder_Tighten, IO_Type.ClampCylinder_Slack);
if (MoveInfo.MoveParam.InStoreNg)
{
OutLog("出库 " + MoveInfo.SLog + " : 夹料气缸夹紧，入料NG，不需要更新料盘位置");
}
else
{
OutLog("出库 " + MoveInfo.SLog + " : 夹料气缸夹紧，更新料盘位置【" + MoveInfo.MoveParam.WareCode + "】【INBELT】【" + lineId + "】");
//更新料盘位置 //更新料盘位置
SServerManager.UpdateTrayLoc(Name, MoveInfo.MoveParam.WareCode, LocStatus.INBELT, lineId); SServerManager.UpdateTrayLoc(Name, MoveInfo.MoveParam.WareCode, LocStatus.INBELT, lineId);
} }
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_03_ClampCylinderSlack)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_03_ClampCylinderSlack))
{ {
MoveInfo.NextMoveStep(LineMoveStep.PO_04_UpDownCylinderUp); MoveInfo.NextMoveStep(LineMoveStep.PO_04_UpDownCylinderUp);
......
source/DeviceLibrary/model/KTK_Store.cs
...@@ -374,6 +374,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -374,6 +374,8 @@ namespace OnlineStore.DeviceLibrary
public void CylinderMove(LineMoveInfo moveInfo, string IoLowType, string IoHighType, bool isCheckMove = false) public void CylinderMove(LineMoveInfo moveInfo, string IoLowType, string IoHighType, bool isCheckMove = false)
{ {
try
{
if (baseConfig.DType.Equals(DeviceType.FeedingEquip)) if (baseConfig.DType.Equals(DeviceType.FeedingEquip))
{ {
if (!baseConfig.DOList.ContainsKey(IoLowType)) if (!baseConfig.DOList.ContainsKey(IoLowType))
...@@ -395,6 +397,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -395,6 +397,10 @@ namespace OnlineStore.DeviceLibrary
IOMove(IoLowType, IO_VALUE.LOW); IOMove(IoLowType, IO_VALUE.LOW);
IOMove(IoHighType, IO_VALUE.HIGH); IOMove(IoHighType, IO_VALUE.HIGH);
} }
}catch(Exception ex)
{
LogUtil.error(Name + "CylinderMove ["+moveInfo.Name+"] ["+IoLowType+"] ["+IoHighType+"] ["+isCheckMove+"] 出错："+ex.ToString());
}
if (moveInfo != null) if (moveInfo != null)
{ {
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW)); moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW));
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!