Merge branch 'master' into wxw

wxw

2025-05-09 1ec3de8254a3dc8d77f01283ab4d85f52d446192

 Wms/Wms/Controllers/DownApiController.cs

@@ -1271,7 +1271,7 @@
                {
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                _hopper.jiaoLiaoHopper(model.AreaNo,model.LocateNo,model.PlnStatus,model.Standard,model.SkuNo,model.LotNo, int.Parse(userId));
                _hopper.jiaoLiaoHopper(model.AreaNo,model.LocateNo,model.PlnStatus,model.Standard,model.SkuNo,model.LotNo,"", int.Parse(userId));

                return Ok(new { data = model, code = 0, msg = "" });
            }
@@ -1302,7 +1302,7 @@
                {
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                _hopper.jiaoCheHopper(model.AreaNo, model.LocateNo,model.PlnNo, model.PlnStatus, model.Weight , model.SkuNo, model.LotNo, int.Parse(userId));
                _hopper.jiaoCheHopper(model.AreaNo, model.LocateNo,model.PlnNo, model.PlnStatus, model.Weight , model.SkuNo, model.LotNo,"", int.Parse(userId));

                return Ok(new { data = model, code = 0, msg = "" });
            }
@@ -1311,8 +1311,39 @@
                return Ok(new { data = "", code = 1, msg = e.Message });
            }
        }
        /// <summary>
        /// 清洗机叫料状态
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult RCSCleanRequest(RCSCleanRequestModel model)
        {
            var logStr = $@".\log\AGV\清洗机叫料" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            AgvResultModel resultModel = null;//返回信息
            try
            {
                var jsonData = JsonConvert.SerializeObject(model);
                LogFile.SaveLogToFile($"清洗机叫料-请求报文：( {jsonData} ),", logStr);

                //具体处理方法
                _hopper.RCSCleanRequest(model.deviceID,model.deviceStation,model.status, _config.AgvHost + _config.GenAgvSchedulingTask);

                resultModel = new AgvResultModel { code = "0", message = "请求成功!"};
                var jsonData2 = JsonConvert.SerializeObject(resultModel);
                LogFile.SaveLogToFile($"清洗机叫料-返回报文：( {jsonData2} ),", logStr);
                return Ok(resultModel);
            }
            catch (Exception e)
            {
                LogFile.SaveLogToFile($"清洗机叫料异常：( {e.Message} ),", logStr);

                resultModel = new AgvResultModel { code = "1", message = e.Message, data = "", reqCode = "" };
                var jsonData2 = JsonConvert.SerializeObject(resultModel);
                LogFile.SaveLogToFile($"清洗机叫料-返回报文：( {jsonData2} ),", logStr);
                return Ok(resultModel);
            }
        }
        #endregion

    }