Compare commits

...

3 Commits

  1. 7
      AGVDataBaseCommunication/AGVDataBaseCommunication.csproj
  2. 24
      AGVDataBaseCommunication/CSendDeviceOrder.cs
  3. 6
      CommLayer/CommLayerFactory.csproj
  4. 6
      CommonClassLib/CommonClassLib.csproj
  5. 7
      CommonLib/CommonLib.csproj
  6. 4
      ControlMonitorClient/DBFactory.dll.config
  7. 27
      ControlMonitorClient/FrmClient.cs
  8. 88
      ControlMonitorClient/FrmControlMonitor.cs
  9. 3371
      ControlMonitorClient/FrmControlMonitor.designer.cs
  10. 2
      ControlMonitorClient/FrmControlMonitor.resx
  11. 3
      ControlMonitorClient/FrmModifyManage.cs
  12. 20
      ControlMonitorClient/FrmModifyManage.designer.cs
  13. 6
      ControlMonitorClient/Properties/Resources.Designer.cs
  14. 4
      ControlMonitorClient/Properties/Settings.Designer.cs
  15. 2
      ControlMonitorClient/Service References/WcfControlMonitor/wcfControlMonitorClient.WcfControlMonitor.DeviceStateType.datasource
  16. 2
      ControlMonitorClient/Service References/WcfControlMonitor/wcfControlMonitorClient.WcfControlMonitor.DevicesDic.datasource
  17. 2
      ControlMonitorClient/Service References/WcfControlMonitor/wcfControlMonitorClient.WcfControlMonitor.LanguageContent.datasource
  18. 2
      ControlMonitorClient/Service References/WcfControlMonitor/wcfControlMonitorClient.WcfControlMonitor.ManageTask.datasource
  19. 2
      ControlMonitorClient/Service References/WcfControlMonitor/wcfControlMonitorClient.WcfControlMonitor.MonitorTask.datasource
  20. 2
      ControlMonitorClient/Service References/WcfControlMonitor/wcfControlMonitorClient.WcfControlMonitor.ST_Cell.datasource
  21. 55
      ControlMonitorClient/app.config
  22. 19
      ControlMonitorClient/wcfControlMonitorClient.csproj
  23. 2
      DBOperator/App.config
  24. 6
      DBOperator/DBFactory.csproj
  25. 6
      ICommLayer/ICommLayer.csproj
  26. 6
      IOControlStatus/IOControlStatus.csproj
  27. 2
      Model/CGeneralFunction.cs
  28. 6
      Model/Model.csproj
  29. 4
      OPCClient/CSendDeviceOrder.cs
  30. 6
      OPCClient/OPCClient.csproj
  31. 6
      SimensSerialPort/SimensSerialPort.csproj
  32. 6
      SocketsTCPIP/SocketsTCPIP.csproj
  33. 122
      SystemConfig/Properties/Resources.Designer.cs
  34. 4
      SystemConfig/Properties/Settings.Designer.cs
  35. 6
      SystemConfig/SystemConfig.csproj
  36. 2
      SystemConfig/app.config
  37. 4
      WcfControlMonitorHost/DBFactory.dll.config
  38. 14
      WcfControlMonitorHost/FrmHost.Designer.cs
  39. 6
      WcfControlMonitorHost/FrmHost.cs
  40. 3
      WcfControlMonitorHost/FrmHost.resx
  41. 101
      WcfControlMonitorHost/Properties/Resources.Designer.cs
  42. 4
      WcfControlMonitorHost/Properties/Settings.Designer.cs
  43. 6
      WcfControlMonitorHost/WcfControlMonitorHost.csproj
  44. 76
      WcfControlMonitorHost/app.config
  45. 11
      WcfControlMonitorLib/App.config
  46. 6
      WcfControlMonitorLib/CCommonFunction.cs
  47. 386
      WcfControlMonitorLib/CControl.cs
  48. 71
      WcfControlMonitorLib/CDisassembleTask.cs
  49. 24
      WcfControlMonitorLib/CGetState.cs
  50. 258
      WcfControlMonitorLib/CObtainTask.cs
  51. 16
      WcfControlMonitorLib/CParsePLCData.cs
  52. 4
      WcfControlMonitorLib/Properties/Settings.Designer.cs
  53. 396
      WcfControlMonitorLib/SControlMonitor.cs
  54. 6
      WcfControlMonitorLib/WcfControlMonitorLib.csproj
  55. 122
      WcfControlMonitorLib/Web References/ManageService/Reference.cs

7
AGVDataBaseCommunication/AGVDataBaseCommunication.csproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,8 +10,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AGVDataBaseCommunication</RootNamespace>
<AssemblyName>AGVDataBaseCommunication</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -21,6 +22,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -29,6 +31,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

24
AGVDataBaseCommunication/CSendDeviceOrder.cs

@ -161,18 +161,18 @@ namespace AGVDataBaseCommunication
return false;
}
sql.Remove(0, sql.Length);
sql.Append("SELECT * FROM T_Monitor_Task WHERE F_DeviceIndex = 50001 and (F_Status = 1 or F_Status = 2) ").Append("and F_NumParam2 = ").Append(START_DEVICE_CODE);//and F_MonitorIndex != .Append(TaskIndex)
dvmm = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView;
if (dvmm.Count > 0)
{
//StringBuilder AheadDetectUnallow = new StringBuilder();
//AheadDetectUnallow.Clear();
//AheadDetectUnallow.Append("等待发送:存在此起点已发送或以获取但未取完货的任务!");
//UpdateAheadDetectUnallow(AheadDetectUnallow, MonitorIndex);
//_commLayerError = "AGVDataBaseCommunication.CSendDeviceOrder.SendDeviceOrder等待发送:存在此起点已发送或以获取但未取完货的任务!";
return false;
}
//sql.Remove(0, sql.Length);
//sql.Append("SELECT * FROM T_Monitor_Task WHERE F_DeviceIndex = 50001 and (F_Status = 1 or F_Status = 2) ").Append("and F_NumParam2 = ").Append(START_DEVICE_CODE);//and F_MonitorIndex != .Append(TaskIndex)
//dvmm = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView;
//if (dvmm.Count > 0)
//{
// //StringBuilder AheadDetectUnallow = new StringBuilder();
// //AheadDetectUnallow.Clear();
// //AheadDetectUnallow.Append("等待发送:存在此起点已发送或以获取但未取完货的任务!");
// //UpdateAheadDetectUnallow(AheadDetectUnallow, MonitorIndex);
// //_commLayerError = "AGVDataBaseCommunication.CSendDeviceOrder.SendDeviceOrder等待发送:存在此起点已发送或以获取但未取完货的任务!";
// return false;
//}
try
{

6
CommLayer/CommLayerFactory.csproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CommLayerFactory</RootNamespace>
<AssemblyName>CommLayerFactory</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@ -43,6 +43,7 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<UseVSHostingProcess>false</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -52,6 +53,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

6
CommonClassLib/CommonClassLib.csproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CommonClassLib</RootNamespace>
<AssemblyName>CommonClassLib</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@ -43,6 +43,7 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<UseVSHostingProcess>false</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -52,6 +53,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />

7
CommonLib/CommonLib.csproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,8 +10,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CommonLib</RootNamespace>
<AssemblyName>CommonLib</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -22,6 +23,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -30,6 +32,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

4
ControlMonitorClient/DBFactory.dll.config

@ -3,10 +3,10 @@
<appSettings>
<!-- SQL connection string for database-->
<!--<add key="ConnString" value="Server = 192.168.0.100; uid = sa; pwd =`123qwe; database = SSWCS_XZDT ; MAX Pool Size = 512 " />-->
<add key="ConnString" value="Server = DESKTOP-0ULTUHD\SQL2008; uid = sa; pwd =`123qwe; database = SSWCS_PZHDS ; MAX Pool Size = 512 " />
<add key="ConnString" value="Server = 10.11.140.250; uid = sa; pwd =`123qwe; database = SSWCS_PZHDS ; MAX Pool Size = 512 " />
<!-- OtherOLEDB connection strings -->
<!-- Oracle connection strings Data Source=Server IP/OracleServiceName-->
<add key="ManConnString" value="Server =DESKTOP-0ULTUHD\SQL2008; uid = sa; pwd =`123qwe; database = SSWCS_PZHDS ; MAX Pool Size = 512 " />
<add key="ManConnString" value="Server =10.11.140.250; uid = sa; pwd =`123qwe; database = SSWMS_PZHDS ; MAX Pool Size = 512 " />
<!--<add key="ManConnString" value="Server = 192.168.0.100; uid = sa; pwd =`123qwe; database = SSWCS_XZDT ; MAX Pool Size = 512 " />-->
<!-- DAL configuration settings. Possible values: SQLServerDBFactory for SqlServer, OracleDBFactory for Oracle
, OleDBFactory for Ole Database

27
ControlMonitorClient/FrmClient.cs

@ -181,8 +181,6 @@ namespace wcfControlMonitorClient
/// <returns></returns>
bool DealWithDeviceState(out string errtext, int deviceindex, byte[] splitbyteValue, byte[] devicestates)
{//deviceindex设备组代表的订阅,首先把设备组按照F_DBW2Address由小到大排序,拆分到具体每个设备
if(deviceindex==19001)
{ }
if ((devicestates == null))//(splitbyteValue == null) &&
{//20120420
errtext = OPCClient.CCommonOPCClient.OpcError;
@ -451,8 +449,6 @@ namespace wcfControlMonitorClient
}
public void SendMessage(string message)
{
char[] cc = new char[1] { '@' };
string[] strsplit = message.Split(cc);
if (strsplit.GetLength(0) > 1)
@ -476,27 +472,6 @@ namespace wcfControlMonitorClient
}));
}
}
//else
//{//刷新数据显示
// this.dgvManager.BeginInvoke(new MethodInvoker(delegate()
// {
// sql.Remove(0, sql.Length);
// sql.Append("select * from V_Manage_Task where ").Append(CStaticClass.Manstatus);
// this.dgvManager.DataSource = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView;
// }));
// this.dgvMonitor.BeginInvoke(new MethodInvoker(delegate()
// {
// sql.Remove(0, sql.Length);
// sql.Append("select * from V_Monitor_Task where ").Append(CStaticClass.Monstatus).Append(" order by 设备指令索引 asc ");
// this.dgvMonitor.DataSource = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView;
// }));
//}
}
//20140824richard
@ -1156,7 +1131,7 @@ namespace wcfControlMonitorClient
if (mi.S7connectOnline.Count > 0)
{
//if (mi.S7connectOnline.ContainsKey("S7 connection_1") && mi.S7connectOnline["S7 connection_1"] == 0)
if (mi.S7connectOnline.ContainsKey("S7 connection_2") && mi.S7connectOnline["S7 connection_2"] == 0)
if (mi.S7connectOnline.ContainsKey("Sc_pzhds") && mi.S7connectOnline["Sc_pzhds"] == 0)
{
MMPLCStatus1.Image = wcfControlMonitorClient.Properties.Resources.linkok;
MMPLCStatus1.ToolTipText = "与PLC连接成功";

88
ControlMonitorClient/FrmControlMonitor.cs

@ -199,7 +199,7 @@ namespace wcfControlMonitorClient
tw5 = tb1_stacker5;
}
#region tabPage2
else if (this.tab.SelectedTab.Name == "tabPage3")
else if (this.tab.SelectedTab.Name == "tabPage2")
{
pp = plAccessorial2;
@ -267,24 +267,24 @@ namespace wcfControlMonitorClient
{//¶Ñ¶â»ú
switch (device.DeviceIndex)
{
case 11001:// +46(880)/15 = 58.67
stack1.Location = new Point((int)(308 + 23.2 * (device.XCoor - 1)), stack1.Location.Y);
case 11001:// 806+40(846)/19 = 44.526
stack1.Location = new Point((int)(1271 - 44.526 * (device.XCoor-1)), stack1.Location.Y);
tw1.Location = new Point(stack1.Location.X + 16, tw1.Location.Y);
break;
case 11002://308 + 925/41=23.2
stack2.Location = new Point((int)(308 + 23.2 * (device.XCoor-1)), stack2.Location.Y);
stack2.Location = new Point((int)(1289 - 29.128 * (device.XCoor-1)), stack2.Location.Y);
tw2.Location = new Point(stack2.Location.X + 16, tw2.Location.Y);
break;
case 11003:
stack3.Location = new Point((int)(308 + 23.2 * (device.XCoor - 1)), stack3.Location.Y);
stack3.Location = new Point((int)(1289 - 29.128 * (device.XCoor-1)), stack3.Location.Y);
tw3.Location = new Point(stack3.Location.X + 16, tw3.Location.Y);
break;
case 11004:
stack4.Location = new Point((int)(308 + 23.2 * (device.XCoor - 1)), stack4.Location.Y);
stack4.Location = new Point((int)(1289 - 29.128 * (device.XCoor - 1)), stack4.Location.Y);
tw4.Location = new Point(stack4.Location.X + 16, tw4.Location.Y);
break;
case 11005:
stack5.Location = new Point((int)(308 + 23.2 * (device.XCoor - 1)), stack5.Location.Y);
stack5.Location = new Point((int)(1289 - 29.128 * (device.XCoor - 1)), stack5.Location.Y);
tw5.Location = new Point(stack5.Location.X + 16, tw5.Location.Y);
break;
@ -296,47 +296,75 @@ namespace wcfControlMonitorClient
{
case 15001:
if (device.XCoor == 1)//22006
if (device.XCoor>29000)//22019
{
stack6.Location = new Point(stack6.Location.X, 196-1);
}
else if (device.XCoor <= 29000 && device.XCoor > 27000)//22022
{
stack6.Location = new Point(stack6.Location.X, 263 -1);
}
else if (device.XCoor <= 27000 && device.XCoor > 25500)//22002
{
stack6.Location = new Point(stack6.Location.X, 291 - 1);
}
else if (device.XCoor <= 25500 && device.XCoor > 23500)//22025
{
stack6.Location = new Point(stack6.Location.X, 309 - 1);
}
else if (device.XCoor <= 23500 && device.XCoor > 21000)//22028
{
stack4.Location = new Point(stack4.Location.X, 208 + 2);
stack6.Location = new Point(stack6.Location.X, 349 - 1);
}
else if (device.XCoor == 2)//12018
else if (device.XCoor <= 21000 && device.XCoor > 19500)//22004
{
stack4.Location = new Point(stack4.Location.X, 308 + 2);
stack6.Location = new Point(stack6.Location.X, 367 - 1);
}
else if (device.XCoor == 3)//22007
else if (device.XCoor <= 19500 && device.XCoor > 18000)//22031
{
stack4.Location = new Point(stack4.Location.X, 340 + 2);
stack6.Location = new Point(stack6.Location.X, 397 - 1);
}
else if (device.XCoor == 4)//12016
else if (device.XCoor <= 18000 && device.XCoor > 17300)//22006
{
stack4.Location = new Point(stack4.Location.X, 394 + 2);
stack6.Location = new Point(stack6.Location.X, 425 - 1);
}
else if (device.XCoor == 5)//22008
else if (device.XCoor <= 17300 && device.XCoor > 15000)//22034
{
stack4.Location = new Point(stack4.Location.X, 415 + 2);
stack6.Location = new Point(stack6.Location.X, 438 - 1);
}
else if (device.XCoor == 6)//22009
else if (device.XCoor <= 15000 && device.XCoor > 14400)//22012
{
stack4.Location = new Point(stack4.Location.X, 463 + 2);
stack6.Location = new Point(stack6.Location.X, 483 - 1);
}
else if (device.XCoor == 7)//22010
else if (device.XCoor <= 14400 && device.XCoor > 12000)//22037
{
stack4.Location = new Point(stack4.Location.X, 533 + 2);
stack6.Location = new Point(stack6.Location.X, 480 - 1);
}
else if (device.XCoor == 8)//12014
else if (device.XCoor <= 12000 && device.XCoor > 10000)//22015
{
stack4.Location = new Point(stack4.Location.X, 542 + 2);
stack6.Location = new Point(stack6.Location.X, 544 - 1);
}
else if (device.XCoor == 9)//22011
else if (device.XCoor <= 10000 && device.XCoor > 7000)//22040
{
stack4.Location = new Point(stack4.Location.X, 581 + 2);
stack6.Location = new Point(stack6.Location.X, 559 - 1);
}
else if (device.XCoor == 10)//22012
else if (device.XCoor <= 7000 && device.XCoor > 64500)//22018
{
stack4.Location = new Point(stack4.Location.X, 652 + 2);
stack6.Location = new Point(stack6.Location.X, 595 - 1);
}
tw4.Location = new Point(stack4.Location.X + 9, stack4.Location.Y + 8);
else if (device.XCoor <= 64500 && device.XCoor > 5000)//22043
{
stack6.Location = new Point(stack6.Location.X, 598 - 1);
}
else if (device.XCoor <= 5000 && device.XCoor > 2000)//22046
{
stack6.Location = new Point(stack6.Location.X, 638 - 1);
}
else if (device.XCoor <= 2000)//22049
{
stack6.Location = new Point(stack6.Location.X, 678 - 1);
}
tw6.Location = new Point(stack6.Location.X + 14, stack6.Location.Y + 9);
break;
}
}
@ -1352,5 +1380,9 @@ namespace wcfControlMonitorClient
}
private void plAccessorial2_Paint(object sender, PaintEventArgs e)
{
}
}
}

3371
ControlMonitorClient/FrmControlMonitor.designer.cs

File diff suppressed because it is too large

2
ControlMonitorClient/FrmControlMonitor.resx

@ -136,7 +136,7 @@
<value>401, 12</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>39</value>
<value>25</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

3
ControlMonitorClient/FrmModifyManage.cs

@ -375,9 +375,6 @@ namespace wcfControlMonitorClient
case "µ÷¶ÈÈÎÎñË÷Òý":
df = "µ÷¶ÈÈÎÎñË÷Òý";
break;
default:
return;
}

20
ControlMonitorClient/FrmModifyManage.designer.cs

@ -70,8 +70,8 @@
//
// panel2
//
this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel2.Controls.Add(this.button3);
this.panel2.Controls.Add(this.button2);
@ -147,7 +147,7 @@
"移库",
"站台间移库"});
this.comboTaskType.Location = new System.Drawing.Point(663, 5);
this.comboTaskType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.comboTaskType.Margin = new System.Windows.Forms.Padding(4);
this.comboTaskType.Name = "comboTaskType";
this.comboTaskType.Size = new System.Drawing.Size(81, 20);
this.comboTaskType.TabIndex = 233;
@ -169,7 +169,7 @@
"1层",
"2层"});
this.comboFloor.Location = new System.Drawing.Point(984, 7);
this.comboFloor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.comboFloor.Margin = new System.Windows.Forms.Padding(4);
this.comboFloor.Name = "comboFloor";
this.comboFloor.Size = new System.Drawing.Size(56, 20);
this.comboFloor.TabIndex = 231;
@ -184,7 +184,7 @@
"18001",
"18002"});
this.comboLane.Location = new System.Drawing.Point(785, 5);
this.comboLane.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.comboLane.Margin = new System.Windows.Forms.Padding(4);
this.comboLane.Name = "comboLane";
this.comboLane.Size = new System.Drawing.Size(72, 20);
this.comboLane.TabIndex = 232;
@ -280,9 +280,9 @@
this.dgvManager.AllowUserToAddRows = false;
this.dgvManager.AllowUserToDeleteRows = false;
this.dgvManager.AllowUserToOrderColumns = true;
this.dgvManager.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.dgvManager.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.dgvManager.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
this.dgvManager.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;
this.dgvManager.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
@ -305,7 +305,7 @@
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvManager.DefaultCellStyle = dataGridViewCellStyle2;
this.dgvManager.Location = new System.Drawing.Point(0, 49);
this.dgvManager.Location = new System.Drawing.Point(2, 51);
this.dgvManager.MultiSelect = false;
this.dgvManager.Name = "dgvManager";
this.dgvManager.ReadOnly = true;
@ -318,7 +318,7 @@
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvManager.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
this.dgvManager.RowTemplate.Height = 23;
this.dgvManager.Size = new System.Drawing.Size(1179, 589);
this.dgvManager.Size = new System.Drawing.Size(1093, 553);
this.dgvManager.TabIndex = 218;
this.dgvManager.DataSourceChanged += new System.EventHandler(this.dgvManager_DataSourceChanged);
this.dgvManager.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvManager_CellDoubleClick);

