From d93440432c13c75f798427be327cde02cfe7f301 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期日, 20 七月 2025 17:00:29 +0800
Subject: [PATCH] 增加无称重的指定货位入库流程，添加指定卸货位解绑接口备用
---
api/AgvController.cs | 54 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/api/AgvController.cs b/api/AgvController.cs
index a64df99..68fb832 100644
--- a/api/AgvController.cs
+++ b/api/AgvController.cs
@@ -1,38 +1,31 @@
-锘縰sing HH.WCS.Mobox3.AnGang.core;
+锘縰sing System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Reflection;
+using System.Text;
+using System.Web;
+using System.Web.Http;
+
+using HH.WCS.Mobox3.AnGang.core;
using HH.WCS.Mobox3.AnGang.dispatch;
using HH.WCS.Mobox3.AnGang.process;
-using HH.WCS.Mobox3.AnGang.wms;
-using Newtonsoft.Json;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Web.Http;
-using static HH.WCS.Mobox3.AnGang.dispatch.NDC;
-using System.Linq;
using HH.WCS.Mobox3.AnGang.util;
+using HH.WCS.Mobox3.AnGang.wms;
+
+using NetSDKCS;
+
+using Newtonsoft.Json;
using static HH.WCS.Mobox3.AnGang.api.ApiModel;
+using static HH.WCS.Mobox3.AnGang.dispatch.NDC;
namespace HH.WCS.Mobox3.AnGang.api
{
/// <summary>
/// 璁惧淇℃伅涓婃姤锛坔osttoagv涓婃姤銆佹澀濂ュ爢鍨涙満銆佸浗鑷猘gv锛� /// </summary>
- [RoutePrefix("agv")]
public class AgvController : ApiController
{
- ///// <summary>
- ///// NDC HostToAGV 浠诲姟鐘舵�鍥炴姤
- ///// </summary>
- ///// <param name="model"></param>
- ///// <returns></returns>
- //[HttpPost]
- //[Route("AGVCallbackState")]
- //public ReturnResult AGVCallbackState(AgvTaskState model)
- //{
- // LogHelper.Info("NDC HostToAGV浠诲姟鐘舵�鍥炴姤锛� + JsonConvert.SerializeObject(model), "HosttoagvTask");
- // return AgvService.OperateAgvTaskStatus(model);
- //}
-
/// <summary>
/// RCS鍥借嚜AGV浠诲姟鐘舵�鍥炴姤
/// </summary>
@@ -45,6 +38,21 @@
return GZRobot.orderStatusReport(model);
}
+ [HttpPost]
+ [Route("agvRealtimeStateReport")]
+ public IHttpActionResult agvRealtimeStateReport(agvRealtimeStateReportInfo model) {
+ LogHelper.Info("agvRealtimeStateReport锛歊CS鍥借嚜AGV瀹炴椂鐘舵�鍥炴姤锛� + JsonConvert.SerializeObject(model), "HosttoagvTask");
+
+ var res = WCSCore.agvRealtimeStateReport(model);
+ if (model == null) return NotFound();
+ if (string.IsNullOrEmpty(res)) {
+ return BadRequest();
+ }
+ else {
+ return Ok();
+ }
+ }
+
/// <summary>
/// AGV 涓庝骇绾胯繘琛屽畨鍏ㄤ氦浜� /// </summary>
@@ -52,7 +60,7 @@
/// <returns></returns>
[HttpPost]
[Route("safetyInteraction")]
- public ReturnResult SafetyInteraction(SafetyInteractionInfo model) {
+ public gzResult SafetyInteraction(SafetyInteractionInfo model) {
return WCSCore.SafetyInteraction(model);
}
}
--
Gitblit v1.9.1