Skip to content

李娜 / RC1271-DUOStore

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

bug修改

1 个父辈 510c7411
内嵌 并排
正在显示 7 个修改的文件 包含 37 行增加 和 10 行删除
source/DUOStore/FrmIOStatus.Designer.cs
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
this.groupBox1.TabIndex = 105; this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入"; this.groupBox1.Text = "DO写入";
this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter);
// //
// btnCloseAll // btnCloseAll
// //
......
source/DUOStore/FrmIOStatus.cs
...@@ -139,7 +139,6 @@ namespace OnlineStore.DUOStore ...@@ -139,7 +139,6 @@ namespace OnlineStore.DUOStore
if (selectControl != null) { selectControl.BackColor = Color.White; } if (selectControl != null) { selectControl.BackColor = Color.White; }
newControl.BackColor = Color.SkyBlue; newControl.BackColor = Color.SkyBlue;
selectControl = newControl; selectControl = newControl;
selectControl = newControl;
} }
} }
} }
...@@ -171,7 +170,8 @@ namespace OnlineStore.DUOStore ...@@ -171,7 +170,8 @@ namespace OnlineStore.DUOStore
foreach (string key in DIControlList.Keys) foreach (string key in DIControlList.Keys)
{ {
IOTextControl control = DIControlList[key]; IOTextControl control = DIControlList[key];
int iov = (int)StoreManager.Store.IOValue(key ); ConfigIO io = StoreManager.Config.DIList[key];
int iov = (int)IOManager.instance.GetDIValue(io.IO_IP,0,io.GetIOAddr());
if (iov != control.IOValue) if (iov != control.IOValue)
{ {
control.IOValue = iov; control.IOValue = iov;
...@@ -181,7 +181,8 @@ namespace OnlineStore.DUOStore ...@@ -181,7 +181,8 @@ namespace OnlineStore.DUOStore
foreach (string key in this.DOControlList.Keys) foreach (string key in this.DOControlList.Keys)
{ {
IOTextControl control = DOControlList[key]; IOTextControl control = DOControlList[key];
int iov = (int)StoreManager.Store.IOValue(key ); ConfigIO io = StoreManager.Config.DOList[key];
int iov = (int)IOManager.instance.GetDOValue(io.IO_IP, 0, io.GetIOAddr());
if (iov != control.IOValue) if (iov != control.IOValue)
{ {
control.IOValue = iov; control.IOValue = iov;
...@@ -345,5 +346,10 @@ namespace OnlineStore.DUOStore ...@@ -345,5 +346,10 @@ namespace OnlineStore.DUOStore
StoreManager.Store.LineStop(null); StoreManager.Store.LineStop(null);
} }
private void groupBox1_Enter(object sender, EventArgs e)
{
}
} }
} }
source/DUOStore/FrmIOStatus.resx
...@@ -121,6 +121,6 @@ ...@@ -121,6 +121,6 @@
<value>17, 11</value> <value>17, 11</value>
</metadata> </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value> <value>87</value>
</metadata> </metadata>
</root> </root>
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/device/IO/IOManager.cs
...@@ -16,7 +16,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -16,7 +16,7 @@ namespace OnlineStore.DeviceLibrary
#region KNDIO #region KNDIO
public static void IOMove(string ioType, IO_VALUE ioValue, int subType = 0) public static void IOMove(string ioType, IO_VALUE ioValue, int subType)
{ {
ConfigIO configIo = GetDO(ioType, subType); ConfigIO configIo = GetDO(ioType, subType);
if (configIo != null) if (configIo != null)
......
source/DeviceLibrary/store/KTK_Store.cs
...@@ -460,7 +460,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -460,7 +460,7 @@ namespace OnlineStore.DeviceLibrary
public bool RunMultiAxis(bool isCheck, string serverOnDO, string breakOnDO, params AxisBean[] axisArray) public bool RunMultiAxis(bool isCheck, string serverOnDO, string breakOnDO, params AxisBean[] axisArray)
{ {
IOManager.IOMove(serverOnDO, IO_VALUE.HIGH); IOManager.IOMove(serverOnDO, IO_VALUE.HIGH, baseConfig.Id);
string msg = ""; string msg = "";
foreach (AxisBean axis in axisArray) foreach (AxisBean axis in axisArray)
{ {
...@@ -486,19 +486,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -486,19 +486,19 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
IOManager.IOMove(breakOnDO, IO_VALUE.HIGH); IOManager.IOMove(breakOnDO, IO_VALUE.HIGH, baseConfig.Id);
return true; return true;
} }
public void CloseMultiAxis(string serverOnDO, string breakOnDO, params AxisBean[] axisArray) public void CloseMultiAxis(string serverOnDO, string breakOnDO, params AxisBean[] axisArray)
{ {
IOManager.IOMove(breakOnDO, IO_VALUE.LOW); IOManager.IOMove(breakOnDO, IO_VALUE.LOW, baseConfig.Id);
foreach (AxisBean axis in axisArray) foreach (AxisBean axis in axisArray)
{ {
axis.ServoOff(); axis.ServoOff();
} }
Thread.Sleep(100); Thread.Sleep(100);
IOManager.IOMove(serverOnDO, IO_VALUE.LOW); IOManager.IOMove(serverOnDO, IO_VALUE.LOW, baseConfig.Id);
} }
public bool RunAxis(bool isCheck, AxisBean axis) public bool RunAxis(bool isCheck, AxisBean axis)
......
source/LoadCVSLibrary/storeConfig/ConfigItemBase.cs
...@@ -159,6 +159,22 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -159,6 +159,22 @@ namespace OnlineStore.LoadCSVLibrary
{ {
} }
public ConfigIO CopyIO(string suffix = "_1")
{
ConfigIO io = new ConfigIO();
io.ConfigStr = this.ConfigStr;
io.DeviceName = this.DeviceName;
io.ElectricalDefinition = this.ElectricalDefinition;
io.ProType = this.ProType;
io.SubType = this.SubType;
io.Explain = this.Explain ;
io.ProType = this.ProType;
io.ProName = this.ProName + suffix;
return io;
}
private string IP = ""; private string IP = "";
public string IO_IP public string IO_IP
......
source/LoadCVSLibrary/storeConfig/config/BaseConfig.cs
...@@ -117,6 +117,8 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -117,6 +117,8 @@ namespace OnlineStore.LoadCSVLibrary
} }
if (DIList.ContainsKey(io.ProName)) if (DIList.ContainsKey(io.ProName))
{ {
ConfigIO newIo = io.CopyIO("_2");
DIList.Add(newIo.ProName , newIo);
LogUtil.debug("配置DI：[" + io.ToString() + "] ProName重复 "); LogUtil.debug("配置DI：[" + io.ToString() + "] ProName重复 ");
} }
else else
...@@ -153,6 +155,8 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -153,6 +155,8 @@ namespace OnlineStore.LoadCSVLibrary
} }
if (DOList.ContainsKey(io.ProName)) if (DOList.ContainsKey(io.ProName))
{ {
ConfigIO newIo = io.CopyIO("_2");
DOList.Add(newIo.ProName , newIo);
LogUtil.debug("配置DO：[" + io.ToString() + "] ProName重复 "); LogUtil.debug("配置DO：[" + io.ToString() + "] ProName重复 ");
} }
else else
...@@ -165,7 +169,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -165,7 +169,7 @@ namespace OnlineStore.LoadCSVLibrary
SubDOList.Add(io.SubType, new Dictionary<string, ConfigIO>()); SubDOList.Add(io.SubType, new Dictionary<string, ConfigIO>());
} }
if (SubDOList[io.SubType].ContainsKey(io.ProName)) if (SubDOList[io.SubType].ContainsKey(io.ProName))
{ {
LogUtil.debug("配置DO：[" + io.ToString() + "] ProName重复 "); LogUtil.debug("配置DO：[" + io.ToString() + "] ProName重复 ");
} }
else else
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!