From 9bd766bb02f4ee29cc58360a34ce7b97025d543c Mon Sep 17 00:00:00 2001
From: sunzy <sunziyue@kehaida.com>
Date: Tue, 26 Mar 2024 15:16:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/RecieveRcsController.cs       |  8 ++-
 src/Khd.Core.Wcs/Wcs/WcsToWms.cs              | 72 ++++++++++++++++++-
 2 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/src/Khd.Core.Api/Controllers/RecieveRcsController.cs b/src/Khd.Core.Api/Controllers/RecieveRcsController.cs
index ac8927f..7e4d01c 100644
--- a/src/Khd.Core.Api/Controllers/RecieveRcsController.cs
+++ b/src/Khd.Core.Api/Controllers/RecieveRcsController.cs
@@ -11,6 +11,8 @@ using Khd.Core.Application;
 using Khd.Core.Domain.Dto.webapi;
 using Microsoft.Build.Utilities;
 using Masuit.Tools;
+using AngleSharp.Css.Values;
+using static System.Net.Mime.MediaTypeNames;
 
 namespace Khd.Core.Api.Controllers
 {
@@ -30,10 +32,10 @@ namespace Khd.Core.Api.Controllers
         /// <param name="model"></param>
         /// <returns></returns>
         [HttpPost("agvCallback")]
-        public ReponseagvCallbackDto agvCallback(string a)
+        public ReponseagvCallbackDto agvCallback(agvCallbackDto agvCallbackDto)
         {
-            LogManager.Info($"RecieveRcsController接口信息：{a.ToJsonString()}");
-            agvCallbackDto agvCallbackDto=new agvCallbackDto();
+            LogManager.Info($"RecieveRcsController接口信息：{agvCallbackDto.ToJsonString()}");
+          
             return  _application.AgvCallback(agvCallbackDto);
           
         }
diff --git a/src/Khd.Core.Wcs/Wcs/WcsToWms.cs b/src/Khd.Core.Wcs/Wcs/WcsToWms.cs
index a76d7d7..2582901 100644
--- a/src/Khd.Core.Wcs/Wcs/WcsToWms.cs
+++ b/src/Khd.Core.Wcs/Wcs/WcsToWms.cs
@@ -19,7 +19,7 @@ namespace Khd.Core.Wcs.Wcs
         /// <returns></returns>
         public bool ManualOutWare(RequestManualOutWare requestManualOutWare)
         {
-            //推送出库数据
+            //手工出库调用
             var url = "/api/Interface/ManualOutWare";
             var concontentType = "application/json";
             var result = HttpHelper.HttpPost(url, requestManualOutWare.ToJsonString(), concontentType, 60, null);
@@ -41,7 +41,7 @@ namespace Khd.Core.Wcs.Wcs
         /// <returns></returns>
         public bool CheckProfit(RequestCheck requestCheck)
         {
-            //推送出库数据
+            //盘盈调用
             var url = "/api/Interface/CheckProfit";
             var concontentType = "application/json";
             var result = HttpHelper.HttpPost(url, requestCheck.ToJsonString(), concontentType, 60, null);
@@ -63,7 +63,7 @@ namespace Khd.Core.Wcs.Wcs
         /// <returns></returns>
         public bool CheckLoss(RequestCheck requestCheck)
         {
-            //推送出库数据
+            //盘亏调用
             var url = "/api/Interface/CheckLoss";
             var concontentType = "application/json";
             var result = HttpHelper.HttpPost(url, requestCheck.ToJsonString(), concontentType, 60, null);
@@ -78,5 +78,71 @@ namespace Khd.Core.Wcs.Wcs
             }
             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;
+        }
     }
 }