Merge branch 'master' into wxw

wxw

2025-05-09 1ec3de8254a3dc8d77f01283ab4d85f52d446192

Merge branch 'master' into wxw

 Wms/Model/InterFaceModel/AgvModel.cs

@@ -192,9 +192,21 @@

    public class TaskDetial
    {
        /// <summary>
        /// 任务号
        /// </summary>
        public string Taskno { get; set; }
        /// <summary>
        /// 起始位置
        /// </summary>
        public string Startport { get; set; }
        /// <summary>
        /// 目标位置
        /// </summary>
        public string Endport { get; set; }
        /// <summary>
        /// 托盘号/桶号
        /// </summary>

        public string Pallno { get; set; }
        /// <summary>

 Wms/Utility/Tools/RcsHelper.cs

@@ -10,6 +10,14 @@
{
    public static class RcsHelper
    {
        /// <summary>
        /// 下发任务
        /// </summary>
        /// <param name="taskDetial">请求参数</param>
        /// <param name="url">请求地址</param>
        /// <param name="agvMsg">返回信息</param>
        /// <param name="priority">优先级</param>
        /// <returns></returns>
        public static bool CreateTaskForAgv(TaskDetial taskDetial, string url, out string agvMsg, string priority = null)
        {
            bool result = false;
@@ -48,17 +56,8 @@
            }
            else
            {
                string logMsg = "";
                if (taskDetial.Crtype == "1")//叫桶（桶出库）
                {
                    logMsg = "申请叫桶";
                }
                else if (taskDetial.Crtype == "0")//申请储位（桶入库）
                {
                    logMsg = "申请储位";
                }
                var logStr = $@".\log\AGV\AGV{logMsg}" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
                LogFile.SaveLogToFile($"AGV{logMsg}异常：( {agvModel.Message} ),", logStr);
                var logStr = $@".\log\AGV\下发给AGV转运命令" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
                LogFile.SaveLogToFile($"下发给AGV转运命令异常：( {agvModel.Message} ),", logStr);

                agvMsg = agvModel.Message;
            }