6
ControlMonitorClient/Properties/Resources.Designer.cs

@ -19,7 +19,7 @@ namespace wcfControlMonitorClient.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen
// (以 /str 作为命令选项),或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@ -47,8 +47,8 @@ namespace wcfControlMonitorClient.Properties {
}
/// <summary>
/// 使用此强类型资源类,为所有资源查找
/// 重写当前线程的 CurrentUICulture 属性
/// 重写当前线程的 CurrentUICulture 属性,对
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {

4
ControlMonitorClient/Properties/Settings.Designer.cs

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.235
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
@ -12,7 +12,7 @@ namespace wcfControlMonitorClient.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.10.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

2
ControlMonitorClient/Service References/WcfControlMonitor/wcfControlMonitorClient.WcfControlMonitor.DeviceStateType.datasource

@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="DeviceStateType" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>wcfControlMonitorClient.WcfControlMonitor.DeviceStateType, Service References.WcfControlMonitor.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
<TypeInfo>wcfControlMonitorClient.WcfControlMonitor.DeviceStateType, Service References.WcfControlMonitor.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

2
ControlMonitorClient/Service References/WcfControlMonitor/wcfControlMonitorClient.WcfControlMonitor.DevicesDic.datasource

@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="DevicesDic" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>wcfControlMonitorClient.WcfControlMonitor.DevicesDic, Service References.WcfControlMonitor.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
<TypeInfo>wcfControlMonitorClient.WcfControlMonitor.DevicesDic, Service References.WcfControlMonitor.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

2
ControlMonitorClient/Service References/WcfControlMonitor/wcfControlMonitorClient.WcfControlMonitor.LanguageContent.datasource

@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="LanguageContent" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>wcfControlMonitorClient.WcfControlMonitor.LanguageContent, Service References.WcfControlMonitor.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
<TypeInfo>wcfControlMonitorClient.WcfControlMonitor.LanguageContent, Service References.WcfControlMonitor.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

2
ControlMonitorClient/Service References/WcfControlMonitor/wcfControlMonitorClient.WcfControlMonitor.ManageTask.datasource

@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ManageTask" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>wcfControlMonitorClient.WcfControlMonitor.ManageTask, Service References.WcfControlMonitor.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
<TypeInfo>wcfControlMonitorClient.WcfControlMonitor.ManageTask, Service References.WcfControlMonitor.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

2
ControlMonitorClient/Service References/WcfControlMonitor/wcfControlMonitorClient.WcfControlMonitor.MonitorTask.datasource

@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="MonitorTask" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>wcfControlMonitorClient.WcfControlMonitor.MonitorTask, Service References.WcfControlMonitor.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
<TypeInfo>wcfControlMonitorClient.WcfControlMonitor.MonitorTask, Service References.WcfControlMonitor.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

2
ControlMonitorClient/Service References/WcfControlMonitor/wcfControlMonitorClient.WcfControlMonitor.ST_Cell.datasource

@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ST_Cell" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>wcfControlMonitorClient.WcfControlMonitor.ST_Cell, Service References.WcfControlMonitor.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
<TypeInfo>wcfControlMonitorClient.WcfControlMonitor.ST_Cell, Service References.WcfControlMonitor.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

55
ControlMonitorClient/app.config

@ -1,75 +1,72 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<appSettings>
<!--记录通讯黑匣子的文件大小单位字节,默认2097152,代表2M-->
<add key="DarkCasketSize" value="2097152" />
<add key="DarkCasketSize" value="2097152"/>
<!--只保留最近记录通讯黑匣子的文件个数,默认60,代表60个-->
<add key="DarkCasketSum" value="60" />
<add key="DarkCasketSum" value="60"/>
<!--路径搜索方式:0,按照最优路径选择固定路线;1,每个正在工作的节点作为起始点,向末端节点重新搜索下一个最优路径的节点-->
<add key="RouteSearchMode" value="0" />
<add key="RouteSearchMode" value="0"/>
<!--OPC服务器的主机IP-->
<!--<add key="HostName" value="192.168.0.100:55101" />-->
<add key="HostName" value="DESKTOP-0ULTUHD" />
<add key="HostName" value="10.11.140.250"/>
<!--OPC服务的ProgID-->
<add key="OPCProgID" value="OPC.SimaticNET.S7" />
<add key="OPCProgID" value="OPC.SimaticNET.S7"/>
<!--WCS语言Chinese English-->
<add key="Language" value="English"/>
<!--移动设备是否被提前触发将取-->
<add key="MovedDeviceAheadTrigger" value="1" />
<add key="MovedDeviceAheadTrigger" value="1"/>
<!--堆垛机出库是否检测目标输送机空闲和有物-->
<add key="OutDetectArrowIdleGoods" value="1" />
<add key="OutDetectArrowIdleGoods" value="1"/>
<!--设备发生故障自动变更路径-->
<add key="DeviceErrorAutoModifyRoutePath" value="1" />
<add key="DeviceErrorAutoModifyRoutePath" value="1"/>
<!--输送超时最大允许时间单位(分钟):默认5分钟-->
<add key="TransportTimeout" value="5" />
<add key="TransportTimeout" value="5"/>
<!--双叉关联入库任务允许等待的时间单位(秒):默认30秒-->
<add key="DoubleForkWaitTime" value="30" />
<add key="DoubleForkWaitTime" value="30"/>
<!--AGV是否允许单叉动作,:默认双叉一起动作 0-->
<add key="AGVAllowSingleFork" value="1" />
<add key="AGVAllowSingleFork" value="1"/>
<!--登陆OPC Server的用户标识-->
<add key="OPCUsername" value="siasun" />
<add key="OPCUsername" value="siasun"/>
<!--登陆OPC Server的密码-->
<add key="OPCPassword" value="{opc123}" />
<add key="OPCPassword" value="{opc123}"/>
<!--调度系统显示的名称-->
<add key="SystemName" value="智能物流系统-【WCS客户端】" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
<add key="ClientSettingsProvider.ConnectionStringName" value="DefaultConnection" />
<add key="SystemName" value="智能物流系统-【WCS客户端】"/>
<add key="ClientSettingsProvider.ServiceUri" value=""/>
<add key="ClientSettingsProvider.ConnectionStringName" value="DefaultConnection"/>
</appSettings>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" connectionStringName="DefaultConnection" credentialsProvider="" />
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" connectionStringName="DefaultConnection" credentialsProvider=""/>
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" connectionStringName="DefaultConnection" />
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" connectionStringName="DefaultConnection"/>
</providers>
</roleManager>
</system.web>
<system.serviceModel>
<bindings>
<netTcpBinding>
<binding name="NetTcpBinding_IControlMonitor" receiveTimeout="23:59:59"
maxBufferPoolSize="5242888" maxReceivedMessageSize="6553688">
<security mode="None" />
<binding name="NetTcpBinding_IControlMonitor" receiveTimeout="23:59:59" maxBufferPoolSize="5242888" maxReceivedMessageSize="6553688">
<security mode="None"/>
</binding>
</netTcpBinding>
</bindings>
<client>
<endpoint address="net.tcp://DESKTOP-0ULTUHD:1028/" binding="netTcpBinding"
bindingConfiguration="NetTcpBinding_IControlMonitor" contract="WcfControlMonitor.IControlMonitor"
name="NetTcpBinding_IControlMonitor">
<endpoint address="net.tcp://10.11.140.250:1028/" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IControlMonitor" contract="WcfControlMonitor.IControlMonitor" name="NetTcpBinding_IControlMonitor">
<identity>
<dns value="DESKTOP-0ULTUHD" />
<dns value="10.11.140.250"/>
</identity>
</endpoint>
</client>
</system.serviceModel>
<connectionStrings>
<add name="DefaultConnection" connectionString="Data Source = |SQL/CE|" />
<add name="DefaultConnection" connectionString="Data Source = |SQL/CE|"/>
</connectionStrings>
</configuration>
</configuration>

19
ControlMonitorClient/wcfControlMonitorClient.csproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@ -10,15 +10,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>wcfControlMonitorClient</RootNamespace>
<AssemblyName>wcfControlMonitorClient</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<IsWebBootstrapper>true</IsWebBootstrapper>
<PublishUrl>http://192.168.1.20:1015/</PublishUrl>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>D:\WCS\</PublishUrl>
<Install>true</Install>
<InstallFrom>Web</InstallFrom>
<UpdateEnabled>true</UpdateEnabled>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
@ -30,9 +30,8 @@
<ProductName>智能物流调度系统WCS客户端</ProductName>
<PublisherName>新松机器人自动化股份有限公司</PublisherName>
<SuiteName>智能物流调度系统WCS</SuiteName>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>pub.htm</WebPage>
<ApplicationRevision>21</ApplicationRevision>
<ApplicationRevision>54</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
@ -50,6 +49,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
@ -59,6 +59,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Resources\Monitor.ico</ApplicationIcon>
@ -92,6 +93,7 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<OutputPath>bin\Release\</OutputPath>
@ -108,6 +110,7 @@
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetSAPI">

2
DBOperator/App.config

@ -24,4 +24,4 @@
-->
</appSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

6
DBOperator/DBFactory.csproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DBFactory</RootNamespace>
<AssemblyName>DBFactory</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@ -43,6 +43,7 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<UseVSHostingProcess>false</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -52,6 +53,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

6
ICommLayer/ICommLayer.csproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ICommLayer</RootNamespace>
<AssemblyName>ICommLayer</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@ -43,6 +43,7 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<UseVSHostingProcess>false</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -52,6 +53,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

6
IOControlStatus/IOControlStatus.csproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IOControlStatus</RootNamespace>
<AssemblyName>IOControlStatus</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@ -43,6 +43,7 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<UseVSHostingProcess>false</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -52,6 +53,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

2
Model/CGeneralFunction.cs

@ -2095,7 +2095,7 @@ namespace Model
}
public const string DBSend = "DB1";
public const string DBGet = "DB1";
public const string DBGet = "DB2";
/// <summary>
/// 20110216根据ReadSubscription标识找到此订阅的开始设备

6
Model/Model.csproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Model</RootNamespace>
<AssemblyName>Model</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@ -43,6 +43,7 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<UseVSHostingProcess>false</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -52,6 +53,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

4
OPCClient/CSendDeviceOrder.cs

@ -937,6 +937,10 @@ namespace OPCClient
// devinfo = Model.CGetInfo.GetDeviceInfo(nowdev);
//}
int[] sendmes = new int[5] { MessageIndex, TaskIndex, Order, DeviceIndex, ArrowDeviceIndex };
if (((Order == 1 || Order == 2))&&(devinfo.DeviceKind !=4))
{
ArrowDeviceIndex = DeviceIndex;
}
devinfo.SendMessage = sendmes;
Model.CGetInfo.SetDeviceMessage(devinfo);
int sn = 0;

6
OPCClient/OPCClient.csproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -12,7 +12,7 @@
<AssemblyName>OPCClient</AssemblyName>
<StartupObject>
</StartupObject>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@ -45,6 +45,7 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<UseVSHostingProcess>false</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -54,6 +55,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />

6
SimensSerialPort/SimensSerialPort.csproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SimensSerialPort</RootNamespace>
<AssemblyName>SimensSerialPort</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@ -43,6 +43,7 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<UseVSHostingProcess>false</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -52,6 +53,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

6
SocketsTCPIP/SocketsTCPIP.csproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SocketsTCPIP</RootNamespace>
<AssemblyName>SocketsTCPIP</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@ -43,6 +43,7 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<UseVSHostingProcess>false</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -52,6 +53,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

