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 | 53 +++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 43 insertions(+), 10 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 a070986..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; @@ -20,22 +21,54 @@ /// <param name="model"></param> /// <returns></returns> [HttpPost] - // [Route("OutboundOrder")] - public Result CreateTask(CreateTaskModel model) + // [Route("OutboundOrder")] + public Result<Empty> CreateTask(CreateTaskModel model) { - Result result=new Result(); - LogHelper.Info("CreateTask Request锛� + JsonConvert.SerializeObject(model), "CreateTask"); - result=ApiHelper.createtask(model); + Result<Empty> result = new Result<Empty>(); + LogHelper.Info("CreateTask 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "CreateTask"); + result = ApiHelper.createtask(model); LogHelper.Info("CreateTask 杩斿洖锛� + JsonConvert.SerializeObject(result), "CreateTask"); return result; } - public Result PutIn(PutInModel model) + /// <summary> + /// 璁惧淇″彿鍙嶉 + /// </summary> + /// <param name="model"></param> + /// <returns></returns> + public Result<Empty> notifyDeviceSignal(NotifyDeviceSignalModel model) { - Result result = new Result(); - LogHelper.Info("PutIn Request锛� + JsonConvert.SerializeObject(model), "CreateTask"); - result = ApiHelper.PutIn(model); - LogHelper.Info("PutIn 杩斿洖锛� + JsonConvert.SerializeObject(result), "CreateTask"); + 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