master
sunzy 2 years ago
parent 89d26082ec
commit 9bd766bb02

@ -11,6 +11,8 @@ using Khd.Core.Application;
using Khd.Core.Domain.Dto.webapi; using Khd.Core.Domain.Dto.webapi;
using Microsoft.Build.Utilities; using Microsoft.Build.Utilities;
using Masuit.Tools; using Masuit.Tools;
using AngleSharp.Css.Values;
using static System.Net.Mime.MediaTypeNames;
namespace Khd.Core.Api.Controllers namespace Khd.Core.Api.Controllers
{ {
@ -30,10 +32,10 @@ namespace Khd.Core.Api.Controllers
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("agvCallback")] [HttpPost("agvCallback")]
public ReponseagvCallbackDto agvCallback(string a) public ReponseagvCallbackDto agvCallback(agvCallbackDto agvCallbackDto)
{ {
LogManager.Info($"RecieveRcsController接口信息{a.ToJsonString()}"); LogManager.Info($"RecieveRcsController接口信息{agvCallbackDto.ToJsonString()}");
agvCallbackDto agvCallbackDto=new agvCallbackDto();
return _application.AgvCallback(agvCallbackDto); return _application.AgvCallback(agvCallbackDto);
} }

@ -19,7 +19,7 @@ namespace Khd.Core.Wcs.Wcs
/// <returns></returns> /// <returns></returns>
public bool ManualOutWare(RequestManualOutWare requestManualOutWare) public bool ManualOutWare(RequestManualOutWare requestManualOutWare)
{ {
//推送出库数据 //手工出库调用
var url = "/api/Interface/ManualOutWare"; var url = "/api/Interface/ManualOutWare";
var concontentType = "application/json"; var concontentType = "application/json";
var result = HttpHelper.HttpPost(url, requestManualOutWare.ToJsonString(), concontentType, 60, null); var result = HttpHelper.HttpPost(url, requestManualOutWare.ToJsonString(), concontentType, 60, null);
@ -41,7 +41,7 @@ namespace Khd.Core.Wcs.Wcs
/// <returns></returns> /// <returns></returns>
public bool CheckProfit(RequestCheck requestCheck) public bool CheckProfit(RequestCheck requestCheck)
{ {
//推送出库数据 //盘盈调用
var url = "/api/Interface/CheckProfit"; var url = "/api/Interface/CheckProfit";
var concontentType = "application/json"; var concontentType = "application/json";
var result = HttpHelper.HttpPost(url, requestCheck.ToJsonString(), concontentType, 60, null); var result = HttpHelper.HttpPost(url, requestCheck.ToJsonString(), concontentType, 60, null);
@ -63,7 +63,7 @@ namespace Khd.Core.Wcs.Wcs
/// <returns></returns> /// <returns></returns>
public bool CheckLoss(RequestCheck requestCheck) public bool CheckLoss(RequestCheck requestCheck)
{ {
//推送出库数据 //盘亏调用
var url = "/api/Interface/CheckLoss"; var url = "/api/Interface/CheckLoss";
var concontentType = "application/json"; var concontentType = "application/json";
var result = HttpHelper.HttpPost(url, requestCheck.ToJsonString(), concontentType, 60, null); var result = HttpHelper.HttpPost(url, requestCheck.ToJsonString(), concontentType, 60, null);
@ -78,5 +78,71 @@ namespace Khd.Core.Wcs.Wcs
} }
return true; return true;
} }
/// <summary>
/// 生成任务单
/// </summary>
/// <param name="requestCheck"></param>
/// <returns></returns>
public bool genAgvSchedulingTask(RequestAGVTaskDto requestAGVTaskDto)
{
//生成任务单
var url = "http://IP:PORT/rcms/services/rest/hikRpcService/genAgvSchedulingTask";
var concontentType = "application/json";
var result = HttpHelper.HttpPost(url, requestAGVTaskDto.ToJsonString(), concontentType, 60, null);
var model = (ReponseMessage)JsonConvert.DeserializeObject(result.ToString(), typeof(ReponseMessage));
if (model.code == "0")
{
LogManager.Info("调用成功。");
}
else
{
LogManager.Info("调用失败。");
}
return true;
}
/// <summary>
/// 继续执行
/// </summary>
/// <param name="requestCheck"></param>
/// <returns></returns>
public bool continueTask(RequestAGVTaskDto requestAGVTaskDto)
{
//继续执行
var url = "http://IP:PORT/rcms/services/rest/hikRpcService/continueTask";
var concontentType = "application/json";
var result = HttpHelper.HttpPost(url, requestAGVTaskDto.ToJsonString(), concontentType, 60, null);
var model = (ReponseMessage)JsonConvert.DeserializeObject(result.ToString(), typeof(ReponseMessage));
if (model.code == "0")
{
LogManager.Info("调用成功。");
}
else
{
LogManager.Info("调用失败。");
}
return true;
}
/// <summary>
/// 继续执行
/// </summary>
/// <param name="requestCheck"></param>
/// <returns></returns>
public bool cancelTask(RequestAGVTaskDto requestAGVTaskDto)
{
//推送出库数据
var url = "http://IP:PORT/rcms/services/rest/hikRpcService/cancelTask";
var concontentType = "application/json";
var result = HttpHelper.HttpPost(url, requestAGVTaskDto.ToJsonString(), concontentType, 60, null);
var model = (ReponseMessage)JsonConvert.DeserializeObject(result.ToString(), typeof(ReponseMessage));
if (model.code == "0")
{
LogManager.Info("调用成功。");
}
else
{
LogManager.Info("调用失败。");
}
return true;
}
} }
} }

Loading…
Cancel
Save