修改问题

DESKTOP-9BNTV8O

2024-12-14 92e2c34a833c4fd3d446c788a711f177f1c29e2a

 Wms/Wms/Controllers/DownApiController.cs

@@ -18,6 +18,7 @@
using Model.ModelVm.BllTaskVm;
using static Model.InterFaceModel.RCSModel;
using WMS.IBLL.IBllTransServer;
using Microsoft.Extensions.Logging;

namespace Wms.Controllers
{
@@ -658,7 +659,6 @@
        public IActionResult GetPalletNo(Pallnetmsg pallmsg)
        {
            var logStr = $@".\log\AGV\AGV申请叫桶" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            var result = new ErpModel { Success = -1, Message = "", };
            try
            {
                var jsonData = JsonConvert.SerializeObject(pallmsg);
@@ -666,25 +666,61 @@

                if (string.IsNullOrWhiteSpace(pallmsg.Location))
                {
                    result.Message = "叫料位置为空！";
                    return Ok(result);
                    return Ok(new AgvResultModel { code = "1", message = "叫料位置为空！", data = "", reqCode = "" });
                }
                if (string.IsNullOrWhiteSpace(pallmsg.Type))
                {
                    result.Message = "任务类型为空！";
                    return Ok(result);
                    return Ok(new AgvResultModel { code = "1", message = "任务类型为空！", data = "", reqCode = "" });
                }
                _rcsserver.GetPalletNo(pallmsg, _config.AgvHost + _config.GenAgvSchedulingTask);
                result.Success = 0;
                result.Message = "叫桶成功！";
                return Ok(result);
                string taskNo = "";
                _rcsserver.GetPalletNo(pallmsg, _config.AgvHost + _config.GenAgvSchedulingTask, out taskNo);
                return Ok(new AgvResultModel { code = "0", message = "叫桶成功", data = taskNo, reqCode = "" });
            }
            catch (Exception e)
            {
                LogFile.SaveLogToFile($"AGV申请叫桶异常：( {e.Message} ),", logStr);

                result.Message = e.Message;
                return Ok(result);
                return Ok(new AgvResultModel { code = "1", message = e.Message, data = "", reqCode = "" });
            }
        }

        /// <summary>
        /// RCS申请储位
        /// </summary>
        /// <param name="pallmsg"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult ApplyLocatNo(Pallnetmsg pallmsg)
        {
            var logStr = $@".\log\AGV\AGV申请储位" + DateTime.Now.ToString("yyyyMMdd") + ".txt";

            try
            {
                var jsonData = JsonConvert.SerializeObject(pallmsg);
                LogFile.SaveLogToFile($"AGV申请储位：( {jsonData} ),", logStr);

                if (string.IsNullOrWhiteSpace(pallmsg.Location))
                {
                    return Ok(new AgvResultModel { code = "1", message = "申请位置为空！", data = "", reqCode = "" });
                }
                if (string.IsNullOrWhiteSpace(pallmsg.Type))
                {
                    return Ok(new AgvResultModel { code = "1", message = "任务类型为空！", data = "", reqCode = "" });
                }
                if (string.IsNullOrWhiteSpace(pallmsg.PalletNo))
                {
                    return Ok(new AgvResultModel { code = "1", message = "申请托盘号为空！", data = "", reqCode = "" });
                }
                string taskNo = "";
                _rcsserver.ApplyLocatNo(pallmsg, _config.AgvHost + _config.GenAgvSchedulingTask, out taskNo);

                return Ok(new AgvResultModel { code = "0", message = "申请储位成功！", data = taskNo, reqCode = "" });
            }
            catch (Exception e)
            {
                LogFile.SaveLogToFile($"AGV申请储位异常：( {e.Message} ),", logStr);

                return Ok(new AgvResultModel { code = "1", message = e.Message, data = "", reqCode = "" });
            }
        }
        /// <summary>
@@ -749,51 +785,6 @@
        }

        /// <summary>
        /// RCS申请储位
        /// </summary>
        /// <param name="pallmsg"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult ApplyLocatNo(Pallnetmsg pallmsg)
        {
            var logStr = $@".\log\AGV\AGV申请储位" + DateTime.Now.ToString("yyyyMMdd") + ".txt";

            var result = new ErpModel { Success = -1, Message = "" };
            try
            {
                var jsonData = JsonConvert.SerializeObject(pallmsg);
                LogFile.SaveLogToFile($"AGV申请储位：( {jsonData} ),", logStr);

                if (string.IsNullOrWhiteSpace(pallmsg.Location))
                {
                    result.Message = "申请位置为空！";
                    return Ok(result);
                }
                if (string.IsNullOrWhiteSpace(pallmsg.Type))
                {
                    result.Message = "任务类型为空！";
                    return Ok(result);
                }
                if (string.IsNullOrWhiteSpace(pallmsg.PalletNo))
                {
                    result.Message = "申请托盘号为空！";
                    return Ok(result);
                }
                _rcsserver.ApplyLocatNo(pallmsg, _config.AgvHost + _config.GenAgvSchedulingTask);
                result.Success = 0;
                result.Message = "申请储位成功！";
                return Ok(result);
            }
            catch (Exception e)
            {
                LogFile.SaveLogToFile($"AGV申请储位异常：( {e.Message} ),", logStr);

                result.Message = e.Message;
                return Ok(result);
            }
        }

        /// <summary>
        /// 入库单据下发
        /// </summary>
        /// <param name="model">入库单信息</param>
@@ -835,11 +826,10 @@
        [HttpPost]
        public IActionResult agvCallBack(AgvTaskDto model)
        {
            var result = new ErpModel { Success = -1, Message = "" };
            //记录log
            var logStr = $@".\log\AGV\任务执行通知" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            try
            {
                //记录log
                var logStr = $@".\log\AGV\任务执行通知" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            {                
                var jsonData = JsonConvert.SerializeObject(model);
                LogFile.SaveLogToFile($"任务执行通知：( {jsonData} ),", logStr);

@@ -856,8 +846,8 @@
                        return Ok(new AgvResultModel { code = "0", message = "成功", reqCode = model.reqCode });

                    case "end"://任务结束
                        result = _noticeSvc.RCSFinishTask(model.reqCode, "1");
                        return Ok(result);
                        _rcsserver.RCSFinishTask(model.reqCode, "1");
                        return Ok(new AgvResultModel { code = "0", message = "成功", reqCode = model.reqCode });
                    case "cancel"://任务单取消
                        return Ok(new AgvResultModel { code = "0", message = "成功", reqCode = model.reqCode });

@@ -870,6 +860,7 @@
            }
            catch (Exception ex)
            {
                LogFile.SaveLogToFile($"AGV任务执行通知异常：( {ex.Message} ),", logStr);
                return Ok(new AgvResultModel { code = "-1", message = ex.Message, reqCode = model.reqCode });
            }
        }