Browse Source

morkf

样式分支
NXX 2 years ago
parent
commit
8b7948e4a3
4 changed files with 5 additions and 16 deletions
  1. +1
    -1
      BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
  2. +1
    -1
      DosingSystem/BPASmartClient.DosingSystem.csproj
  3. +1
    -1
      FryPot_DosingSystem/Control/DosingLogicControl.cs
  4. +2
    -13
      TestDemo/Form1.cs

+ 1
- 1
BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj View File

@@ -409,7 +409,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BPA.Helper" Version="1.0.17" />
<PackageReference Include="BPA.Helper" Version="1.0.28" />
<PackageReference Include="BPA.Message" Version="1.0.66" />
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" />
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />


+ 1
- 1
DosingSystem/BPASmartClient.DosingSystem.csproj View File

@@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BPA.Helper" Version="1.0.19" />
<PackageReference Include="BPA.Helper" Version="1.0.28" />
<PackageReference Include="BPA.Message" Version="1.0.66" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>


+ 1
- 1
FryPot_DosingSystem/Control/DosingLogicControl.cs View File

@@ -3706,7 +3706,7 @@ namespace FryPot_DosingSystem.Control
/// </summary>
private void AgvLineThreeLoadRollerCom()
{
if (globalVar.agvLineThreeLoadCom || globalVar.LineThreeRobotTaskError))
if (globalVar.agvLineThreeLoadCom || globalVar.LineThreeRobotTaskError)
{
globalVar.rollerLineThree.CanRun = true;
globalVar.agvLineThreeLoadCom = false;


+ 2
- 13
TestDemo/Form1.cs View File

@@ -55,7 +55,7 @@ namespace TestDemo
////string url = $\"http://172.16.11.118:8089/apicallback/quicktron/robotjob/upstreamrequest?sign={value}\";
//string url = $\"http://172.16.11.118:8089/apicallback/quicktron/robotjob/upstreamrequest\";
//var res = APIHelper.GetInstance.HttpRequest(url, \"\", aGVToUpSystem, RequestType.POST);
Upstreamrequest aGVToUpSystem = new Upstreamrequest() { agvCode = "123" };
Upstreamrequest aGVToUpSystem = new Upstreamrequest() {};
// string value = JsonConvert.SerializeObject(aGVToUpSystem);
// string url = $"http://192.168.1.40:8089/apicallback/quicktron/robotjob/upstreamrequest?sign={value}";
string url = $"http://192.168.1.40:8089/apicallback/quicktron/robotjob/upstreamrequest";
@@ -89,17 +89,6 @@ namespace TestDemo
siemensHelper.WriteClass(tt, 3);
}

private void button5_Click(object sender, EventArgs e)
{
//string body =\" { \\"header\\":{ \\"requestId\\":\\"05c1124b4ec443329bbf8da7d2aba5f2\\",\\"timestamp\\":\\"2022-10-19 12:27:27\\",\\"version\\":\\"2.7\\"},\\"body\\":{ \\"event\\":{ \\"agvCode\\":\\"ZT11-21\\",\\"command\\":\\"LOAD\\",\\"containerCode\\":\\"24fefca64b65f2a\\",\\"equipmentId\\":0,\\"jobId\\":\\"SIRoller_166615364143003483\\",\\"msgId\\":\\"1666153642429\\"},\\"ts\\":1666153642429,\\"type\\":\\"REQUEST_DEVICE\\",\\"warehouseId\\":1,\\"zoneCode\\":\\"zone\\"} }\";

string body =" { \"header\":{ \"requestId\":\"471d848e19ed4696858f72c25415f0e8\",\"timestamp\":\"2022-10-19 17:29:27\",\"version\":\"2.7\"},\"body\":{ \"event\":{ \"jobData\":{ \"agvCode\":\"ZT11-24\",\"containerCode\":\"24ff16fcb707a86\",\"pointCode\":\"sxSX88\",\"startPointCode\":\"sxSX88\",\"targetPointCode\":\"naFssQ\"},\"jobId\":\"SIBucket_166617173650007811\",\"jobType\":\"POINT_ROLLER_MOVE\",\"robotJobId\":\"c981a984-91bc-4f94-9685-3a8a36629457\",\"state\":\"ROLLER_LOAD_DOING\",\"warehouseId\":1},\"id\":\"18717ed5-9e79-4f73-a6ea-176e50792696\",\"ts\":1666171767233,\"type\":\"JobReportEvent\",\"warehouseId\":1,\"zoneCode\":\"kckq\"} }";

var res = JsonConvert.DeserializeObject<TaskData>(body);
var r = res.body.@event;



}
}
}

Loading…
Cancel
Save