程序修改

zhaowc

2 天以前 bb0b78e7ef5317a38adc18a648e41aa8cc4711bc

 Wms/Wms/Controllers/DownApiController.cs

@@ -912,9 +912,10 @@
                //具体处理方法
                _hopper.OutBinAgv(model.robotTaskCode, _config.AgvHost + _config.GenAgvSchedulingTask,_config.AgvHost+_config.AGVBindPallets);

                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);
                return Ok(resultModel);
@@ -923,10 +924,10 @@
            {
                LogFile.SaveLogToFile($"AGV任务执行通知-走出储位-异常：( {ex.Message} ),", logStr);

                
                resultModel.code = "1";
                resultModel.message = ex.Message;
                resultModel.da.robotTaskCode = model.robotTaskCode;
                Data data = new Data();
                data.robotTaskCode = model.robotTaskCode;
                resultModel = new AgvResultModel2 { code = "1", message = ex.Message, da = data };
               
                var jsonData2 = JsonConvert.SerializeObject(resultModel);
                LogFile.SaveLogToFile($"AGV任务执行通知-走出储位-返回报文：( {jsonData2} ),", logStr);
                return Ok(resultModel);
@@ -957,9 +958,9 @@
                //具体处理方法
                _hopper.RCSFinishTask(model.robotTaskCode, "1", "AGV");

                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);
@@ -969,9 +970,9 @@
            {
                LogFile.SaveLogToFile($"AGV任务执行通知-任务结束-异常：( {ex.Message} ),", logStr);

                resultModel.code = "1";
                resultModel.message = ex.Message;
                resultModel.da.robotTaskCode = model.robotTaskCode;
                Data data = new Data();
                data.robotTaskCode = model.robotTaskCode;
                resultModel = new AgvResultModel2 { code = "1", message = ex.Message, da = data };
                var jsonData2 = JsonConvert.SerializeObject(resultModel);
                LogFile.SaveLogToFile($"AGV任务执行通知-任务结束-返回报文：( {jsonData2} ),", logStr);
                return Ok(resultModel);
@@ -1015,7 +1016,51 @@
                LogFile.SaveLogToFile($"AGV任务执行通知-任务单取消-返回报文：( {jsonData2} ),", logStr);
                return Ok(resultModel);
            }
        }        
        }

        /// <summary>
        /// 走出储位
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult AGVCallback(AgvTaskDto model)
        {
            //记录log
            var logStr = $@".\log\AGV\任务执行通知" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            AgvResultModel2 resultModel = null;//返回信息
            try
            {
                var extraValue = new ExtraModel();
                extraValue = model.extra;
                switch (extraValue.values.method)
                {
                    case "outbin":
                        var a = outbin(model);
                        break;
                    case "end":
                        var b = end(model);
                        break;
                    default:
                        break;
                }
                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);
                return Ok(resultModel);
            }
            catch (Exception ex)
            {
                Data data = new Data();
                data.robotTaskCode = model.robotTaskCode;
                resultModel = new AgvResultModel2 { code = "1", message = ex.Message, da = data };
                var jsonData2 = JsonConvert.SerializeObject(resultModel);
                LogFile.SaveLogToFile($"AGV任务执行通知-返回报文：( {jsonData2} ),", logStr);
                return Ok(resultModel);
            }
        }

        #endregion

@@ -1072,7 +1117,7 @@
                {
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                _rcsserver.DownTask(model.taskNo, int.Parse(userId), _config.AgvHost + _config.GenAgvSchedulingTask);
                _rcsserver.DownTask(model.taskNo, int.Parse(userId), _config.AgvHost + _config.GenAgvSchedulingTask,_config.AgvHost + _config.AGVBindPallets);

                return Ok(new { code = 0, msg = "重新下发已完成", data = "" });
            }
@@ -1106,7 +1151,7 @@
                //具体处理方法
                _rcsserver.RCSFinishTask(model.taskNo, "1", "WMS");

                return Ok(new { code = 0, msg = "重新下发已完成", data = "" });
                return Ok(new { code = 0, msg = "任务已手动完成", data = "" });
            }
            catch (Exception e)
            {
@@ -1373,6 +1418,8 @@
                return Ok(resultModel);
            }
        }

       
        #endregion

    }