wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整调用Agv创建任务链代码逻辑

Browse Source
This commit is contained in:
alex
2023-08-08 15:15:53 +08:00
parent 7b02f83a67
commit 446c4e45c8
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -7,10 +7,10 @@ using System.Linq.Expressions;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Text.Encodings.Web;
using System.Threading.Tasks; using System.Threading.Tasks;
using Aop.Api.Domain; using Aop.Api.Domain;
using Aspose.Cells.Drawing; using Aspose.Cells.Drawing;
using Dm;
using JNPF; using JNPF;
using JNPF.Common.Contracts; using JNPF.Common.Contracts;
using JNPF.Common.Core.Manager; using JNPF.Common.Core.Manager;
@@ -29,9 +29,6 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis;
using Newtonsoft.Json; using Newtonsoft.Json;
using NPOI.HPSF;
using NPOI.OpenXmlFormats.Wordprocessing;
using NPOI.SS.Formula.Functions;
using Polly.Timeout; using Polly.Timeout;
using Senparc.NeuChar.Helpers; using Senparc.NeuChar.Helpers;
using Senparc.Weixin.Work.AdvancedAPIs.OaDataOpen; using Senparc.Weixin.Work.AdvancedAPIs.OaDataOpen;
@@ -331,19 +328,21 @@ namespace Tnb.WarehouseMgr
} }
sw.Stop(); sw.Stop();
JNPF.Logging.Log.Information($"程序运行耗时{sw.ElapsedMilliseconds}ms"); Log.Information($"程序运行耗时{sw.ElapsedMilliseconds}ms");
await db.Ado.CommitTranAsync(); await db.Ado.CommitTranAsync();
//调用AGV创建任务链接口 //调用AGV创建任务链接口
var requestCfg = App.Configuration.Build<AgvRequestConfig>(); var requestCfg = App.Configuration.Build<AgvRequestConfig>();
var url = requestCfg.AgvRequestUrls.CreateTaskChainUrl;
var taskChainCodeDic = disTasks.Where(t => !t.groups.IsNullOrWhiteSpace()).GroupBy(g => g.groups!) var taskChainCodeDic = disTasks.Where(t => !t.groups.IsNullOrWhiteSpace()).GroupBy(g => g.groups!)
.ToDictionary(x => x.Key, x => x.Select(it => new .ToDictionary(x => x.Key, x => x.Select(it => new
{ {
taskCode = it.bill_code, taskCode = it.bill_code,
sourceName = it.startlocation_code, sourceName = it.startpoint_code,
targetName = it.endlocation_code targetName = it.endpoint_code
})); }));
Log.Information($"请求地址：{url}");
foreach (var (k, v) in taskChainCodeDic) foreach (var (k, v) in taskChainCodeDic)
{ {
dynamic reqBody = new ExpandoObject(); dynamic reqBody = new ExpandoObject();
@@ -352,8 +351,9 @@ namespace Tnb.WarehouseMgr
reqBody.sequential = false; reqBody.sequential = false;
reqBody.taskChainPriority = 0; reqBody.taskChainPriority = 0;
reqBody.taskList = v; reqBody.taskList = v;
await HttpClientHelper.PostStreamAsync(requestCfg.AgvRequestUrls.CreateTaskChainUrl, reqBody, CancellationToken.None); Log.Information($"请求参数：{JsonConvert.SerializeObject(reqBody)}");
//await HttpClientHelper.HttpPostAsync(url, JsonConvert.SerializeObject(reqBody)); var respBody = await HttpClientHelper.PostStreamAsync(url, reqBody, CancellationToken.None);
JNPF.Logging.Log.Information($"调用Agv接口响应结果:{respBody}");
} }
} }
} }

4
apihost/Tnb.API.Entry/Configurations/AgvRequestCfgUrl.json
View File

@@ -1,6 +1,6 @@
{ {
"AgvRequestUrls": { "AgvRequestUrls": {
"CreateTaskChainUrl": "http://192.168.11.104:1880/localhost/api/task‑chain/create", "CreateTaskChainUrl": "http://192.168.11.104:1880/api/task-chain/create",
"CancelTaskChainUrl": "http://192.168.11.104:1880/api/task‑chain/cancel" "CancelTaskChainUrl": "http://192.168.11.104:1880/api/task-chain/cancel"
} }
} }

2
apihost/Tnb.API.Entry/Startup.cs
View File

@@ -63,10 +63,8 @@ public class Startup : AppStartup
services.AddOverideVisualDev(); services.AddOverideVisualDev();
#if !DEBUG
//定时任务 //定时任务
services.AddHostedService<TimedTaskBackgroundService>(); services.AddHostedService<TimedTaskBackgroundService>();
#endif
} }
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IServiceProvider serviceProvider, IOptions<SenparcSetting> senparcSetting, IOptions<SenparcWeixinSetting> senparcWeixinSetting) public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IServiceProvider serviceProvider, IOptions<SenparcSetting> senparcSetting, IOptions<SenparcWeixinSetting> senparcWeixinSetting)