Skip to content

孙克 / RC1250-AssemblyLine

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

1

1 个父辈 b2a13516
内嵌 并排
正在显示 11 个修改的文件 包含 110 行增加 和 107 行删除
source/AssemblyLineClient/App.config
......@@ -43,6 +43,8 @@
<add key ="LineRunTest" value ="1"/>
<!--ABB机器人服务器-->
<add key ="ABBServerPort" value ="21"/>
<!--是否打开托盘编码界面-->
<add key ="OpenRFIDWrite" value ="1"/>
</appSettings>
<log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
......
source/AssemblyLineClient/FrmLineStore.cs
......@@ -113,6 +113,7 @@ namespace OnlineStore.AssemblyLine
int autoValue = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun);
chbAutoRun.Checked = autoValue.Equals(1);
LoadListView();
托盘初始化ToolStripMenuItem.Visible = ConfigAppSettings.GetIntValue(Setting_Init.OpenRFIDWrite).Equals(1);
LoadOk = true;
HideForm();
timer1.Start();
......@@ -252,7 +253,7 @@ namespace OnlineStore.AssemblyLine
IOManager.instance.CloseAllDO();
IOManager.instance.CloseAllConnection();
AIManager.CloseConnect();
//AIManager.CloseConnect();
ACServerManager.CloseAllPort();
//this.Close();
System.Environment.Exit(System.Environment.ExitCode);
......
source/AssemblyLineClient/FrmRFIPEdit.Designer.cs
......@@ -74,7 +74,7 @@
this.btnBack.Anchor = System.Windows.Forms.AnchorStyles.Top;
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(383, 392);
this.btnBack.Location = new System.Drawing.Point(420, 392);
this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(120, 45);
this.btnBack.TabIndex = 274;
......@@ -119,8 +119,8 @@
this.comType.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comType.FormattingEnabled = true;
this.comType.Items.AddRange(new object[] {
"L",
"R"});
"流水线托盘",
"料架"});
this.comType.Location = new System.Drawing.Point(222, 187);
this.comType.Name = "comType";
this.comType.Size = new System.Drawing.Size(120, 28);
......@@ -134,7 +134,7 @@
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(167, 25);
this.label3.TabIndex = 279;
this.label3.Text = "读卡器类型：";
this.label3.Text = "卡类型：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// button1
......
source/AssemblyLineClient/FrmRFIPEdit.cs
......@@ -42,7 +42,7 @@ namespace OnlineStore.AssemblyLine
DialogResult result = MessageBox.Show( "确定将【"+comboxType.Text+"】当前的托盘编号定为【"+value+"】?", "确定提示", MessageBoxButtons.OKCancel);
if (result.Equals(DialogResult.OK))
{
RFIPManager.WriteData(ip, new RFIPData(value, type));
RFIDManager.WriteData(ip, new RFIDData(value, type));
}
}
......@@ -55,7 +55,7 @@ namespace OnlineStore.AssemblyLine
private void button1_Click(object sender, EventArgs e)
{
string ip = txtIP.Text;
RFIPData data= RFIPManager.ReadData(ip);
RFIDData data = RFIDManager.ReadData(ip);
string resul = "";
if (data != null)
{
......@@ -79,7 +79,7 @@ namespace OnlineStore.AssemblyLine
private void btnFind_Click(object sender, EventArgs e)
{
string ip = txtIP.Text;
bool result = RFIPManager.FindRFID(ip);
bool result = RFIDManager.FindRFID(ip);
if (result)
{
lblHas.Text = "有标签";
......
source/AssemblyLineSystem/LineStoreSystem.cs
......@@ -43,7 +43,7 @@ namespace StoreServer
}
IOManager.instance.CloseAllDO();
IOManager.instance.CloseAllConnection();
AIManager.CloseConnect();
//AIManager.CloseConnect();
LOGGER.Info(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss ") + "*************************Stop.");
}
}
......
source/Common/Setting_Init.cs
......@@ -74,5 +74,6 @@ namespace OnlineStore.Common
public static string ConfigPath_DischargeLine= "ConfigPath_DischargeLine";
public static string ABBServerPort = "ABBServerPort";
public static string OpenRFIDWrite = "OpenRFIDWrite";
}
}
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -71,7 +71,6 @@
<Compile Include="assemblyLine\FeedingEquip.cs" />
<Compile Include="assemblyLine\TrayManager.cs" />
<Compile Include="deviceLibrary\halcon\CodeManager.cs" />
<Compile Include="deviceLibrary\IO\AIManager.cs" />
<Compile Include="deviceLibrary\IO\AIOBOX\AIOBOXManager.cs" />
<Compile Include="deviceLibrary\IO\IOManager.cs" />
<Compile Include="assemblyLine\LineBean.cs" />
......
source/DeviceLibrary/assemblyLine/LineBean.cs
......@@ -118,11 +118,11 @@ namespace OnlineStore.DeviceLibrary
Task.Factory.StartNew(delegate
{
//连接rfip
RFIPManager.ConnectRFIOList(new List<string>(DeviceConfig.ProRFIpMap.Values));
RFIDManager.ConnectRFIOList(new List<string>(DeviceConfig.ProRFIpMap.Values));
Thread.Sleep(5);
IOManager.instance.ConnectionIOList(ioList);
Thread.Sleep(10);
AIManager.ConnectionIP(Config.AIDevice_IP);
//Thread.Sleep(10);
//AIManager.ConnectionIP(Config.AIDevice_IP);
addLastDI(IO_Type.Airpressure_Check, IOValue(IO_Type.Airpressure_Check));
addLastDI(IO_Type.SuddenStop_BTN, IOValue(IO_Type.SuddenStop_BTN));
......
source/DeviceLibrary/assemblyLine/TrayManager.cs
......@@ -174,7 +174,7 @@ namespace OnlineStore.DeviceLibrary
{
string ip = GetRFIP(subType, rtType);
//获取盘号
RFIPData data = RFIPManager.ReadData(ip);
RFIDData data = RFIDManager.ReadData(ip);
if (data != null)
{
return data.Num;
......
source/DeviceLibrary/deviceLibrary/RFID/RFIDManager.cs
......@@ -9,7 +9,7 @@ using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
public class RFIPManager
public class RFIDManager
{
public static Dictionary<string, Reader> RFReaderMap = new Dictionary<string, Reader>();
......@@ -68,40 +68,40 @@ namespace OnlineStore.DeviceLibrary
isProcess = false;
}
internal static void ConnectionIP(string rfip)
internal static void ConnectionIP(string rfid)
{
Reader rfipReader = null;
if (RFReaderMap.ContainsKey(rfip))
Reader rfidReader = null;
if (RFReaderMap.ContainsKey(rfid))
{
rfipReader = RFReaderMap[rfip];
if (null != rfipReader)
rfidReader = RFReaderMap[rfid];
if (null != rfidReader)
{
rfipReader.Close();
rfipReader = null;
rfidReader.Close();
rfidReader = null;
}
RFReaderMap.Remove(rfip);
RFReaderMap.Remove(rfid);
}
string logName = "RFIP模块[" + rfip + "] ";
string logName = "RFIP模块[" + rfid + "] ";
try
{
rfipReader = new Reader();
rfipReader.LocalIP = "192.168.100.101";
rfipReader.RemoteIP = rfip;
RFReaderMap.Add(rfip, rfipReader);
rfidReader = new Reader();
// rfidReader.LocalIP = "192.168.100.101";
rfidReader.RemoteIP = rfid;
RFReaderMap.Add(rfid, rfidReader);
LogUtil.debug("开始连接" + logName + "，尝试重连3次");
for (int i = 1; i <= 3; i++)
{
bool result = rfipReader.Connect();
bool result = rfidReader.Connect();
if (result)
{
LogUtil.info("第【" + i + "】次连接 " + logName + " 成功：");
Thread.Sleep(10);
if (RfIPList.Contains(rfip))
if (RfIPList.Contains(rfid))
{
RfIPList.Remove(rfip);
RfIPList.Remove(rfid);
}
break;
}
......@@ -126,25 +126,25 @@ namespace OnlineStore.DeviceLibrary
reader.Close();
}
}
public static bool WriteData(string rfIp, RFIPData obj)
public static bool WriteData(string IP, RFIDData obj)
{
byte[] sendData = obj.ToData();
return WriteData(rfIp, sendData, 3);
return WriteData(IP, sendData, 3);
}
public static RFIPData ReadData(string rfIp)
public static RFIDData ReadData(string IP)
{
byte[] reviceData = ReadData(rfIp, 3);
byte[] reviceData = ReadData(IP, 3);
if (reviceData != null)
{
return new RFIPData(reviceData);
return new RFIDData(reviceData);
}
return null;
}
public static bool FindRFID(string rfIp)
public static bool FindRFID(string IP)
{
try
{
Reader rfReader = getRfReader(rfIp);
Reader rfReader = getRfReader(IP);
if (rfReader != null)
{
return rfReader.FindRFID();
......@@ -152,15 +152,15 @@ namespace OnlineStore.DeviceLibrary
}
catch (Exception ex)
{
LogUtil.error("RFIP FindRFID [" + rfIp + "] 出错 ：" + ex.ToString());
LogUtil.error("RFIP FindRFID [" + IP + "] 出错 ：" + ex.ToString());
}
return false;
}
public static byte[] ReadData(string rfIp, int reReadCount = 1,int startIndex=0,int readLength=10)
public static byte[] ReadData(string IP, int reReadCount = 1,int startIndex=0,int readLength=10)
{
try
{
Reader rfReader = getRfReader(rfIp);
Reader rfReader = getRfReader(IP);
if (rfReader == null)
{
return null;
......@@ -172,20 +172,20 @@ namespace OnlineStore.DeviceLibrary
{
return reviceData;
}
LogUtil.error("RFIP ReadData [" + rfIp + "] 第" + i + "次失败 ");
LogUtil.error("RFIP ReadData [" + IP + "] 第" + i + "次失败 ");
}
}
catch (Exception ex)
{
LogUtil.error("RFIP ReadData [" + rfIp + "] 出错 ：" + ex.ToString());
LogUtil.error("RFIP ReadData [" + IP + "] 出错 ：" + ex.ToString());
}
return null;
}
public static bool WriteData(string rfIp, byte[] data, int reWriteCount = 1)
public static bool WriteData(string IP, byte[] data, int reWriteCount = 1)
{
try
{
Reader rfReader = getRfReader(rfIp);
Reader rfReader = getRfReader(IP);
if (rfReader == null)
{
return false;
......@@ -197,30 +197,30 @@ namespace OnlineStore.DeviceLibrary
{
return result;
}
LogUtil.error("RFIP WriteData [" + rfIp + "] 第" + i + "次失败：");
LogUtil.error("RFIP WriteData [" + IP + "] 第" + i + "次失败：");
}
}
catch (Exception ex)
{
LogUtil.error("RFIP WriteData [" + rfIp + "] 出错 ：" + ex.ToString());
LogUtil.error("RFIP WriteData [" + IP + "] 出错 ：" + ex.ToString());
}
return false;
}
private static Reader getRfReader(string rfIp)
private static Reader getRfReader(string IP)
{
Reader rfReader = null;
if (RFReaderMap.ContainsKey(rfIp))
if (RFReaderMap.ContainsKey(IP))
{
rfReader = RFReaderMap[rfIp];
rfReader = RFReaderMap[IP];
}
else
{
LogUtil.error("getRfReader 没有连接RFIP模块：" + rfIp);
LogUtil.error("getRfReader 没有连接RFIP模块：" + IP);
}
return rfReader;
}
}
public class RFIPData
public class RFIDData
{
/// <summary>
/// RFID类型，区分是料架还是托盘，托盘=L
......@@ -231,13 +231,13 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public int Num = 0;
public RFIPData (int num,int t=1)
public RFIDData (int num,int t=1)
{
this.RFType = t;
this.Num = num;
}
public RFIPData(byte[] data)
public RFIDData(byte[] data)
{
try
{
......
source/LoadCVSLibrary/storeConfig/config/Line_Config.cs
......@@ -59,59 +59,59 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("IO_DOLength")]
public string IO_DOLength { get; set; }
/// <summary>
/// PRO 模拟量IO模块的IP地址 AIDevice_IP 192.168.200.11
/// </summary>
[ConfigProAttribute("AIDevice_IP", true)]
public string AIDevice_IP { get; set; }
/// <summary>
/// PRO 模拟量测高1mm对应的转换值 AI_ConvertPosition 55
/// </summary>
[ConfigProAttribute("AI_ConvertPosition", true)]
public int AI_ConvertPosition { get; set; }
/// <summary>
/// PRO,模拟信号1默认高度,AIDI1_DefaultPosition,1,,,,,,,
/// </summary>
[ConfigProAttribute("AIDI1_DefaultPosition", true)]
public double AIDI1_DefaultPosition { get; set; }
/// <summary>
/// PRO,模拟信号2默认高度,AIDI2_DefaultPosition,1,,,,,,,
/// </summary>
[ConfigProAttribute("AIDI2_DefaultPosition", true)]
public double AIDI2_DefaultPosition { get; set; }
/// <summary>
/// PRO,模拟信号3默认高度,AIDI3_DefaultPosition,1,,,,,,,
/// </summary>
[ConfigProAttribute("AIDI3_DefaultPosition", true)]
public double AIDI3_DefaultPosition { get; set; }
/// <summary>
/// PRO,模拟信号4默认高度,AIDI4_DefaultPosition,1,,,,,,,
/// </summary>
[ConfigProAttribute("AIDI4_DefaultPosition", true)]
public double AIDI4_DefaultPosition { get; set; }
/// <summary>
/// PRO 模拟信号1的地址 AIDI1_Addr 7
/// </summary>
[ConfigProAttribute("AIDI1_Addr", true)]
public int AIDI1_Addr { get; set; }
/// <summary>
/// PRO 模拟信号2的地址 AIDI2_Addr 8
/// </summary>
[ConfigProAttribute("AIDI2_Addr", true)]
public int AIDI2_Addr { get; set; }
/// <summary>
/// PRO 模拟信号3的地址 AIDI3_Addr 5
/// </summary>
[ConfigProAttribute("AIDI3_Addr", true)]
public int AIDI3_Addr { get; set; }
/// <summary>
/// PRO 模拟信号4的地址 AIDI4_Addr 6
/// </summary>
[ConfigProAttribute("AIDI4_Addr", true)]
public int AIDI4_Addr { get; set; }
///// <summary>
///// PRO 模拟量IO模块的IP地址 AIDevice_IP 192.168.200.11
///// </summary>
//[ConfigProAttribute("AIDevice_IP", true)]
//public string AIDevice_IP { get; set; }
///// <summary>
///// PRO 模拟量测高1mm对应的转换值 AI_ConvertPosition 55
///// </summary>
//[ConfigProAttribute("AI_ConvertPosition", true)]
//public int AI_ConvertPosition { get; set; }
///// <summary>
///// PRO,模拟信号1默认高度,AIDI1_DefaultPosition,1,,,,,,,
///// </summary>
//[ConfigProAttribute("AIDI1_DefaultPosition", true)]
//public double AIDI1_DefaultPosition { get; set; }
///// <summary>
///// PRO,模拟信号2默认高度,AIDI2_DefaultPosition,1,,,,,,,
///// </summary>
//[ConfigProAttribute("AIDI2_DefaultPosition", true)]
//public double AIDI2_DefaultPosition { get; set; }
///// <summary>
///// PRO,模拟信号3默认高度,AIDI3_DefaultPosition,1,,,,,,,
///// </summary>
//[ConfigProAttribute("AIDI3_DefaultPosition", true)]
//public double AIDI3_DefaultPosition { get; set; }
///// <summary>
///// PRO,模拟信号4默认高度,AIDI4_DefaultPosition,1,,,,,,,
///// </summary>
//[ConfigProAttribute("AIDI4_DefaultPosition", true)]
//public double AIDI4_DefaultPosition { get; set; }
///// <summary>
///// PRO 模拟信号1的地址 AIDI1_Addr 7
///// </summary>
//[ConfigProAttribute("AIDI1_Addr", true)]
//public int AIDI1_Addr { get; set; }
///// <summary>
///// PRO 模拟信号2的地址 AIDI2_Addr 8
///// </summary>
//[ConfigProAttribute("AIDI2_Addr", true)]
//public int AIDI2_Addr { get; set; }
///// <summary>
///// PRO 模拟信号3的地址 AIDI3_Addr 5
///// </summary>
//[ConfigProAttribute("AIDI3_Addr", true)]
//public int AIDI3_Addr { get; set; }
///// <summary>
///// PRO 模拟信号4的地址 AIDI4_Addr 6
///// </summary>
//[ConfigProAttribute("AIDI4_Addr", true)]
//public int AIDI4_Addr { get; set; }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!