Merge branch 'master' into csc

chengsc

2024-10-18 1e26a7575d9969e728b0aa01466f490409cb173c

 Wms/Wms/Controllers/PdaCrController.cs

@@ -395,9 +395,19 @@
                }

                var uId = int.Parse(userId);
                _pdaCrSvc.AgvTransport2(model.SoNo,model.PalletNo, model.AreaNo, uId, _config.WcsHost + _config.GenAgvSchedulingTask);
                var str = _pdaCrSvc.AgvTransport2(model.SoNo,model.PalletNo, model.AreaNo, uId, _config.WcsHost + _config.GenAgvSchedulingTask);
                var msgStr = "";
                if (str.Contains("0"))
                {
                    msgStr += "成功";
                }
                if (str.Contains("1"))
                {
                    msgStr += "部分托盘已有小车等待执行或正在执行的任务";
                }
                 

                return Ok(new { data = "", code = 0, msg = "成功" });
                return Ok(new { data = "", code = 0, msg = msgStr });
            }
            catch (Exception e)
            {
@@ -406,5 +416,31 @@
        }
        #endregion

        #region 箱码查询
        /// <summary>
        /// pda箱码查询
        /// </summary>
        /// <param name="boxNo">箱码</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetBoxQueryList(string boxNo)
        {
            try
            {
                DataBoxDto stockList = _pdaCrSvc.GetBoxQueryList(boxNo);
                if (stockList == null)
                {
                    return Ok(new { data = stockList, code = 1, msg = "无数据" });
                }
                return Ok(new { data = stockList, code = 0, msg = "成功" });
            }
            catch (Exception e)
            {
                return Ok(new { data = "", code = 1, msg = $"异常：{e.Message}" });
            }

        }
        #endregion

    }
}