From 71129e21a35a2d4be75ee0f1e96e2c51ced5f23b Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期四, 05 六月 2025 17:25:46 +0800
Subject: [PATCH] 大洋原材料库开发
---
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 12861d1..81b449a 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs
@@ -1,4 +1,5 @@
锘�+using HH.WCS.DaYang.core;
using Newtonsoft.Json;
using System.Web.Http;
using static HH.WCS.DaYang.api.ApiHelper;
@@ -21,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");
@@ -31,16 +32,43 @@
}
/// <summary>
- /// 鐢宠鍏ュ簱
+ /// 璁惧淇″彿鍙嶉
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public Result EquipmentInfo(EquipmentInfoModel model)
+ public Result<Empty> notifyDeviceSignal(NotifyDeviceSignalModel model)
{
- Result result = new Result();
- LogHelper.Info("EquipmentInfo 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "EquipmentInfo");
- result = ApiHelper.EquipmentInfo(model);
- LogHelper.Info("EquipmentInfo 杩斿洖锛� + JsonConvert.SerializeObject(result), "EquipmentInfo");
+ Result<Empty> result = new Result<Empty>();
+ LogHelper.Info("notifyDeviceSignal 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "EquipmentInfo");
+ result = ApiHelper.NotifyDeviceSignal(model);
+ LogHelper.Info("notifyDeviceSignal 杩斿洖锛� + JsonConvert.SerializeObject(result), "EquipmentInfo");
+ return result;
+ }
+
+ /// <summary>
+ /// 浠诲姟鐘舵�鍙嶉
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public Result<Empty> notifyTaskStatus(NotifyTaskStatusModel model)
+ {
+ LogHelper.Info("notifyTaskStatus 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "EquipmentInfo");
+ var result= WCSCore.NotifyTaskStatus(model);
+ LogHelper.Info("notifyTaskStatus 杩斿洖锛� + JsonConvert.SerializeObject(result), "EquipmentInfo");
+ 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), "EquipmentInfo");
+ result = ApiHelper.GetCntrInfo(model);
+ LogHelper.Info("getCntrInfo 杩斿洖锛� + JsonConvert.SerializeObject(result), "EquipmentInfo");
return result;
}
}
--
Gitblit v1.9.1