From c378b390c2b98c00135d055de6896d2d5a8ccdd3 Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期一, 19 五月 2025 17:21:54 +0800
Subject: [PATCH] 大洋原材料库业务开发
---
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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..326ba60 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs
@@ -22,9 +22,9 @@
/// <returns></returns>
[HttpPost]
// [Route("OutboundOrder")]
- public Result CreateTask(CreateTaskModel model)
+ public Result<Empty> CreateTask(CreateTaskModel model)
{
- Result result = new Result();
+ Result<Empty> result = new Result<Empty>();
LogHelper.Info("CreateTask 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "CreateTask");
result = ApiHelper.createtask(model);
LogHelper.Info("CreateTask 杩斿洖锛� + JsonConvert.SerializeObject(result), "CreateTask");
@@ -36,9 +36,9 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public Result notifyDeviceSignal(NotifyDeviceSignalModel model)
+ public Result<Empty> notifyDeviceSignal(NotifyDeviceSignalModel model)
{
- Result result = new Result();
+ Result<Empty> result = new Result<Empty>();
LogHelper.Info("notifyDeviceSignal 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "EquipmentInfo");
result = ApiHelper.NotifyDeviceSignal(model);
LogHelper.Info("notifyDeviceSignal 杩斿洖锛� + JsonConvert.SerializeObject(result), "EquipmentInfo");
@@ -50,11 +50,21 @@
/// </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), "EquipmentInfo");
+ var result= WCSCore.NotifyTaskStatus(model);
+ LogHelper.Info("notifyTaskStatus 杩斿洖锛� + JsonConvert.SerializeObject(result), "EquipmentInfo");
+ return result;
+ }
+
+ public Result<Empty> getCntrInfo(GetCntrInfoModel model)
+ {
+ Result<Empty> result = new Result<Empty>();
+ LogHelper.Info("getCntrInfo 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "EquipmentInfo");
+ result = ApiHelper.GetCntrInfo(model);
+ LogHelper.Info("getCntrInfo 杩斿洖锛� + JsonConvert.SerializeObject(result), "EquipmentInfo");
+ return result;
}
}
}
--
Gitblit v1.9.1