122
SystemConfig/Properties/Resources.Designer.cs

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.1
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
@ -19,7 +19,7 @@ namespace SystemConfig.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen
// (以 /str 作为命令选项),或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@ -47,8 +47,8 @@ namespace SystemConfig.Properties {
}
/// <summary>
/// 使用此强类型资源类,为所有资源查找
/// 重写当前线程的 CurrentUICulture 属性
/// 重写当前线程的 CurrentUICulture 属性,对
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
@ -60,6 +60,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap AGV1 {
get {
object obj = ResourceManager.GetObject("AGV1", resourceCulture);
@ -67,6 +70,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap AGV2 {
get {
object obj = ResourceManager.GetObject("AGV2", resourceCulture);
@ -74,6 +80,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap box1 {
get {
object obj = ResourceManager.GetObject("box1", resourceCulture);
@ -81,6 +90,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap CARD3 {
get {
object obj = ResourceManager.GetObject("CARD3", resourceCulture);
@ -88,6 +100,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap Conveyor1 {
get {
object obj = ResourceManager.GetObject("Conveyor1", resourceCulture);
@ -95,6 +110,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap Conveyor2 {
get {
object obj = ResourceManager.GetObject("Conveyor2", resourceCulture);
@ -102,6 +120,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap Conveyor3 {
get {
object obj = ResourceManager.GetObject("Conveyor3", resourceCulture);
@ -109,6 +130,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap Conveyor4 {
get {
object obj = ResourceManager.GetObject("Conveyor4", resourceCulture);
@ -116,6 +140,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap Conveyor5 {
get {
object obj = ResourceManager.GetObject("Conveyor5", resourceCulture);
@ -123,6 +150,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap Conveyor6 {
get {
object obj = ResourceManager.GetObject("Conveyor6", resourceCulture);
@ -130,6 +160,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap Conveyor7 {
get {
object obj = ResourceManager.GetObject("Conveyor7", resourceCulture);
@ -137,6 +170,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap ErrAGV1 {
get {
object obj = ResourceManager.GetObject("ErrAGV1", resourceCulture);
@ -144,6 +180,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap ErrAGV2 {
get {
object obj = ResourceManager.GetObject("ErrAGV2", resourceCulture);
@ -151,6 +190,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap ErrConveyor1 {
get {
object obj = ResourceManager.GetObject("ErrConveyor1", resourceCulture);
@ -158,6 +200,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap ErrConveyor2 {
get {
object obj = ResourceManager.GetObject("ErrConveyor2", resourceCulture);
@ -165,6 +210,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap ErrConveyor3 {
get {
object obj = ResourceManager.GetObject("ErrConveyor3", resourceCulture);
@ -172,6 +220,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap ErrConveyor4 {
get {
object obj = ResourceManager.GetObject("ErrConveyor4", resourceCulture);
@ -179,6 +230,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap ErrConveyor5 {
get {
object obj = ResourceManager.GetObject("ErrConveyor5", resourceCulture);
@ -186,6 +240,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap ErrConveyor6 {
get {
object obj = ResourceManager.GetObject("ErrConveyor6", resourceCulture);
@ -193,6 +250,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap ErrConveyor7 {
get {
object obj = ResourceManager.GetObject("ErrConveyor7", resourceCulture);
@ -200,6 +260,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap ErrScanner {
get {
object obj = ResourceManager.GetObject("ErrScanner", resourceCulture);
@ -207,6 +270,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap ErrStack1 {
get {
object obj = ResourceManager.GetObject("ErrStack1", resourceCulture);
@ -214,6 +280,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap GoodsAGV1 {
get {
object obj = ResourceManager.GetObject("GoodsAGV1", resourceCulture);
@ -221,6 +290,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap GoodsAGV2 {
get {
object obj = ResourceManager.GetObject("GoodsAGV2", resourceCulture);
@ -228,6 +300,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap GoodsConveyor1 {
get {
object obj = ResourceManager.GetObject("GoodsConveyor1", resourceCulture);
@ -235,6 +310,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap GoodsConveyor2 {
get {
object obj = ResourceManager.GetObject("GoodsConveyor2", resourceCulture);
@ -242,6 +320,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap GoodsConveyor3 {
get {
object obj = ResourceManager.GetObject("GoodsConveyor3", resourceCulture);
@ -249,6 +330,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap GoodsConveyor4 {
get {
object obj = ResourceManager.GetObject("GoodsConveyor4", resourceCulture);
@ -256,6 +340,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap GoodsConveyor5 {
get {
object obj = ResourceManager.GetObject("GoodsConveyor5", resourceCulture);
@ -263,6 +350,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap GoodsConveyor6 {
get {
object obj = ResourceManager.GetObject("GoodsConveyor6", resourceCulture);
@ -270,6 +360,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap GoodsConveyor7 {
get {
object obj = ResourceManager.GetObject("GoodsConveyor7", resourceCulture);
@ -277,6 +370,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap GoodsScanner {
get {
object obj = ResourceManager.GetObject("GoodsScanner", resourceCulture);
@ -284,6 +380,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap GoodsStack1 {
get {
object obj = ResourceManager.GetObject("GoodsStack1", resourceCulture);
@ -291,6 +390,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap pallet1 {
get {
object obj = ResourceManager.GetObject("pallet1", resourceCulture);
@ -298,6 +400,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap pallet2 {
get {
object obj = ResourceManager.GetObject("pallet2", resourceCulture);
@ -305,6 +410,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap Scanner {
get {
object obj = ResourceManager.GetObject("Scanner", resourceCulture);
@ -312,6 +420,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap Stack1 {
get {
object obj = ResourceManager.GetObject("Stack1", resourceCulture);
@ -319,6 +430,9 @@ namespace SystemConfig.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap {
get {
object obj = ResourceManager.GetObject("新松", resourceCulture);

4
SystemConfig/Properties/Settings.Designer.cs

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.1
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
@ -12,7 +12,7 @@ namespace SystemConfig.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

6
SystemConfig/SystemConfig.csproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -19,7 +19,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@ -52,6 +52,7 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<UseVSHostingProcess>false</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -61,6 +62,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />

2
SystemConfig/app.config

@ -1,3 +1,3 @@
<?xml version="1.0"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

4
WcfControlMonitorHost/DBFactory.dll.config

@ -2,11 +2,11 @@
<configuration>
<appSettings>
<!-- SQL connection string for database-->
<add key="ConnString" value="Server = DESKTOP-0ULTUHD\SQL2008; uid = sa; pwd =`123qwe; database = SSWCS_PZHDS ; MAX Pool Size = 512 " />
<add key="ConnString" value="Server = 10.11.140.250; uid = sa; pwd =`123qwe; database = SSWCS_PZHDS ; MAX Pool Size = 512 " />
<!--<add key="ConnString" value="Server = 192.168.0.100; uid = sa; pwd =`123qwe; database = SSWCS_XZDT ; MAX Pool Size = 512 " />-->
<!-- OtherOLEDB connection strings -->
<!-- Oracle connection strings Data Source=Server IP/OracleServiceName-->
<add key="ManConnString" value="Server = DESKTOP-0ULTUHD\SQL2008; uid = sa; pwd =`123qwe; database = SSWCS_PZHDS ; MAX Pool Size = 512 " />
<add key="ManConnString" value="Server =10.11.140.250; uid = sa; pwd =`123qwe; database = SSWMS_PZHDS ; MAX Pool Size = 512 " />
<!--<add key="ManConnString" value="Server = 192.168.1.30; uid = sa; pwd =`123qwe; database = WMS_HYFG ; MAX Pool Size = 512 " />-->
<!--<add key="ManConnString" value="Server = 192.168.0.100; uid = sa; pwd =`123qwe; database = WMS_HYFG ; MAX Pool Size = 512 " />-->
<!-- DAL configuration settings. Possible values: SQLServerDBFactory for SqlServer, OracleDBFactory for Oracle

14
WcfControlMonitorHost/FrmHost.Designer.cs

@ -93,9 +93,9 @@
//
// listBox1
//
this.listBox1.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.listBox1.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.listBox1.FormattingEnabled = true;
this.listBox1.HorizontalScrollbar = true;
this.listBox1.ItemHeight = 12;
@ -194,8 +194,8 @@
//
// tsStatus
//
this.tsStatus.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tsStatus.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tsStatus.BackColor = System.Drawing.SystemColors.ControlLight;
this.tsStatus.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.tsStatus.Font = new System.Drawing.Font("黑体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@ -225,8 +225,8 @@
//
// listBox2
//
this.listBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right)));
this.listBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right)));
this.listBox2.FormattingEnabled = true;
this.listBox2.ItemHeight = 12;
this.listBox2.Location = new System.Drawing.Point(706, 46);

6
WcfControlMonitorHost/FrmHost.cs

@ -192,8 +192,8 @@ namespace wcfControlMonitorClient
private ServiceHost policyHost = null;
private void FrmHost_Load(object sender, EventArgs e)
{
MITurnOn_Click(sender, e);
MIStartRetrieveTask_Click(sender, e);
//MITurnOn_Click(sender, e);
//MIStartRetrieveTask_Click(sender, e);
}
private void MIDataClear_Click(object sender, EventArgs e)
{
@ -1081,7 +1081,7 @@ namespace wcfControlMonitorClient
// MMConnection1.Image = wcfControlMonitorClient.Properties.Resources.linkerror;
//}
if (mi.S7connectOnline.ContainsKey("S7 connection_2") && mi.S7connectOnline["S7 connection_2"] == 0)
if (mi.S7connectOnline.ContainsKey("Sc_pzhds") && mi.S7connectOnline["Sc_pzhds"] == 0)
{
MMConnection1.Image = wcfControlMonitorClient.Properties.Resources.linkok;
//MMConnection2.Image = wcfControlMonitorClient.Properties.Resources.linkok;

3
WcfControlMonitorHost/FrmHost.resx

@ -681,6 +681,9 @@
<metadata name="timerGetAgvState.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>551, 56</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>117</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAgIAAAAEACAAoTAAAFgAAACgAAACAAAAAAAEAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

101
WcfControlMonitorHost/Properties/Resources.Designer.cs

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.1
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
@ -19,7 +19,7 @@ namespace wcfControlMonitorClient.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen
// (以 /str 作为命令选项),或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@ -47,8 +47,8 @@ namespace wcfControlMonitorClient.Properties {
}
/// <summary>
/// 使用此强类型资源类,为所有资源查找
/// 重写当前线程的 CurrentUICulture 属性
/// 重写当前线程的 CurrentUICulture 属性,对
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
@ -60,6 +60,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
/// </summary>
internal static System.Drawing.Icon _11 {
get {
object obj = ResourceManager.GetObject("_11", resourceCulture);
@ -67,6 +70,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
/// </summary>
internal static System.Drawing.Icon call_modul_volume_add {
get {
object obj = ResourceManager.GetObject("call_modul_volume_add", resourceCulture);
@ -74,6 +80,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap call_modul_volume_reduce {
get {
object obj = ResourceManager.GetObject("call_modul_volume_reduce", resourceCulture);
@ -81,6 +90,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
/// </summary>
internal static System.Drawing.Icon ERGO {
get {
object obj = ResourceManager.GetObject("ERGO", resourceCulture);
@ -88,6 +100,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
/// </summary>
internal static System.Drawing.Icon Icon_02 {
get {
object obj = ResourceManager.GetObject("Icon_02", resourceCulture);
@ -95,6 +110,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
/// </summary>
internal static System.Drawing.Icon Icon_03 {
get {
object obj = ResourceManager.GetObject("Icon_03", resourceCulture);
@ -102,6 +120,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap linkerror {
get {
object obj = ResourceManager.GetObject("linkerror", resourceCulture);
@ -109,6 +130,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap linkok {
get {
object obj = ResourceManager.GetObject("linkok", resourceCulture);
@ -116,6 +140,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap LOGO {
get {
object obj = ResourceManager.GetObject("LOGO", resourceCulture);
@ -123,6 +150,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap LOGO1 {
get {
object obj = ResourceManager.GetObject("LOGO1", resourceCulture);
@ -130,6 +160,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
/// </summary>
internal static System.Drawing.Icon Monitor {
get {
object obj = ResourceManager.GetObject("Monitor", resourceCulture);
@ -137,6 +170,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap MSN {
get {
object obj = ResourceManager.GetObject("MSN", resourceCulture);
@ -144,6 +180,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap MSN1 {
get {
object obj = ResourceManager.GetObject("MSN1", resourceCulture);
@ -151,6 +190,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap MSN2 {
get {
object obj = ResourceManager.GetObject("MSN2", resourceCulture);
@ -158,6 +200,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
/// </summary>
internal static System.Drawing.Icon OOFL {
get {
object obj = ResourceManager.GetObject("OOFL", resourceCulture);
@ -165,6 +210,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap ProgressError {
get {
object obj = ResourceManager.GetObject("ProgressError", resourceCulture);
@ -172,6 +220,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap ProgressSuccess {
get {
object obj = ResourceManager.GetObject("ProgressSuccess", resourceCulture);
@ -179,6 +230,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap Role {
get {
object obj = ResourceManager.GetObject("Role", resourceCulture);
@ -186,6 +240,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap SCDCNCLL {
get {
object obj = ResourceManager.GetObject("SCDCNCLL", resourceCulture);
@ -193,6 +250,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
/// </summary>
internal static System.Drawing.Icon SCDRESPL {
get {
object obj = ResourceManager.GetObject("SCDRESPL", resourceCulture);
@ -200,6 +260,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
/// </summary>
internal static System.Drawing.Icon search {
get {
object obj = ResourceManager.GetObject("search", resourceCulture);
@ -207,6 +270,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap shelf {
get {
object obj = ResourceManager.GetObject("shelf", resourceCulture);
@ -214,6 +280,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
/// </summary>
internal static System.Drawing.Icon tab_callhistory_save {
get {
object obj = ResourceManager.GetObject("tab_callhistory_save", resourceCulture);
@ -221,6 +290,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
/// </summary>
internal static System.Drawing.Icon verifydialog {
get {
object obj = ResourceManager.GetObject("verifydialog", resourceCulture);
@ -228,6 +300,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
/// </summary>
internal static System.Drawing.Icon zip_file {
get {
object obj = ResourceManager.GetObject("zip_file", resourceCulture);
@ -235,6 +310,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap shelf {
get {
object obj = ResourceManager.GetObject("原料shelf", resourceCulture);
@ -242,6 +320,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap shelf {
get {
object obj = ResourceManager.GetObject("成品shelf", resourceCulture);
@ -249,6 +330,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap {
get {
object obj = ResourceManager.GetObject("新松", resourceCulture);
@ -256,6 +340,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap shelf {
get {
object obj = ResourceManager.GetObject("聊城shelf", resourceCulture);
@ -263,6 +350,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap shelf {
get {
object obj = ResourceManager.GetObject("辅料shelf", resourceCulture);
@ -270,6 +360,9 @@ namespace wcfControlMonitorClient.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap shelf {
get {
object obj = ResourceManager.GetObject("青海shelf", resourceCulture);

4
WcfControlMonitorHost/Properties/Settings.Designer.cs

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.235
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
@ -12,7 +12,7 @@ namespace wcfControlMonitorClient.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

6
WcfControlMonitorHost/WcfControlMonitorHost.csproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>wcfControlMonitorClient</RootNamespace>
<AssemblyName>WcfControlMonitorHost</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
@ -53,6 +53,7 @@
</DocumentationFile>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<UseVSHostingProcess>false</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
@ -62,6 +63,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Resources\11.ico</ApplicationIcon>

76
WcfControlMonitorHost/app.config

@ -1,15 +1,15 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<configuration>
<system.web>
<compilation debug="true" />
<compilation debug="true"/>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
</providers>
</roleManager>
</system.web>
@ -21,7 +21,7 @@
<bindings>
<netTcpBinding>
<binding>
<security mode="None" />
<security mode="None"/>
</binding>
</netTcpBinding>
</bindings>
@ -29,7 +29,7 @@
<service name="WcfControlMonitorLib.SControlMonitor">
<endpoint address="" binding="netTcpBinding" contract="WcfControlMonitorLib.IControlMonitor">
<identity>
<dns value="DESKTOP-0ULTUHD" />
<dns value="10.11.140.250"/>
<!--PC-20181027PUNM-->
</identity>
</endpoint>
@ -41,11 +41,11 @@
</endpoint>
-->
<endpoint address="mex1" binding="mexTcpBinding" contract="IMetadataExchange" />
<endpoint address="mex1" binding="mexTcpBinding" contract="IMetadataExchange"/>
<!-- <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" /> -->
<host>
<baseAddresses>
<add baseAddress="net.tcp://DESKTOP-0ULTUHD:1028" />
<add baseAddress="net.tcp://10.11.140.250:1028"/>
<!-- <add baseAddress="http://DESKTOP-0ULTUHD:4523" /> -->
@ -58,68 +58,68 @@
<behavior>
<!-- 为避免泄漏元数据信息,
请在部署前将以下值设置为 false 并删除上面的元数据终结点 -->
<serviceMetadata httpGetEnabled="false" />
<serviceMetadata httpGetEnabled="false"/>
<!-- 要接收故障异常详细信息以进行调试,
请将以下值设置为 true。在部署前设置为 false
以避免泄漏异常信息-->
<serviceDebug includeExceptionDetailInFaults="False" />
<serviceDebug includeExceptionDetailInFaults="False"/>
</behavior>
</serviceBehaviors>
</behaviors>
</system.serviceModel>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
</startup>
<appSettings>
<!--记录通讯黑匣子的文件大小单位字节,默认2097152,代表2M-->
<add key="DarkCasketSize" value="2097152" />
<add key="DarkCasketSize" value="2097152"/>
<!--只保留最近记录通讯黑匣子的文件个数,默认60,代表60个-->
<add key="DarkCasketSum" value="60" />
<add key="DarkCasketSum" value="60"/>
<!--路径搜索方式:0,按照最优路径选择固定路线;1,每个正在工作的节点作为起始点,向末端节点重新搜索下一个最优路径的节点-->
<add key="RouteSearchMode" value="0" />
<add key="RouteSearchMode" value="0"/>
<!--OPC服务器的主机IP :4845-->
<add key="HostName" value="DESKTOP-0ULTUHD" />
<add key="HostName" value="10.11.140.250"/>
<!--OPC服务的ProgID-->
<add key="OPCProgID" value="OPC.SimaticNET.S7" />
<add key="OPCProgID" value="OPC.SimaticNET.S7"/>
<!--WCS语言Chinese English-->
<add key="Language" value="Chinese" />
<add key="Language" value="Chinese"/>
<!--移动设备是否被提前触发将取-->
<add key="MovedDeviceAheadTrigger" value="0" />
<add key="MovedDeviceAheadTrigger" value="0"/>
<!--堆垛机出库是否检测目标输送机空闲和有物-->
<add key="OutDetectArrowIdleGoods" value="1" />
<add key="OutDetectArrowIdleGoods" value="1"/>
<!--设备发生故障自动变更路径-->
<add key="DeviceErrorAutoModifyRoutePath" value="0" />
<add key="DeviceErrorAutoModifyRoutePath" value="0"/>
<!--输送超时最大允许时间单位(分钟):默认5分钟-->
<add key="TransportTimeout" value="5" />
<add key="TransportTimeout" value="5"/>
<!--多叉关联入库任务允许等待的时间单位(秒):默认30秒-->
<add key="DoubleForkWaitTime" value="10" />
<add key="DoubleForkWaitTime" value="10"/>
<!--保存历史任务记录的时间:默认60天-->
<add key="SaveDays" value="60" />
<add key="SaveDays" value="60"/>
<!--终点相同的出库任务执行的最大数量-->
<add key="OutTaskCounts" value="4" />
<add key="OutTaskCounts" value="4"/>
<!--终点相同的出库任务执行的最大数量到筒体拆垛机器人21001-->
<add key="OutTaskCounts1" value="4" />
<add key="OutTaskCounts1" value="4"/>
<!--终点到箱体拆垛机器人21002-->
<add key="OutTaskCounts2" value="6" />
<add key="OutTaskCounts2" value="6"/>
<!--终点到拆盘机的任务-->
<add key="OutTaskCounts3" value="2" />
<add key="HCA12068" value="6" />
<add key="OutTaskCounts3" value="2"/>
<add key="HCA12068" value="6"/>
<!--siasun自定义-->
<add key="AGVTaskCount" value="EGSwQd5K5jo0+aIQBu95AnFoN9ddu1IuvRUnAXNYQ80=" />
<add key="AGVTaskCount" value="EGSwQd5K5jo0+aIQBu95AnFoN9ddu1IuvRUnAXNYQ80="/>
<!--化成B出库包含12019的不能超过4个-->
<add key="HCB12019" value="4" />
<add key="HCB12019" value="4"/>
<!--化成B去倒箔间和回库的任务包含12034等待执行的不能超过3个-->
<add key="HCB12034" value="3" />
<add key="HCB12034" value="3"/>
<!--立库到化成B倒箔间任务每个巷道最多两个-->
<add key="HCBLanewayOutDB" value="2" />
<add key="HCBLanewayOutDB" value="2"/>
<!--socket发送任务的时间间隔毫秒值-->
<add key="SendTimeSpan" value="300" />
<add key="SendTimeSpan" value="300"/>
<!--执行任务的堆垛机,0表示不指定堆垛机-->
<add key="WorkStack" value="0" />
<add key="WorkStack" value="0"/>
<!--调度系统显示的名称-->
<add key="SystemName" value="自动物流系统服务端" />
<add key="StockCodeCheck" value="^[B|D|G|P][A-Z][0-9]{4}$" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
<add key="SystemName" value="自动物流系统服务端"/>
<add key="StockCodeCheck" value="^[B|D|G|P][A-Z][0-9]{4}$"/>
<add key="ClientSettingsProvider.ServiceUri" value=""/>
</appSettings>
</configuration>
</configuration>

11
WcfControlMonitorLib/App.config

@ -1,9 +1,9 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<configuration>
<configSections>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="WcfControlMonitorLib.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="WcfControlMonitorLib.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
</sectionGroup>
</configSections>
<system.web>
@ -12,11 +12,10 @@
<!-- 部署服务库项目时,必须将配置文件的内容添加到
主机的 app.config 文件中。System.Configuration 不支持库的配置文件。-->
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
<applicationSettings>
<WcfControlMonitorLib.Properties.Settings>
<setting name="WcfControlMonitorLib_ManageService_S_ManageService"
serializeAs="String">
<setting name="WcfControlMonitorLib_ManageService_S_ManageService" serializeAs="String">
<value>http://192.168.0.118:9090/Service/ManageService</value>
</setting>
</WcfControlMonitorLib.Properties.Settings>

6
WcfControlMonitorLib/CCommonFunction.cs

@ -1086,7 +1086,7 @@ namespace WcfControlMonitorLib
dv = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView;
if (dv.Count > 0)
{
return Convert.ToInt32(dv[0]["fcontroltasktype"]);
return Convert.ToInt32(dv[0]["FSTARTDEVICE"]);
}
else
{
@ -1125,7 +1125,7 @@ namespace WcfControlMonitorLib
dv = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView;
if (dv.Count > 0)
{
return Convert.ToInt32(dv[0]["fcontroltasktype"]);
return Convert.ToInt32(dv[0]["FENDDEVICE"]);
}
else
{
@ -1638,7 +1638,7 @@ namespace WcfControlMonitorLib
rr[0] = dv[0]["F_RGVGateDeviceIndex"].ToString();
rr[1] = dv[0]["F_Device_Stop"].ToString();
rr[2] = dv[0]["F_Device_Allow"].ToString();
//rr[3] = dv[0]["F_Input"].ToString();
//rr[3] = dv[0]["F_Allow_Device"].ToString();
//rr[4] = dv[0]["F_Output"].ToString();
//rr[5] = dv[0]["F_Top"].ToString();
//rr[6] = dv[0]["F_Left"].ToString();

386
WcfControlMonitorLib/CControl.cs

@ -3117,9 +3117,9 @@ namespace WcfControlMonitorLib
////}
if ((tempZ == 1) || (tempZ == 5) || (tempZ == 11) || (tempZ == 15) || (tempZ == 4) || (tempZ == 10) || (tempZ == 14) || (tempZ == 18))//里位取货时,要判读是否有外位的取货任务)//里位取货时,要判读是否有外位的取货任务
if ((tempZ == 3) || (tempZ == 6) || (tempZ == 7) || (tempZ == 10) || (tempZ == 11) || (tempZ == 14) || (tempZ == 15) || (tempZ == 18))//里位取货时,要判读是否有外位的取货任务)//里位取货时,要判读是否有外位的取货任务
{//获取外位坐标
if ((tempZ == 1) || (tempZ == 5) || (tempZ == 11) || (tempZ == 15))
if ((tempZ == 3) || (tempZ == 7) || (tempZ == 11) || (tempZ == 15))
{
newZ=getZ+1;
}
@ -3165,9 +3165,9 @@ namespace WcfControlMonitorLib
////{
// tempZ =sendZ%4;
////}
if ((tempZ == 2) || (tempZ == 6) || (tempZ == 12) || (tempZ == 16) || (tempZ == 3) || (tempZ == 9) || (tempZ == 13) || (tempZ == 17))//外位送货时,要判读是否有里位的送货任务
if ((tempZ == 4) || (tempZ == 5) || (tempZ == 8) || (tempZ == 9) || (tempZ == 12) || (tempZ == 13) || (tempZ == 16) || (tempZ == 17))//外位送货时,要判读是否有里位的送货任务
{//获取里位坐标
if ((tempZ == 2) || (tempZ == 6) || (tempZ == 12) || (tempZ == 16))
if ((tempZ == 4) || (tempZ == 8) || (tempZ == 12) || (tempZ == 16))
{
newZ = sendZ - 1;
}
@ -4402,14 +4402,10 @@ namespace WcfControlMonitorLib
if (GetFirstDeviceIFLocked(MonitorIndex, true) == false)//没有被锁定,空闲
{
for (int g = 0; g < 3; g++)//控制入库不能在输送线上停盘
{
}
//攀枝花当升控制投料层,双向输送线顶牛
if ((deviceIdx == 15001) && (deviceOrder == 2) && (TaskControlType == 1))//执行穿梭车入库取货任务
if ((deviceIdx == 15001) && (deviceOrder == 2) && ((TaskControlType == 1)))//执行穿梭车入库取货任务
{
DataView dvRouteN = dbo.ExceSQL(string.Format("SELECT * FROM T_Manage_Task WHERE FCONTROLTASKTYPE =2 and FSTATUS > 0 and FSTARTDEVICE = {0} and FENDDEVICE > 22020 and FENDDEVICE < 22049 and FCurrentLocation < 22019", ManageEnddeviceIndex)).Tables[0].DefaultView;
DataView dvRouteN = dbo.ExceSQL(string.Format("SELECT * FROM T_Manage_Task WHERE FCONTROLTASKTYPE =2 and FSTATUS > 0 and FSTARTDEVICE = {0} and FENDDEVICE > 22020 and FENDDEVICE < 22052 and FCurrentLocation < 22019", ManageEnddeviceIndex)).Tables[0].DefaultView;
if (dvRouteN.Count > 0)//存在已执行的投料口出库任务
{
AheadDetectUnallow.Clear();
@ -4419,14 +4415,29 @@ namespace WcfControlMonitorLib
}
}
if (((deviceIdx == 11001) || (deviceIdx == 11002) || (deviceIdx == 11003) || (deviceIdx == 11004) || (deviceIdx == 11005)) && (deviceOrder == 4) && (TaskControlType == 2) && (ManageEnddeviceIndex > 22020) && (ManageEnddeviceIndex < 22049))//执行垛机投料口取货任务
//if (ManageStartDeviceIndex == 22006 && TaskControlType == 4 && (ManageEnddeviceIndex == 12056 || ManageEnddeviceIndex == 12059))
if (((ManageStartDeviceIndex == 22006) || (ManageStartDeviceIndex == 22021)||(ManageStartDeviceIndex == 22048)) && (TaskControlType == 4) && (deviceIdx == 15001) && (deviceOrder == 2) && (ManageEnddeviceIndex == 12056 || ManageEnddeviceIndex == 12059))
{
DataView dvRoutegj = dbo.ExceSQL(string.Format("SELECT * FROM T_Monitor_Task WHERE F_ManageTaskIndex = {0} and F_DeviceIndex >=11001 and F_DeviceIndex <= 11005", manageTaskIdx)).Tables[0].DefaultView;
if (dvRoutegj.Count > 0)//
{
DataView dvRoutejN = dbo.ExceSQL(string.Format("SELECT * FROM T_Manage_Task WHERE FCONTROLTASKTYPE =2 and FSTATUS > 0 and FSTARTDEVICE = {0} and FENDDEVICE > 22020 and FENDDEVICE < 22052 and FCurrentLocation < 22019", Convert.ToInt32(dvRoutegj[0]["F_DeviceIndex"])+7000)).Tables[0].DefaultView;
if (dvRoutejN.Count > 0)//存在已执行的投料口出库任务
{
AheadDetectUnallow.Clear();
AheadDetectUnallow.Append("所用巷道存在已经运行出库任务且位置已经进入冲撞区");
UpdateAheadDetectUnallow(AheadDetectUnallow, MonitorIndex);
return false;
}
}
}
if ((devinfo.DeviceKind == 1) && (deviceOrder == 4) && (TaskControlType == 2) && (ManageEnddeviceIndex > 22020) && (ManageEnddeviceIndex < 22052))//执行垛机投料口取货任务
{
//for (int g = 0; g < 3; g++)//控制出库不能在输送线上停盘
//{
//}
DataView dvRouteJ = dbo.ExceSQL(string.Format("SELECT * FROM T_Manage_Task WHERE FCONTROLTASKTYPE =1 and FENDDEVICE = {0} and (FSTARTDEVICE = 22021 or FSTARTDEVICE = 22006 or FSTARTDEVICE = 22012)", ManageStartDeviceIndex)).Tables[0].DefaultView;// and FCurrentLocation < 22019//and FSTATUS > 0
DataView dvRouteJ = dbo.ExceSQL(string.Format("SELECT * FROM T_Manage_Task WHERE (FCONTROLTASKTYPE =1 and FENDDEVICE = {0} and (FSTARTDEVICE = 22021 or FSTARTDEVICE = 22012 or FSTARTDEVICE = 22006 or FSTARTDEVICE = 22048)) ", ManageStartDeviceIndex)).Tables[0].DefaultView;//or (FSTARTDEVICE = 22006 and FCONTROLTASKTYPE = 4 and FENDDEVICE = {0}) and FCurrentLocation < 22019//and FSTATUS > 0
if (dvRouteJ.Count > 0)//存在已执行的对应巷道3楼入库库任务,且已经运行到穿梭车货巷道对应输送线上或穿梭车上
{
AheadDetectUnallow.Clear();
@ -4434,6 +4445,48 @@ namespace WcfControlMonitorLib
UpdateAheadDetectUnallow(AheadDetectUnallow, MonitorIndex);
return false;
}
DataView dvRouteJN= dbo.ExceSQL("SELECT * FROM T_Manage_Task WHERE ((FSTARTDEVICE = 22006 or FSTARTDEVICE = 22021 or FSTARTDEVICE = 22048)and FCONTROLTASKTYPE = 4 and (FENDDEVICE = 12056 or FENDDEVICE = 12059) and ((FCurrentLocation < 22052 and FCurrentLocation >= 22001) or FCurrentLocation = 0 or FCurrentLocation = 15001))").Tables[0].DefaultView;// and FCurrentLocation < 22019//and FSTATUS > 0
for(int k = 0;k< dvRouteJN.Count;k++)//存在已执行的对应巷道3楼入库库任务,且已经运行到穿梭车货巷道对应输送线上或穿梭车上
{
DataView dvRouteGJN = dbo.ExceSQL(string.Format("SELECT * FROM T_Monitor_Task WHERE (F_DeviceIndex ={1} and F_ManageTaskIndex = {0})", Convert.ToInt32(dvRouteJN[k]["FID"]),devinfo.DeviceIndex)).Tables[0].DefaultView;//or (FSTARTDEVICE = 22006 and FCONTROLTASKTYPE = 4 and FENDDEVICE = {0}) and FCurrentLocation < 22019//and FSTATUS > 0
if (dvRouteGJN.Count > 0)
{
AheadDetectUnallow.Clear();
AheadDetectUnallow.Append("经过此垛机的子托盘垛任务已经存在且位置没有移除冲撞区");
UpdateAheadDetectUnallow(AheadDetectUnallow, MonitorIndex);
return false;
}
}
//if (TaskControlType == 2 && ManageEnddeviceIndex > 22020 && ManageEnddeviceIndex< 22052)
{
DataView dvRouteN = dbo.ExceSQL(string.Format("SELECT * FROM T_Manage_Task WHERE FCONTROLTASKTYPE =2 and FENDDEVICE = {0} and FSTATUS > 0 and FID != {1}", ManageEnddeviceIndex, manageTaskIdx)).Tables[0].DefaultView;// and FCurrentLocation < 22019//and FSTATUS > 0
if (dvRouteN.Count > 0)//存在对应口的已执行任务或有货
{
AheadDetectUnallow.Clear();
AheadDetectUnallow.Append("已经存在出库到本终点的运行任务");
UpdateAheadDetectUnallow(AheadDetectUnallow, MonitorIndex);
return false;
}
int countgood = 0;
for (int j = 0; j < 3; j++)
{
Model.MDevice devinfoX = Model.CGetInfo.GetDeviceInfo(ManageEnddeviceIndex - j);
countgood += devinfoX.SplitByte_0;
countgood += devinfoX.RunState;
}
if (countgood > 0)
{
AheadDetectUnallow.Clear();
AheadDetectUnallow.Append("对应终点输送线状态不正确");
UpdateAheadDetectUnallow(AheadDetectUnallow, MonitorIndex);
return false;
}
}
}
devinfo = Model.CGetInfo.GetDeviceInfo(deviceIdx);
@ -4467,11 +4520,130 @@ namespace WcfControlMonitorLib
}
else if (deviceKind == 6)//agv
{
DataView dvmm = new DataView();
sql.Remove(0, sql.Length);
sql.Append("SELECT * FROM T_Monitor_Task WHERE F_DeviceIndex = 50001 and (F_Status = 1 or F_Status = 2 ) ").Append("and F_NumParam2 != 22055 and F_NumParam2 = ").Append(gc[0]).Append("and F_MonitorIndex != ").Append(MonitorIndex.ToString());//or F_Status = 0
dvmm = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView;
if (dvmm.Count > 0)
{
StringBuilder AheadDetectUnallow = new StringBuilder();
AheadDetectUnallow.Clear();
AheadDetectUnallow.Append("等待发送:存在此起点已发送或以获取但未取完货的任务!");
UpdateAheadDetectUnallow(AheadDetectUnallow, MonitorIndex);
return false;
}
if (gc[3] == 22073)
{
//Model.MDevice devinfo22073 = Model.CGetInfo.GetDeviceInfo(22073);
//if (devinfo22073.SplitByte_0 == 1 && gc[3] == 22073)
//{
// StringBuilder AheadDetectUnallow = new StringBuilder();
// AheadDetectUnallow.Clear();
// AheadDetectUnallow.Append("等待发送:终点有货!");
// UpdateAheadDetectUnallow(AheadDetectUnallow, MonitorIndex);
// return false;
//}
sql.Remove(0, sql.Length);
sql.Append("SELECT * FROM T_Monitor_Task WHERE F_DeviceIndex = 50001 and F_Status != 0 and F_NumParam2 = 22055 and F_NumParam5 = 22073");//.Append("and F_MonitorIndex != ").Append(MonitorIndex.ToString());//or F_Status = 0
dvmm = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView;
if (dvmm.Count > 0)
{
StringBuilder AheadDetectUnallow = new StringBuilder();
AheadDetectUnallow.Clear();
AheadDetectUnallow.Append("等待发送:存在此起点和终点未完成的任务!");
UpdateAheadDetectUnallow(AheadDetectUnallow, MonitorIndex);
return false;
}
}
int iTaskLevel = ccf.GetTaskLevel(manageTaskIdx);
string strPalletBarcode = ccf.GetBarCodeFromManageTask(manageTaskIdx, manageKindIdx);
sendok = sdo.SendDeviceOrder(MonitorIndex, iTaskLevel, strPalletBarcode, gc[0].ToString(), gc[3].ToString(), 0, 0, DateTime.Now);
//int TaskIndex, int TASK_LEVEL, string PALLET_BARCODE, string START_DEVICE_CODE, string FINISH_DEVICE_CODE, int status, int agvcode, DateTime time
if (gc[3].ToString() == "15010")
{
StringBuilder[] wv = new StringBuilder[1] { new StringBuilder("") };
StringBuilder[] witemnames = new StringBuilder[1] { new StringBuilder("") };
if (gc[0].ToString() == "12066")
{
Model.MDevice devinfo12066 = Model.CGetInfo.GetDeviceInfo(12066);
sdo = CommModeCreate.CreateSendDeviceOrder(12066);
StringBuilder sbsG = new StringBuilder();
sbsG.Remove(0, sbsG.Length);
sbsG.Append("select END_DEVICE_CODE from IO_CONTROL where CONTROL_ID = ").Append(manageTaskIdx);
DataView dvtG = CStaticClass.dboM.ExceSQL(sbsG.ToString()).Tables[0].DefaultView;
if (dvtG.Count > 0)
{
witemnames[0].Remove(0, witemnames[0].Length);
witemnames[0].Append(Model.CGeneralFunction.DBSend).Append(".").Append(2350).Append(",b");//20130510
wv[0].Remove(0, wv[0].Length);
wv[0].Append(Convert.ToString(dvtG[0]["END_DEVICE_CODE"]));
sdo.WriteDBData(witemnames, wv, devinfo12066.S7Connection);
CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "AGV:12066取货任务", "任务号:"+ MonitorIndex.ToString(), "终点:"+ Convert.ToString(dvtG[0]["END_DEVICE_CODE"]) );
Model.CGeneralFunction.ActionComplete(deviceIdx, MonitorIndex, 1);
sendok = true;
}
else
{
sendok = false;
}
}
else if (gc[0].ToString() == "12888")
{
Model.MDevice devinfo12888 = Model.CGetInfo.GetDeviceInfo(12888);
sdo = CommModeCreate.CreateSendDeviceOrder(12888);
StringBuilder sbsG = new StringBuilder();
sbsG.Remove(0, sbsG.Length);
sbsG.Append("select END_DEVICE_CODE from IO_CONTROL where CONTROL_ID = ").Append(manageTaskIdx);
DataView dvtG = CStaticClass.dboM.ExceSQL(sbsG.ToString()).Tables[0].DefaultView;
if (dvtG.Count > 0)
{
witemnames[0].Remove(0, witemnames[0].Length);
witemnames[0].Append(Model.CGeneralFunction.DBSend).Append(".").Append(2360).Append(",b");//20130510
wv[0].Remove(0, wv[0].Length);
wv[0].Append(Convert.ToString(dvtG[0]["END_DEVICE_CODE"]));
sdo.WriteDBData(witemnames, wv, devinfo12888.S7Connection);
CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "AGV:12888取货任务", "任务号:" + MonitorIndex.ToString(), "终点:" + Convert.ToString(dvtG[0]["END_DEVICE_CODE"]));
Model.CGeneralFunction.ActionComplete(deviceIdx, MonitorIndex, 1);
sendok = true;
}
else
{
sendok = false;
}
}
else
{
sendok = false;
}
}
else
{
if (gc[0].ToString() == "15010")
{
StringBuilder sbsG = new StringBuilder();
sbsG.Remove(0, sbsG.Length);
sbsG.Append("select START_DEVICE_CODE from IO_CONTROL where CONTROL_ID = ").Append(manageTaskIdx);
DataView dvtG = CStaticClass.dboM.ExceSQL(sbsG.ToString()).Tables[0].DefaultView;
if (dvtG.Count > 0)
{
gc[0] = Convert.ToInt32(dvtG[0]["START_DEVICE_CODE"]);
}
}
sendok = sdo.SendDeviceOrder(MonitorIndex, iTaskLevel, strPalletBarcode, gc[0].ToString(), gc[3].ToString(), 0, 0, DateTime.Now);
}
//sendok = sdo.SendDeviceOrder(MonitorIndex, iTaskLevel, strPalletBarcode, gc[0].ToString(), gc[3].ToString(), 0, 0, DateTime.Now);
////int TaskIndex, int TASK_LEVEL, string PALLET_BARCODE, string START_DEVICE_CODE, string FINISH_DEVICE_CODE, int status, int agvcode, DateTime time
}
else if (_DeviceKind == 4)
@ -4489,76 +4661,87 @@ namespace WcfControlMonitorLib
}
else if (_DeviceKind == 7)
{
#region 攀枝花当升出库上报称重
//int ControlType = ccf.GetFCONTROLTASKTYPEFromManageTask(_ManageKindIdx, _ManageTaskIdx);
if (devinfo.DeviceIndex == 16005 || devinfo.DeviceIndex == 16006)
{
AheadDetectUnallow.Clear();
AheadDetectUnallow.Append("等待称重结果");
UpdateAheadDetectUnallow(AheadDetectUnallow, MonitorIndex);
return false;
}
#endregion
int ControlType = ccf.GetFCONTROLTASKTYPEFromManageTask(_ManageKindIdx, _ManageTaskIdx);
#region 条码设备直接比对
DataView dv = dbo.ExceSQL(string.Format("SELECT F_MonitorIndex FROM T_Base_PLC_Ask ,T_Monitor_Task WHERE T_Base_PLC_Ask.F_DeviceIndex = T_Monitor_Task.F_DeviceIndex AND T_Base_PLC_Ask.F_BarCode = T_Monitor_Task.F_TxtParam and (T_Monitor_Task.F_MonitorIndex = {0})", MonitorIndex)).Tables[0].DefaultView;
if ((dv.Count > 0) || (ControlType != 1))
{//比对正确
object[] obj = new object[3] { _ManageKindIdx, _ManageTaskIdx, Model.CGeneralFunction.TASKABEND };
dbo.ExecuteSql(string.Format("UPDATE T_Manage_Task SET FExceptionNO=NULL WHERE (F_ManageTaskKindIndex ={0}) AND (FID ={1}) and FExceptionNO={2}", obj));
//DataView dv = dbo.ExceSQL(string.Format("SELECT F_MonitorIndex FROM T_Base_PLC_Ask ,T_Monitor_Task WHERE T_Base_PLC_Ask.F_DeviceIndex = T_Monitor_Task.F_DeviceIndex AND T_Base_PLC_Ask.F_BarCode = T_Monitor_Task.F_TxtParam and (T_Monitor_Task.F_MonitorIndex = {0})", MonitorIndex)).Tables[0].DefaultView;
//if ((dv.Count > 0) || (ControlType != 1))
//{//比对正确
// object[] obj = new object[3] { _ManageKindIdx, _ManageTaskIdx, Model.CGeneralFunction.TASKABEND };
// dbo.ExecuteSql(string.Format("UPDATE T_Manage_Task SET FExceptionNO=NULL WHERE (F_ManageTaskKindIndex ={0}) AND (FID ={1}) and FExceptionNO={2}", obj));
Model.CGeneralFunction.ActionComplete(deviceIdx, MonitorIndex, 0);
}
else
{//比对错误,改道异常处理口
//修改目标位置至异常口
dv = dbo.ExceSQL(string.Format("SELECT F_Remark,F_BindingDevice,F_BarCode FROM T_Base_PLC_Ask WHERE T_Base_PLC_Ask.F_DeviceIndex = {0}", deviceIdx)).Tables[0].DefaultView;
if (dv.Count > 0)
{
if ((CStaticClass.DeviceErrorAutoModifyRoutePath == "1") && (dv[0]["F_BarCode"].ToString().IndexOf("11111") < 0))
{
object[] obj = new object[5] { _ManageKindIdx, _ManageTaskIdx, Convert.ToInt32(dv[0]["F_Remark"]), Model.CGeneralFunction.TASKABEND, Convert.ToInt32(dv[0]["F_BindingDevice"]) };
dbo.ExecuteSql(string.Format("UPDATE T_Manage_Task SET FExceptionNO={3},FSTARTDEVICE ={4}, FSTARTCELL ='-',FENDDEVICE ={2}, FENDCELL ='-', FENDUCODE =0 WHERE (F_ManageTaskKindIndex ={0}) AND (FID ={1})", obj));
ccf.GetUseableRouteIDSubAndModifyRoute(_ManageTaskIdx, _ManageKindIdx, Convert.ToInt32(dv[0]["F_BindingDevice"]));
}
else
{
Model.MError me;
if (dv[0]["F_BarCode"].ToString() == "-")//扫描器未读条码
{
me = null;
Model.CGeneralFunction.ActionComplete(deviceIdx, MonitorIndex, 0);
//me = Model.CGetInfo.GetErrorInfo(732);
//dbo.ExecuteSql(string.Format("update T_Monitor_Task set F_Status=32 WHERE (T_Monitor_Task.F_MonitorIndex = {0})", MonitorIndex));
}
else if (dv[0]["F_BarCode"].ToString().IndexOf("11111") >= 0)
{//"1111111111"条码未读到
object[] obj = new object[3] { _ManageKindIdx, _ManageTaskIdx, Model.CGeneralFunction.TASKABEND };
dbo.ExecuteSql(string.Format("UPDATE T_Manage_Task SET FExceptionNO={2} WHERE (F_ManageTaskKindIndex ={0}) AND (FID ={1})", obj));
// Model.CGeneralFunction.ActionComplete(deviceIdx, MonitorIndex, 0);
//}
//else
//{//比对错误,改道异常处理口
// //修改目标位置至异常口
// dv = dbo.ExceSQL(string.Format("SELECT F_Remark,F_BindingDevice,F_BarCode FROM T_Base_PLC_Ask WHERE T_Base_PLC_Ask.F_DeviceIndex = {0}", deviceIdx)).Tables[0].DefaultView;
// if (dv.Count > 0)
// {
// if ((CStaticClass.DeviceErrorAutoModifyRoutePath == "1") && (dv[0]["F_BarCode"].ToString().IndexOf("11111") < 0))
// {
// object[] obj = new object[5] { _ManageKindIdx, _ManageTaskIdx, Convert.ToInt32(dv[0]["F_Remark"]), Model.CGeneralFunction.TASKABEND, Convert.ToInt32(dv[0]["F_BindingDevice"]) };
// dbo.ExecuteSql(string.Format("UPDATE T_Manage_Task SET FExceptionNO={3},FSTARTDEVICE ={4}, FSTARTCELL ='-',FENDDEVICE ={2}, FENDCELL ='-', FENDUCODE =0 WHERE (F_ManageTaskKindIndex ={0}) AND (FID ={1})", obj));
// ccf.GetUseableRouteIDSubAndModifyRoute(_ManageTaskIdx, _ManageKindIdx, Convert.ToInt32(dv[0]["F_BindingDevice"]));
// }
// else
// {
// Model.MError me;
// if (dv[0]["F_BarCode"].ToString() == "-")//扫描器未读条码
// {
// me = null;
// Model.CGeneralFunction.ActionComplete(deviceIdx, MonitorIndex, 0);
// //me = Model.CGetInfo.GetErrorInfo(732);
// //dbo.ExecuteSql(string.Format("update T_Monitor_Task set F_Status=32 WHERE (T_Monitor_Task.F_MonitorIndex = {0})", MonitorIndex));
// }
// else if (dv[0]["F_BarCode"].ToString().IndexOf("11111") >= 0)
// {//"1111111111"条码未读到
// object[] obj = new object[3] { _ManageKindIdx, _ManageTaskIdx, Model.CGeneralFunction.TASKABEND };
// dbo.ExecuteSql(string.Format("UPDATE T_Manage_Task SET FExceptionNO={2} WHERE (F_ManageTaskKindIndex ={0}) AND (FID ={1})", obj));
Model.CGeneralFunction.ActionComplete(deviceIdx, MonitorIndex, 0);
//dbo.ExecuteSql(string.Format("update T_Monitor_Task set F_Status=30 WHERE (T_Monitor_Task.F_MonitorIndex = {0})", MonitorIndex));
me = Model.CGetInfo.GetErrorInfo(730);
// Model.CGeneralFunction.ActionComplete(deviceIdx, MonitorIndex, 0);
// //dbo.ExecuteSql(string.Format("update T_Monitor_Task set F_Status=30 WHERE (T_Monitor_Task.F_MonitorIndex = {0})", MonitorIndex));
// me = Model.CGetInfo.GetErrorInfo(730);
}
else
{//条码不正确
object[] obj = new object[3] { _ManageKindIdx, _ManageTaskIdx, Model.CGeneralFunction.TASKABEND };
dbo.ExecuteSql(string.Format("UPDATE T_Manage_Task SET FExceptionNO={2} WHERE (F_ManageTaskKindIndex ={0}) AND (FID ={1})", obj));
// }
// else
// {//条码不正确
// object[] obj = new object[3] { _ManageKindIdx, _ManageTaskIdx, Model.CGeneralFunction.TASKABEND };
// dbo.ExecuteSql(string.Format("UPDATE T_Manage_Task SET FExceptionNO={2} WHERE (F_ManageTaskKindIndex ={0}) AND (FID ={1})", obj));
Model.CGeneralFunction.ActionComplete(deviceIdx, MonitorIndex, 0);
// dbo.ExecuteSql(string.Format("update T_Monitor_Task set F_Status=31 WHERE (T_Monitor_Task.F_MonitorIndex = {0})", MonitorIndex));
me = Model.CGetInfo.GetErrorInfo(731);
// Model.CGeneralFunction.ActionComplete(deviceIdx, MonitorIndex, 0);
// // dbo.ExecuteSql(string.Format("update T_Monitor_Task set F_Status=31 WHERE (T_Monitor_Task.F_MonitorIndex = {0})", MonitorIndex));
// me = Model.CGetInfo.GetErrorInfo(731);
}
if (me != null)
{
RefreshMonitorEventArgs rmea = new RefreshMonitorEventArgs("notifyIcon1", "警告:" + devinfo.DeviceName + "," + deviceIdx + "发生故障:" + me.ErrorName);
OnRefreshMonitor(rmea);
}
}
if (_ManageKindIdx == 1)
{
sql.Remove(0, sql.Length);
sql.Append("update IO_Control set ERROR_TEXT='").Append(devinfo.DeviceName).Append(",").Append(deviceIdx).Append("条码不正确!").Append("' where CONTROL_ID=").Append(manageTaskIdx);
dboM.ExceSQL(sql.ToString());
}
}
}
//20130709 dbo.ExecuteSql(string.Format("UPDATE T_Base_PLC_Ask SET F_BarCode = '-' WHERE (F_DeviceIndex = {0}) ", deviceIdx));
// }
// if (me != null)
// {
// RefreshMonitorEventArgs rmea = new RefreshMonitorEventArgs("notifyIcon1", "警告:" + devinfo.DeviceName + "," + deviceIdx + "发生故障:" + me.ErrorName);
// OnRefreshMonitor(rmea);
// }
// }
// if (_ManageKindIdx == 1)
// {
// sql.Remove(0, sql.Length);
// sql.Append("update IO_Control set ERROR_TEXT='").Append(devinfo.DeviceName).Append(",").Append(deviceIdx).Append("条码不正确!").Append("' where CONTROL_ID=").Append(manageTaskIdx);
// dboM.ExceSQL(sql.ToString());
// }
// }
//}
//20130709 dbo.ExecuteSql(string.Format("UPDATE T_Base_PLC_Ask SET F_BarCode = '-' WHERE (F_DeviceIndex = {0}) ", deviceIdx));
#endregion
return true;
#endregion
return true;
}
else if (_DeviceKind == 8)
{//20130510在订阅处理称重任务和重量
@ -4608,6 +4791,53 @@ namespace WcfControlMonitorLib
// //do nothing
// }
//}
StringBuilder[] wv = new StringBuilder[1] { new StringBuilder("") };
StringBuilder[] witemnames = new StringBuilder[1] { new StringBuilder("") };
if ((devinfo.DeviceIndex == 12069) && (gc[5] != 12888))
{
sql.Remove(0, sql.Length);
sql.Append("select MODEL from AGV_MODEL");
DataView dvgjn = dboM.ExceSQL(sql.ToString()).Tables[0].DefaultView;
if (dvgjn.Count > 0)
{
if (dvgjn[0]["MODEL"].ToString() == "0")
{
Model.MDevice devinfo12888 = Model.CGetInfo.GetDeviceInfo(12888);
sdo = CommModeCreate.CreateSendDeviceOrder(12888);
StringBuilder sbsG = new StringBuilder();
witemnames[0].Remove(0, witemnames[0].Length);
witemnames[0].Append(Model.CGeneralFunction.DBSend).Append(".").Append(2360).Append(",b");//20130510
wv[0].Remove(0, wv[0].Length);
wv[0].Append("1");
sdo.WriteDBData(witemnames, wv, devinfo12888.S7Connection);
CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "12069入库", "任务号:" + MonitorIndex.ToString(), "释放12888AGV车辆 写入:1");
}
}
}
if((devinfo.DeviceIndex == 12066) && (deviceOrder == 6))//(gc[5] != 12066))&&()
{
sql.Remove(0, sql.Length);
sql.Append("select MODEL from AGV_MODEL");
DataView dvgjn = dboM.ExceSQL(sql.ToString()).Tables[0].DefaultView;
if (dvgjn.Count > 0)
{
if (dvgjn[0]["MODEL"].ToString() == "0")
{
Model.MDevice devinfo12066 = Model.CGetInfo.GetDeviceInfo(12066);
sdo = CommModeCreate.CreateSendDeviceOrder(12066);
witemnames[0].Remove(0, witemnames[0].Length);
witemnames[0].Append(Model.CGeneralFunction.DBSend).Append(".").Append(2350).Append(",b");//20130510
wv[0].Remove(0, wv[0].Length);
wv[0].Append("1");
sdo.WriteDBData(witemnames, wv, devinfo12066.S7Connection);
CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "12066入库", "任务号:" + MonitorIndex.ToString(), "释放12066AGV车辆 写入:1");
}
}
}
sendok = sdo.SendDeviceOrder(msgIdx, MonitorIndex, deviceOrder, deviceIdx, gc[5]);
}

71
WcfControlMonitorLib/CDisassembleTask.cs

@ -1052,6 +1052,7 @@ namespace WcfControlMonitorLib
{
//选择最短调度路径并且判断此路径上是否有设备发生故障
routeid = MinRouteID(Convert.ToInt32(dv[j]["FSTARTDEVICE"]), Convert.ToInt32(dv[j]["FENDDEVICE"]), dv[j]["FUseAwayFork"]);
//routeid = 122001;
if (routeid == -1)
{
if (CStaticClass.DeviceErrorAutoModifyRoutePath == "1")
@ -1334,7 +1335,7 @@ namespace WcfControlMonitorLib
//选择最短调度路径并且判断此路径上是否有设备发生故障
routeid = MinRouteID(Convert.ToInt32(dv[j]["FSTARTDEVICE"]), Convert.ToInt32(dv[j]["FENDDEVICE"]), dv[j]["FUseAwayFork"]);
//routeid = 64001;
//routeid =23001;
if (routeid == -1)
{
@ -1386,7 +1387,8 @@ namespace WcfControlMonitorLib
{
//选择最短调度路径并且判断此路径上是否有设备发生故障
routeid = MinRouteID(Convert.ToInt32(dvM[i]["FSTARTDEVICE"]), Convert.ToInt32(dvM[i]["FENDDEVICE"]), dvM[i]["FUseAwayFork"]);
routeid = 108001;
//routeid = 206001;
if (routeid == -1)
{
@ -2174,6 +2176,7 @@ namespace WcfControlMonitorLib
case 1:
#region 堆垛机
if (NextKeyDevice[3] == -1) continue;
string getdetecttask = "";//攀枝花当升添加移动设备对接jiaoyanrenwu
AheadDetect.Remove(0, AheadDetect.Length);//20101124
#region 3、4楼的巷道的同一U型移库操作//20111020
if (NextDevice.Count > 0 && PriorDevice.Count > 0)
@ -2514,6 +2517,7 @@ namespace WcfControlMonitorLib
//如果NextDevice是固定站台则取送货命令,获取堆垛机送坐标
Coor0_2 = GetStackCoordinateFromLaneGate(NextKeyDevice[0], PriorDevice[0], true);
getdetecttask = ";R" + PriorDevice[0].ToString();//攀枝花当升添加取货校验是否为当前对应任务
}
Coor[0] = Coor0_2[0];
@ -2863,6 +2867,7 @@ namespace WcfControlMonitorLib
}
//AheadDetect .Append( ";" ).Append( GetBeDetectedDevices(NextKeyDevice[0]));//20101124
AheadDetect .Append( ";" ).Append( GetBeDetectedDevices(keydevice));//20101124
AheadDetect.Append(getdetecttask);
//取货
//if (DeviceAndOrderExitInMonitor(Mankind, ManFID, NextKeyDevice[0], 4, 0, Coor) == false)
if (DeviceAndOrderExitInMonitor(Mankind, ManFID, keydevice, 4, 0, Coor) == false)
@ -3605,18 +3610,13 @@ namespace WcfControlMonitorLib
//rr[0] = dv[0]["F_RGVGateDeviceIndex"].ToString();
//rr[1] = dv[0]["F_Device_Stop"].ToString();
//rr[2] = dv[0]["F_Device_Allow"].ToString();
//rr[2] = dv[0]["F_Device_Allow"].ToString();
string[] cdi = ccf.GetRRGVwayDeviceInfoFromRGVGate(NextKeyDevice[0], NextDevice[0]);///2020 3 23 gaojianan
if (cdi != null)
{
// //if (cdi[1] != "")
// //{
// // AheadDetect.Append(";D-").Append(cdi[1]);
// //}
if (cdi[1] != "")//检测非联机停车
if ((cdi[1] != "") && ((Convert.ToString(drv["FCONTROLTASKTYPE"]) == "1") || (Convert.ToString(drv["FCONTROLTASKTYPE"]) == "4")))//pzhds检测穿梭车入库第二节输送线无货
{
AheadDetect.Append(";D-").Append(cdi[1]);
AheadDetect.Append(cdi[1]);
}
if (cdi[2] != "")
{
@ -3648,26 +3648,21 @@ namespace WcfControlMonitorLib
AheadDetect.Append(";D-").Append(tw.ToString());//20180303
}
//rr[0] = dv[0]["F_RGVGateDeviceIndex"].ToString();
//rr[1] = dv[0]["F_Device_Stop"].ToString();
//rr[2] = dv[0]["F_Device_Allow"].ToString();
string[] cdii = ccf.GetRRGVwayDeviceInfoFromRGVGate(NextKeyDevice[0], PriorDevice[0]);///2020 3 23 gaojianan
if (cdii != null)
////rr[0] = dv[0]["F_RGVGateDeviceIndex"].ToString();
////rr[1] = dv[0]["F_Device_Stop"].ToString();
////rr[2] = dv[0]["F_Device_Allow"].ToString();
string[] cdii = ccf.GetRRGVwayDeviceInfoFromRGVGate(NextKeyDevice[0], PriorDevice[0]);///2020 3 23 gaojianan
if (cdii != null)
{
if ((cdii[1] != "") && ((Convert.ToString(drv["FCONTROLTASKTYPE"]) == "1") || (Convert.ToString(drv["FCONTROLTASKTYPE"]) == "4")))//pzhds检测穿梭车入库第二节输送线无货
{
// //if (cdi[1] != "")
// //{
// // AheadDetect.Append(";D-").Append(cdi[1]);
// //}
if (cdii[1] != "")//检测非联机停车
{
AheadDetect.Append(";D-").Append(cdii[1]);
}
if (cdii[2] != "")
{
AheadDetect.Append(";D-").Append(cdii[2]);//目标输送机允许穿梭车动作
}
AheadDetect.Append(cdii[1]);
}
if (cdii[2] != "")
{
AheadDetect.Append(";D-").Append(cdii[2]);//目标输送机允许穿梭车动作
}
}
@ -3774,14 +3769,9 @@ namespace WcfControlMonitorLib
string[] cdii = ccf.GetRRGVwayDeviceInfoFromRGVGate(NextKeyDevice[0], NextDevice[0]);///2020 3 23 gaojianan
if (cdii != null)
{
// //if (cdi[1] != "")
// //{
// // AheadDetect.Append(";D-").Append(cdi[1]);
// //}
if (cdii[1] != "")//检测非联机停车
if ((cdii[1] != "") && ((Convert.ToString(drv["FCONTROLTASKTYPE"]) == "1")||(Convert.ToString(drv["FCONTROLTASKTYPE"]) == "4")))//pzhds检测穿梭车入库第二节输送线无货
{
AheadDetect.Append(";D-").Append(cdii[1]);
AheadDetect.Append(cdii[1]);
}
if (cdii[2] != "")
{
@ -3820,9 +3810,6 @@ namespace WcfControlMonitorLib
}
break;
#endregion
case 6:
#region AGV
@ -3982,8 +3969,8 @@ namespace WcfControlMonitorLib
if (DeviceAndOrderExitInMonitor(Mankind, ManFID, NextKeyDevice[0], agvorder, 0, Coor) == false)//出库搬运指令对申请出库无影响,暂不发送 20170914
{
AheadDetect.Remove(0, AheadDetect.Length);
AheadDetect.Append(";D-").Append(Coor[1].ToString() + ".3");//.3允许AGV取货
AheadDetect.Append(";D-").Append(Coor[4].ToString() + ".4");//.4允许AGV放货
//AheadDetect.Append(";D-").Append(Coor[1].ToString() + ".3");//.3允许AGV取货
//AheadDetect.Append(";D-").Append(Coor[4].ToString() + ".4");//.4允许AGV放货
int mindex = ccf.GetMonitorIndex(ManFID, Mankind);
mindex = ccf.GetMonitorIndex(ManFID, Mankind);//20110104
mindex = ccf.GetMonitorIndex(ManFID, Mankind);//20110104
@ -4927,9 +4914,9 @@ namespace WcfControlMonitorLib
//{
// tempZ = getZ % 4;
//}
if ((tempZ == 1) || (tempZ == 5) || (tempZ == 11) || (tempZ == 15) || (tempZ == 4) || (tempZ == 10) || (tempZ == 14) || (tempZ == 18))//里位取货时,要判读是否有外位的取货任务
if ((tempZ == 3) || (tempZ == 6) || (tempZ == 7) || (tempZ == 10) || (tempZ == 11) || (tempZ == 14) || (tempZ == 15) || (tempZ == 18))//里位取货时,要判读是否有外位的取货任务
{//获取外位坐标
if ((tempZ == 1) || (tempZ == 5) || (tempZ == 11) || (tempZ == 15))
if ((tempZ == 3) || (tempZ == 7) || (tempZ == 11) || (tempZ == 15))
{
newZ = getZ + 1;
}

24
WcfControlMonitorLib/CGetState.cs

@ -444,7 +444,6 @@ namespace WcfControlMonitorLib
///<param name="ClearZero">是否向设备发送清零命令:1清零;900撤销整个调度任务;999手工报告调度任务完成</param>
public void ActionComplete(int DeviceIdx,int TaskIdx,int ClearZero)
{
if (TaskIdx == 0) return;
string dtime = string.Empty;
devinfo =Model.CGetInfo.GetDeviceInfo(DeviceIdx);
@ -635,6 +634,11 @@ namespace WcfControlMonitorLib
}
if (GetManage_Kind(TaskIdx) == false) return;
int errrcode= ccf.GetExceptionNOFromManageTask(_fid,_mti );
//攀枝花当升将当前任务存储到对应称重位置
if (DeviceIdx == 12056 || DeviceIdx == 12059)
{
dbo.ExecuteSql(string.Format("UPDATE T_Base_PLC_Ask SET F_TaskIndex = {0} WHERE (F_BindingDevice = {1}) ", _fid, DeviceIdx));
}
//int ControlType = ccf.GetFCONTROLTASKTYPEFromManageTask(_mti, _fid);
//string useawayfork = Model.CGeneralFunction.GetUseAwayFork(TaskIdx);
string barcode = ccf.GetBarCodeFromMonitor(TaskIdx);
@ -2710,16 +2714,16 @@ namespace WcfControlMonitorLib
}
#endregion
}
//20161224
if (DeviceIdx == 22012 || DeviceIdx == 22030)
{
int enddevice = ccf.GetEndTransDeviceWithTaskIndex(DeviceIdx, TaskIdx);
if (enddevice>0)
{
ActionComplete(DeviceIdx, TaskIdx, 0);
}
////20161224
//if (DeviceIdx == 22012 || DeviceIdx == 22030)
//{
// int enddevice = ccf.GetEndTransDeviceWithTaskIndex(DeviceIdx, TaskIdx);
// if (enddevice>0)
// {
// ActionComplete(DeviceIdx, TaskIdx, 0);
// }
}
//}

258
WcfControlMonitorLib/CObtainTask.cs

@ -42,7 +42,9 @@ namespace WcfControlMonitorLib
static Model.MDevice devinfo;
static StringBuilder sbs = new StringBuilder();
static StringBuilder temp = new StringBuilder();
static string LastEndDeviceindex = "22021,22024,22027,22030,22033,22036,22039,22042,22045,22048";
static string LastEndDeviceindex = "22021,22024,22027,22030,22033,22036,22039,22042,22045,22048,22051";
static string OutEndDeviceindex = "12056,12059";
static string OutEndDeviceindexfllor2 = "22055,22071,22072,22073";
private static void BeginListen()
{//20091107
while (!exitThread )
@ -99,6 +101,7 @@ namespace WcfControlMonitorLib
DataView DMAN = new DataView();
DataView dvc = new DataView();
DataView dvCopy = new DataView();
DataView dvCopycopy = new DataView();
object obj = null;
#region //受流量限制的出库任务,变量初始化20151120
StringBuilder startcell = new StringBuilder("");
@ -257,7 +260,7 @@ namespace WcfControlMonitorLib
//sbs.Append(") or (CONTROL_TASK_TYPE=4 and CONTROL_STATUS=").Append(Model.CGeneralFunction.TASKWAIT.ToString());
sbs.Append(") or (CONTROL_STATUS=").Append(Model.CGeneralFunction.TASKSINGLEFORKRUN.ToString()).Append(") or (CONTROL_STATUS=");
sbs.Append(Model.CGeneralFunction.TASKALTERROUTEREPLY.ToString());
sbs.Append(")) ");//+ temp.ToString()).Append(" ").Append(notin);//20151120
sbs.Append(")) and CONTROL_TASK_TYPE != 99 ");//+ temp.ToString()).Append(" ").Append(notin);//20151120
sbs.Append(" order by CONTROL_TASK_LEVEL desc,CONTROL_ID asc");//20151120
dsIOC = dboM.ExceSQL(sbs.ToString());
dvIOC = dsIOC.Tables[0].DefaultView;
@ -455,7 +458,7 @@ namespace WcfControlMonitorLib
// ("46006,46007,46008".IndexOf(dvIOC[i]["END_DEVICE_CODE"].ToString()) >= 0) &&
// (dvIOC[i]["START_DEVICE_CODE"].ToString() == dvIOC[i]["END_DEVICE_CODE"].ToString()))
//{
// IntegrativeNotifyDischarging(Convert.ToInt32(dvIOC[i]["CONTROL_ID"]), Convert.ToInt32(dvIOC[i]["START_DEVICE_CODE"]));
// continue;
//}
@ -532,7 +535,17 @@ namespace WcfControlMonitorLib
#endregion
#region 攀枝花当升添加判断任务数量控制
////临时控制用
//if ((dvIOC[i]["CONTROL_TASK_TYPE"].ToString() == "1") && (dvIOC[i]["START_DEVICE_CODE"].ToString() == "22057"))
//{
// sbs.Remove(0, sbs.Length);
// sbs.Append("SELECT FSTATUS FROM T_Manage_Task where FSTARTDEVICE = 22057");
// DataView dvOutCount3 = dbo.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
// if (dvOutCount3.Count >= 11)
// {
// Ifobtain = false;
// }
//}
if ((dvIOC[i]["CONTROL_TASK_TYPE"].ToString() == "2") && (LastEndDeviceindex.IndexOf(dvIOC[i]["END_DEVICE_CODE"].ToString()) >= 0))
{
@ -541,7 +554,7 @@ namespace WcfControlMonitorLib
{
Model.MDevice devinfoX = Model.CGetInfo.GetDeviceInfo(Convert.ToInt32(dvIOC[i]["END_DEVICE_CODE"]) - j);
countgood += devinfoX.SplitByte_0;
countgood += devinfoX.RunState;
countgood += devinfoX.RunState;
}
if (countgood > 0)
{
@ -556,6 +569,216 @@ namespace WcfControlMonitorLib
Ifobtain = false;
}
}
if ((dvIOC[i]["CONTROL_TASK_TYPE"].ToString() == "2") && (OutEndDeviceindex.IndexOf(dvIOC[i]["END_DEVICE_CODE"].ToString()) >= 0))
{
sbs.Remove(0, sbs.Length);
sbs.Append("SELECT FSTATUS FROM T_Manage_Task where FENDDEVICE = 12056 OR FENDDEVICE = 12059");
DataView dvOutCount3 = dbo.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
if (dvOutCount3.Count >= 11)
{
Ifobtain = false;
}
if (Ifobtain == true)
{
//攀枝花当升1楼出库均衡控制
sbs.Remove(0, sbs.Length);
sbs.Append("SELECT FSTATUS FROM T_Manage_Task where FSTARTDEVICE = 18004 and (FENDDEVICE = 12056 OR FENDDEVICE = 12059)");
DataView dvOutCount18004 = dbo.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
sbs.Remove(0, sbs.Length);
sbs.Append("SELECT FSTATUS FROM T_Manage_Task where FSTARTDEVICE = 18005 and (FENDDEVICE = 12056 OR FENDDEVICE = 12059)");
DataView dvOutCount18005 = dbo.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
if (dvOutCount18004.Count < dvOutCount18005.Count)//如果获取任务4巷道出库少并且此任务为5巷道 携带拆分一个4巷道出库任务
{
if (Convert.ToInt32(dvIOC[i]["START_DEVICE_CODE"].ToString().Substring(0, 2)) >= 15)//当前要货物任务为5巷道携带一个4巷道的任务
{
sbs.Remove(0, sbs.Length);
sbs.Append("select * from IO_CONTROL where (CONTROL_TASK_TYPE = 2) and (CONTROL_STATUS= 0) and (END_DEVICE_CODE = 12059 or END_DEVICE_CODE = 12056) and (substring(START_DEVICE_CODE,1,2)= '13' or substring(START_DEVICE_CODE,1,2)= '14') order by CONTROL_TASK_LEVEL desc,CONTROL_ID asc");
dvCopy = dboM.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
if (dvCopy.Count > 0)
{
if (Convert.ToInt32(dvCopy[0]["CONTROL_TASK_TYPE"]) == 2)
{
int tempZ = Convert.ToInt32(Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]).Substring(0, 2));
if ((tempZ == 6) || (tempZ == 10) || (tempZ == 14) || (tempZ == 18))
{
string newcode = "";
if (tempZ - 1 < 10)
{
newcode = "0" + Convert.ToString(tempZ - 1) + Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]).Substring(2, 6);
}
else
{
newcode = Convert.ToString(tempZ - 1) + Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]).Substring(2, 6);
}
sbs.Remove(0, sbs.Length);
sbs.Append("select * from IO_CONTROL where (CONTROL_STATUS= 0) and START_DEVICE_CODE = '").Append(newcode).Append("'");
dvCopycopy = dboM.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
if (dvCopycopy.Count > 0)
{
ObtainDoubleForkTask(dvCopycopy[0]["CONTROL_ID"], "0");
CommonClassLib.CCarryConvert.WriteDarkCasket("获取远端巷道任务时有近端任务一起获取", "controlid = " + Convert.ToString(dvCopy[0]["CONTROL_ID"]) + " 货位:" + Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]), "近端关联contrilID = :" + Convert.ToString(dvCopycopy[0]["CONTROL_ID"]) + " 货位:" + Convert.ToString(dvCopycopy[0]["START_DEVICE_CODE"]), "*****");
}
}
else if ((tempZ == 3) || (tempZ == 7) || (tempZ == 11) || (tempZ == 15))
{
//string newcode = Convert.ToString(tempZ + 1) + Convert.ToString(dvIOC[i]["START_DEVICE_CODE"]).Substring(2, 6);
string newcode = "";
if (tempZ + 1 < 10)
{
newcode = "0" + Convert.ToString(tempZ + 1) + Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]).Substring(2, 6);
}
else
{
newcode = Convert.ToString(tempZ + 1) + Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]).Substring(2, 6);
}
sbs.Remove(0, sbs.Length);
sbs.Append("select * from IO_CONTROL where (CONTROL_STATUS= 0) and START_DEVICE_CODE = '").Append(newcode).Append("'");
dvCopycopy = dboM.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
if (dvCopycopy.Count > 0)
{
ObtainDoubleForkTask(dvCopycopy[0]["CONTROL_ID"], "0");
CommonClassLib.CCarryConvert.WriteDarkCasket("获取远端巷道任务时有近端任务一起获取", "controlid = " + Convert.ToString(dvCopy[0]["CONTROL_ID"]) + " 货位:" + Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]), "近端关联contrilID = :" + Convert.ToString(dvCopycopy[0]["CONTROL_ID"]) + " 货位:" + Convert.ToString(dvCopycopy[0]["START_DEVICE_CODE"]), "*****");
}
}
}
ObtainDoubleForkTask(dvCopy[0]["CONTROL_ID"], "0");
CommonClassLib.CCarryConvert.WriteDarkCasket("获取1楼出库任务时获取任务巷道任务数量多,携带另一个巷道任务拆分", "controlid = " + Convert.ToString(dvIOC[i]["CONTROL_ID"]) + " 货位:" + Convert.ToString(dvIOC[i]["START_DEVICE_CODE"]), "携带任务contrilID = :" + Convert.ToString(dvCopy[0]["CONTROL_ID"]) + " 货位:" + Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]), "*****");
}
}
}
else if (dvOutCount18004.Count > dvOutCount18005.Count)
{
if (Convert.ToInt32(dvIOC[i]["START_DEVICE_CODE"].ToString().Substring(0, 2)) < 15)
{
sbs.Remove(0, sbs.Length);
sbs.Append("select * from IO_CONTROL where (CONTROL_TASK_TYPE = 2) and (CONTROL_STATUS= 0) and (END_DEVICE_CODE = 12059 or END_DEVICE_CODE = 12056) and (substring(START_DEVICE_CODE,1,2)= '15' or substring(START_DEVICE_CODE,1,2)= '16'or substring(START_DEVICE_CODE,1,2)= '17'or substring(START_DEVICE_CODE,1,2)= '18') order by CONTROL_TASK_LEVEL desc,CONTROL_ID asc");
dvCopy = dboM.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
if (dvCopy.Count > 0)
{
if (Convert.ToInt32(dvCopy[0]["CONTROL_TASK_TYPE"]) == 2)
{
int tempZ = Convert.ToInt32(Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]).Substring(0, 2));
if ((tempZ == 6) || (tempZ == 10) || (tempZ == 14) || (tempZ == 18))
{
string newcode = "";
if (tempZ - 1 < 10)
{
newcode = "0" + Convert.ToString(tempZ - 1) + Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]).Substring(2, 6);
}
else
{
newcode = Convert.ToString(tempZ - 1) + Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]).Substring(2, 6);
}
sbs.Remove(0, sbs.Length);
sbs.Append("select * from IO_CONTROL where (CONTROL_STATUS= 0) and START_DEVICE_CODE = '").Append(newcode).Append("'");
dvCopycopy = dboM.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
if (dvCopycopy.Count > 0)
{
ObtainDoubleForkTask(dvCopycopy[0]["CONTROL_ID"], "0");
CommonClassLib.CCarryConvert.WriteDarkCasket("获取远端巷道任务时有近端任务一起获取", "controlid = " + Convert.ToString(dvCopy[0]["CONTROL_ID"]) + " 货位:" + Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]), "近端关联contrilID = :" + Convert.ToString(dvCopycopy[0]["CONTROL_ID"]) + " 货位:" + Convert.ToString(dvCopycopy[0]["START_DEVICE_CODE"]), "*****");
}
}
else if ((tempZ == 3) || (tempZ == 7) || (tempZ == 11) || (tempZ == 15))
{
//string newcode = Convert.ToString(tempZ + 1) + Convert.ToString(dvIOC[i]["START_DEVICE_CODE"]).Substring(2, 6);
string newcode = "";
if (tempZ + 1 < 10)
{
newcode = "0" + Convert.ToString(tempZ + 1) + Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]).Substring(2, 6);
}
else
{
newcode = Convert.ToString(tempZ + 1) + Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]).Substring(2, 6);
}
sbs.Remove(0, sbs.Length);
sbs.Append("select * from IO_CONTROL where (CONTROL_STATUS= 0) and START_DEVICE_CODE = '").Append(newcode).Append("'");
dvCopycopy = dboM.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
if (dvCopycopy.Count > 0)
{
ObtainDoubleForkTask(dvCopycopy[0]["CONTROL_ID"], "0");
CommonClassLib.CCarryConvert.WriteDarkCasket("获取远端巷道任务时有近端任务一起获取", "controlid = " + Convert.ToString(dvCopy[0]["CONTROL_ID"]) + " 货位:" + Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]), "近端关联contrilID = :" + Convert.ToString(dvCopycopy[0]["CONTROL_ID"]) + " 货位:" + Convert.ToString(dvCopycopy[0]["START_DEVICE_CODE"]), "*****");
}
}
}
ObtainDoubleForkTask(dvCopy[0]["CONTROL_ID"], "0");
CommonClassLib.CCarryConvert.WriteDarkCasket("获取1楼出库任务时获取任务巷道任务数量多,携带两一个巷道任务拆分", "controlid = " + Convert.ToString(dvIOC[i]["CONTROL_ID"]) + " 货位:" + Convert.ToString(dvIOC[i]["START_DEVICE_CODE"]), "携带任务contrilID = :" + Convert.ToString(dvCopy[0]["CONTROL_ID"]) + " 货位:" + Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]), "*****");
}
}
}
}
}
if ((dvIOC[i]["CONTROL_TASK_TYPE"].ToString() == "2") && (OutEndDeviceindexfllor2.IndexOf(dvIOC[i]["END_DEVICE_CODE"].ToString()) >= 0))
{
if (dvIOC[i]["END_DEVICE_CODE"].ToString() == "22055")
{
sbs.Remove(0, sbs.Length);
sbs.Append("SELECT FSTATUS FROM T_Manage_Task where FENDDEVICE = 22055");
DataView dvOutCount3 = dbo.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
sbs.Remove(0, sbs.Length);
sbs.Append("SELECT FSTATUS FROM T_Manage_Task where FENDDEVICE = 12056 OR FENDDEVICE = 12059");
DataView dvOutCount4 = dbo.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
if (dvOutCount4.Count >= 1)
{
if (dvOutCount3.Count >= 5)
{
Ifobtain = false;
}
}
else
{
if (dvOutCount3.Count >= 11)
{
Ifobtain = false;
}
}
}
else if (dvIOC[i]["END_DEVICE_CODE"].ToString() == "22071")
{
sbs.Remove(0, sbs.Length);
sbs.Append("SELECT FSTATUS FROM T_Manage_Task where FENDDEVICE = 22071");
DataView dvOutCount3 = dbo.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
if (dvOutCount3.Count >= 1)
{
Ifobtain = false;
}
}
else if (dvIOC[i]["END_DEVICE_CODE"].ToString() == "22072")
{
sbs.Remove(0, sbs.Length);
sbs.Append("SELECT FSTATUS FROM T_Manage_Task where FENDDEVICE = 22072");
DataView dvOutCount3 = dbo.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
if (dvOutCount3.Count >= 1)
{
Ifobtain = false;
}
}
else if (dvIOC[i]["END_DEVICE_CODE"].ToString() == "22073")
{
sbs.Remove(0, sbs.Length);
sbs.Append("SELECT FSTATUS FROM T_Manage_Task where FENDDEVICE = 22073");
DataView dvOutCount3 = dbo.ExceSQL(sbs.ToString()).Tables[0].DefaultView;
if (dvOutCount3.Count >=2)
{
Ifobtain = false;
}
}
}
#endregion
@ -569,10 +792,12 @@ namespace WcfControlMonitorLib
// }
//}
//远近货位任务控制,连续出库任务远货位出库时查找是否有近货位的任务 如果有先获取
int tempobtainflag = 0;
if (Convert.ToInt32(dvIOC[i]["CONTROL_TASK_TYPE"]) == 2)
{
int tempZ = Convert.ToInt32(Convert.ToString(dvIOC[i]["START_DEVICE_CODE"]).Substring(0, 2));
if ((tempZ == 4) || (tempZ == 10) || (tempZ == 14) || (tempZ == 18))
if ((tempZ == 6) || (tempZ == 10) || (tempZ == 14) || (tempZ == 18))
{
string newcode = "";
if (tempZ - 1 < 10)
@ -591,10 +816,11 @@ namespace WcfControlMonitorLib
if (dvCopy.Count > 0)
{
ObtainDoubleForkTask(dvCopy[0]["CONTROL_ID"], "0");
tempobtainflag = 1;
CommonClassLib.CCarryConvert.WriteDarkCasket("获取远端巷道任务时有近端任务一起获取", "controlid = " + Convert.ToString(dvIOC[i]["CONTROL_ID"]) + " 货位:" + Convert.ToString(dvIOC[i]["START_DEVICE_CODE"]), "近端关联contrilID = :" + Convert.ToString(dvCopy[0]["CONTROL_ID"]) + " 货位:" + Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]), "*****");
}
}
else if ((tempZ == 1) || (tempZ == 5) || (tempZ == 11) || (tempZ == 15))
else if ((tempZ == 3) || (tempZ == 7) || (tempZ == 11) || (tempZ == 15))
{
//string newcode = Convert.ToString(tempZ + 1) + Convert.ToString(dvIOC[i]["START_DEVICE_CODE"]).Substring(2, 6);
string newcode = "";
@ -614,12 +840,15 @@ namespace WcfControlMonitorLib
if (dvCopy.Count > 0)
{
ObtainDoubleForkTask(dvCopy[0]["CONTROL_ID"], "0");
tempobtainflag = 1;
CommonClassLib.CCarryConvert.WriteDarkCasket("获取远端巷道任务时有近端任务一起获取", "controlid = " + Convert.ToString(dvIOC[i]["CONTROL_ID"]) + " 货位:" + Convert.ToString(dvIOC[i]["START_DEVICE_CODE"]), "近端关联contrilID = :" + Convert.ToString(dvCopy[0]["CONTROL_ID"]) + " 货位:" + Convert.ToString(dvCopy[0]["START_DEVICE_CODE"]), "*****");
}
}
}
//if (tempobtainflag == 0)
//{ }
ObtainDoubleForkTask(dvIOC[i]["CONTROL_ID"], "0");
RecCount++;
}
@ -1706,7 +1935,7 @@ namespace WcfControlMonitorLib
{
FTASKLEVEL = Convert.ToInt32(level);
}
//if (dvIOC[i]["CONTROL_TASK_TYPE"].ToString() == "3")
//{
// FTASKLEVEL = 2;
@ -1716,6 +1945,19 @@ namespace WcfControlMonitorLib
// FTASKLEVEL = 1;
//}
if ((Convert.ToString(dvIOC[i]["CONTROL_TASK_TYPE"]) == "1") && ((FSTARTDEVICE == 22006) || (FSTARTDEVICE == 22012) || (FSTARTDEVICE == 22021) || (FSTARTDEVICE == 22048)))
{
FTASKLEVEL = 100;
}
if (FENDDEVICE >= 10 && FENDDEVICE <= 100)
{
FENDDEVICE = 15010;
}
if (FSTARTDEVICE >= 10 && FSTARTDEVICE <= 100)
{
FSTARTDEVICE = 15010;
}
if (UseAwayFork == "0")
{
string[] lc = new string[2] { "0", "0" };

16
WcfControlMonitorLib/CParsePLCData.cs

@ -379,7 +379,10 @@ namespace WcfControlMonitorLib
/// <returns></returns>
public static bool AlterRoute(int devInx, int state)
{
//if (devInx == 15001)
//{
// int temp = 0;
//}
DataView dvr = new DataView(); DataView dv1 = new DataView(); DataView dv = new DataView();
try
{
@ -404,8 +407,17 @@ namespace WcfControlMonitorLib
//}
#endregion
sql.Remove(0, sql.Length);
sql.Append("select distinct F_RouteID from T_Base_Route_Device where F_DeviceOrder!=-1 and F_DeviceIndex=").Append(devInx);//F_DeviceOrder>0 and 20170927
//sql.Append("select distinct F_RouteID from T_Base_Route_Device where F_DeviceOrder!=-1 and F_DeviceIndex=").Append(devInx);//F_DeviceOrder>0 and 20170927
//sql.Append("select distinct F_RouteID from T_Base_Route_Device where F_DeviceOrder>0 and F_DeviceIndex=").Append(devInx);
if (devInx != 12888 && devInx != 12066 && devInx != 12006 && devInx != 12009)
{
sql.Append("select distinct F_RouteID from T_Base_Route_Device where F_DeviceOrder!=-1 and F_DeviceIndex=").Append(devInx);
}
else
{
sql.Append("select distinct F_RouteID from T_Base_Route_Device where F_DeviceIndex=").Append(devInx);
}
//sql.Append("select distinct F_RouteID from T_Base_Route_Device where(F_DeviceOrder!= -1 and F_DeviceIndex = 12888) or ((F_DeviceIndex=12888 or F_DeviceIndex=12066)and F_SerialNumber = 3)
dv = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView;
for (int i = 0; i < dv.Count; i++)
{

4
WcfControlMonitorLib/Properties/Settings.Designer.cs

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.1
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
@ -12,7 +12,7 @@ namespace WcfControlMonitorLib.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

396
WcfControlMonitorLib/SControlMonitor.cs

@ -5620,10 +5620,41 @@ namespace WcfControlMonitorLib
case 2:
if (IsEquals(devinfo.ReturnMessage, states, 10) == false)
{
bc = GetBarcodeFromMonitorIndex(taskindex);
if (devinfo.DeviceIndex == 22021 || devinfo.DeviceIndex == 22048)//功能屏蔽组件车间缓存&& (1 == 0)
{
if ((devinfo.SplitByte_0 == 1) && ((devicestates[tempdb2addr + 4] & 1) == 0))
{
StringBuilder dtime = new StringBuilder(DateTime.Now.ToString("u"));
dtime.Remove(dtime.Length - 1, 1);
object[] ob = new object[8] { 3, devinfo.DeviceIndex, 0, 0, dtime, "", "1", 0 };
try
{
DataView dvspApply22021 = dboMan.ExceSQL(string.Format("select STOCK_BARCODE from IO_CONTROL_APPLY WHERE APPLY_TASK_STATUS < 4 and DEVICE_CODE = {0}", devinfo.DeviceIndex)).Tables[0].DefaultView;
//if (dbo.GetSingle(String.Format("select fid from T_Manage_Task where FENDDEVICE='{0}'", devinfo.DeviceIndex.ToString())) == null)
if ((dboMan.GetSingle(String.Format("select END_DEVICE_CODE from IO_CONTROL where END_DEVICE_CODE ='{0}'", devinfo.DeviceIndex.ToString())) == null) && (dvspApply22021.Count <= 0))
{
//dboMan.ExecuteSql(string.Format("INSERT INTO IO_CONTROL_APPLY(CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME,WAREHOUSE_CODE,STOCK_HEIGHT)VALUES(IO_CONTROL_APPLY_SEQ.nextval,{0},'{1}','{2}',0,'{4}','{6}','{7}')", ob));
dboMan.ExecuteSql(string.Format("INSERT INTO IO_CONTROL_APPLY(CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME)VALUES ({0},'{1}','{2}',{3},'{4}')", ob));
CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "22021/22048申请来盘:", "类型3", string.Format(",站台:{0},申请类型:2 ", devinfo.DeviceIndex.ToString()));
}
else
{
CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "有来此站台的任务不申请料箱任务任务任务:", devinfo.DeviceIndex.ToString(), string.Format(",站台:{0},申请类型:3 ", devinfo.DeviceIndex.ToString()));
}
}
catch (Exception ex)
{
RefreshMonitorEventArgs rmea = new RefreshMonitorEventArgs("tsStatus", "向管理申请组件车间出库托盘垛任务时发生错误:" + ex.StackTrace + ex.Message);
OnRefreshMonitor(rmea);
continue;
}
}
}
bc = GetBarcodeFromMonitorIndex(taskindex);
devinfo.SplitByte_0 = (devicestates[tempdb2addr + 4] & 1) == 1 ? 1 : 0;
devinfo.SplitByte_1 = (devicestates[tempdb2addr + 4] & 2) == 2 ? 1 : 0;
devinfo.SplitByte_2 = (devicestates[tempdb2addr + 4] & 4) == 4 ? 1 : 0;
@ -5803,19 +5834,23 @@ namespace WcfControlMonitorLib
#region 条形码字符串信息
case 7:
if (devicestates[tempdb2addr + 0] != 1) continue;
dvsp = dbo.ExceSQL(string.Format("select * from T_Base_PLC_Ask WHERE F_DeviceIndex = {0} ", devidx)).Tables[0].DefaultView; //20130510F_ManageAskkind
if (dvsp.Count > 0)
{
StringBuilder warehouse = new StringBuilder(dvsp[0]["F_WareHouse"].ToString());
StringBuilder barcodePT = new StringBuilder();
StringBuilder barcodeCT = new StringBuilder();
int dcode = Convert.ToInt32(dvsp[0]["F_BindingDevice"]);//完成信号对应的主设备索引或者安装扫描器的输送机设备索引
int apptype = Convert.ToInt32(dvsp[0]["F_ManageAskkind"]);//20130510
int BoxQuality = 0;// devicestates[tempdb2addr + 1]; //数量,只要是上报条码必须预留数量字节
char[] cc = new char[1] { ';' };
int High = devicestates[tempdb2addr + 1];
int BoxWeight = devicestates[tempdb2addr + 5] + (devicestates[tempdb2addr + 4] << 8) + (devicestates[tempdb2addr + 3] << 16) + (devicestates[tempdb2addr + 2] << 32);//称重
//plc_ASK 表里的字段 托盘条码长度
int PalletBarcodeLength = Convert.ToInt32(dvsp[0]["F_PalletBarcodeLength"]);//电力纸箱码垛机器人专用\普通条码申请
#region 初始化接收条码
barcode.Clear();
if (PalletBarcodeLength > 0)//托盘条码
@ -5826,19 +5861,27 @@ namespace WcfControlMonitorLib
//{
// barcode.Append(Convert.ToChar(devicestates[tempdb2addr + j]).ToString().ToUpper());
//}
int startindex = 10;//条码开始位置 db2预留了10个字节 托盘条码获取的地方
if (dvsp[0]["F_Askkind"].ToString() == "7")
if (dvsp[0]["F_Askkind"].ToString() != "16")
{
for (int j = startindex; j < PalletBarcodeLength + startindex; j++)
{
if (devicestates[tempdb2addr + j] == 36)//$结尾
if (j < startindex + 6)
{
break;
barcodePT.Append(Convert.ToChar(devicestates[tempdb2addr + j]).ToString().ToUpper());
}
else if(j >= startindex + 8)
{
if (devicestates[tempdb2addr + j] == 36)//$结尾
{
break;
}
barcodeCT.Append(Convert.ToChar(devicestates[tempdb2addr + j]).ToString().ToUpper());
barcodeCT = new StringBuilder(barcodeCT.ToString().TrimEnd('\0'));
}
barcode.Append(Convert.ToChar(devicestates[tempdb2addr + j]).ToString().ToUpper());
}
barcode = new StringBuilder(barcode.ToString().TrimEnd('\0'));
}
}
//x箱数
@ -5864,7 +5907,7 @@ namespace WcfControlMonitorLib
if (dvsp[0]["F_BarCode"] != DBNull.Value)
{
if ((appdt.AddSeconds(2) > DateTime.Now) && (dvsp[0]["F_BarCode"].ToString() == barcode.ToString()))
if ((appdt.AddSeconds(10) > DateTime.Now) && (dvsp[0]["F_BarCode"].ToString() == barcode.ToString()))
{
dbo.ExecuteSql(string.Format("UPDATE T_Base_PLC_Ask SET F_BarCode = '{1}',F_Time='{2}' WHERE (F_DeviceIndex = {0}) ", devidx, barcode.ToString(), DateTime.Now));
CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "PLC重复上报条码:", devidx.ToString(), ",站台:" + dcode + ",条码:" + barcode.ToString().ToUpper());
@ -5885,10 +5928,10 @@ namespace WcfControlMonitorLib
new StringBuilder(DateTime.Now.ToString("u"));
dtime.Remove(dtime.Length - 1, 1);
string barcodePP = barcodePT.ToString();
object[] ob = new object[10]
{
apptype, dcode, barcode, 0, dtime,High,0,0,0,0
apptype, dcode, barcodePP, 0, dtime,High,0,0,0,0
};
@ -5909,7 +5952,7 @@ namespace WcfControlMonitorLib
// ob));
CommonClassLib.CCarryConvert.WriteDarkCasket(
"OPCClient", "向管理条码申请任务:", devidx.ToString(),
",站台:" + dcode + ",条码:" +
",站台:" + barcodePP + ",条码:" +
barcode.ToString().ToUpper()); //20140218
}
catch (Exception ex)
@ -5934,12 +5977,12 @@ namespace WcfControlMonitorLib
new StringBuilder(DateTime.Now.ToString("u"));
dtime1.Remove(dtime1.Length - 1, 1);
int timearrive_flag = 0;//申请时间间隔控制
string barcodeP = barcode.ToString().Substring(0, 6);
string barcodeC = barcode.ToString().Substring(6, barcode.Length-6);
string barcodeP = barcodePT.ToString();
string barcodeC = barcodeCT.ToString();
High = devicestates[tempdb2addr + 1];
object[] ob1 = new object[10]
{
apptype, dcode, barcodeP, BoxQuality, dtime1,High,0,barcodeC,0,0
apptype, dcode, barcodeP, BoxQuality, dtime1,High,0,barcodeC,0,BoxWeight
};
if (devidx == 16001)
@ -5963,14 +6006,14 @@ namespace WcfControlMonitorLib
dboMan.ExecuteSql(
string.Format(
"INSERT INTO IO_CONTROL_APPLY (CONTROL_APPLY_TYPE,DEVICE_CODE,STOCK_BARCODE,CONTROL_APPLY_PARAMETER,CONTROL_APPLY_PARA01,APPLY_TASK_STATUS, CREATE_TIME)VALUES ({0},'{1}','{3}',{3},'{4}')",
"INSERT INTO IO_CONTROL_APPLY (CONTROL_APPLY_TYPE,DEVICE_CODE,STOCK_BARCODE,CONTROL_APPLY_PARAMETER,CONTROL_APPLY_PARA01,APPLY_TASK_STATUS, CREATE_TIME,CONTROL_APPLY_PARA02)VALUES ({0},'{1}','{2}','{7}','{5}',{6},'{4}','{9}')",
ob1));
//dbo.ExecuteSql(
// string.Format(
// "INSERT INTO IO_CONTROL_APPLY_WCS (CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME,CONTROL_APPLY_REMARK,WAREHOUSE_CODE,CONTROL_APPLY_PARA01,CONTROL_APPLY_PARA02,CONTROL_APPLY_PARAMETER)VALUES ({0},'{1}','{2}',{3},'{4}','{5}','{6}','{7}','{8}','{9}')",
// ob1));
CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "子母扫码申请入库:", "母拖盘码:" + barcodeP, ",站台:" + dcode + "物料条码:" + barcodeC); //20140218
CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "子母扫码申请入库:", "母拖盘码:" + barcodeP, ",站台:" + dcode + "物料条码:" + barcodeC + ";重量:"+ BoxWeight.ToString()+"gaodu:"+High); //20140218
}
else
{
@ -6015,81 +6058,22 @@ namespace WcfControlMonitorLib
#endregion
break;
case "15":
//多叉顶升机条码组申请入库//20140218
#region 多叉向管理申请任务
//StringBuilder devbind = new StringBuilder();
//StringBuilder devbinds = new StringBuilder();
//parameter.Clear();
//for (int i = 0; i < BarcodeForkAmount; i++)
//{
// bool ifexit = false;
// if (appbarArray[i].ToString() != noneBarcode.ToString())
// {
// devbind.Clear();
// devbind.Append(dcode.ToString() + ((i + 1).ToString()));
// devbinds.Append("|").Append(devbind);
// if (appbarArray[i].ToString() == incompleteBarcode.ToString())//扫到残码,但是有货物
// {//自动生成条码“9+dvsp[0]["F_BindingDevice"]+顺序号”
// parameter.Append("|").Append(GetErrorBarcode(dcode, devidx, BarcodeLength));
// }
// else
// {
// parameter.Append("|").Append(appbarArray[i].ToString());
// }
// dvbc = dboMan.ExceSQL(string.Format("SELECT DEVICE_CODE,STOCK_BARCODE FROM IO_CONTROL_APPLY WHERE APPLY_TASK_STATUS<2 and DEVICE_CODE='{0}' and (STOCK_BARCODE = '{1}')", devbind, appbarArray[i].ToString())).Tables[0].DefaultView;
// if (dvbc.Count > 0)
// {
// ifexit = true;
// }
// dvbc = dboMan.ExceSQL(string.Format("select CONTROL_ID from IO_CONTROL where STOCK_BARCODE like '%{0}%'", appbarArray[i].ToString())).Tables[0].DefaultView;
// if (dvbc.Count > 0)
// {
// ifexit = true;
// }
// dvbc = dbo.ExceSQL(string.Format("select fid from T_Manage_Task where FPALLETBARCODE like '%{0}%'", appbarArray[i].ToString())).Tables[0].DefaultView;
// if (dvbc.Count > 0)
// {
// ifexit = true;
// }
// }
// if (ifexit == true)
// {
// RefreshMonitorEventArgs rmea = new RefreshMonitorEventArgs("tsStatus", "向管理申请入库任务时发生错误:条码" + appbarArray[i].ToString() + "对应的管理任务已经存在!");
// OnRefreshMonitor(rmea);
// }
//}
//if (devbinds.ToString().Length > 1)
//{
// devbinds = new StringBuilder(devbinds.ToString().Substring(1));
// parameter = new StringBuilder(parameter.ToString().Substring(1));
// barcode.Clear();//记录堆垛机最大叉的箱条码
// barcode.Append(appbarArray[BarcodeForkAmount-1].ToString());
// string dtime = DateTime.Now.ToString("u");
// dtime = dtime.Substring(0, dtime.Length - 1);
// int appid = dboMan.GetManageTableIndex("IO_CONTROL_APPLY", true);//CONTROL_APPLY_ID
// object[] ob = new object[8] { apptype, devbinds.ToString(), parameter.ToString(), 0, dtime, "", warehouse.ToString(), appid };
// try
// {
// dboMan.ExecuteSql(string.Format("INSERT INTO IO_CONTROL_APPLY( CONTROL_APPLY_ID,CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME,CONTROL_APPLY_REMARK,WAREHOUSE_CODE)VALUES ({7},{0},'{1}','{2}',{3},'{4}','{5}','{6}')", ob));
// CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "向管理条码申请任务:", devidx.ToString(), ",站台:" + dcode + ",条码:" + parameter.ToString().ToUpper());//20140218
// sql.Remove(0, sql.Length);
// sql.Append("UPDATE T_Base_PLC_Ask SET F_FirstProject = '").Append(parameter.ToString()).Append(" WHERE F_DeviceIndex = ").Append(devidx) ;
// dbo.ExecuteSql(sql.ToString());
// }
// catch (Exception ex)
// {
// RefreshMonitorEventArgs rmea = new RefreshMonitorEventArgs("tsStatus", "向管理申请入库任务时发生错误:" + ex.StackTrace + ex.Message);
// OnRefreshMonitor(rmea);
// continue;//20140218
// }
#region 出库上报称重
//在调度上记录最后一个出库口称重重量
dbo.ExecuteSql(string.Format("UPDATE T_Base_PLC_Ask SET F_Time='{0}', F_BarCode = '{1}' WHERE (F_DeviceIndex = {2}) ", DateTime.Now, BoxWeight.ToString(), devidx));
//}
//上报管理当前称重值
DataView dvspweight = dbo.ExceSQL(string.Format("select F_TaskIndex from T_Base_PLC_Ask WHERE (F_DeviceIndex = {0}) ", devidx)).Tables[0].DefaultView;
if (dvspweight.Count > 0)
{
dboMan.ExecuteSql(string.Format("UPDATE IO_CONTROL SET CONTROL_WEIGHT ='{0}' WHERE (CONTROL_ID = {1}) ", BoxWeight.ToString(), Convert.ToInt32(dvspweight[0]["F_TaskIndex"])));
DataView dvspweight1 = dbo.ExceSQL(string.Format("select F_MonitorIndex from T_Monitor_Task WHERE (F_DeviceIndex = {0} and F_ManageTaskIndex = {1}) ", devidx,Convert.ToInt32(dvspweight[0]["F_TaskIndex"]))).Tables[0].DefaultView;
if (dvspweight1.Count > 0)
{
cgs.ActionComplete(devidx, Convert.ToInt32(dvspweight1[0]["F_MonitorIndex"]), 0);
}
}
#endregion
break;
@ -6103,17 +6087,30 @@ namespace WcfControlMonitorLib
apptype, dcode, BoxQuality, 0, dtime16,0,0,0,0,0
};
DataView dvspHave16 = new DataView();
DataView dvspApply16 = dboMan.ExceSQL(string.Format("select STOCK_BARCODE from IO_CONTROL_APPLY WHERE APPLY_TASK_STATUS < 2 and DEVICE_CODE = {0}", dcode)).Tables[0].DefaultView;
if ((devidx == 120621) || (devidx == 220551))//供给托盘垛出库申请,如果后续有添加缓存位在按实际情况更改数量
DataView dvspApply16 = new DataView();
Model.MDevice devinfo22066 = Model.CGetInfo.GetDeviceInfo(22066);
Model.MDevice devinfo22068 = Model.CGetInfo.GetDeviceInfo(22067);
if ((devidx == 120621) || (devidx == 220551) || (devidx == 220661)||(devidx == 22071)|| (devidx == 22072))//供给托盘垛出库申请,如果后续有添加缓存位在按实际情况更改数量
{
dvspApply16 = dboMan.ExceSQL(string.Format("select STOCK_BARCODE from IO_CONTROL_APPLY WHERE APPLY_TASK_STATUS < 4 and DEVICE_CODE = {0}", dcode)).Tables[0].DefaultView;
dvspHave16 = dbo.ExceSQL(string.Format("select FENDDEVICE from T_MANAGE_TASK WHERE FENDDEVICE = {0}", dcode)).Tables[0].DefaultView;
}
//else if (devidx == 220661)
//{
// dvspApply16 = dboMan.ExceSQL(string.Format("select STOCK_BARCODE from IO_CONTROL_APPLY WHERE APPLY_TASK_STATUS < 4 and DEVICE_CODE = {0}", dcode)).Tables[0].DefaultView;
// dvspHave16 = dbo.ExceSQL(string.Format("select FSTARTDEVICE from T_MANAGE_TASK WHERE FSTARTDEVICE = {0} and FSTATUS = 0", dcode)).Tables[0].DefaultView;
//}
else//其余托盘垛入库申请
{
dvspApply16 = dboMan.ExceSQL(string.Format("select STOCK_BARCODE from IO_CONTROL_APPLY WHERE APPLY_TASK_STATUS < 2 and DEVICE_CODE = {0}", dcode)).Tables[0].DefaultView;
dvspHave16 = dbo.ExceSQL(string.Format("select FSTARTDEVICE from T_MANAGE_TASK WHERE FSTARTDEVICE = {0} and FSTATUS = 0", dcode)).Tables[0].DefaultView;
}
if (dvspApply16.Count + dvspHave16.Count > 0)
if (((dvspApply16.Count + dvspHave16.Count > 0) && (devidx != 220661)) || ((dvspApply16.Count + dvspHave16.Count + devinfo22066.SplitByte_0 > 2) && (devidx == 220661)))
//if(dvspApply16.Count + dvspHave16.Count > 0)
{
CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "向管理申请出入库托盘垛时:", devidx.ToString(), ",站台:" + dcode + ",已有任务+申请>0 不申请" + " 申请数量:" + dvspApply16.Count.ToString() + " 任务数量:" + dvspHave16.Count.ToString());
witemnames[0].Clear();
@ -6130,19 +6127,37 @@ namespace WcfControlMonitorLib
{
try
{
dboMan.ExecuteSql(
string.Format(
"INSERT INTO IO_CONTROL_APPLY (CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME)VALUES ({0},'{1}','{3}',{5},'{4}')",
ob16));
//dbo.ExecuteSql(
// string.Format(
// "INSERT INTO IO_CONTROL_APPLY_WCS (CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME,CONTROL_APPLY_REMARK,WAREHOUSE_CODE,CONTROL_APPLY_PARA01,CONTROL_APPLY_PARA02,CONTROL_APPLY_PARAMETER)VALUES ({0},'{1}','{2}',{3},'{4}','{5}','{6}','{7}','{8}','{9}')",
// ob1));
CommonClassLib.CCarryConvert.WriteDarkCasket(
"OPCClient", "向管理申请出入库托盘垛:", "",
",站台:" + dcode + ",申请类型:" +
apptype.ToString());
if (devidx == 220661)
{
for (int i = 0; i < 2 - dvspApply16.Count - dvspHave16.Count - devinfo22066.SplitByte_0; i++)//- devinfo22068.SplitByte_0
{
dboMan.ExecuteSql(
string.Format(
"INSERT INTO IO_CONTROL_APPLY (CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME)VALUES ({0},'{1}','{3}',{5},'{4}')",
ob16));
CommonClassLib.CCarryConvert.WriteDarkCasket(
"OPCClient", "向管理申请出入库托盘垛:", "",
",站台:" + dcode + ",申请类型:" +
apptype.ToString());
}
}
else
{
dboMan.ExecuteSql(
string.Format(
"INSERT INTO IO_CONTROL_APPLY (CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME)VALUES ({0},'{1}','{3}',{5},'{4}')",
ob16));
//dbo.ExecuteSql(
// string.Format(
// "INSERT INTO IO_CONTROL_APPLY_WCS (CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME,CONTROL_APPLY_REMARK,WAREHOUSE_CODE,CONTROL_APPLY_PARA01,CONTROL_APPLY_PARA02,CONTROL_APPLY_PARAMETER)VALUES ({0},'{1}','{2}',{3},'{4}','{5}','{6}','{7}','{8}','{9}')",
// ob1));
CommonClassLib.CCarryConvert.WriteDarkCasket(
"OPCClient", "向管理申请出入库托盘垛:", "",
",站台:" + dcode + ",申请类型:" +
apptype.ToString());
}
}
catch (Exception ex)
{
@ -7952,64 +7967,86 @@ namespace WcfControlMonitorLib
#region 攀枝花当升1期二楼按钮申请
Model.MDevice devinfoT = Model.CGetInfo.GetDeviceInfo(Convert.ToInt32(devidx.ToString().Substring(0, 5)));
DataView dvspRG2 = new DataView();
int tempdeviceindex = 0;
switch (devinfoT.DeviceIndex)
DataView dvspRG2 = new DataView(); int tempveal = 0;
#region 攀枝花当升NO using
//int tempdeviceindex = 0;
//switch (devinfoT.DeviceIndex)
//{
// case 22021:
// tempdeviceindex = 22019;
// break;
// case 22024:
// tempdeviceindex = 22022;
// break;
// case 22027:
// tempdeviceindex = 22025;
// break;
// case 22030:
// tempdeviceindex = 22028;
// break;
// case 22033:
// tempdeviceindex = 22031;
// break;
// case 22036:
// tempdeviceindex = 22034;
// break;
// case 22039:
// tempdeviceindex = 22037;
// break;
// case 22042:
// tempdeviceindex = 22040;
// break;
// case 22045:
// tempdeviceindex = 22043;
// break;
// case 22048:
// tempdeviceindex = 22046;
// break;
// case 22051:
// tempdeviceindex = 22049;
// break;
//}
#endregion
if (devinfoT.DeviceIndex == 22021|| devinfoT.DeviceIndex == 22048)
{
case 22021:
tempdeviceindex = 22019;
break;
case 22024:
tempdeviceindex = 22022;
break;
case 22027:
tempdeviceindex = 22025;
break;
case 22030:
tempdeviceindex = 22028;
break;
case 22033:
tempdeviceindex = 22031;
break;
case 22036:
tempdeviceindex = 22034;
break;
case 22039:
tempdeviceindex = 22037;
break;
case 22042:
tempdeviceindex = 22040;
break;
case 22045:
tempdeviceindex = 22043;
break;
case 22048:
tempdeviceindex = 22046;
break;
case 22051:
tempdeviceindex = 22049;
break;
dvspRG2 = dbo.ExceSQL(string.Format("select FSTARTDEVICE from T_Manage_Task WHERE (FSTARTDEVICE = {0} and ((FCurrentLocation < 22019 and FCurrentLocation >=22001)or FCurrentLocation = 0 or FCurrentLocation = 15001)) ", devinfoT.DeviceIndex)).Tables[0].DefaultView;
}
dvspRG2 = dbo.ExceSQL(string.Format("select F_NumParam1 from T_Monitor_Task WHERE (F_DeviceIndex = 15001 and F_NumParam1 = {0} and F_DeviceCommandIndex = 2) ", tempdeviceindex.ToString().Substring(0, 5))).Tables[0].DefaultView;
else
{
dvspRG2 = dbo.ExceSQL(string.Format("select FSTARTDEVICE from T_Manage_Task WHERE (FSTARTDEVICE = {0}) ", devinfoT.DeviceIndex)).Tables[0].DefaultView;
} //dvspRG2 = dbo.ExceSQL(string.Format("select F_NumParam1 from T_Monitor_Task WHERE (F_DeviceIndex = 15001 and F_NumParam1 = {0} and F_DeviceCommandIndex = 2) ", tempdeviceindex.ToString().Substring(0, 5))).Tables[0].DefaultView;
if (dvspRG2.Count <= 0)
{
if (devinfoT.SplitByte_0 > 0)//如有货
if ((devinfoT.SplitByte_0 > 0) && (devinfoT.RunState == 0))//如当前位置有货&&(devinfoT.DeviceIndex != 22021)
{
int tempFid = ccf.GetTempManageIdx();
int end_deviceindex = 0;
if (devinfoT.DeviceIndex == 22021 || devinfoT.DeviceIndex == 22048)
{
end_deviceindex = 12059;
}
else
{
end_deviceindex = 22006;
}
barcode.Clear();
barcode.Append(tempFid.ToString());
object[] obt = new object[17] { tempFid, 2, barcode.ToString(), 1, 4, 1, 1, ccf.GetWarehouseIndex(), ccf.GetWarehouseIndex(), "-", devinfoT.DeviceIndex, 22006.ToString(), "-", 0, DateTime.Now.ToString("u"), 0, Model.CGeneralFunction.TASKABEND };
object[] obt = new object[17] { tempFid, 2, barcode.ToString(), 1, 4, 1, 1, ccf.GetWarehouseIndex(), ccf.GetWarehouseIndex(), "-", devinfoT.DeviceIndex, end_deviceindex.ToString(), "-", 0, DateTime.Now.ToString("u"), 0, Model.CGeneralFunction.TASKABEND };
dbo.ExceSQL(string.Format("INSERT INTO T_Manage_Task(FID, F_ManageTaskKindIndex,FPALLETBARCODE,FMANAGETASKTYPE,FCONTROLTASKTYPE, FTASKLEVEL, FISRETURN,FSTARTWAREHOUSE,FENDWAREHOUSE, FSTARTCELL, FSTARTDEVICE, FENDDEVICE, FENDCELL, FSTATUS, FBEGTIME, FIntoStepOK,FExceptionNO)VALUES({0},{1},'{2}',{3},{4},{5},{6},'{7}','{8}','{9}',{10},{11},'{12}',{13},'{14}','{15}',{16})", obt));
CommonClassLib.CCarryConvert.WriteDarkCasket(devinfoT.DeviceIndex.ToString(), "", "", "按钮申请托盘离开,生成去叠盘机任务");
}
else
{
CommonClassLib.CCarryConvert.WriteDarkCasket(devinfoT.DeviceIndex.ToString(), "", "", "按钮申请托盘离开," + devinfoT.DeviceIndex.ToString() + "无货");
CommonClassLib.CCarryConvert.WriteDarkCasket(devinfoT.DeviceIndex.ToString(), "", "", "按钮申请托盘离开," + devinfoT.DeviceIndex.ToString() + "无货或不空闲");
}
}
else
{
CommonClassLib.CCarryConvert.WriteDarkCasket(devinfoT.DeviceIndex.ToString(), "", "", "按钮申请托盘离开,存在穿梭车从" + devinfoT.DeviceIndex.ToString() + "取货任务");
CommonClassLib.CCarryConvert.WriteDarkCasket(devinfoT.DeviceIndex.ToString(), "", "", "按钮申请托盘离开,存在" + devinfoT.DeviceIndex.ToString() + "没执行完任务");
}
#endregion
witemnames[0].Clear();
@ -8018,7 +8055,7 @@ namespace WcfControlMonitorLib
wv[0].Append("2");
sdo = CommModeCreate.CreateSendDeviceOrder(devidx);
sdo.WriteDBData(witemnames, wv, devinfo.S7Connection);
CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "写拆垛应答", devidx.ToString(), "写标志2**");
CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "写按钮应答", devidx.ToString(), "写标志2**");
break;
#endregion
#region 安全门
@ -8554,6 +8591,8 @@ namespace WcfControlMonitorLib
bool bReturnState = true;
errText = string.Empty;
sql.Remove(0, sql.Length);
sql.Append("SELECT * FROM AGV_TASK");
dv = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView;
@ -8565,6 +8604,11 @@ namespace WcfControlMonitorLib
sql.Append("SELECT * FROM T_Monitor_Task WHERE F_MonitorIndex =")
.Append(dv[i]["FID"].ToString());
dvM = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView;
int TaskControlType = ccf.GetManageTaskTypefromMonitor(Convert.ToInt32(dv[i]["FID"]));
int fid = ccf.GetManageTaskIndexfromMonitor(Convert.ToInt32(dv[i]["FID"]));
int mti = ccf.GetManageTaskKindIndexFromMonitor(Convert.ToInt32(dv[i]["FID"]));
if (dvM.Count > 0)
{
int iAGVStatus = Convert.ToInt32(dv[i]["AGV_TASK_STATUS"]);
@ -8577,6 +8621,7 @@ namespace WcfControlMonitorLib
sql.Append("UPDATE T_Monitor_Task SET F_Status = 7 WHERE F_MonitorIndex = ")
.Append(dv[i]["FID"].ToString());
dbo.ExecuteSql(sql.ToString());
CommonClassLib.CCarryConvert.WriteDarkCasket("设备指令管理", "AGV接受设备指令", "托盘条码:" + dvM[0]["F_TxtParam"].ToString(), "设备索引:" + dvM[0]["F_DeviceIndex"].ToString() + ";设备指令索引:" + dv[i]["FID"].ToString());
}
break;
case 10: //执行中
@ -8586,6 +8631,12 @@ namespace WcfControlMonitorLib
sql.Append("UPDATE T_Monitor_Task SET F_Status = 10 WHERE F_MonitorIndex = ")
.Append(dv[i]["FID"].ToString());
dbo.ExecuteSql(sql.ToString());
sql.Remove(0, sql.Length);
sql.Append("update T_Manage_Task set FCurrentLocation=50001").Append(" where F_ManageTaskKindIndex=").Append(mti).Append(" and FID=").Append(fid);
dbo.ExceSQL(sql.ToString());
CommonClassLib.CCarryConvert.WriteDarkCasket("设备指令管理", "AGV执行设备指令", "托盘条码:" + dvM[0]["F_TxtParam"].ToString(), "设备索引:" + dvM[0]["F_DeviceIndex"].ToString() + ";设备指令索引:" + dv[i]["FID"].ToString());
}
break;
case 5: //已完成
@ -8594,17 +8645,30 @@ namespace WcfControlMonitorLib
sql.Append("DELETE FROM AGV_TASK WHERE FID = ")
.Append(dv[i]["FID"].ToString());
dbo.ExecuteSql(sql.ToString());
CommonClassLib.CCarryConvert.WriteDarkCasket("设备指令管理", "AGV完成设备指令", "托盘条码:" + dvM[0]["F_TxtParam"].ToString(), "设备索引:" + dvM[0]["F_DeviceIndex"].ToString() + ";设备指令索引:" + dv[i]["FID"].ToString());
break;
case 6: //申请删除
if (dvM[0]["F_Status"].ToString() != "900")
if (TaskControlType != 2)
{
if (dvM[0]["F_Status"].ToString() != "900")
{
sql.Remove(0, sql.Length);
sql.Append("UPDATE T_Monitor_Task SET F_Status = 900 WHERE F_MonitorIndex = ")
.Append(dv[i]["FID"].ToString());
dbo.ExecuteSql(sql.ToString());
CommonClassLib.CCarryConvert.WriteDarkCasket("设备指令管理", "AGV申请删除设备指令", "托盘条码:" + dvM[0]["F_TxtParam"].ToString(), "设备索引:" + dvM[0]["F_DeviceIndex"].ToString() + ";设备指令索引:" + dv[i]["FID"].ToString());
cgs.ActionComplete(Convert.ToInt32(dvM[0]["F_DeviceIndex"]), Convert.ToInt32(dvM[0]["F_MonitorIndex"]), Model.CGeneralFunction.TASKDELETE);
}
}
else
{
cgs.ActionComplete(Convert.ToInt32(dvM[0]["F_DeviceIndex"]), Convert.ToInt32(dvM[0]["F_MonitorIndex"]), 0);
sql.Remove(0, sql.Length);
sql.Append("UPDATE T_Monitor_Task SET F_Status = 900 WHERE F_MonitorIndex = ")
sql.Append("DELETE FROM AGV_TASK WHERE FID = ")
.Append(dv[i]["FID"].ToString());
dbo.ExecuteSql(sql.ToString());
CommonClassLib.CCarryConvert.WriteDarkCasket("设备指令管理", "AGV申请删除设备指令", "托盘条码:" + dvM[0]["F_TxtParam"].ToString(), "设备索引:" + dvM[0]["F_DeviceIndex"].ToString() + ";设备指令索引:" + dv[i]["FID"].ToString());
cgs.ActionComplete(Convert.ToInt32(dvM[0]["F_DeviceIndex"]), Convert.ToInt32(dvM[0]["F_MonitorIndex"]), Model.CGeneralFunction.TASKDELETE);
CommonClassLib.CCarryConvert.WriteDarkCasket("设备指令管理", "AGV申请删除出库类型设备指令转报完成", "托盘条码:" + dvM[0]["F_TxtParam"].ToString(), "设备索引:" + dvM[0]["F_DeviceIndex"].ToString() + ";设备指令索引:" + dv[i]["FID"].ToString());
}
break;
case 1: //已发送
@ -8624,12 +8688,16 @@ namespace WcfControlMonitorLib
.Append(dv[i]["FID"].ToString());
dbo.ExecuteSql(sql.ToString());
if ((dvM[0]["F_NumParam2"].ToString() == "32025")&&(dvM[0]["F_DeviceIndex"].ToString() == "50001"))
{
sql.Remove(0, sql.Length);
sql.Append("UPDATE IO_CONTROL SET CONTROL_STATUS = 3 WHERE CONTROL_ID = ").Append(dvM[0]["F_ManageTaskIndex"].ToString());
dboMan.ExceSQL(sql.ToString());
}
sql.Remove(0, sql.Length);
sql.Append("update T_Manage_Task set FCurrentLocation=50001").Append(" where F_ManageTaskKindIndex=").Append(mti).Append(" and FID=").Append(fid);
dbo.ExceSQL(sql.ToString());
//if ((dvM[0]["F_NumParam2"].ToString() == "32025")&&(dvM[0]["F_DeviceIndex"].ToString() == "50001"))
//{
// sql.Remove(0, sql.Length);
// sql.Append("UPDATE IO_CONTROL SET CONTROL_STATUS = 3 WHERE CONTROL_ID = ").Append(dvM[0]["F_ManageTaskIndex"].ToString());
// dboMan.ExceSQL(sql.ToString());
//}
}
break;
@ -8651,8 +8719,8 @@ namespace WcfControlMonitorLib
// continue;
}
bReturnState = false;
errText += "AGV系统任务:任务号:" + dv[i]["FID"].ToString() + "在调度系统中不存在,请通知管理人员处理";
//bReturnState = false;
//errText += "AGV系统任务:任务号:" + dv[i]["FID"].ToString() + "在调度系统中不存在,请通知管理人员处理";
continue;
}

6
WcfControlMonitorLib/WcfControlMonitorLib.csproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -12,7 +12,7 @@
<AssemblyName>WcfControlMonitorLib</AssemblyName>
<ProjectTypeGuids>{3D9AD99F-2412-4246-B90B-4EAA41C64699};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<StartArguments>/client:"WcfTestClient.exe"</StartArguments>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>
@ -27,6 +27,7 @@
<DocumentationFile>
</DocumentationFile>
<UseVSHostingProcess>false</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -35,6 +36,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Cellbi.Lib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">

122
WcfControlMonitorLib/Web References/ManageService/Reference.cs

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.1
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
@ -9,7 +9,7 @@
//------------------------------------------------------------------------------
//
// 此源代码是由 Microsoft.VSDesigner 4.0.30319.1 版自动生成。
// 此源代码是由 Microsoft.VSDesigner 4.0.30319.42000 版自动生成。
//
#pragma warning disable 1591
@ -18,13 +18,13 @@ namespace WcfControlMonitorLib.ManageService {
using System.Web.Services;
using System.Diagnostics;
using System.Web.Services.Protocols;
using System.ComponentModel;
using System.Xml.Serialization;
using System.ComponentModel;
using System.Data;
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Web.Services.WebServiceBindingAttribute(Name="BasicHttpBinding_I_ManageService", Namespace="http://tempuri.org/")]
@ -1446,7 +1446,7 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.datacontract.org/2004/07/SiaSun.LMS.Enum")]
public enum MANAGE_STATUS {
@ -1471,7 +1471,7 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@ -1569,7 +1569,7 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@ -1718,7 +1718,7 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@ -1766,7 +1766,7 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@ -1828,7 +1828,7 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.datacontract.org/2004/07/SiaSun.LMS.Enum")]
public enum MANAGE_TYPE {
@ -1847,11 +1847,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageTypeGetTableCompletedEventHandler(object sender, ManageTypeGetTableCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageTypeGetTableCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -1873,11 +1873,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageCompleteCompletedEventHandler(object sender, ManageCompleteCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageCompleteCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -1915,11 +1915,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageExceptionCompletedEventHandler(object sender, ManageExceptionCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageExceptionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -1957,11 +1957,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageErrorCompletedEventHandler(object sender, ManageErrorCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageErrorCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -1999,11 +1999,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageCancelCompletedEventHandler(object sender, ManageCancelCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageCancelCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2041,11 +2041,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageUpdateStatusCompletedEventHandler(object sender, ManageUpdateStatusCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageUpdateStatusCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2083,11 +2083,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageExecuteCompletedEventHandler(object sender, ManageExecuteCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageExecuteCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2125,11 +2125,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageSendControlCompletedEventHandler(object sender, ManageSendControlCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageSendControlCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2167,11 +2167,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageSendLedCompletedEventHandler(object sender, ManageSendLedCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageSendLedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2209,11 +2209,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageCreateInCompletedEventHandler(object sender, ManageCreateInCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageCreateInCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2267,11 +2267,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageCreateOutCompletedEventHandler(object sender, ManageCreateOutCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageCreateOutCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2325,11 +2325,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageCreateOut_StockCompletedEventHandler(object sender, ManageCreateOut_StockCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageCreateOut_StockCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2383,11 +2383,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageMoveCompletedEventHandler(object sender, ManageMoveCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageMoveCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2441,11 +2441,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageMoveGoodsCompletedEventHandler(object sender, ManageMoveGoodsCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageMoveGoodsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2483,11 +2483,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageCreateChangeCompletedEventHandler(object sender, ManageCreateChangeCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageCreateChangeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2541,11 +2541,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageCreateLocalOutCompletedEventHandler(object sender, ManageCreateLocalOutCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageCreateLocalOutCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2599,11 +2599,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageCreateLocalInCompletedEventHandler(object sender, ManageCreateLocalInCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageCreateLocalInCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2657,11 +2657,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageCreateStockCompletedEventHandler(object sender, ManageCreateStockCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageCreateStockCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2699,11 +2699,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageCreateLocalIn_YTHCompletedEventHandler(object sender, ManageCreateLocalIn_YTHCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageCreateLocalIn_YTHCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2757,11 +2757,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageCheckSG186CompletedEventHandler(object sender, ManageCheckSG186CompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageCheckSG186CompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2799,11 +2799,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageInStorageCheckoutCompletedEventHandler(object sender, ManageInStorageCheckoutCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageInStorageCheckoutCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2849,23 +2849,23 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ControlTranslateCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ControlApplyCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ControlClearCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ManageStockCreateApplyCompletedEventHandler(object sender, ManageStockCreateApplyCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ManageStockCreateApplyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2911,11 +2911,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void Control_UpdateStatusCompletedEventHandler(object sender, Control_UpdateStatusCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class Control_UpdateStatusCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@ -2953,11 +2953,11 @@ namespace WcfControlMonitorLib.ManageService {
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
public delegate void ControlApply_ADDCompletedEventHandler(object sender, ControlApply_ADDCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9037.0")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class ControlApply_ADDCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {

Loading…
Cancel
Save