Skip to content

张东亮 / SO1131-ConveyorLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit cc23dd9a 由 张东亮
选项

agv上报

1 个父辈 553e6f4f
全部展开
内嵌 并排
正在显示 8 个修改的文件 包含 10 行增加 和 21 行删除
AssemblyLine.sln
...@@ -15,8 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RFID_PuYue", "source\RFID_P ...@@ -15,8 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RFID_PuYue", "source\RFID_P
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PosConfig", "source\PosConfig\PosConfig\PosConfig.csproj", "{4A2857DF-01D4-46D4-A1F8-340B59828260}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PosConfig", "source\PosConfig\PosConfig\PosConfig.csproj", "{4A2857DF-01D4-46D4-A1F8-340B59828260}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfigHelper", "..\..\CSharp-Workspace\MyProject\DLL\ConfigHelper\ConfigHelper\ConfigHelper.csproj", "{290182DB-D949-434E-9FF7-C59BDE3F433A}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -72,14 +70,6 @@ Global ...@@ -72,14 +70,6 @@ Global
{4A2857DF-01D4-46D4-A1F8-340B59828260}.Release|Any CPU.Build.0 = Release|Any CPU {4A2857DF-01D4-46D4-A1F8-340B59828260}.Release|Any CPU.Build.0 = Release|Any CPU
{4A2857DF-01D4-46D4-A1F8-340B59828260}.Release|x64.ActiveCfg = Release|Any CPU {4A2857DF-01D4-46D4-A1F8-340B59828260}.Release|x64.ActiveCfg = Release|Any CPU
{4A2857DF-01D4-46D4-A1F8-340B59828260}.Release|x64.Build.0 = Release|Any CPU {4A2857DF-01D4-46D4-A1F8-340B59828260}.Release|x64.Build.0 = Release|Any CPU
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Debug|x64.ActiveCfg = Debug|x64
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Debug|x64.Build.0 = Debug|x64
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Release|Any CPU.Build.0 = Release|Any CPU
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Release|x64.ActiveCfg = Release|x64
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
source/AssemblyLineClient/App.config
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<add key="App_Title" value="流水线客户端" /> <add key="App_Title" value="流水线客户端" />
<add key="UseBuzzer" value="1" /> <add key="UseBuzzer" value="1" />
<!--Server address--> <!--Server address-->
<add key="http.server" value="http://127.0.0.1/smf-core/" /> <add key="http.server" value="http://192.168.1.84:8801/" />
<!--<add key="http.server" value="http://127.0.0.1:8800/" />--> <!--<add key="http.server" value="http://127.0.0.1:8800/" />-->
<!--ESS server address--> <!--ESS server address-->
<add key="ESS_Server" value="http://10.42.176.205:9046" /> <add key="ESS_Server" value="http://10.42.176.205:9046" />
......
source/AssemblyLineClient/ConveyorLineClient.csproj
...@@ -61,6 +61,9 @@ ...@@ -61,6 +61,9 @@
<Reference Include="CodeLibrary"> <Reference Include="CodeLibrary">
<HintPath>..\..\dll\CodeLibrary.dll</HintPath> <HintPath>..\..\dll\CodeLibrary.dll</HintPath>
</Reference> </Reference>
<Reference Include="ConfigHelper">
<HintPath>..\..\..\..\SharedRefDll\Neotel\ConfigHelper.dll</HintPath>
</Reference>
<Reference Include="halcondotnet"> <Reference Include="halcondotnet">
<HintPath>..\..\dll\halcondotnet.dll</HintPath> <HintPath>..\..\dll\halcondotnet.dll</HintPath>
</Reference> </Reference>
...@@ -203,10 +206,6 @@ ...@@ -203,10 +206,6 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\CSharp-Workspace\MyProject\DLL\ConfigHelper\ConfigHelper\ConfigHelper.csproj">
<Project>{290182db-d949-434e-9ff7-c59bde3f433a}</Project>
<Name>ConfigHelper</Name>
</ProjectReference>
<ProjectReference Include="..\Common\Common.csproj"> <ProjectReference Include="..\Common\Common.csproj">
<Project>{43cdd09e-fcf3-4960-a01d-3bbfe9933122}</Project> <Project>{43cdd09e-fcf3-4960-a01d-3bbfe9933122}</Project>
<Name>Common</Name> <Name>Common</Name>
......
source/AssemblyLineClient/FrmLine.cs
...@@ -34,6 +34,7 @@ namespace OnlineStore.AssemblyLine ...@@ -34,6 +34,7 @@ namespace OnlineStore.AssemblyLine
startTimer.Interval = 1000; startTimer.Interval = 1000;
startTimer.Enabled = false; startTimer.Enabled = false;
startTimer.AutoReset = false; startTimer.AutoReset = false;
//SServerManager.UpdateAgvStatus(new List<AgvStatus>() { new AgvStatus() { name ="agv1", elec="20", loc= "WAREHOUSE", message="test", type=1 } });
} }
private void FrmMain_Load(object sender, EventArgs e) private void FrmMain_Load(object sender, EventArgs e)
{ {
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -43,6 +43,9 @@ ...@@ -43,6 +43,9 @@
<Reference Include="CodeLibrary"> <Reference Include="CodeLibrary">
<HintPath>..\..\dll\CodeLibrary.dll</HintPath> <HintPath>..\..\dll\CodeLibrary.dll</HintPath>
</Reference> </Reference>
<Reference Include="ConfigHelper">
<HintPath>..\..\..\..\SharedRefDll\Neotel\ConfigHelper.dll</HintPath>
</Reference>
<Reference Include="halcondotnet"> <Reference Include="halcondotnet">
<HintPath>..\..\dll\halcondotnet.dll</HintPath> <HintPath>..\..\dll\halcondotnet.dll</HintPath>
</Reference> </Reference>
...@@ -115,10 +118,6 @@ ...@@ -115,10 +118,6 @@
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\CSharp-Workspace\MyProject\DLL\ConfigHelper\ConfigHelper\ConfigHelper.csproj">
<Project>{290182db-d949-434e-9ff7-c59bde3f433a}</Project>
<Name>ConfigHelper</Name>
</ProjectReference>
<ProjectReference Include="..\Common\Common.csproj"> <ProjectReference Include="..\Common\Common.csproj">
<Project>{43cdd09e-fcf3-4960-a01d-3bbfe9933122}</Project> <Project>{43cdd09e-fcf3-4960-a01d-3bbfe9933122}</Project>
<Name>Common</Name> <Name>Common</Name>
......
source/DeviceLibrary/lineManager/ALineManager.cs
...@@ -265,7 +265,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -265,7 +265,7 @@ namespace OnlineStore.DeviceLibrary
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("UploadAGVStatus", ex); LogUtil.error($"UploadAGVStatus:{JsonHelper.SerializeObject(robotStates)}", ex);
} }
} }
/// <summary> /// <summary>
......
source/DeviceLibrary/lineManager/SServerManager.cs
...@@ -535,7 +535,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -535,7 +535,7 @@ namespace OnlineStore.DeviceLibrary
Dictionary<string, string> queryStr = new Dictionary<string, string>(); Dictionary<string, string> queryStr = new Dictionary<string, string>();
//queryStr.Add("rfid", rfid); //queryStr.Add("rfid", rfid);
string server = GetAddr(Addr_agvStatus, queryStr); string server = GetAddr(Addr_agvStatus, queryStr);
string json = HttpHelper.Post(server,""); string json = HttpHelper.Post(server,JsonHelper.SerializeObject(agvStatuses));
ServerData rtnData = JsonHelper.DeserializeJsonToObject<ServerData>(json); ServerData rtnData = JsonHelper.DeserializeJsonToObject<ServerData>(json);
if(!agvStr.Equals(json)) if(!agvStr.Equals(json))
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!