程序修改

zhaowc

20 小时以前 35e3dae48db445e66c9614ee55dba062659e33d7

 Wms/Wms/Controllers/DownApiController.cs

@@ -23,6 +23,7 @@
using Model.ModelVm.BllCheckVm;
using Model.ModelVm.SysVm;
using System.Security.Policy;
using Model.ModelVm.DataVm;

namespace Wms.Controllers
{
@@ -956,7 +957,7 @@
                LogFile.SaveLogToFile($"AGV任务执行通知-任务结束-请求报文：( {jsonData} ),", logStr);

                //具体处理方法
                _hopper.RCSFinishTask(model.robotTaskCode, extraValue.values.slotCode, "1", "AGV");
                _hopper.RCSFinishTask(model.robotTaskCode, extraValue.values.slotName, "1", "AGV");

                Data data = new Data();
                data.robotTaskCode = model.robotTaskCode;
@@ -991,18 +992,22 @@
            AgvResultModel2 resultModel = null;//返回信息
            try
            {
                var extraValue = new ExtraModel();
                extraValue = model.extra;
                if (!(extraValue.values.method == "cancel"))
                {
                    throw new Exception("小车调用方法错误");
                }
                var jsonData = JsonConvert.SerializeObject(model);
                LogFile.SaveLogToFile($"AGV任务执行通知-任务单取消-请求报文：( {jsonData} ),", logStr);

                LogFile.SaveLogToFile($"AGV任务执行通知-任务取消-请求报文：( {jsonData} ),", logStr);
                //具体处理方法
                //_rcsserver.CancelTask(model.robotTaskCode, _config.AgvHost + _config.CancelTask, 0);



                resultModel.code = "0";
                resultModel.message = "成功";
                resultModel.da.robotTaskCode = model.robotTaskCode;
                Data data = new Data();
                //data.robotTaskCode = model.robotTaskCode;
                resultModel = new AgvResultModel2 { code = "0", message = "成功", da = data };
                var jsonData2 = JsonConvert.SerializeObject(resultModel);
                LogFile.SaveLogToFile($"AGV任务执行通知-任务单取消-返回报文：( {jsonData2} ),", logStr);
                LogFile.SaveLogToFile($"AGV任务执行通知-任务取消-返回报文：( {jsonData2} ),", logStr);
                return Ok(resultModel);
            }
            catch (Exception ex)
@@ -1040,6 +1045,9 @@
                        break;
                    case "end":
                        var b = end(model);
                        break;
                    case "cancel":
                        var c = cancel(model);
                        break;
                    default:
                        break;
@@ -1180,7 +1188,7 @@
                {
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                _rcsserver.CancelTask(model.taskNo, int.Parse(userId));
                _rcsserver.CancelTask(model.taskNo, _config.AgvHost + _config.CancelTask, int.Parse(userId));

                return Ok(new { code = 0, msg = "成功取消任务", data = "" });
            }
@@ -1419,7 +1427,76 @@
            }
        }

       
        /// <summary>
        /// 点对点任务
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult PointToPointRequest(PointTask model)
        {
            var logStr = $@".\log\AGV\点对点任务下发" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            AgvResultModel resultModel = null;//返回信息
            try
            {
                var jsonData = JsonConvert.SerializeObject(model);
                LogFile.SaveLogToFile($"任务下发：( {jsonData} ),", logStr);
                //具体处理方法
                _hopper.PointToPointRequest(model.ID, model.BeginPoint, model.EndPoint, _config.AgvHost + _config.GenAgvSchedulingTask, _config.AgvHost + _config.AGVBindPallets);

                resultModel = new AgvResultModel { code = "0", message = "请求成功!" };
               
                return Ok(resultModel);
            }
            catch (Exception e)
            {
                LogFile.SaveLogToFile($"下发点对点任务异常：( {e.Message} ),", logStr);
                resultModel = new AgvResultModel { code = "1", message = e.Message, data = "", reqCode = "" };
                return Ok(resultModel);
            }
        }

        /// <summary>
        /// 删除当前库存信息
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult DelStockWms(DelStockInfo model)
        {
            try
            {
                //获取当前登录的用户ID
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(userId))
                {
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                string errMsg = "";
                bool t = _rcsserver.DelStockWms(model.StockId, _config.AgvHost + _config.AGVUnBindPallets, int.Parse(userId),out errMsg);
                if (t)
                {
                    return Ok(new { code = 0, msg = "删除成功", data = "" });
                }
                else
                {
                    return Ok(new { code = 1, msg = "删除失败", data = errMsg });
                }


                }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }


        #endregion

    }