yanjinhui
2026-03-02 a4c0e9759befb4e8efa91e322370afe9d4673d4b
优化
已修改3个文件
118 ■■■■ 文件已修改
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/TrackloginfoService.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs 113 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/KLSTaskExtend.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/TrackloginfoService.cs
@@ -43,7 +43,8 @@
                Dt_trackloginfo trackloginfo = new Dt_trackloginfo()
                {
                    tracklog_name = logName,
                    tracklog_content = JsonConvert.SerializeObject(entity),
                    //tracklog_content = JsonConvert.SerializeObject(entity),
                    tracklog_content = entity is string strEntity ? strEntity : JsonConvert.SerializeObject(entity),//如果entity是字符串类型,则直接使用,否则序列化为JSON字符串
                    tracklog_createtime = DateTime.Now,
                    tracklog_type = content.Status ? "成功" : "失败",
                    tracklog_code = content.Status ? logCode : ("4" + logCode),
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs
@@ -18,32 +18,29 @@
        {
            _taskService = taskService;
        }
        public WMSReturn ReturnWMS(WebResponseContent content, int successCode = 0, int failCode = 404)
        {
            return new WMSReturn
            {
                code = content.Status ? successCode : failCode,
                msg = content.Message ?? (content.Status ? "操作成功" : "操作失败"),
                data = content.Status ? content.Data : null
            };
        }
        /// <summary>
        /// WMS下发任务
        /// </summary>
        /// <param name="taskDTOs"></param>
        /// <returns></returns>
        [HttpPost, Route("ReceiveTask"), AllowAnonymous]
        public object ReceiveWMSTask([FromBody] List<WMSTasksDTO> taskDTOs)
        public WMSReturn ReceiveWMSTask([FromBody] List<WMSTasksDTO> taskDTOs)
        {
            WebResponseContent content = _taskService.ReceiveWMSTask(taskDTOs);
            if (!content.Status)
            {
                return new
                {
                    code = "404",
                    msg = content.Message
                };
            }
            else
            {
                return new
                {
                    code = "0",
                    msg = content.Message,
                    data = content.Data
                };
            }
            return ReturnWMS(content);
        }
        /// <summary>
@@ -52,26 +49,10 @@
        /// <param name="wMSCancelTask"></param>
        /// <returns></returns>
        [HttpPost, Route("CancelWMSTask"), AllowAnonymous]
        public object CancelWMSTask([FromBody] WMSCancelTask wMSCancelTask)
        public WMSReturn CancelWMSTask([FromBody] WMSCancelTask wMSCancelTask)
        {
            WebResponseContent content = _taskService.CancelWMSTask(wMSCancelTask);
            if (!content.Status)
            {
                return new
                {
                    code = "404",
                    msg = content.Message
                };
            }
            else
            {
                return new
                {
                    code = "0",
                    msg = content.Message,
                    data = content.Data
                };
            }
            return ReturnWMS(content);
        }
        /// <summary>
@@ -80,26 +61,10 @@
        /// <param name="updateTaskPriority"></param>
        /// <returns></returns>
        [HttpPost, Route("UpdateWMSTaskPriority"), AllowAnonymous]
        public object UpdateWMSTaskPriority([FromBody] WMSUpdateTaskPriority updateTaskPriority)
        public WMSReturn UpdateWMSTaskPriority([FromBody] WMSUpdateTaskPriority updateTaskPriority)
        {
            WebResponseContent content = _taskService.UpdateWMSTaskPriority(updateTaskPriority);
            if (!content.Status)
            {
                return new
                {
                    code = "404",
                    msg = content.Message
                };
            }
            else
            {
                return new
                {
                    code = "0",
                    msg = content.Message,
                    data = content.Data
                };
            }
            return ReturnWMS(content);
        }
        /// <summary>
@@ -108,26 +73,10 @@
        /// <param name="WMSUpdateLocationArea"></param>
        /// <returns></returns>
        [HttpPost, Route("ModifyWMSLayoutZone"), AllowAnonymous]
        public object ModifyWMSLayoutZone([FromBody] WMSUpdateLocationArea wMSUpdateLocationArea)
        public WMSReturn ModifyWMSLayoutZone([FromBody] WMSUpdateLocationArea wMSUpdateLocationArea)
        {
            WebResponseContent content = _taskService.ModifyWMSLayoutZone(wMSUpdateLocationArea);
            if (!content.Status)
            {
                return new
                {
                    code = "404",
                    msg = content.Message
                };
            }
            else
            {
                return new
                {
                    code = "0",
                    msg = content.Message,
                    data = content.Data
                };
            }
            return ReturnWMS(content);
        }
        /// <summary>
@@ -136,26 +85,10 @@
        /// <param name="AreaCode">区域号</param>
        /// <returns></returns>
        [HttpPost, Route("LocationInquiry"), AllowAnonymous]
        public object  LocationInquiry(string AreaCode)
        public WMSReturn LocationInquiry(string AreaCode)
        {
            WebResponseContent content = _taskService.LocationInquiry(AreaCode);
            if (!content.Status)
            {
                return new
                {
                    code = "404",
                    msg = content.Message
                };
            }
            else
            {
                return new
                {
                    code = "0",
                    msg = content.Message,
                    data = content.Data
                };
            }
            return ReturnWMS(content);
        }
    }
}
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/KLSTaskExtend.cs
@@ -60,7 +60,7 @@
            }
            finally
            {
                _trackloginfoService.AddTrackLog(gALAXISTaskInfo.Serialize(), content, "下发凯乐士AGV任务","","");
                _trackloginfoService.AddTrackLog(gALAXISTaskInfo, content, "下发凯乐士AGV任务","","");
                //dt_trackloginfoService.Instance.AddTrackLog(outTaskInfo, content, "接收宇航WMS出库任务下发", "", $"{msg},变更结果:{content.Status}");
            }
        }