From 17e3ef45fe0a6b6f8a147b50740834ac734f9317 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期二, 15 七月 2025 17:30:13 +0800
Subject: [PATCH] 1111

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs |   69 ++++++++++++++++++++++++++++------
 1 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs
index d756ce6..908cd63 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs
@@ -22,26 +22,26 @@
         /// <returns></returns>
         [HttpPost]
         // [Route("OutboundOrder")]
-        public Result CreateTask(CreateTaskModel model)
+        public Result<Empty> CreateTask(CreateTaskModel model)
         {
-            Result result = new Result();
-            LogHelper.Info("CreateTask 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "CreateTask");
+            Result<Empty> result = new Result<Empty>();
+            LogHelper.Info("CreateTask 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "API");
             result = ApiHelper.createtask(model);
-            LogHelper.Info("CreateTask 杩斿洖锛� + JsonConvert.SerializeObject(result), "CreateTask");
+            LogHelper.Info("CreateTask 杩斿洖锛� + JsonConvert.SerializeObject(result), "API");
             return result;
         }
 
         /// <summary>
-        /// 鐢宠鍏ュ簱
+        /// 璁惧淇″彿鍙嶉
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        public Result notifyDeviceSignal(NotifyDeviceSignalModel model)
+        public Result<Empty> notifyDeviceSignal(NotifyDeviceSignalModel model)
         {
-            Result result = new Result();
-            LogHelper.Info("notifyDeviceSignal 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "EquipmentInfo");
+            Result<Empty> result = new Result<Empty>();
+            LogHelper.Info("notifyDeviceSignal 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "API");
             result = ApiHelper.NotifyDeviceSignal(model);
-            LogHelper.Info("notifyDeviceSignal 杩斿洖锛� + JsonConvert.SerializeObject(result), "EquipmentInfo");
+            LogHelper.Info("notifyDeviceSignal 杩斿洖锛� + JsonConvert.SerializeObject(result), "API");
             return result;
         }
 
@@ -50,11 +50,54 @@
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        public ReturnResult notifyTaskStatus(NotifyTaskStatusModel model)
+        public Result<Empty> notifyTaskStatus(NotifyTaskStatusModel model)
         {
-            LogHelper.Info("AGVCallbackState Request锛� + JsonConvert.SerializeObject(model), "HosttoagvTask");
-            WCSCore.NotifyTaskStatus(model);
-            return new ReturnResult();
+            LogHelper.Info("notifyTaskStatus 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "API");
+           var result= WCSCore.NotifyTaskStatus(model);
+            LogHelper.Info("notifyTaskStatus 杩斿洖锛� + JsonConvert.SerializeObject(result), "API");
+            return result;
+        }
+
+        /// <summary>
+        /// 鑾峰彇鎵樼洏鐗╂枡淇℃伅
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public Result<Empty> getCntrInfo(GetCntrInfoModel model)
+        {
+            Result<Empty> result = new Result<Empty>();
+            LogHelper.Info("getCntrInfo 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "API");
+            result = ApiHelper.GetCntrInfo(model);
+            LogHelper.Info("getCntrInfo 杩斿洖锛� + JsonConvert.SerializeObject(result), "API");
+            return result;
+        }
+
+        /// <summary>
+        /// 鐢宠缁堢偣
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public Result<ReseltApplyDestModel> applyDest(ApplyDestModel model)
+        {
+            Result<ReseltApplyDestModel> result = new Result<ReseltApplyDestModel>();
+            LogHelper.Info("applyDest 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "API");
+            result = ApiHelper.ApplyDest(model);
+            LogHelper.Info("applyDest 杩斿洖锛� + JsonConvert.SerializeObject(result), "API");
+            return result;
+        }
+
+        /// <summary>
+        /// 璁惧鎶ヨ涓婃姤
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public Result<Empty> notifyAlarm(NotifyAlarmModel model)
+        {
+            Result<Empty> result = new Result<Empty>();
+            LogHelper.Info("notifyAlarm 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "API");
+            //result = ApiHelper.ApplyDest(model);
+            LogHelper.Info("notifyAlarm 杩斿洖锛� + JsonConvert.SerializeObject(result), "API");
+            return result;
         }
     }
 }

--
Gitblit v1.9.1