Skip to content

孙克 / RC1250-VMILineClient

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

aio.dll更新

1 个父辈 1295ef65
内嵌 并排
正在显示 5 个修改的文件 包含 481 行增加 和 545 行删除
dll/Asa.IOModule.AIOBOX.xml
...@@ -9,12 +9,6 @@ ...@@ -9,12 +9,6 @@
AIOBOX操作类 AIOBOX操作类
</summary> </summary>
</member> </member>
<member name="F:Asa.IOModule.AIOBOX._unrevdRemote">
<summary>
暂停次数
WriteDO 命令非常多时，暂停一次发送 ReadDI 或 ReadDO
</summary>
</member>
<member name="F:Asa.IOModule.AIOBOX.SEND_SLEEP"> <member name="F:Asa.IOModule.AIOBOX.SEND_SLEEP">
<summary> <summary>
每条命令发送的间隔 每条命令发送的间隔
...@@ -22,13 +16,12 @@ ...@@ -22,13 +16,12 @@
小于30时，会出现接收数据连包的情况 小于30时，会出现接收数据连包的情况
</summary> </summary>
</member> </member>
<member name="F:Asa.IOModule.AIOBOX.LISTEN_SLEEP"> <member name="F:Asa.IOModule.AIOBOX.PORT">
<summary> <summary>
监听网络接收数据的间隔 ModBus端口
必须小于SEND_SLEEP
</summary> </summary>
</member> </member>
<member name="T:Asa.IOModule.AIOBOX.DI_Changed"> <member name="T:Asa.IOModule.AIOBOX.DIO_Changed">
<summary> <summary>
自动读取DI委托 自动读取DI委托
</summary> </summary>
...@@ -40,19 +33,12 @@ ...@@ -40,19 +33,12 @@
自动读取DI事件触发 自动读取DI事件触发
</summary> </summary>
</member> </member>
<member name="T:Asa.IOModule.AIOBOX.DO_Changed">
<summary>
自动读取DO委托
</summary>
<param name="box">AIOBOX</param>
<param name="sta">所有DO状态</param>
</member>
<member name="E:Asa.IOModule.AIOBOX.DO_Changed_Event"> <member name="E:Asa.IOModule.AIOBOX.DO_Changed_Event">
<summary> <summary>
自动读取DO事件触发 自动读取DO事件触发
</summary> </summary>
</member> </member>
<member name="T:Asa.IOModule.AIOBOX.AI_Changed"> <member name="T:Asa.IOModule.AIOBOX.AIO_Changed">
<summary> <summary>
自动读取AI委托 自动读取AI委托
</summary> </summary>
...@@ -64,13 +50,6 @@ ...@@ -64,13 +50,6 @@
自动读取AI事件触发 自动读取AI事件触发
</summary> </summary>
</member> </member>
<member name="T:Asa.IOModule.AIOBOX.AO_Changed">
<summary>
自动读取AO委托
</summary>
<param name="box">AIOBOX</param>
<param name="val">所有AO的值</param>
</member>
<member name="E:Asa.IOModule.AIOBOX.AO_Changed_Event"> <member name="E:Asa.IOModule.AIOBOX.AO_Changed_Event">
<summary> <summary>
自动读取AO事件触发 自动读取AO事件触发
...@@ -86,11 +65,6 @@ ...@@ -86,11 +65,6 @@
IP地址 IP地址
</summary> </summary>
</member> </member>
<member name="P:Asa.IOModule.AIOBOX.Port">
<summary>
ModBus端口
</summary>
</member>
<member name="P:Asa.IOModule.AIOBOX.IsConn"> <member name="P:Asa.IOModule.AIOBOX.IsConn">
<summary> <summary>
是否连接 是否连接
...@@ -101,35 +75,12 @@ ...@@ -101,35 +75,12 @@
错误信息 错误信息
</summary> </summary>
</member> </member>
<member name="P:Asa.IOModule.AIOBOX.LogOutDir"> <member name="M:Asa.IOModule.AIOBOX.LogPath(System.String,Asa.IOModule.LogType)">
<summary>
日志输出目录
</summary>
</member>
<member name="P:Asa.IOModule.AIOBOX.LogOut">
<summary>
错误日志输出，默认true
</summary>
</member>
<member name="P:Asa.IOModule.AIOBOX.InputCount">
<summary>
输入总数
</summary>
</member>
<member name="P:Asa.IOModule.AIOBOX.OutputCount">
<summary>
输出总数
</summary>
</member>
<member name="P:Asa.IOModule.AIOBOX.InputReadSleep">
<summary> <summary>
自动读取DI间隔 日志路径，连接前设置路径会自动保存日志
</summary>
</member>
<member name="P:Asa.IOModule.AIOBOX.OutputReadSleep">
<summary>
自动读取DO间隔
</summary> </summary>
<param name="path">文件夹路径</param>
<param name="type">输出类型</param>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.SetInput(Asa.IOModule.Box_Type,System.Int32)"> <member name="M:Asa.IOModule.AIOBOX.SetInput(Asa.IOModule.Box_Type,System.Int32)">
<summary> <summary>
...@@ -163,7 +114,6 @@ ...@@ -163,7 +114,6 @@
<summary> <summary>
连接 连接
</summary> </summary>
<returns></returns>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.Close"> <member name="M:Asa.IOModule.AIOBOX.Close">
<summary> <summary>
...@@ -197,6 +147,12 @@ ...@@ -197,6 +147,12 @@
<param name="sta"></param> <param name="sta"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.ReverseStatus(Asa.IOModule.Box_Sta@)">
<summary>
相反状态(ON/OFF)
</summary>
<param name="sta"></param>
</member>
<member name="M:Asa.IOModule.AIOBOX.ReadDI(System.Int32)"> <member name="M:Asa.IOModule.AIOBOX.ReadDI(System.Int32)">
<summary> <summary>
读取单个DI输入状态(ON/OFF) 读取单个DI输入状态(ON/OFF)
...@@ -292,20 +248,17 @@ ...@@ -292,20 +248,17 @@
读取所有DO状态，功能码1 读取所有DO状态，功能码1
</summary> </summary>
<param name="buff"></param> <param name="buff"></param>
<returns></returns>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.ReadDI(System.Byte[])"> <member name="M:Asa.IOModule.AIOBOX.ReadDI(System.Byte[])">
<summary> <summary>
读取所有DI状态，功能码2 读取所有DI状态，功能码2
</summary> </summary>
<returns></returns>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.ReadAI(System.Byte[])"> <member name="M:Asa.IOModule.AIOBOX.ReadAI(System.Byte[])">
<summary> <summary>
读取所有AI的值，功能码4 读取所有AI的值，功能码4
</summary> </summary>
<param name="buff"></param> <param name="buff"></param>
<returns></returns>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.Command"> <member name="M:Asa.IOModule.AIOBOX.Command">
<summary> <summary>
...@@ -373,5 +326,62 @@ ...@@ -373,5 +326,62 @@
闭合，打开，高电平 闭合，打开，高电平
</summary> </summary>
</member> </member>
<member name="T:Asa.IOModule.LogType">
<summary>
日志类型
</summary>
</member>
<member name="F:Asa.IOModule.LogType.OnlyError">
<summary>
仅错误信息
</summary>
</member>
<member name="F:Asa.IOModule.LogType.All">
<summary>
所有
</summary>
</member>
<member name="T:Asa.IOModule.LogFile">
<summary>
日志操作类
</summary>
</member>
<member name="M:Asa.IOModule.LogFile.#ctor(System.String,System.String)">
<summary>
日志
</summary>
<param name="path">文件夹路径</param>
<param name="ip"></param>
</member>
<member name="M:Asa.IOModule.LogFile.Close">
<summary>
关闭文件
</summary>
</member>
<member name="M:Asa.IOModule.LogFile.OutError(System.String)">
<summary>
输出错误
</summary>
<param name="s"></param>
</member>
<member name="M:Asa.IOModule.LogFile.OutInfo(System.String)">
<summary>
输出信息
</summary>
<param name="s"></param>
</member>
<member name="M:Asa.IOModule.LogFile.OutData(System.String,System.Byte[])">
<summary>
输出数据
</summary>
<param name="tr"></param>
<param name="buff"></param>
</member>
<member name="M:Asa.IOModule.LogFile.OutData(System.String)">
<summary>
输出数据
</summary>
<param name="s"></param>
</member>
</members> </members>
</doc> </doc>
source/DeviceLibrary/IO/AIOBOX/AIOBOXManager.cs
...@@ -9,6 +9,7 @@ using OnlineStore.Common; ...@@ -9,6 +9,7 @@ using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using System.Threading.Tasks; using System.Threading.Tasks;
using Asa.IOModule; using Asa.IOModule;
using System.Windows.Forms;
namespace OnlineStore.DeviceLibrary namespace OnlineStore.DeviceLibrary
{ {
...@@ -28,50 +29,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -28,50 +29,17 @@ namespace OnlineStore.DeviceLibrary
private object DILock = ""; private object DILock = "";
private object DOLock = ""; private object DOLock = "";
private List<string> IoIPLIst = new List<string>();
private System.Timers.Timer conTimer = null;
public override void ConnectionIOList(List<string> DIONameList) public override void ConnectionIOList(List<string> DIONameList)
{ {
if (conTimer == null)
{
conTimer = new System.Timers.Timer();
conTimer.AutoReset = true;
conTimer.Interval = 60000;
conTimer.Elapsed += ConTimer_Elapsed;
}
conTimer.Enabled = false;
IoIPLIst = new List<string>(DIONameList);
foreach (string ip in DIONameList) foreach (string ip in DIONameList)
{ {
ConnectionIP(ip); ConnectionIP(ip);
} }
if (IoIPLIst.Count > 0)
{
//启动定时器，1一分钟重连一次
conTimer.Start();
}
}
private void ConTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
try
{
List<string> list = new List<string>(IoIPLIst);
if (list.Count > 0)
{
foreach (string ip in list)
{
LogUtil.info("重连AOI :" + ip);
ConnectionIP(ip);
}
}
}
catch (Exception ex)
{
LogUtil.error("AOI ConTimer_Elapsed 出错： " + ex.ToString());
}
} }
private bool isProcess = false;
private DateTime lastTime = DateTime.Now;
public void ConnectionIP(string ioIp) public void ConnectionIP(string ioIp)
{ {
...@@ -79,11 +47,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -79,11 +47,17 @@ namespace OnlineStore.DeviceLibrary
if (AIOMap.ContainsKey(ioIp)) if (AIOMap.ContainsKey(ioIp))
{ {
aioBox = AIOMap[ioIp]; aioBox = AIOMap[ioIp];
try
if (null != aioBox) {
if (null != aioBox)
{
aioBox.Close();
aioBox = null;
}
}
catch (Exception ex)
{ {
aioBox.Close(); LogUtil.error("关闭Io模块【" + ioIp + "】出错：", ex);
aioBox = null;
} }
AIOMap.Remove(ioIp); AIOMap.Remove(ioIp);
} }
...@@ -110,48 +84,30 @@ namespace OnlineStore.DeviceLibrary ...@@ -110,48 +84,30 @@ namespace OnlineStore.DeviceLibrary
string logName = "IO模块[" + ioIp + "] DI[" + DILength + "] DO[" + DOLength + "]，[" + DIMS + "] [" + DOMS + "]"; string logName = "IO模块[" + ioIp + "] DI[" + DILength + "] DO[" + DOLength + "]，[" + DIMS + "] [" + DOMS + "]";
try try
{ {
// Create new modbus master and add event functions
aioBox = new AIOBOX(); aioBox = new AIOBOX();
aioBox.IP = ioIp;
// bool rtn = aioBox.AutoIP(ioIp); aioBox.LogPath(Application.StartupPath + @"\logs\aio\", LogType.OnlyError);
aioBox.IP = ioIp;
aioBox.SetInput(Asa.IOModule.Box_Type.DI, DILength); aioBox.SetInput(Asa.IOModule.Box_Type.DI, DILength);
aioBox.SetOutput(Asa.IOModule.Box_Type.DO, DOLength); aioBox.SetOutput(Asa.IOModule.Box_Type.DO, DOLength);
//DI主动上传 //DI主动上传
aioBox.AutoReadInput(true,DIMS); aioBox.AutoReadInput(true);
aioBox.AutoReadOutput(true, DOMS); aioBox.AutoReadOutput(false, DOMS);
aioBox.LogOut = true;
aioBox.DI_Changed_Event += AioBox_DI_Changed_Event; ; aioBox.DI_Changed_Event += AioBox_DI_Changed_Event; ;
aioBox.DO_Changed_Event += AioBox_DO_Changed_Event; aioBox.DO_Changed_Event += AioBox_DO_Changed_Event;
// aioBox.Log_Out_Event += AioBox_Log_Out_Event;
//aioBox.Log_RxTx_Event += AioBox_Log_RxTx_Event;
AIOMap.Add(ioIp, aioBox);
LogUtil.debug("开始连接" + logName + "，尝试重连5次"); LogUtil.info("开始连接：" + logName + "：" + aioBox.ErrInfo);
for (int i = 1; i <= 3; i++) aioBox.Connect();
{
bool result = aioBox.Connect();
if (result)
{
LogUtil.info("第【" + i + "】次连接 " + logName + " 成功：" + aioBox.ErrInfo);
Thread.Sleep(10);
//读取所有的DO
ReadAllDI(ioIp, 0);
if (IoIPLIst.Contains(ioIp))
{
IoIPLIst.Remove(ioIp);
}
break;
}
else
{
LogUtil.error("第【" + i + "】次连接 " + logName + " 失败：" + aioBox.ErrInfo + "");
}
Thread.Sleep(2);
}
AIOMap.Add(ioIp, aioBox);
Thread.Sleep(5);
//读取所有的DO
ReadAllDI(ioIp, 0);
Thread.Sleep(5);
GC.Collect();
} }
catch (Exception error) catch (Exception error)
{ {
...@@ -159,26 +115,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -159,26 +115,13 @@ namespace OnlineStore.DeviceLibrary
} }
} }
private void AioBox_Reconnect_Event(AIOBOX box, int times, ref bool conn, Dictionary<string, string> dict)
{
conn = true;
string msg = "重连AIO块【" + box.IP + "】次数：" + times + "【" + box.ErrInfo + "】，连接信息如下\r\n";
foreach (string key in dict.Keys)
{
msg = msg + "\t" + "[" + key + "]=[" + dict[key] + "],";
}
LogUtil.error(msg);
}
private DateTime lastLogTime = DateTime.Now; private DateTime lastLogTime = DateTime.Now;
private void AioBox_Log_Out_Event(AIOBOX box, string[] s) private void AioBox_Log_Out_Event(AIOBOX box, string[] s)
{ {
foreach (string str in s) foreach (string str in s)
{ {
// LogUtil.AIOLog.Debug("[" + box.IP + "]" + str); LogUtil.AIOLog.Debug("[" + box.IP + "]" + str);
} }
} }
...@@ -190,7 +133,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -190,7 +133,7 @@ namespace OnlineStore.DeviceLibrary
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("AioBox_DI_Changed_Event出错：" + ex.ToString()); LogUtil.error("AioBox_DI_Changed_Event出错：", ex);
} }
} }
private void AioBox_DO_Changed_Event(AIOBOX box, Box_Sta[] sta) private void AioBox_DO_Changed_Event(AIOBOX box, Box_Sta[] sta)
...@@ -202,7 +145,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -202,7 +145,7 @@ namespace OnlineStore.DeviceLibrary
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("AioBox_DO_Changed_Event出错：" + ex.ToString()); LogUtil.error("AioBox_DO_Changed_Event出错：", ex);
} }
} }
...@@ -222,14 +165,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -222,14 +165,6 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
//foreach(Box_Sta s in sta)
//{
// updateDi += s.ToString() + "，";
//}
//if (ip.Equals("192.168.201.61"))
//{
// LogUtil.info(updateDi);
//}
for (int i = 0; i < newList.Count; i++) for (int i = 0; i < newList.Count; i++)
{ {
if (!(oldList[i].Equals(newList[i]))) if (!(oldList[i].Equals(newList[i])))
...@@ -262,12 +197,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -262,12 +197,7 @@ namespace OnlineStore.DeviceLibrary
newList.AddRange(sta); newList.AddRange(sta);
List<Box_Sta> oldList = null; List<Box_Sta> oldList = null;
DOValueMap.TryGetValue(ip, out oldList); DOValueMap.TryGetValue(ip, out oldList);
//string result = "UpdateAllDO ip[" + ip + "], sta :";
//for (int i = 0; i < newList.Count; i++)
//{
// result += newList[i] + ",";
//}
//LogUtil.info(result);
if (oldList == null || oldList.Count.Equals(newList.Count).Equals(false)) if (oldList == null || oldList.Count.Equals(newList.Count).Equals(false))
{ {
needUpdate = true; needUpdate = true;
...@@ -295,17 +225,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -295,17 +225,6 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
//else
//{
// if (sta == null)
// {
// LogUtil.error("UpdateAllDO ip[" + ip + "], sta=null");
// }
// else
// {
// LogUtil.error(" UpdateAllDO ip[" + ip + "], sta.Length=" + sta.Length);
// }
//}
} }
...@@ -318,16 +237,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -318,16 +237,13 @@ namespace OnlineStore.DeviceLibrary
ushort length = LineManager.Config.GetDOLength(aio.IP); ushort length = LineManager.Config.GetDOLength(aio.IP);
for (ushort i = 0; i < length; i++) for (ushort i = 0; i < length; i++)
{ {
// ushort u = (ushort)(i + length);
// ushort u = (ushort)(i );
// Box_Addr addr = GetAddr(u);
aio.WriteDO(i, Box_Sta.Off); aio.WriteDO(i, Box_Sta.Off);
} }
} }
} }
public override void CloseAllConnection() public override void CloseAllConnection()
{ {
foreach (AIOBOX aio in AIOMap.Values) foreach (AIOBOX aio in AIOMap.Values)
{ {
try try
...@@ -336,10 +252,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -336,10 +252,9 @@ namespace OnlineStore.DeviceLibrary
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("", ex); LogUtil.error("aio.Close出错：", ex);
} }
} }
AIOMap.Clear(); AIOMap.Clear();
} }
public override void WriteSingleDO(string ioIp, byte slaveId, ushort StartAddress, IO_VALUE onOff) public override void WriteSingleDO(string ioIp, byte slaveId, ushort StartAddress, IO_VALUE onOff)
...@@ -350,19 +265,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -350,19 +265,10 @@ namespace OnlineStore.DeviceLibrary
AIOBOX aioBox = getAIO(ioIp); AIOBOX aioBox = getAIO(ioIp);
if (aioBox != null) if (aioBox != null)
{ {
// Box_Addr add = GetAddr(StartAddress); bool result = aioBox.WriteDO(StartAddress, GetBox_Sta(onOff));
if (!result)
for (int i = 1; i <= 3; i++)
{ {
bool result = aioBox.WriteDO(StartAddress, GetBox_Sta(onOff)); LogUtil.error("AIO WriteSingleDO [" + ioIp + "] [" + StartAddress + "] 失败：" + aioBox.ErrInfo);
if (!result)
{
LogUtil.error("AIO WriteSingleDO [" + StartAddress + "] 第" + i + "次失败：" + aioBox.ErrInfo);
}
else
{
break;
}
} }
} }
else else
...@@ -372,19 +278,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -372,19 +278,17 @@ namespace OnlineStore.DeviceLibrary
} }
catch (Exception ex) catch (Exception ex)
{ {
LOGGER.Error("出错啦：" + ex.ToString()); LOGGER.Error("AIO WriteSingleDO [" + ioIp + "] [" + StartAddress + "] 出错啦：", ex);
} }
} }
public override void WriteSingleDO(string ioIp, byte slaveId, ushort StartAddress, IO_VALUE onOff, int mSeconds) public override void WriteSingleDO(string ioIp, byte slaveId, ushort StartAddress, IO_VALUE onOff, int mSeconds)
{ {
try try
{ {
AIOBOX aioBox = getAIO(ioIp); AIOBOX aioBox = getAIO(ioIp);
Box_Sta currBox_Sta = GetBox_Sta(onOff);
if (aioBox != null) if (aioBox != null)
{ {
// Box_Addr add = GetAddr(StartAddress); Box_Sta currBox_Sta = GetBox_Sta(onOff);
aioBox.WriteDO(StartAddress, currBox_Sta); aioBox.WriteDO(StartAddress, currBox_Sta);
//写入之后，等待指定间隔后回写 //写入之后，等待指定间隔后回写
...@@ -394,24 +298,25 @@ namespace OnlineStore.DeviceLibrary ...@@ -394,24 +298,25 @@ namespace OnlineStore.DeviceLibrary
try try
{ {
aioBox.WriteDO(StartAddress, aioBox.ReverseStatus(currBox_Sta)); aioBox.WriteDO(StartAddress, aioBox.ReverseStatus(currBox_Sta));
LogUtil.debug(LOGGER, "**********定时回写入 IO【" + ioIp + "," + StartAddress + ",值" + aioBox.ReverseStatus(currBox_Sta) + "】："); LogUtil.debug(LOGGER, "**********定时回写入 IO [" + ioIp + "] [" + StartAddress + "]值" + aioBox.ReverseStatus(currBox_Sta) + "】：");
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error(LOGGER, "**********定时回写入 出错：" + ex.StackTrace); LogUtil.error(LOGGER, "**********定时回写入 出错：", ex);
} }
}; };
mytimer.AutoReset = false;//设置是否自动重启，即自动执行多次； mytimer.AutoReset = false;//设置是否自动重启，即自动执行多次；
mytimer.Enabled = true;//是否执行System.Timers.Timer.Elapsed事件mytask； mytimer.Enabled = true;//是否执行System.Timers.Timer.Elapsed事件mytask；
} }
else else
{ {
LogUtil.error(LOGGER, "WriteSingleDO出错 没有连接IO模块：" + ioIp); LogUtil.error(LOGGER, "AIO WriteSingleDO [" + ioIp + "] [" + StartAddress + "] 出错 没有连接IO模块：" + ioIp);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("WriteSingleDO 出错：" + ioIp); LogUtil.error("AIO WriteSingleDO [" + ioIp + "] [" + StartAddress + "] 出错：" + ioIp);
} }
} }
public override void ReadAllDI(string ioIp, byte slaveId) public override void ReadAllDI(string ioIp, byte slaveId)
...@@ -427,7 +332,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -427,7 +332,7 @@ namespace OnlineStore.DeviceLibrary
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("ReadAllDI出错：" + ioIp); LogUtil.error("ReadAllDI [" + ioIp + "]出错：" + ioIp);
} }
} }
public override void ReadAllDO(string ioIp, byte slaveId) public override void ReadAllDO(string ioIp, byte slaveId)
...@@ -444,7 +349,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -444,7 +349,7 @@ namespace OnlineStore.DeviceLibrary
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("ReadAllDO出错：" + ioIp); LogUtil.error("ReadAllDO [" + ioIp + "]出错：" + ioIp);
} }
} }
public override IO_VALUE GetDOValue(string ioIP, byte slaveId, ushort StartAddress) public override IO_VALUE GetDOValue(string ioIP, byte slaveId, ushort StartAddress)
...@@ -456,9 +361,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -456,9 +361,6 @@ namespace OnlineStore.DeviceLibrary
if (aioBox != null) if (aioBox != null)
{ {
Box_Sta sta = Box_Sta.Off; Box_Sta sta = Box_Sta.Off;
// Box_Addr addr = GetAddr(StartAddress);
// int index = (int)StartAddress - (int)StoreManager.Config.GetDILength(ioIP);
if (DOValueMap.ContainsKey(ioIP) && DOValueMap[ioIP].Count > StartAddress) if (DOValueMap.ContainsKey(ioIP) && DOValueMap[ioIP].Count > StartAddress)
{ {
sta = DOValueMap[ioIP][StartAddress]; sta = DOValueMap[ioIP][StartAddress];
...@@ -469,11 +371,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -469,11 +371,15 @@ namespace OnlineStore.DeviceLibrary
{ {
value = IO_VALUE.HIGH; value = IO_VALUE.HIGH;
} }
else
{
value = IO_VALUE.LOW;
}
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("GetDOValue 出错：" + ex.ToString()); LogUtil.error("GetDOValue [" + ioIP + "] [" + StartAddress + "] 出错：", ex);
} }
return value; return value;
} }
...@@ -481,31 +387,39 @@ namespace OnlineStore.DeviceLibrary ...@@ -481,31 +387,39 @@ namespace OnlineStore.DeviceLibrary
public override IO_VALUE GetDIValue(string ioIP, byte slaveId, ushort StartAddress) public override IO_VALUE GetDIValue(string ioIP, byte slaveId, ushort StartAddress)
{ {
IO_VALUE value = IO_VALUE.LOW; IO_VALUE value = IO_VALUE.LOW;
try for (int i = 1; i <= 3; i++)
{ {
AIOBOX aioBox = getAIO(ioIP); try
if (aioBox != null)
{ {
Box_Sta sta = Box_Sta.Off; AIOBOX aioBox = getAIO(ioIP);
// Box_Addr addr = GetAddr(StartAddress); if (aioBox != null)
int index = StartAddress;
if (DIValueMap.ContainsKey(ioIP) && DIValueMap[ioIP].Count > index)
{
sta = DIValueMap[ioIP][index];
}
else
{ {
sta = aioBox.ReadDI(StartAddress); Box_Sta sta = Box_Sta.Off;
} // Box_Addr addr = GetAddr(StartAddress);
if (sta.Equals(Box_Sta.On)) int index = StartAddress;
{ if (DIValueMap.ContainsKey(ioIP) && DIValueMap[ioIP].Count > index)
value = IO_VALUE.HIGH; {
sta = DIValueMap[ioIP][index];
}
else
{
sta = aioBox.ReadDI(StartAddress);
}
if (sta.Equals(Box_Sta.On))
{
value = IO_VALUE.HIGH;
}
else
{
value = IO_VALUE.LOW;
}
} }
break;
}
catch (Exception ex)
{
LogUtil.error(" 第【" + i + "】次 GetDIValue [" + ioIP + "] [" + StartAddress + "] 出错：", ex);
} }
}
catch (Exception ex)
{
LogUtil.error("GetDIValue 出错：" + ex.ToString());
} }
return value; return value;
} }
...@@ -516,24 +430,20 @@ namespace OnlineStore.DeviceLibrary ...@@ -516,24 +430,20 @@ namespace OnlineStore.DeviceLibrary
{ {
if (configIO.ProType.Equals(ConfigItemType.DI)) if (configIO.ProType.Equals(ConfigItemType.DI))
{ {
return GetDIValue(configIO.DeviceName, configIO.SlaveID, configIO.GetIOAddr()); return GetDIValue(configIO.IO_IP, configIO.SlaveID, configIO.GetIOAddr());
} }
else if (configIO.ProType.Equals(ConfigItemType.DO)) else if (configIO.ProType.Equals(ConfigItemType.DO))
{ {
return GetDOValue(configIO.DeviceName, configIO.SlaveID, configIO.GetIOAddr()); return GetDOValue(configIO.IO_IP, configIO.SlaveID, configIO.GetIOAddr());
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error(LOGGER, " GetIOValue 获取数据出错：" + ex.ToString()); LogUtil.error(LOGGER, " GetIOValue [" + configIO.IO_IP + "] [" + configIO.GetIOAddr() + "] 获取数据出错：", ex);
} }
return value; return value;
} }
//private Box_Addr GetAddr(ushort StartAddress)
//{
// return (Box_Addr)(StartAddress);
//}
private Box_Sta GetBox_Sta(IO_VALUE onOff) private Box_Sta GetBox_Sta(IO_VALUE onOff)
{ {
if (onOff.Equals(IO_VALUE.HIGH)) if (onOff.Equals(IO_VALUE.HIGH))
...@@ -555,5 +465,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -555,5 +465,18 @@ namespace OnlineStore.DeviceLibrary
} }
return aioBox; return aioBox;
} }
//public override bool IsConnect(string ip)
//{
// if (AIOMap.ContainsKey(ip))
// {
// if (AIOMap[ip].IsConn)
// {
// return true;
// }
// return false;
// }
// return false;
//}
} }
} }
source/VMILineClient/FrmVMIClient.Designer.cs
...@@ -25,57 +25,57 @@ ...@@ -25,57 +25,57 @@
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmVMIClient)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmVMIClient));
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.lblWarnMsg = new System.Windows.Forms.Label();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.lblThisSta = new System.Windows.Forms.Label();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.panel1 = new System.Windows.Forms.Panel();
this.lblInfo = new System.Windows.Forms.Label();
this.btnVmiExit = new System.Windows.Forms.Button();
this.btnVmiStart = new System.Windows.Forms.Button();
this.chbDebug = new System.Windows.Forms.CheckBox();
this.btnVmiStop = new System.Windows.Forms.Button();
this.chbAuto = new System.Windows.Forms.CheckBox();
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.显示ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.显示ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.btnClearL = new System.Windows.Forms.Button(); this.groupBox5 = new System.Windows.Forms.GroupBox();
this.btnLogDebug = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.groupBox4 = new System.Windows.Forms.GroupBox(); this.txtShelfId = new System.Windows.Forms.TextBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.txtname = new System.Windows.Forms.TextBox();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.btnNeedEntry = new System.Windows.Forms.Button();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.btnNeedLeave = new System.Windows.Forms.Button();
this.btnDis = 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.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
this.btnStopTDown = new System.Windows.Forms.Button(); this.btnStopTDown = new System.Windows.Forms.Button();
this.cmbStopList = new System.Windows.Forms.ComboBox(); this.cmbStopList = 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.btnLogDebug = new System.Windows.Forms.Button();
this.btnOLOutStopDown = new System.Windows.Forms.Button(); this.btnOLOutStopDown = new System.Windows.Forms.Button();
this.btnOLInStopDown = new System.Windows.Forms.Button(); this.btnOLInStopDown = new System.Windows.Forms.Button();
this.btnInLOutStopDown = new System.Windows.Forms.Button(); this.btnInLOutStopDown = new System.Windows.Forms.Button();
this.btnInLInStopDown = new System.Windows.Forms.Button(); this.btnInLInStopDown = new System.Windows.Forms.Button();
this.btnInLineRun = new System.Windows.Forms.Button(); this.btnInLineRun = new System.Windows.Forms.Button();
this.btnOutL = new System.Windows.Forms.Button(); this.btnOutL = new System.Windows.Forms.Button();
this.groupBox5 = new System.Windows.Forms.GroupBox(); this.groupBox4 = new System.Windows.Forms.GroupBox();
this.txtShelfId = new System.Windows.Forms.TextBox(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.txtname = new System.Windows.Forms.TextBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.btnNeedEntry = new System.Windows.Forms.Button(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.btnNeedLeave = new System.Windows.Forms.Button(); this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.btnDis = new System.Windows.Forms.Button(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.btnInit = new System.Windows.Forms.Button(); this.lblWarnMsg = new System.Windows.Forms.Label();
this.button1 = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel();
this.chbMoveStop = new System.Windows.Forms.CheckBox(); this.chbMoveStop = new System.Windows.Forms.CheckBox();
this.groupBox3.SuspendLayout(); this.lblInfo = new System.Windows.Forms.Label();
this.panel1.SuspendLayout(); this.btnVmiExit = new System.Windows.Forms.Button();
this.btnVmiStart = new System.Windows.Forms.Button();
this.chbDebug = new System.Windows.Forms.CheckBox();
this.btnVmiStop = new System.Windows.Forms.Button();
this.chbAuto = new System.Windows.Forms.CheckBox();
this.lblThisSta = new System.Windows.Forms.Label();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
this.groupBox4.SuspendLayout(); this.groupBox5.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
this.groupBox5.SuspendLayout(); this.groupBox4.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox3.SuspendLayout();
this.panel1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer1 // timer1
...@@ -83,139 +83,6 @@ ...@@ -83,139 +83,6 @@
this.timer1.Interval = 1000; this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick); this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
// //
// lblWarnMsg
//
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(267, 66);
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(856, 52);
this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// richTextBox1
//
this.richTextBox1.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.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.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(689, 510);
this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = "";
this.richTextBox1.VisibleChanged += new System.EventHandler(this.richTextBox1_VisibleChanged);
//
// lblThisSta
//
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.ForeColor = System.Drawing.Color.Green;
this.lblThisSta.Location = new System.Drawing.Point(8, 83);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(65, 19);
this.lblThisSta.TabIndex = 216;
this.lblThisSta.Text = "等待启动";
//
// groupBox3
//
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox3.Controls.Add(this.lblWarnMsg);
this.groupBox3.Controls.Add(this.panel1);
this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Location = new System.Drawing.Point(10, 6);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(1129, 124);
this.groupBox3.TabIndex = 268;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态";
//
// panel1
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel1.Controls.Add(this.chbMoveStop);
this.panel1.Controls.Add(this.lblInfo);
this.panel1.Controls.Add(this.btnVmiExit);
this.panel1.Controls.Add(this.btnVmiStart);
this.panel1.Controls.Add(this.chbDebug);
this.panel1.Controls.Add(this.btnVmiStop);
this.panel1.Controls.Add(this.chbAuto);
this.panel1.Location = new System.Drawing.Point(5, 15);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1121, 48);
this.panel1.TabIndex = 273;
//
// lblInfo
//
this.lblInfo.AutoSize = true;
this.lblInfo.Location = new System.Drawing.Point(277, 5);
this.lblInfo.Name = "lblInfo";
this.lblInfo.Size = new System.Drawing.Size(56, 17);
this.lblInfo.TabIndex = 273;
this.lblInfo.Text = "运行信息";
//
// btnVmiExit
//
this.btnVmiExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnVmiExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnVmiExit.Location = new System.Drawing.Point(984, 3);
this.btnVmiExit.Name = "btnVmiExit";
this.btnVmiExit.Size = new System.Drawing.Size(132, 39);
this.btnVmiExit.TabIndex = 4;
this.btnVmiExit.Text = "退出";
this.btnVmiExit.UseVisualStyleBackColor = true;
this.btnVmiExit.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click);
//
// btnVmiStart
//
this.btnVmiStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnVmiStart.Location = new System.Drawing.Point(4, 3);
this.btnVmiStart.Name = "btnVmiStart";
this.btnVmiStart.Size = new System.Drawing.Size(132, 39);
this.btnVmiStart.TabIndex = 0;
this.btnVmiStart.Text = "启动";
this.btnVmiStart.UseVisualStyleBackColor = true;
this.btnVmiStart.Click += new System.EventHandler(this.btnVmiStart_Click);
//
// chbDebug
//
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
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.Location = new System.Drawing.Point(893, 10);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 271;
this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true;
this.chbDebug.CheckedChanged += new System.EventHandler(this.chbDebug_CheckedChanged);
//
// btnVmiStop
//
this.btnVmiStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnVmiStop.Location = new System.Drawing.Point(139, 3);
this.btnVmiStop.Name = "btnVmiStop";
this.btnVmiStop.Size = new System.Drawing.Size(132, 39);
this.btnVmiStop.TabIndex = 1;
this.btnVmiStop.Text = "停止";
this.btnVmiStop.UseVisualStyleBackColor = true;
this.btnVmiStop.Click += new System.EventHandler(this.btnVmiStop_Click);
//
// chbAuto
//
this.chbAuto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
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.Location = new System.Drawing.Point(772, 10);
this.chbAuto.Name = "chbAuto";
this.chbAuto.Size = new System.Drawing.Size(112, 24);
this.chbAuto.TabIndex = 270;
this.chbAuto.Text = "开机自动启动";
this.chbAuto.UseVisualStyleBackColor = true;
this.chbAuto.CheckedChanged += new System.EventHandler(this.chbAuto_CheckedChanged);
//
// notifyIcon1 // notifyIcon1
// //
this.notifyIcon1.ContextMenuStrip = this.contextMenuStrip1; this.notifyIcon1.ContextMenuStrip = this.contextMenuStrip1;
...@@ -252,77 +119,97 @@ ...@@ -252,77 +119,97 @@
this.toolStripMenuItem1.Text = "退出"; this.toolStripMenuItem1.Text = "退出";
this.toolStripMenuItem1.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click); this.toolStripMenuItem1.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click);
// //
// btnClearL // groupBox5
// //
this.btnClearL.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
this.btnClearL.Location = new System.Drawing.Point(301, 546); | System.Windows.Forms.AnchorStyles.Right)));
this.btnClearL.Name = "btnClearL"; this.groupBox5.Controls.Add(this.button1);
this.btnClearL.Size = new System.Drawing.Size(104, 39); this.groupBox5.Controls.Add(this.txtShelfId);
this.btnClearL.TabIndex = 14; this.groupBox5.Controls.Add(this.txtname);
this.btnClearL.Text = "清理日志"; this.groupBox5.Controls.Add(this.btnNeedEntry);
this.btnClearL.UseVisualStyleBackColor = true; this.groupBox5.Controls.Add(this.btnNeedLeave);
this.btnClearL.Click += new System.EventHandler(this.btnClearL_Click); this.groupBox5.Controls.Add(this.btnDis);
this.groupBox5.Controls.Add(this.btnInit);
this.groupBox5.Location = new System.Drawing.Point(450, 132);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(728, 77);
this.groupBox5.TabIndex = 277;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "AGV调度通信";
// //
// btnLogDebug // button1
// //
this.btnLogDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLogDebug.Location = new System.Drawing.Point(196, 546); this.button1.Location = new System.Drawing.Point(577, 24);
this.btnLogDebug.Name = "btnLogDebug"; this.button1.Name = "button1";
this.btnLogDebug.Size = new System.Drawing.Size(104, 39); this.button1.Size = new System.Drawing.Size(100, 39);
this.btnLogDebug.TabIndex = 13; this.button1.TabIndex = 7;
this.btnLogDebug.Text = "开启DEBUG"; this.button1.Text = "NeedEntry";
this.btnLogDebug.UseVisualStyleBackColor = true; this.button1.UseVisualStyleBackColor = true;
this.btnLogDebug.Click += new System.EventHandler(this.btnLogDebug_Click);
// //
// groupBox4 // txtShelfId
// //
this.groupBox4.Controls.Add(this.tableLayoutPanel2); this.txtShelfId.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox4.Location = new System.Drawing.Point(218, 15); this.txtShelfId.Location = new System.Drawing.Point(300, 31);
this.groupBox4.Name = "groupBox4"; this.txtShelfId.MaxLength = 4;
this.groupBox4.Size = new System.Drawing.Size(208, 251); this.txtShelfId.Name = "txtShelfId";
this.groupBox4.TabIndex = 275; this.txtShelfId.Size = new System.Drawing.Size(53, 26);
this.groupBox4.TabStop = false; this.txtShelfId.TabIndex = 6;
this.groupBox4.Text = "DO列表"; this.txtShelfId.Text = "000";
// //
// tableLayoutPanel2 // txtname
// //
this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.txtname.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
| System.Windows.Forms.AnchorStyles.Left) this.txtname.Location = new System.Drawing.Point(239, 31);
| System.Windows.Forms.AnchorStyles.Right))); this.txtname.MaxLength = 4;
this.tableLayoutPanel2.ColumnCount = 1; this.txtname.Name = "txtname";
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.txtname.Size = new System.Drawing.Size(53, 26);
this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14); this.txtname.TabIndex = 5;
this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.txtname.Text = "C2";
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, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(197, 231);
this.tableLayoutPanel2.TabIndex = 103;
// //
// groupBox1 // btnNeedEntry
// //
this.groupBox1.Controls.Add(this.tableLayoutPanel1); this.btnNeedEntry.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.groupBox1.Location = new System.Drawing.Point(6, 15); this.btnNeedEntry.Location = new System.Drawing.Point(469, 24);
this.groupBox1.Name = "groupBox1"; this.btnNeedEntry.Name = "btnNeedEntry";
this.groupBox1.Size = new System.Drawing.Size(208, 251); this.btnNeedEntry.Size = new System.Drawing.Size(100, 39);
this.groupBox1.TabIndex = 274; this.btnNeedEntry.TabIndex = 4;
this.groupBox1.TabStop = false; this.btnNeedEntry.Text = "NeedEntry";
this.groupBox1.Text = "DI列表"; this.btnNeedEntry.UseVisualStyleBackColor = true;
this.btnNeedEntry.Click += new System.EventHandler(this.btnNeedEntry_Click);
// //
// tableLayoutPanel1 // btnNeedLeave
// //
this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.btnNeedLeave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
| System.Windows.Forms.AnchorStyles.Left) this.btnNeedLeave.Location = new System.Drawing.Point(361, 24);
| System.Windows.Forms.AnchorStyles.Right))); this.btnNeedLeave.Name = "btnNeedLeave";
this.tableLayoutPanel1.ColumnCount = 1; this.btnNeedLeave.Size = new System.Drawing.Size(100, 39);
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.btnNeedLeave.TabIndex = 3;
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14); this.btnNeedLeave.Text = "NeedLeave";
this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.btnNeedLeave.UseVisualStyleBackColor = true;
this.tableLayoutPanel1.RowCount = 2; this.btnNeedLeave.Click += new System.EventHandler(this.btnNeedLeave_Click);
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, 17F)); // btnDis
this.tableLayoutPanel1.Size = new System.Drawing.Size(197, 231); //
this.tableLayoutPanel1.TabIndex = 102; this.btnDis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDis.Location = new System.Drawing.Point(131, 24);
this.btnDis.Name = "btnDis";
this.btnDis.Size = new System.Drawing.Size(100, 39);
this.btnDis.TabIndex = 2;
this.btnDis.Text = "断开";
this.btnDis.UseVisualStyleBackColor = true;
this.btnDis.Click += new System.EventHandler(this.btnDis_Click);
//
// btnInit
//
this.btnInit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInit.Location = new System.Drawing.Point(23, 24);
this.btnInit.Name = "btnInit";
this.btnInit.Size = new System.Drawing.Size(100, 39);
this.btnInit.TabIndex = 1;
this.btnInit.Text = "连接";
this.btnInit.UseVisualStyleBackColor = true;
this.btnInit.Click += new System.EventHandler(this.btnInit_Click);
// //
// groupBox2 // groupBox2
// //
...@@ -345,7 +232,7 @@ ...@@ -345,7 +232,7 @@
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(10, 132);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(434, 593); this.groupBox2.Size = new System.Drawing.Size(434, 551);
this.groupBox2.TabIndex = 276; this.groupBox2.TabIndex = 276;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
// //
...@@ -413,8 +300,9 @@ ...@@ -413,8 +300,9 @@
// //
// btnCloseA // btnCloseA
// //
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, 546); this.btnCloseA.Location = new System.Drawing.Point(22, 495);
this.btnCloseA.Name = "btnCloseA"; this.btnCloseA.Name = "btnCloseA";
this.btnCloseA.Size = new System.Drawing.Size(173, 39); this.btnCloseA.Size = new System.Drawing.Size(173, 39);
this.btnCloseA.TabIndex = 282; this.btnCloseA.TabIndex = 282;
...@@ -422,6 +310,30 @@ ...@@ -422,6 +310,30 @@
this.btnCloseA.UseVisualStyleBackColor = true; this.btnCloseA.UseVisualStyleBackColor = true;
this.btnCloseA.Click += new System.EventHandler(this.btnCloseA_Click); this.btnCloseA.Click += new System.EventHandler(this.btnCloseA_Click);
// //
// btnClearL
//
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.Location = new System.Drawing.Point(301, 495);
this.btnClearL.Name = "btnClearL";
this.btnClearL.Size = new System.Drawing.Size(104, 39);
this.btnClearL.TabIndex = 14;
this.btnClearL.Text = "清理日志";
this.btnClearL.UseVisualStyleBackColor = true;
this.btnClearL.Click += new System.EventHandler(this.btnClearL_Click);
//
// btnLogDebug
//
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.Location = new System.Drawing.Point(196, 495);
this.btnLogDebug.Name = "btnLogDebug";
this.btnLogDebug.Size = new System.Drawing.Size(104, 39);
this.btnLogDebug.TabIndex = 13;
this.btnLogDebug.Text = "开启DEBUG";
this.btnLogDebug.UseVisualStyleBackColor = true;
this.btnLogDebug.Click += new System.EventHandler(this.btnLogDebug_Click);
//
// btnOLOutStopDown // btnOLOutStopDown
// //
this.btnOLOutStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOLOutStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
...@@ -488,104 +400,115 @@ ...@@ -488,104 +400,115 @@
this.btnOutL.UseVisualStyleBackColor = true; this.btnOutL.UseVisualStyleBackColor = true;
this.btnOutL.Click += new System.EventHandler(this.btnOutL_Click); this.btnOutL.Click += new System.EventHandler(this.btnOutL_Click);
// //
// groupBox5 // groupBox4
// //
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.groupBox4.Controls.Add(this.tableLayoutPanel2);
| System.Windows.Forms.AnchorStyles.Right))); this.groupBox4.Location = new System.Drawing.Point(218, 15);
this.groupBox5.Controls.Add(this.button1); this.groupBox4.Name = "groupBox4";
this.groupBox5.Controls.Add(this.txtShelfId); this.groupBox4.Size = new System.Drawing.Size(208, 251);
this.groupBox5.Controls.Add(this.txtname); this.groupBox4.TabIndex = 275;
this.groupBox5.Controls.Add(this.btnNeedEntry); this.groupBox4.TabStop = false;
this.groupBox5.Controls.Add(this.btnNeedLeave); this.groupBox4.Text = "DO列表";
this.groupBox5.Controls.Add(this.btnDis);
this.groupBox5.Controls.Add(this.btnInit);
this.groupBox5.Location = new System.Drawing.Point(450, 132);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(689, 77);
this.groupBox5.TabIndex = 277;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "AGV调度通信";
// //
// txtShelfId // tableLayoutPanel2
// //
this.txtShelfId.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.txtShelfId.Location = new System.Drawing.Point(300, 31); | System.Windows.Forms.AnchorStyles.Left)
this.txtShelfId.MaxLength = 4; | System.Windows.Forms.AnchorStyles.Right)));
this.txtShelfId.Name = "txtShelfId"; this.tableLayoutPanel2.ColumnCount = 1;
this.txtShelfId.Size = new System.Drawing.Size(53, 26); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.txtShelfId.TabIndex = 6; this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14);
this.txtShelfId.Text = "000"; this.tableLayoutPanel2.Name = "tableLayoutPanel2";
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, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(197, 231);
this.tableLayoutPanel2.TabIndex = 103;
// //
// txtname // groupBox1
// //
this.txtname.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Controls.Add(this.tableLayoutPanel1);
this.txtname.Location = new System.Drawing.Point(239, 31); this.groupBox1.Location = new System.Drawing.Point(6, 15);
this.txtname.MaxLength = 4; this.groupBox1.Name = "groupBox1";
this.txtname.Name = "txtname"; this.groupBox1.Size = new System.Drawing.Size(208, 251);
this.txtname.Size = new System.Drawing.Size(53, 26); this.groupBox1.TabIndex = 274;
this.txtname.TabIndex = 5; this.groupBox1.TabStop = false;
this.txtname.Text = "C2"; this.groupBox1.Text = "DI列表";
// //
// btnNeedEntry // tableLayoutPanel1
// //
this.btnNeedEntry.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.btnNeedEntry.Location = new System.Drawing.Point(469, 24); | System.Windows.Forms.AnchorStyles.Left)
this.btnNeedEntry.Name = "btnNeedEntry"; | System.Windows.Forms.AnchorStyles.Right)));
this.btnNeedEntry.Size = new System.Drawing.Size(100, 39); this.tableLayoutPanel1.ColumnCount = 1;
this.btnNeedEntry.TabIndex = 4; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.btnNeedEntry.Text = "NeedEntry"; this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
this.btnNeedEntry.UseVisualStyleBackColor = true; this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.btnNeedEntry.Click += new System.EventHandler(this.btnNeedEntry_Click); 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, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(197, 231);
this.tableLayoutPanel1.TabIndex = 102;
// //
// btnNeedLeave // richTextBox1
// //
this.btnNeedLeave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.btnNeedLeave.Location = new System.Drawing.Point(361, 24); | System.Windows.Forms.AnchorStyles.Left)
this.btnNeedLeave.Name = "btnNeedLeave"; | System.Windows.Forms.AnchorStyles.Right)));
this.btnNeedLeave.Size = new System.Drawing.Size(100, 39); this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNeedLeave.TabIndex = 3; this.richTextBox1.Location = new System.Drawing.Point(450, 215);
this.btnNeedLeave.Text = "NeedLeave"; this.richTextBox1.Name = "richTextBox1";
this.btnNeedLeave.UseVisualStyleBackColor = true; this.richTextBox1.Size = new System.Drawing.Size(728, 468);
this.btnNeedLeave.Click += new System.EventHandler(this.btnNeedLeave_Click); this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = "";
this.richTextBox1.VisibleChanged += new System.EventHandler(this.richTextBox1_VisibleChanged);
// //
// btnDis // groupBox3
// //
this.btnDis.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
this.btnDis.Location = new System.Drawing.Point(131, 24); | System.Windows.Forms.AnchorStyles.Right)));
this.btnDis.Name = "btnDis"; this.groupBox3.Controls.Add(this.lblWarnMsg);
this.btnDis.Size = new System.Drawing.Size(100, 39); this.groupBox3.Controls.Add(this.panel1);
this.btnDis.TabIndex = 2; this.groupBox3.Controls.Add(this.lblThisSta);
this.btnDis.Text = "断开"; this.groupBox3.Location = new System.Drawing.Point(10, 6);
this.btnDis.UseVisualStyleBackColor = true; this.groupBox3.Name = "groupBox3";
this.btnDis.Click += new System.EventHandler(this.btnDis_Click); this.groupBox3.Size = new System.Drawing.Size(1168, 124);
this.groupBox3.TabIndex = 268;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态";
// //
// btnInit // lblWarnMsg
// //
this.btnInit.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInit.Location = new System.Drawing.Point(23, 24); this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.btnInit.Name = "btnInit"; this.lblWarnMsg.Location = new System.Drawing.Point(267, 66);
this.btnInit.Size = new System.Drawing.Size(100, 39); this.lblWarnMsg.Name = "lblWarnMsg";
this.btnInit.TabIndex = 1; this.lblWarnMsg.Size = new System.Drawing.Size(856, 52);
this.btnInit.Text = "连接"; this.lblWarnMsg.TabIndex = 224;
this.btnInit.UseVisualStyleBackColor = true; this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.btnInit.Click += new System.EventHandler(this.btnInit_Click);
// //
// button1 // panel1
// //
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
this.button1.Location = new System.Drawing.Point(577, 24); | System.Windows.Forms.AnchorStyles.Right)));
this.button1.Name = "button1"; this.panel1.Controls.Add(this.chbMoveStop);
this.button1.Size = new System.Drawing.Size(100, 39); this.panel1.Controls.Add(this.lblInfo);
this.button1.TabIndex = 7; this.panel1.Controls.Add(this.btnVmiExit);
this.button1.Text = "NeedEntry"; this.panel1.Controls.Add(this.btnVmiStart);
this.button1.UseVisualStyleBackColor = true; this.panel1.Controls.Add(this.chbDebug);
this.panel1.Controls.Add(this.btnVmiStop);
this.panel1.Controls.Add(this.chbAuto);
this.panel1.Location = new System.Drawing.Point(5, 15);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1160, 48);
this.panel1.TabIndex = 273;
// //
// 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(665, 10); this.chbMoveStop.Location = new System.Drawing.Point(704, 10);
this.chbMoveStop.Name = "chbMoveStop"; this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24); this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.TabIndex = 274; this.chbMoveStop.TabIndex = 274;
...@@ -593,36 +516,116 @@ ...@@ -593,36 +516,116 @@
this.chbMoveStop.UseVisualStyleBackColor = true; this.chbMoveStop.UseVisualStyleBackColor = true;
this.chbMoveStop.CheckedChanged += new System.EventHandler(this.chbMoveStop_CheckedChanged); this.chbMoveStop.CheckedChanged += new System.EventHandler(this.chbMoveStop_CheckedChanged);
// //
// lblInfo
//
this.lblInfo.AutoSize = true;
this.lblInfo.Location = new System.Drawing.Point(277, 5);
this.lblInfo.Name = "lblInfo";
this.lblInfo.Size = new System.Drawing.Size(56, 17);
this.lblInfo.TabIndex = 273;
this.lblInfo.Text = "运行信息";
//
// btnVmiExit
//
this.btnVmiExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnVmiExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnVmiExit.Location = new System.Drawing.Point(1023, 3);
this.btnVmiExit.Name = "btnVmiExit";
this.btnVmiExit.Size = new System.Drawing.Size(132, 39);
this.btnVmiExit.TabIndex = 4;
this.btnVmiExit.Text = "退出";
this.btnVmiExit.UseVisualStyleBackColor = true;
this.btnVmiExit.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click);
//
// btnVmiStart
//
this.btnVmiStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnVmiStart.Location = new System.Drawing.Point(4, 3);
this.btnVmiStart.Name = "btnVmiStart";
this.btnVmiStart.Size = new System.Drawing.Size(132, 39);
this.btnVmiStart.TabIndex = 0;
this.btnVmiStart.Text = "启动";
this.btnVmiStart.UseVisualStyleBackColor = true;
this.btnVmiStart.Click += new System.EventHandler(this.btnVmiStart_Click);
//
// chbDebug
//
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
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.Location = new System.Drawing.Point(932, 10);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 271;
this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true;
this.chbDebug.CheckedChanged += new System.EventHandler(this.chbDebug_CheckedChanged);
//
// btnVmiStop
//
this.btnVmiStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnVmiStop.Location = new System.Drawing.Point(139, 3);
this.btnVmiStop.Name = "btnVmiStop";
this.btnVmiStop.Size = new System.Drawing.Size(132, 39);
this.btnVmiStop.TabIndex = 1;
this.btnVmiStop.Text = "停止";
this.btnVmiStop.UseVisualStyleBackColor = true;
this.btnVmiStop.Click += new System.EventHandler(this.btnVmiStop_Click);
//
// chbAuto
//
this.chbAuto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
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.Location = new System.Drawing.Point(811, 10);
this.chbAuto.Name = "chbAuto";
this.chbAuto.Size = new System.Drawing.Size(112, 24);
this.chbAuto.TabIndex = 270;
this.chbAuto.Text = "开机自动启动";
this.chbAuto.UseVisualStyleBackColor = true;
this.chbAuto.CheckedChanged += new System.EventHandler(this.chbAuto_CheckedChanged);
//
// lblThisSta
//
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.ForeColor = System.Drawing.Color.Green;
this.lblThisSta.Location = new System.Drawing.Point(8, 83);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(65, 19);
this.lblThisSta.TabIndex = 216;
this.lblThisSta.Text = "等待启动";
//
// FrmVMIClient // FrmVMIClient
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1145, 729); this.ClientSize = new System.Drawing.Size(1184, 687);
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.MaximizeBox = false;
this.Name = "FrmVMIClient"; this.Name = "FrmVMIClient";
this.Opacity = 0D; this.Opacity = 0D;
this.Text = "VMI总仓进出料架缓存线"; this.Text = "VMI总仓进出料架缓存线";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmStoreBox_FormClosed); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmStoreBox_FormClosed);
this.Load += new System.EventHandler(this.FrmTest_Load); this.Load += new System.EventHandler(this.FrmTest_Load);
this.Shown += new System.EventHandler(this.FrmStoreBox_Shown); this.Shown += new System.EventHandler(this.FrmStoreBox_Shown);
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.contextMenuStrip1.ResumeLayout(false); this.contextMenuStrip1.ResumeLayout(false);
this.groupBox4.ResumeLayout(false); this.groupBox5.ResumeLayout(false);
this.groupBox1.ResumeLayout(false); this.groupBox5.PerformLayout();
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout(); this.groupBox2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
this.groupBox5.ResumeLayout(false); this.groupBox4.ResumeLayout(false);
this.groupBox5.PerformLayout(); this.groupBox1.ResumeLayout(false);
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
......
source/VMILineClient/FrmVMIClient.cs
...@@ -309,7 +309,7 @@ namespace OnlineStore.VMILineClient ...@@ -309,7 +309,7 @@ namespace OnlineStore.VMILineClient
{ {
this.Opacity = 100; this.Opacity = 100;
this.Visible = true; this.Visible = true;
this.WindowState = FormWindowState.Maximized; this.WindowState = FormWindowState.Normal;
this.notifyIcon1.Visible = false; this.notifyIcon1.Visible = false;
this.ShowInTaskbar = true; this.ShowInTaskbar = true;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!