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 | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 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 81b449a..908cd63 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs
@@ -25,9 +25,9 @@
public Result<Empty> CreateTask(CreateTaskModel model)
{
Result<Empty> result = new Result<Empty>();
- LogHelper.Info("CreateTask 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "CreateTask");
+ 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;
}
@@ -39,9 +39,9 @@
public Result<Empty> notifyDeviceSignal(NotifyDeviceSignalModel model)
{
Result<Empty> result = new Result<Empty>();
- LogHelper.Info("notifyDeviceSignal 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "EquipmentInfo");
+ 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;
}
@@ -52,9 +52,9 @@
/// <returns></returns>
public Result<Empty> notifyTaskStatus(NotifyTaskStatusModel model)
{
- LogHelper.Info("notifyTaskStatus 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "EquipmentInfo");
+ LogHelper.Info("notifyTaskStatus 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "API");
var result= WCSCore.NotifyTaskStatus(model);
- LogHelper.Info("notifyTaskStatus 杩斿洖锛� + JsonConvert.SerializeObject(result), "EquipmentInfo");
+ LogHelper.Info("notifyTaskStatus 杩斿洖锛� + JsonConvert.SerializeObject(result), "API");
return result;
}
@@ -66,9 +66,37 @@
public Result<Empty> getCntrInfo(GetCntrInfoModel model)
{
Result<Empty> result = new Result<Empty>();
- LogHelper.Info("getCntrInfo 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "EquipmentInfo");
+ LogHelper.Info("getCntrInfo 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "API");
result = ApiHelper.GetCntrInfo(model);
- LogHelper.Info("getCntrInfo 杩斿洖锛� + JsonConvert.SerializeObject(result), "EquipmentInfo");
+ 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